From 126abf545000d97ea0d088f3f2201c389281ed06 Mon Sep 17 00:00:00 2001 From: Technoduck Date: Tue, 17 Sep 2024 21:21:23 -0400 Subject: [PATCH] some updates to pages and meeting minutes routing --- src/components/EventElement.astro | 4 +- src/components/MinutesElement.astro | 30 +++++++++++++++ src/meetings/exec_meet_1.md | 23 ++++++++++++ src/meetings/exec_meet_2.md | 10 +++++ src/meetings/exec_meet_3.md | 7 ++++ src/pages/about.astro | 10 ++--- src/pages/index.astro | 12 +++--- src/pages/meetings/[meeting_param].astro | 47 ++++++++++++++++++++++++ src/pages/minutes.astro | 32 +++++++++------- 9 files changed, 147 insertions(+), 28 deletions(-) create mode 100644 src/components/MinutesElement.astro create mode 100644 src/meetings/exec_meet_1.md create mode 100644 src/meetings/exec_meet_2.md create mode 100644 src/meetings/exec_meet_3.md create mode 100644 src/pages/meetings/[meeting_param].astro diff --git a/src/components/EventElement.astro b/src/components/EventElement.astro index 861364e..877871b 100644 --- a/src/components/EventElement.astro +++ b/src/components/EventElement.astro @@ -11,8 +11,8 @@ const {name, time,location,description,past} = Astro.props; var border_class = "border-y-4 p-2 border-accent-400"; var info_class = "underline underline-offset-4 decoration-4 decoration-primary-400"; if (past) { - border_class = "border-y-4 p-2 border-accent-300"; - info_class = "underline underline-offset-4 decoration-4 decoration-primary-300"; + border_class = "border-y-4 p-2 border-primary-300"; + info_class = "underline underline-offset-4 decoration-4 decoration-accent-300"; } --- diff --git a/src/components/MinutesElement.astro b/src/components/MinutesElement.astro new file mode 100644 index 0000000..d248617 --- /dev/null +++ b/src/components/MinutesElement.astro @@ -0,0 +1,30 @@ +--- +interface Props { + name: string, + date: string, + meeting_link: string, +} +const {name, date, meeting_link} = Astro.props; + +var border_class = "hover:bg-neutral-300 border-y-4 p-2 border-accent-400"; +var info_class = "underline underline-offset-4 decoration-4 decoration-primary-400"; +--- + +
+ +
+

+ {name} +

+
+

+ date: {date} +

+
+
+ + +
+ diff --git a/src/meetings/exec_meet_1.md b/src/meetings/exec_meet_1.md new file mode 100644 index 0000000..927f761 --- /dev/null +++ b/src/meetings/exec_meet_1.md @@ -0,0 +1,23 @@ +--- +name: Exec Meeting +date: September 2024 +--- + + +some minutes idk? + + + +* Some list +* Some list +* Some list +* Some list + + 1. Some list + 2. Some list + + +- [x] what? +- [ ] what? +- [ ] what? +- [x] what? diff --git a/src/meetings/exec_meet_2.md b/src/meetings/exec_meet_2.md new file mode 100644 index 0000000..dffde3c --- /dev/null +++ b/src/meetings/exec_meet_2.md @@ -0,0 +1,10 @@ +--- +name: Exec Meeting +date: October 2024 +--- + + +# some minutes idk + +## waa + diff --git a/src/meetings/exec_meet_3.md b/src/meetings/exec_meet_3.md new file mode 100644 index 0000000..e84d800 --- /dev/null +++ b/src/meetings/exec_meet_3.md @@ -0,0 +1,7 @@ +--- +name: Exec Meeting +date: November 2024 +--- + + +some minutes idk diff --git a/src/pages/about.astro b/src/pages/about.astro index b88cea6..ba09a15 100644 --- a/src/pages/about.astro +++ b/src/pages/about.astro @@ -12,14 +12,14 @@ import Navbar from "../components/Navbar.astro" -
-

CUBCAPS (this should be a better logo)

-
+

- - Some landing page i still not sure about what it should be. + + explanation who we are


diff --git a/src/pages/index.astro b/src/pages/index.astro index e5b525a..7378bdf 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -16,19 +16,17 @@ import Navbar from "../components/Navbar.astro"

CUBCAPS (this should be a better logo)

-
+

Some landing page i still not sure about what it should be.


-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam mollis velit sed nibh lobortis facilisis. Nam lacinia, purus in convallis maximus, eros nisi lacinia sapien, ac accumsan erat ipsum vitae ligula. Aliquam euismod faucibus ipsum, quis molestie est pulvinar nec. Proin egestas feugiat mollis. Vivamus vestibulum nisi tortor, ut laoreet risus eleifend ut. Quisque porta tellus et tortor lacinia, vel scelerisque neque varius. Sed tempus justo mi, nec egestas nisl ultrices quis. In fermentum velit luctus massa luctus varius. Integer augue risus, suscipit ut efficitur eu, suscipit sed justo. Vivamus diam nulla, semper at ipsum et, interdum efficitur risus. Donec dignissim sagittis erat. In dignissim bibendum augue quis sagittis. Integer nec lacus a lacus commodo varius ut sit amet elit. Pellentesque mattis congue massa non gravida. Pellentesque cursus eget ex sed imperdiet. Sed sed suscipit ipsum. - -Sed malesuada lorem non libero pellentesque, id maximus quam fermentum. Vestibulum eu eros porta, tempor eros eget, maximus augue. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse porta, mauris id maximus dignissim, quam ex hendrerit est, quis rutrum enim nibh a neque. Nunc eu massa sit amet lectus euismod viverra eu vel sem. Maecenas sit amet dictum lorem. Nulla ac est vel arcu rutrum pharetra. Sed mattis, lectus ac fringilla euismod, libero nisl porttitor nisl, id gravida ipsum dui viverra ex. In hac habitasse platea dictumst. Nunc lobortis rutrum augue et hendrerit. Quisque vel hendrerit ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam sodales tellus euismod justo iaculis tempus. Phasellus ultricies convallis lectus, sed aliquam tortor semper quis. - -Vestibulum et venenatis libero, non iaculis ligula. Vestibulum tempor porta viverra. In hac habitasse platea dictumst. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin non consectetur dui. Donec non mi lobortis turpis rutrum dignissim. Aenean quis tempor quam. Duis et cursus libero. Ut augue velit, mattis sed dapibus id, ornare sit amet tellus. Duis eu velit ac felis fermentum dictum. Quisque ut ultrices nisl, ac accumsan nunc. Maecenas suscipit fringilla dui sit amet vehicula. Nulla venenatis faucibus libero vitae sodales. Cras nisl sapien, dictum ut purus id, dapibus laoreet lacus. - + maybe pictuers? some intro? overview. +

+

+ not sure yet

diff --git a/src/pages/meetings/[meeting_param].astro b/src/pages/meetings/[meeting_param].astro new file mode 100644 index 0000000..09a1488 --- /dev/null +++ b/src/pages/meetings/[meeting_param].astro @@ -0,0 +1,47 @@ +--- +import Navbar from '../../components/Navbar.astro'; + +export async function getStaticPaths() { + + + var return_list = [] + const meetings_list = await Astro.glob('../../meetings/*.md'); + meetings_list.map((meeting) => ( + //meeting.file.split("/meetings/")[1].split(".")[0] + return_list.push( { + params: {meeting_param: meeting.file.split("/meetings/")[1].split(".")[0]}, + props: {meeting} + + } ) + )); + return return_list +} + +const { meeting_param } = Astro.params; +const { meeting } = Astro.props; +--- + + + + + + + CUBCAPS + + + + +
+ +
+

+ {meeting.frontmatter.name} +

+

+ {meeting.frontmatter.date} +

+
+ +
+ + diff --git a/src/pages/minutes.astro b/src/pages/minutes.astro index 81f0f9a..852a15f 100644 --- a/src/pages/minutes.astro +++ b/src/pages/minutes.astro @@ -1,5 +1,8 @@ --- import Navbar from "../components/Navbar.astro" +import MinutesElement from "../components/MinutesElement.astro" + +const meetings = await Astro.glob('../meetings/*.md'); --- @@ -12,24 +15,25 @@ import Navbar from "../components/Navbar.astro" -
-

CUBCAPS (this should be a better logo)

-
-
-

- - Some landing page i still not sure about what it should be. -

-
-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nam mollis velit sed nibh lobortis facilisis. Nam lacinia, purus in convallis maximus, eros nisi lacinia sapien, ac accumsan erat ipsum vitae ligula. Aliquam euismod faucibus ipsum, quis molestie est pulvinar nec. Proin egestas feugiat mollis. Vivamus vestibulum nisi tortor, ut laoreet risus eleifend ut. Quisque porta tellus et tortor lacinia, vel scelerisque neque varius. Sed tempus justo mi, nec egestas nisl ultrices quis. In fermentum velit luctus massa luctus varius. Integer augue risus, suscipit ut efficitur eu, suscipit sed justo. Vivamus diam nulla, semper at ipsum et, interdum efficitur risus. Donec dignissim sagittis erat. In dignissim bibendum augue quis sagittis. Integer nec lacus a lacus commodo varius ut sit amet elit. Pellentesque mattis congue massa non gravida. Pellentesque cursus eget ex sed imperdiet. Sed sed suscipit ipsum. +

-Sed malesuada lorem non libero pellentesque, id maximus quam fermentum. Vestibulum eu eros porta, tempor eros eget, maximus augue. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse porta, mauris id maximus dignissim, quam ex hendrerit est, quis rutrum enim nibh a neque. Nunc eu massa sit amet lectus euismod viverra eu vel sem. Maecenas sit amet dictum lorem. Nulla ac est vel arcu rutrum pharetra. Sed mattis, lectus ac fringilla euismod, libero nisl porttitor nisl, id gravida ipsum dui viverra ex. In hac habitasse platea dictumst. Nunc lobortis rutrum augue et hendrerit. Quisque vel hendrerit ipsum. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Etiam sodales tellus euismod justo iaculis tempus. Phasellus ultricies convallis lectus, sed aliquam tortor semper quis. +

+ Previous meetings +

+ +
+ + + { +meetings.reverse().map((meeting) => ( +
+ )) + } + + -Vestibulum et venenatis libero, non iaculis ligula. Vestibulum tempor porta viverra. In hac habitasse platea dictumst. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin non consectetur dui. Donec non mi lobortis turpis rutrum dignissim. Aenean quis tempor quam. Duis et cursus libero. Ut augue velit, mattis sed dapibus id, ornare sit amet tellus. Duis eu velit ac felis fermentum dictum. Quisque ut ultrices nisl, ac accumsan nunc. Maecenas suscipit fringilla dui sit amet vehicula. Nulla venenatis faucibus libero vitae sodales. Cras nisl sapien, dictum ut purus id, dapibus laoreet lacus. -