Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

initial data update #26

Merged
merged 2 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
}

.agenda_item {
padding: 8px;
padding: 8px 15px;
border-radius: 50px;
box-shadow: 0px 0px 15px 1px #00000026;
}
Expand Down
4 changes: 2 additions & 2 deletions app/_components/(homepage)/contact/individual.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { TbMail } from "react-icons/tb";
import { TbPhone } from "react-icons/tb";

export function Individual({ props }){
const { name, image, role, pronouns, phone, email, linkedin } = props
const { name, image, role, pronouns, phone, email } = props

return(
<div className={styles.individual_card}>
Expand All @@ -23,7 +23,7 @@ export function Individual({ props }){
<div className={styles.bottom_card}>
<p><TbPhone/> {phone}</p>
<p><TbMail/> {email}</p>
<p><TbBrandLinkedin/> {linkedin}</p>
{/* <p><TbBrandLinkedin/> {linkedin}</p> */}
</div>
</div>
);
Expand Down
40 changes: 18 additions & 22 deletions app/_data/homepage.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,40 @@
"current_week": 1,
"links": {
"training_repo": "https://github.com/include-davis/tech-fw-2024",
"slack_invite": "https://join.slack.com/t/2nclude-at-davis/shared_invite/zt-2ugw1anrb-T35J5ehvjXVV1aBj6KeSuA"
"slack_invite": "https://join.slack.com/t/2nclude-at-davis/shared_invite/zt-2xs9er08y-3McmYoNfdmagZ8dWY5T3Yw"
},
"contacts": [
{
"name": "Haylie Tan",
"image": "/contacts/Haylie.jpg",
"name": "Sreya Mathew",
"image": "/contacts/Sreya.jpg",
"role": "Tech Lead",
"pronouns": "she/her",
"phone": "(510)358-1578",
"email": "haytan@ucdavis.edu",
"linkedin": "haylie"
"phone": "(209)879-2625",
"email": "ssmathew@ucdavis.edu"
},
{
"name": "Haylie Tan",
"image": "/contacts/Michelle.jpg",
"name": "Nandhana Selvam",
"image": "/contacts/Nandhana.jpg",
"role": "Tech Lead",
"pronouns": "she/her",
"phone": "(510)358-1578",
"email": "haytan@ucdavis.edu",
"linkedin": "haylie"
"phone": "(925)503-9432",
"email": "nselvam@ucdavis.edu"
},
{
"name": "Haylie Tan",
"image": "/contacts/Naomi.jpg",
"name": "Sruti Elangovan",
"image": "/contacts/Sruti.jpg",
"role": "Tech Lead",
"pronouns": "she/her",
"phone": "(510)358-1578",
"email": "haytan@ucdavis.edu",
"linkedin": "haylie"
"phone": "(530)756-1606",
"email": "selangovan@ucdavis.edu"
},
{
"name": "Haylie Tan",
"image": "/contacts/Cristian.jpg",
"name": "Vijit Dua",
"image": "/contacts/Vijit.jpg",
"role": "Tech Lead",
"pronouns": "she/her",
"phone": "(510)358-1578",
"email": "haytan@ucdavis.edu",
"linkedin": "haylie"
"pronouns": "he/him",
"phone": "(530)757-2328",
"email": "vijdua@ucdavis.edu"
}
]
}
7 changes: 4 additions & 3 deletions app/_data/workshops.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@
"agenda": [
"How The Internet Works",
"Workspace Setup",
"Overview of Web Development"
"Web Development",
"Intro to Git"
],
"assignment": {
"brief": "For your assignment you will need to practice HTML and CSS.\n\nAccess your personal page and create a profile. Introduce yourself by briefly telling us about you. Practice correct HTML semantics. Then create a “Skills” section. Create a list of your skills.\n\nOnce you complete the HTML, starting designing your CSS. Make sure to use the techniques taught in the workshop.",
"tags": ["flexbox", "html", "media queries"],
"deadline": "10.18.2024"
"deadline": "2.3.2025"
},
"timeline": [
{
Expand Down Expand Up @@ -42,7 +43,7 @@
"endBeforeHalf": 3
}
],
"slideDeckLink": "https://docs.google.com/presentation/d/1CbY3OSKcWMfvrco0U_Z6pnmxEtvNUaZF/edit?usp=drive_link&ouid=111649398785307597923&rtpof=true&sd=true",
"slideDeckLink": "https://docs.google.com/presentation/d/1ewQZ1HhVQ1b20G3XeMrt6rBJtL67yPqk7xNFqaYBb-I/edit?usp=sharing",
"recordingLink": "",
"lessons": [
{
Expand Down
Binary file added public/contacts/Nandhana.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/contacts/Sreya.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/contacts/Sruti.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/contacts/Vijit.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading