From 392ce9565ff475accdfd20be413155b87f563111 Mon Sep 17 00:00:00 2001 From: Amber Welby Date: Thu, 29 Aug 2024 09:36:15 -0700 Subject: [PATCH 1/9] Add test data to config --- config.yaml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/config.yaml b/config.yaml index 9afd74e..1c381f3 100644 --- a/config.yaml +++ b/config.yaml @@ -90,4 +90,30 @@ home_page: - text: NEWS ABOUT EXCITING EVENT date: 2024-07-25 # href: / - href: / +# Configuration for About page +about_page: + sections: + - section_type: TextSecion + section_header: Who Are We? + text: I need some test data + image: + src: /AboutUsPlaceHolder.jpg + alt: Who Are We Image + - section_type: TextSecion + section_header: Our Mission + text: (missed a line) + image: + src: /AboutUsPlaceHolder.jpg + alt: Our Mission Image + - section_type: TextSecion + section_header: Why Join Us? + text: And I didn't feel like opening discord + image: + src: /AboutUsPlaceHolder.jpg + alt: Why Join Us Image + - section_type: TextSecion + section_header: Meet The Team + text: so here's some bad writing + image: + src: /AboutUsPlaceHolder.jpg + alt: Meet The Team Image From 199462c1c8ebb9e4e40273a515c21c5173d3e839 Mon Sep 17 00:00:00 2001 From: Amber Welby Date: Thu, 29 Aug 2024 09:36:33 -0700 Subject: [PATCH 2/9] Initial structure and styling (error importing config) --- pages/about.tsx | 30 ++++++++++++++++++++++++++++++ styles/About.module.scss | 7 +++++++ 2 files changed, 37 insertions(+) create mode 100644 pages/about.tsx create mode 100644 styles/About.module.scss diff --git a/pages/about.tsx b/pages/about.tsx new file mode 100644 index 0000000..e238927 --- /dev/null +++ b/pages/about.tsx @@ -0,0 +1,30 @@ +import styles from '../styles/About.module.scss'; +import { about_page } from '../config'; +import NavBar from '../components/NavBar'; +import EventBanner from '../components/EventBanner'; +import HeroBanner from '../components/HeroBanner'; +import Footer from '../components/Footer'; +import Section from '../layouts/Section'; + +export default function About() { + const { sections } = about_page; + + return ( + <> + + +
+
+ + {/* Sections found in the config */} + {sections.map((section, i) => ( +
+
+
+ ))} +
+
+
+ + ) +} \ No newline at end of file diff --git a/styles/About.module.scss b/styles/About.module.scss new file mode 100644 index 0000000..cb964f8 --- /dev/null +++ b/styles/About.module.scss @@ -0,0 +1,7 @@ +.container { + @aply flex flex-col; +} + +.MainArea { + @apply bg-color-1 flex-grow; +} \ No newline at end of file From dae6f255766d413eab957556d62e5a43b6456c32 Mon Sep 17 00:00:00 2001 From: Amber Welby Date: Thu, 29 Aug 2024 09:51:52 -0700 Subject: [PATCH 3/9] Add content from TCSCA WEBSITE CONTENT file --- config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config.yaml b/config.yaml index 1c381f3..8fea676 100644 --- a/config.yaml +++ b/config.yaml @@ -95,25 +95,25 @@ about_page: sections: - section_type: TextSecion section_header: Who Are We? - text: I need some test data + text: The Trent Computer Science Club Association is a student-run organization dedicated to enriching the computer science experience at Trent University. From coding workshops to hackathons, the TCSCA offers a variety of opportunities for students to expand their knowledge and network effectively to break into the tech industry. image: src: /AboutUsPlaceHolder.jpg alt: Who Are We Image - section_type: TextSecion section_header: Our Mission - text: (missed a line) + text: Our mission is to improve the computer science experience at Trent university and create an environment where every member can easily pursue their tech interests. Whether it's mastering a programming language, developing cutting-edge software, enhancing academic success, or simply gaining a better understanding of how technology shapes our world. The TCSCA provides the support, resources, and community to help you achieve your goals and advance in your tech journey image: src: /AboutUsPlaceHolder.jpg alt: Our Mission Image - section_type: TextSecion section_header: Why Join Us? - text: And I didn't feel like opening discord + text: Joining the Trent Computer Science Club Association opens the door to countless opportunities. You'll gain hands-on experience through collaborative projects and workshops, build a network and connect with industry professionals, and develop skills that will give you a competitive edge in your future prospects. Whether you're looking to boost your resume, make new friends, or just have fun with technology, The TCSCA is the place to be image: src: /AboutUsPlaceHolder.jpg alt: Why Join Us Image - section_type: TextSecion section_header: Meet The Team - text: so here's some bad writing + text: Meet the team behind the Trent Computer Science Club Association! Our dedicated executive members and volunteers work tirelessly to ensure the club runs smoothly and continues to grow. image: src: /AboutUsPlaceHolder.jpg alt: Meet The Team Image From 6b95be54fa7b4345f61c3c9fc42da84801ac0877 Mon Sep 17 00:00:00 2001 From: Amber Welby Date: Thu, 29 Aug 2024 09:54:37 -0700 Subject: [PATCH 4/9] Add Join Now button config --- config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config.yaml b/config.yaml index 8fea676..2a12797 100644 --- a/config.yaml +++ b/config.yaml @@ -117,3 +117,6 @@ about_page: image: src: /AboutUsPlaceHolder.jpg alt: Meet The Team Image + button: + text: Join Now! + href: /Apply From fdcd14b2360af6370858b2a98250d03ad56d65d3 Mon Sep 17 00:00:00 2001 From: Amber Welby Date: Thu, 29 Aug 2024 10:14:34 -0700 Subject: [PATCH 5/9] Run formatter --- config.yaml | 4 ++-- pages/about.tsx | 7 ++++--- styles/About.module.scss | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config.yaml b/config.yaml index 2a12797..1f93a54 100644 --- a/config.yaml +++ b/config.yaml @@ -95,7 +95,7 @@ about_page: sections: - section_type: TextSecion section_header: Who Are We? - text: The Trent Computer Science Club Association is a student-run organization dedicated to enriching the computer science experience at Trent University. From coding workshops to hackathons, the TCSCA offers a variety of opportunities for students to expand their knowledge and network effectively to break into the tech industry. + text: The Trent Computer Science Club Association is a student-run organization dedicated to enriching the computer science experience at Trent University. From coding workshops to hackathons, the TCSCA offers a variety of opportunities for students to expand their knowledge and network effectively to break into the tech industry. image: src: /AboutUsPlaceHolder.jpg alt: Who Are We Image @@ -114,7 +114,7 @@ about_page: - section_type: TextSecion section_header: Meet The Team text: Meet the team behind the Trent Computer Science Club Association! Our dedicated executive members and volunteers work tirelessly to ensure the club runs smoothly and continues to grow. - image: + image: src: /AboutUsPlaceHolder.jpg alt: Meet The Team Image button: diff --git a/pages/about.tsx b/pages/about.tsx index e238927..9184eb4 100644 --- a/pages/about.tsx +++ b/pages/about.tsx @@ -1,5 +1,6 @@ import styles from '../styles/About.module.scss'; import { about_page } from '../config'; +// Internal Components import NavBar from '../components/NavBar'; import EventBanner from '../components/EventBanner'; import HeroBanner from '../components/HeroBanner'; @@ -8,7 +9,7 @@ import Section from '../layouts/Section'; export default function About() { const { sections } = about_page; - + return ( <> @@ -26,5 +27,5 @@ export default function About() {