Skip to content

Commit 0ca30d0

Browse files
C3vicheC3viche
authored
Merge pull request #68 from include-davis/final-fixes
Final fixes
2 parents ea3941d + d6f538d commit 0ca30d0

File tree

18 files changed

+1359
-383
lines changed

18 files changed

+1359
-383
lines changed

‎app/(pages)/(home)/page.jsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import styles from "./page.module.scss";
22
import Image from "next/image";
33
import { FaHome, FaClock, FaEnvelope } from "react-icons/fa";
44
import Link from "next/link";
5-
import data from "@/app/(pages)/_data/home.json";
65
import HomepageCarousel from "../_components/HomepageCarousel/HomepageCarousel";
76
import HomeCard from "../_components/HomeCard/HomeCard";
87

‎app/(pages)/_components/AboutUsCard/AboutUsCard.module.scss‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,35 +17,33 @@
1717
color: var(--emerald);
1818
}
1919
@include mixins.phone {
20-
width: 100%;
20+
width: 100%;
2121
border-radius: var(--card-border-radius);
2222
box-shadow: var(--drop-shadow);
23-
// display: flex;
23+
// display: flex;
2424
flex-direction: column;
25-
justify-content: center;
26-
// align-items: center;
27-
h3 {
28-
text-align: center;
29-
}
25+
justify-content: center;
26+
// align-items: center;
27+
h3 {
28+
text-align: center;
29+
}
3030
}
3131
}
3232

3333
.cardWrapper.left {
3434
flex-direction: row-reverse;
35-
@include mixins.phone{
35+
@include mixins.phone {
3636
//align-items: center;
3737
flex-direction: column-reverse;
3838
}
3939
}
4040

4141
.cardWrapper.right {
4242
flex-direction: row;
43-
@include mixins.phone{
44-
45-
// align-items: center;
46-
flex-direction: column-reverse;
43+
@include mixins.phone {
44+
// align-items: center;
45+
flex-direction: column-reverse;
4746
}
48-
4947
}
5048

5149
.cardContainer {
@@ -55,8 +53,8 @@
5553
gap: 20px;
5654
padding: var(--card-padding);
5755
flex: 1;
58-
@mixin phone{
59-
padding: 10px;
56+
@mixin phone {
57+
padding: 10px;
6058
align-items: center;
6159
}
6260
}
@@ -71,7 +69,6 @@
7169
align-items: center;
7270
padding-bottom: 200px;
7371

74-
7572
//margin-bottom: 10px;
7673
}
7774
}

‎app/(pages)/_components/ClinicRolesCard/ClinicRolesCard.jsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ export default function ClinicRolesCard({
2626
<Image src={icon} width={40} height={40} alt={iconAlt} />
2727
<h3>{title}</h3>
2828
</div>
29-
<p className={styles.description} dangerouslySetInnerHTML={{ __html: description }} />
29+
<p
30+
className={styles.description}
31+
dangerouslySetInnerHTML={{ __html: description }}
32+
/>
3033
</div>
3134
</div>
3235
);

‎app/(pages)/_components/ClinicRolesCard/ClinicRolesCard.module.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
.card {
1212
width: 60%; // had to change this
1313
position: relative;
14-
14+
1515
flex-direction: column;
1616
align-items: center;
1717

@@ -103,7 +103,7 @@
103103
ul {
104104
margin-left: 30px;
105105
}
106-
106+
107107
@include mixins.fontStyle(1.1rem, 400, 150%, var(--font2));
108108

109109
@include mixins.tablet {

‎app/(pages)/_components/HomepageCarousel/HomepageCarousel.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import "swiper/css/free-mode";
1313

1414
export default function HomepageCarousel({ data }) {
1515
let slides = Object.values(data);
16-
16+
1717
if (Object.keys(data).length === 1) {
1818
slides = Object.values([...data, ...data, ...data, ...data]);
1919
}

‎app/(pages)/_components/HomepageCarousel/HomepageCarousel.module.scss‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
color: var(--dark-grey);
2424
}
2525

26-
.swiper{
27-
width: calc(8px * 123);
28-
// display: flex;
29-
justify-content: center;
30-
align-items: center;
31-
margin: auto;
32-
overflow: visible !important;
26+
.swiper {
27+
width: calc(8px * 123);
28+
// display: flex;
29+
justify-content: center;
30+
align-items: center;
31+
margin: auto;
32+
overflow: visible !important;
3333
}
3434

3535
.swiperslide {

‎app/(pages)/_data/community-partners.json‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
[
2-
{
3-
"name": "Harm Reduction Services",
4-
"description": "HRS offers free, confidential harm reduction services to improve the health and well-being of drug users, in addition to empowering local communities.",
5-
"location": "2800 Stockton Blvd. Sacramento, CA 95817",
6-
"date": "Monday - Friday, 12:00 PM - 6:00 PM",
7-
"appointment": "",
8-
"website": "https://hrssac.org/",
9-
"buttonText": "Visit HRS Website",
10-
"imageSrc": "/HRS.png",
11-
"imageAlt": "Volunteers at an event table for Harm Reduction Services"
12-
},
13-
{
14-
"name": "Gender Health Center",
15-
"description": "GHC offers free or low-cost health, legal, and support services for trans and gender-expansive communities.",
16-
"location": "3823 V Street Sacramento, CA 95817",
17-
"date": "1st & 3rd Friday of each month, 6:00 PM - 9:00 PM",
18-
"appointment": "By appointment only",
19-
"website": "https://www.genderhealthcenter.org/",
20-
"buttonText": "Visit GHC Website",
21-
"imageSrc": "/GHC.png",
22-
"imageAlt": "Three volunteers holding service items"
23-
},
24-
{
25-
"name": "Stockton Harm Reduction Program",
26-
"description": "SHRP offers harm reduction tools, wound care supplies, referrals to health and legal services, and advocates for social justice in Stockton.",
27-
"location": "446 S Harrison St, Stockton, CA 95203",
28-
"date": "Saturdays, 9:00 AM - 1 :00 PM",
29-
"appointment": "",
30-
"website": "https://theshrp.org/",
31-
"buttonText": "Visit SHRP Website",
32-
"imageSrc": "/SHRC.jpg",
33-
"imageAlt": "Stockton Harm Reduction Program volunteers at a community event"
34-
}
35-
]
2+
{
3+
"name": "Harm Reduction Services",
4+
"description": "HRS offers free, confidential harm reduction services to improve the health and well-being of drug users, in addition to empowering local communities.",
5+
"location": "2800 Stockton Blvd. Sacramento, CA 95817",
6+
"date": "Monday - Friday, 12:00 PM - 6:00 PM",
7+
"appointment": "",
8+
"website": "https://hrssac.org/",
9+
"buttonText": "Visit HRS Website",
10+
"imageSrc": "/HRS.png",
11+
"imageAlt": "Volunteers at an event table for Harm Reduction Services"
12+
},
13+
{
14+
"name": "Gender Health Center",
15+
"description": "GHC offers free or low-cost health, legal, and support services for trans and gender-expansive communities.",
16+
"location": "3823 V Street Sacramento, CA 95817",
17+
"date": "1st & 3rd Friday of each month, 6:00 PM - 9:00 PM",
18+
"appointment": "By appointment only",
19+
"website": "https://www.genderhealthcenter.org/",
20+
"buttonText": "Visit GHC Website",
21+
"imageSrc": "/GHC.png",
22+
"imageAlt": "Three volunteers holding service items"
23+
},
24+
{
25+
"name": "Stockton Harm Reduction Program",
26+
"description": "SHRP offers harm reduction tools, wound care supplies, referrals to health and legal services, and advocates for social justice in Stockton.",
27+
"location": "446 S Harrison St, Stockton, CA 95203",
28+
"date": "Saturdays, 9:00 AM - 1 :00 PM",
29+
"appointment": "",
30+
"website": "https://theshrp.org/",
31+
"buttonText": "Visit SHRP Website",
32+
"imageSrc": "/SHRC.jpg",
33+
"imageAlt": "Stockton Harm Reduction Program volunteers at a community event"
34+
}
35+
]

‎app/(pages)/_data/footer.json‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
11
{
2-
"img": "/logo.png",
3-
"imgAlt": "JVM Clinic Logo",
4-
"socialUrl": "https://www.instagram.com/jvmclinic",
5-
"navLinks": [
6-
{ "label": "Home", "href": "/", "isButton": false },
7-
{ "label": "Clinic Schedules", "href": "/clinic-schedule", "isButton": false },
8-
{ "label": "Community Partners", "href": "/community-partners", "isButton": false },
9-
{ "label": "About Us", "href": "/about-us", "isButton": false },
10-
{ "label": "Volunteer", "href": "/volunteer", "isButton": false },
11-
{ "label": "Contact Us", "href": "/contact-us", "isButton": false }
12-
],
13-
"mainInstagram": "@jvmclinic",
14-
"studentInstagram": "@jvmcstudents",
15-
"footerText": "Made with 🤍 by #include at Davis © 2025"
16-
}
2+
"img": "/logo.png",
3+
"imgAlt": "JVM Clinic Logo",
4+
"socialUrl": "https://www.instagram.com/jvmclinic",
5+
"navLinks": [
6+
{ "label": "Home", "href": "/", "isButton": false },
7+
{
8+
"label": "Clinic Schedules",
9+
"href": "/clinic-schedule",
10+
"isButton": false
11+
},
12+
{
13+
"label": "Community Partners",
14+
"href": "/community-partners",
15+
"isButton": false
16+
},
17+
{ "label": "About Us", "href": "/about-us", "isButton": false },
18+
{ "label": "Volunteer", "href": "/volunteer", "isButton": false },
19+
{ "label": "Contact Us", "href": "/contact-us", "isButton": false }
20+
],
21+
"mainInstagram": "@jvmclinic",
22+
"studentInstagram": "@jvmcstudents",
23+
"footerText": "Made with 🤍 by #include at Davis © 2025"
24+
}

‎app/(pages)/_data/general-info.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
"tagline_desktop": "Serving the health care needs of uninsured drug users, sex workers, trans folks, and their families regardless of documentation status.",
3-
"tagline_mobile": "Serving health care needs of uninsured drug users, sex workers, trans folks, and their families.",
4-
"address": "3647 40th St, Sacramento, CA 95817",
5-
"hours": "Every Saturday: 1:00pm - 4:00pm",
6-
7-
"appointment_instruction": "No Appointments Needed! Open every Saturday 1-4pm",
8-
9-
"volunteer_page_description": "Once a month, our clinic conducts a mobile outreach program. There our volunteers work alongside Sacramento’s Gender Hormone Clinic and the Stockton Harm Reduction Program to provide the best care to our patients.\n\nOutside of our clinic, our undergraduate volunteers work in one of our seven committees to build and reinforce projects in the Oak Park Community, hosting events such as the Health Fair and the Harm Reduction Conference.",
10-
"volunteer_image": "/volunteer-entrance.png",
11-
"volunteer_image_alt_text": "JVMC volunteers posing at a drive in Sacramento",
12-
13-
"event_card_title": "Annual Health Fair",
14-
"event_card_description": "JVMC will be hosting our Annual Health Fair this year on May 3rd, 2025. This event seeks to provide diverse health and wellness booths to provide free resources and supplies to the community members of Oak Park. Please refer to our Instagram for updates on time and location!",
15-
"event_card_image": "/about-annual-health-fair.jpg",
16-
"event_card_image_alt_text": "Health Fair",
17-
"event_card_button_text": "Get Involved",
18-
"event_card_button_url": "https://www.instagram.com/jvmclinic/"
19-
}
2+
"tagline_desktop": "Serving the health care needs of uninsured drug users, sex workers, trans folks, and their families regardless of documentation status.",
3+
"tagline_mobile": "Serving health care needs of uninsured drug users, sex workers, trans folks, and their families.",
4+
"address": "3647 40th St, Sacramento, CA 95817",
5+
"hours": "Every Saturday: 1:00pm - 4:00pm",
6+
7+
"appointment_instruction": "No Appointments Needed! Open every Saturday 1-4pm",
8+
9+
"volunteer_page_description": "Once a month, our clinic conducts a mobile outreach program. There our volunteers work alongside Sacramento’s Gender Hormone Clinic and the Stockton Harm Reduction Program to provide the best care to our patients.\n\nOutside of our clinic, our undergraduate volunteers work in one of our seven committees to build and reinforce projects in the Oak Park Community, hosting events such as the Health Fair and the Harm Reduction Conference.",
10+
"volunteer_image": "/volunteer-entrance.png",
11+
"volunteer_image_alt_text": "JVMC volunteers posing at a drive in Sacramento",
12+
13+
"event_card_title": "Annual Health Fair",
14+
"event_card_description": "JVMC will be hosting our Annual Health Fair this year on May 3rd, 2025. This event seeks to provide diverse health and wellness booths to provide free resources and supplies to the community members of Oak Park. Please refer to our Instagram for updates on time and location!",
15+
"event_card_image": "/about-annual-health-fair.jpg",
16+
"event_card_image_alt_text": "Health Fair",
17+
"event_card_button_text": "Get Involved",
18+
"event_card_button_url": "https://www.instagram.com/jvmclinic/"
19+
}

‎app/(pages)/_data/home-cards.json‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[
2-
{
3-
"title": "Unbiased Healthcare",
4-
"description": "We provide basic medical care and health education in a non-judgmental, accessible way.\n\n Offering free primary health care services to the uninsured population in the Oak Park area of Sacramento, CA.\n\n Our mission is fulfilled through the service of UC Davis undergraduates, medical, PA, NP students and the generosity of physicians.",
5-
"image": "/home-card-img1.jpg",
6-
"image_alt_text": "Image of JVMC Workers handling documents",
7-
"icon": "/akar-icons_health.png",
8-
"icon_alt_text": "Health Icon"
9-
},
10-
{
11-
"title": "The People We Serve",
12-
"description": "At JVMC, we welcome everyone, regardless of their life history. No matter who you are, you are welcome.\n\n We are known in the community for caring about forgotten populations, in particular:\n Individuals who use intravenous drugs\n Sex workers\n People who identify as transgender\n Families",
13-
"image": "/home-card-img2.jpg",
14-
"image_alt_text": "Image of JVMC Workers grouped together smiling",
15-
"icon": "/bi_people.png",
16-
"icon_alt_text": "Health Workers Icon"
17-
}
18-
]
2+
{
3+
"title": "Unbiased Healthcare",
4+
"description": "We provide basic medical care and health education in a non-judgmental, accessible way.\n\n Offering free primary health care services to the uninsured population in the Oak Park area of Sacramento, CA.\n\n Our mission is fulfilled through the service of UC Davis undergraduates, medical, PA, NP students and the generosity of physicians.",
5+
"image": "/home-card-img1.jpg",
6+
"image_alt_text": "Image of JVMC Workers handling documents",
7+
"icon": "/akar-icons_health.png",
8+
"icon_alt_text": "Health Icon"
9+
},
10+
{
11+
"title": "The People We Serve",
12+
"description": "At JVMC, we welcome everyone, regardless of their life history. No matter who you are, you are welcome.\n\n We are known in the community for caring about forgotten populations, in particular:\n Individuals who use intravenous drugs\n Sex workers\n People who identify as transgender\n Families",
13+
"image": "/home-card-img2.jpg",
14+
"image_alt_text": "Image of JVMC Workers grouped together smiling",
15+
"icon": "/bi_people.png",
16+
"icon_alt_text": "Health Workers Icon"
17+
}
18+
]

0 commit comments

Comments
 (0)