Skip to content

Commit 5ddaa39

Browse files
committed
Resolved failing tests
1 parent e2ed2f0 commit 5ddaa39

11 files changed

Lines changed: 32 additions & 35 deletions

File tree

cypress/e2e/events/events.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ describe('Event Page', () => {
22
it('displays the correct main title', () => {
33
cy.visit('localhost:5173/events');
44

5-
cy.should('contain', 'my events');
5+
cy.contains('my events');
66
});
77
});

cypress/e2e/organizations/organizations.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ describe('Organizations Page', () => {
22
it('displays the correct main title', () => {
33
cy.visit('localhost:5173/organizations');
44

5-
cy.should('contain', 'my orgs');
5+
cy.contains('my orgs');
66
});
77
});

src/components/Carousel.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,27 @@ import Organization from './Organization.tsx';
33

44
type CarouselProps = {
55
type: string;
6-
}
6+
};
77

88
export default function Carousel({ type }: CarouselProps) {
99
return (
1010
<>
1111
<div>
1212
<h2 className="carousel-title">{type}</h2>
1313
<div className="carousel">
14-
<Organization title="Math Club" desc="The RPI Math Faculty approved and Union affiliated math club!"/>
15-
<Organization title="Math Club" desc="The RPI Math Faculty approved and Union affiliated math club!"/>
16-
<Organization title="Math Club" desc="The RPI Math Faculty approved and Union affiliated math club!"/>
17-
</div>
14+
<Organization
15+
title="Math Club"
16+
desc="The RPI Math Faculty approved and Union affiliated math club!"
17+
/>
18+
<Organization
19+
title="Math Club"
20+
desc="The RPI Math Faculty approved and Union affiliated math club!"
21+
/>
22+
<Organization
23+
title="Math Club"
24+
desc="The RPI Math Faculty approved and Union affiliated math club!"
25+
/>
26+
</div>
1827
</div>
1928
</>
2029
);

src/components/Event.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
import '../css/events.css';
2-
31
export default function Event() {
4-
return (
5-
<div className="org">
6-
7-
</div>
8-
);
2+
return <div className="org"></div>;
93
}

src/components/Organization.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import '../css/organizations.css';
33
type OrganizationProps = {
44
title: string;
55
desc: string;
6-
}
6+
};
77

8-
export default function Organization({title, desc}:OrganizationProps) {
8+
export default function Organization({ title, desc }: OrganizationProps) {
99
return (
1010
<div className="org">
1111
<div className="org-metadata">
@@ -14,12 +14,8 @@ export default function Organization({title, desc}:OrganizationProps) {
1414
<span>{desc}</span>
1515
</div>
1616
<div className="org-btns">
17-
<button className="events-btn">
18-
Events
19-
</button>
20-
<button className="manage-btn">
21-
Manage
22-
</button>
17+
<button className="events-btn">Events</button>
18+
<button className="manage-btn">Manage</button>
2319
</div>
2420
</div>
2521
);

src/css/carousel.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
height: 18rem;
1111
border-radius: 2rem;
1212
padding: 1rem;
13-
1413
display: flex;
1514
flex-direction: row;
1615
align-items: center;
@@ -22,4 +21,4 @@
2221
font-size: 1rem;
2322
color: var(--standard-bw-text);
2423
font-weight: 600;
25-
}
24+
}

src/css/colors.css

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ section as well.
1818
--site-transition: 0.25s;
1919
--site-font: 'Asap', sans-serif;
2020

21-
2221
/* CAPY COLOR SUITE ========================= */
2322

2423
/* All colors used on the site are found here */
@@ -31,10 +30,8 @@ section as well.
3130
--highlight: #f4f8f6;
3231
--off-black: #20201f;
3332

34-
3533
/* MISC DEV VARIABLES ======================= */
3634

37-
3835
/* COLOR VARIABLES ========================== */
3936

4037
/* Global Styles: backgrounds, text */
@@ -54,7 +51,7 @@ section as well.
5451
--carousel-bg: #f2dede;
5552

5653
/* Organizations */
57-
--org-bg: #D9D9D9;
54+
--org-bg: #d9d9d9;
5855
--img-placeholder-bg: #b3807d;
5956
--general-org-btn-bg: #b3807d;
6057
--manage-org-btn-bg: #97bdc6;
@@ -72,6 +69,5 @@ section as well.
7269

7370
/* Navbar */
7471

75-
7672
/* Carousel */
7773
}

src/css/events.css

Whitespace-only changes.

src/css/organizations.css

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
flex-direction: row;
3131
}
3232

33-
.events-btn, .join-btn, .manage-btn, .home-btn {
33+
.events-btn,
34+
.join-btn,
35+
.manage-btn,
36+
.home-btn {
3437
font-size: 1rem;
3538
padding: 0.25rem 2rem;
3639
border-radius: 2rem;
@@ -55,4 +58,4 @@
5558

5659
.home-btn {
5760
background: var(--general-org-btn-bg);
58-
}
61+
}

src/pages/Events.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export default function Events() {
44
return (
55
<>
66
<div className={`carousel-page-container`}>
7-
<Carousel type="my events"/>
8-
<Carousel type="recommended"/>
7+
<Carousel type="my events" />
8+
<Carousel type="recommended" />
99
</div>
1010
</>
1111
);

0 commit comments

Comments
 (0)