From 4f44f38cc91d224603044eb5dddc804098d96a1c Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Tue, 17 Sep 2024 03:06:57 -0700 Subject: [PATCH 1/4] chore: remove content from resources --- README.md | 14 ++--- src/app/pages/Resources/Resources.js | 2 +- src/assets/data/resources.json | 77 ---------------------------- src/assets/data/resources.ts | 60 ++++++++++++++++++++++ 4 files changed, 68 insertions(+), 85 deletions(-) delete mode 100644 src/assets/data/resources.json create mode 100644 src/assets/data/resources.ts diff --git a/README.md b/README.md index 444baa4f..2bac072f 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ DUCI-website │ ├── alumniBoard.json │ ├── currentBoard.json │ ├── merchList.json -│ ├── resources.json +│ ├── resources.ts │ └── socials.json ├── .gitignore ├── package.json @@ -62,7 +62,7 @@ DUCI-website | alumniBoard.json | information of all alumni board members | `src/app/pages/About` | | currentBoard.json | information of all current board members | `src/app/pages/About` | | merchList.json | list of all historical merch data (currently only has stickers) | `src/app/pages/Merch` | -| resources.json | all design resources for club members | `src/app/pages/Resources`, `src/app/pages/ResourcesFeatured` | +| resources.ts | all design resources for club members | `src/app/pages/Resources`, `src/app/pages/ResourcesFeatured` | | socials.json | social media links for DUCI | `src/app/pages/Contact`, `src/app/components/Nav`, `src/app/components/Footer` | | short_socials.json | full social media icon-links for DUCI | `src/app/pages/Join`, `src/app/pages/Hey` | @@ -117,14 +117,14 @@ An example is the list of board members that gets displayed in the `About` page. ### Suspense -Currently, the final build size is about 50kb which isn't nearly big enough to warrant implementing Suspense for every page but probably will have plans to do so since the infrastucture is there. +Currently, the final build size is about 50kb which isn't nearly big enough to warrant implementing Suspense for every page but probably will have plans to do so since the infrastructure is there. ### Immediate improvements to be made -- i18n? -- a11y - mouse hover interaction (fields - text, buttons - pointer), semantic html (text component for example should be switched to various h tags) -- pagination for events list -- A lot of styling still needs to be refactored +- i18n? +- a11y - mouse hover interaction (fields - text, buttons - pointer), semantic html (text component for example should be switched to various h tags) +- pagination for events list +- A lot of styling still needs to be refactored ### Later planned updates: diff --git a/src/app/pages/Resources/Resources.js b/src/app/pages/Resources/Resources.js index 445d4936..d693077c 100644 --- a/src/app/pages/Resources/Resources.js +++ b/src/app/pages/Resources/Resources.js @@ -3,7 +3,7 @@ import { Link } from "react-router-dom"; import { Text } from "app/components"; import { Section, Icon, Space } from "app/Symbols.js"; -import RESOURCES from "assets/data/resources.json"; +import { RESOURCES } from "assets/data/resources.ts"; import cn from "./Resources.module.scss"; diff --git a/src/assets/data/resources.json b/src/assets/data/resources.json deleted file mode 100644 index d1e206d9..00000000 --- a/src/assets/data/resources.json +++ /dev/null @@ -1,77 +0,0 @@ -[ - { - "title": "Mentorship Program", - "link": "/mentorship", - "desc": "Learn about our mentorship program ", - "main": "orange", - "accent": "gray", - "background": "var(--peach)", - "icon": "mentor.svg" - }, - { - "title": "Project Teams", - "link": "/project-teams", - "desc": "Work on a team to design a beautiful large-scale product.", - "main": "red", - "accent": "gray", - "background": "var(--blush)", - "icon": "res-pt.svg" - }, - { - "title": "Merch", - "link": "/merch", - "desc": "Support and represent Design at UCI.", - "main": "green", - "accent": "gray", - "background": "var(--mint)", - "icon": "res-merch.svg" - }, - { - "title": "Workshop Slides", - "link": "https://drive.google.com/drive/folders/14yhiCBnk0E6GECv8LPwSxduM1Nb6GOAQ?usp=sharing", - "desc": "View past workshop slides.", - "newTab": true, - "main": "orange", - "accent": "gray", - "background": "#ffe4d4", - "icon": "res-slides.svg" - }, - { - "title": "Featured Resources", - "link": "/resources/featured/", - "desc": "Explore our curated collection of useful online tools, guides, and more.", - "main": "orange", - "accent": "gray", - "background": "var(--peach)", - "icon": "res-featured.svg" - }, - { - "title": "Design-a-thon", - "link": "/designathons/", - "desc": "Our biggest event held every year. Teams design and compete for prizes", - "main": "blue", - "accent": "gray", - "background": "var(--sky)", - "icon": "res-designathon.svg" - }, - { - "title": "Newsletter Archive", - "link": "https://us16.campaign-archive.com/home/?u=96e1277e37e6f4c2940cd1dc9&id=3cdf6c3ea8", - "desc": "View past newsletters.", - "newTab": true, - "main": "black", - "accent": "gray", - "background": "var(--silver)", - "icon": "res-archive.svg" - }, - { - "title": "Board Blogs", - "link": "https://medium.com/@designatuci", - "desc": "Learn more about the people behind Design at UCI.", - "newTab": true, - "main": "black", - "accent": "gray", - "background": "var(--silver)", - "icon": "res-blog.svg" - } -] diff --git a/src/assets/data/resources.ts b/src/assets/data/resources.ts new file mode 100644 index 00000000..8c2d4cda --- /dev/null +++ b/src/assets/data/resources.ts @@ -0,0 +1,60 @@ +type Resource = { + title: string; + link: string; + desc: string; + newTab?: boolean; + main: string; + accent: string; + background: string; + icon: string; +}; + +export const RESOURCES: Resource[] = [ + { + title: "Project Teams", + link: "/project-teams", + desc: "Work on a team to design a beautiful large-scale product.", + main: "red", + accent: "gray", + background: "var(--blush)", + icon: "res-pt.svg", + }, + { + title: "Workshop Slides", + link: "https://drive.google.com/drive/folders/14yhiCBnk0E6GECv8LPwSxduM1Nb6GOAQ?usp=sharing", + desc: "View past workshop slides.", + newTab: true, + main: "orange", + accent: "gray", + background: "#ffe4d4", + icon: "res-slides.svg", + }, + { + title: "Featured Resources", + link: "/resources/featured/", + desc: "Explore our curated collection of useful online tools, guides, and more.", + main: "orange", + accent: "gray", + background: "var(--peach)", + icon: "res-featured.svg", + }, + { + title: "Design-a-thon", + link: "/designathons/", + desc: "Our biggest event held every year. Teams design and compete for prizes", + main: "blue", + accent: "gray", + background: "var(--sky)", + icon: "res-designathon.svg", + }, + { + title: "Newsletter Archive", + link: "https://us16.campaign-archive.com/home/?u=96e1277e37e6f4c2940cd1dc9&id=3cdf6c3ea8", + desc: "View past newsletters.", + newTab: true, + main: "black", + accent: "gray", + background: "var(--silver)", + icon: "res-archive.svg", + }, +]; From a1c5767d28abceca1a7eb913dd08aa465af40dd1 Mon Sep 17 00:00:00 2001 From: Kevin Wu Date: Tue, 17 Sep 2024 03:07:25 -0700 Subject: [PATCH 2/4] chore: clean up footer --- src/app/components/Footer/Footer.js | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/src/app/components/Footer/Footer.js b/src/app/components/Footer/Footer.js index baaa87eb..2934e2af 100644 --- a/src/app/components/Footer/Footer.js +++ b/src/app/components/Footer/Footer.js @@ -27,7 +27,9 @@ const Footer = () => ( src={icons.default} style={{ marginRight: "16px" }} /> - {name} + + {name} + ))} @@ -51,26 +53,11 @@ const Footer = () => ( Project Teams -
- - Mentorship - -
-
- - Merch - -
Design-a-thon
-
- - Board Blogs - -
Date: Tue, 17 Sep 2024 03:08:36 -0700 Subject: [PATCH 3/4] chore: remove banner --- src/app/App.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/App.js b/src/app/App.js index f5f06cb5..685cacc7 100644 --- a/src/app/App.js +++ b/src/app/App.js @@ -38,7 +38,6 @@ function App() { return ( <> -