Fixes #7 Co-authored-by: Linna Luo <linnaluo18@gmail.com> Reviewed-on: #70 Reviewed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-authored-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca> Co-committed-by: Aditya Thakral <a3thakra@csclub.uwaterloo.ca>
This commit is contained in:
parent
44621b2daf
commit
f670247ec5
|
|
@ -0,0 +1,7 @@
|
|||
.bubble {
|
||||
padding: calc(36rem / 16) 0;
|
||||
}
|
||||
|
||||
.bubble:nth-child(odd) {
|
||||
background-color: var(--blue-1-20);
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import React from "react";
|
||||
import { DefaultLayout } from "./DefaultLayout";
|
||||
import styles from "./Bubble.module.css";
|
||||
|
||||
export default function Bubble(props: { children: React.ReactNode }) {
|
||||
return (
|
||||
<div className={styles.bubble}>
|
||||
<DefaultLayout>{props.children}</DefaultLayout>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
.defaultLayout {
|
||||
margin: 0 auto;
|
||||
max-width: calc(800rem / 16);
|
||||
padding: 0 calc(20rem / 16);
|
||||
padding-bottom: calc(20rem / 16);
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
import React from "react";
|
||||
import styles from "./DefaultLayout.module.css";
|
||||
|
||||
export function DefaultLayout(props: { children: React.ReactNode }) {
|
||||
return <div className={styles.defaultLayout}>{props.children}</div>;
|
||||
}
|
||||
|
|
@ -0,0 +1,89 @@
|
|||
import Bubble from "./../../components/Bubble";
|
||||
|
||||
<Bubble>
|
||||
|
||||
CS Club is working towards bridging the gap between each and every CS student,
|
||||
to support their undergraduate experience and to provide a community that
|
||||
students can belong to and identify with. With hundreds of CS students joining
|
||||
Waterloo every year, CS Club aims to run events that encourage students to
|
||||
connect and socialize, to increase technical and academic interest with
|
||||
workshops and talks, and to provide a safe environment for academic learning and
|
||||
growth.
|
||||
|
||||
</Bubble>
|
||||
|
||||
<Bubble>
|
||||
|
||||
## Our <span>Vision</span>
|
||||
|
||||
1. Academic: Promoting the knowledge and interest of Computer Science, as well
|
||||
as supporting students throughout their academic experiences.
|
||||
|
||||
2. Career: Providing career guidance and resources to help students gain
|
||||
experience and knowledge for their own job search.
|
||||
|
||||
3. Community: Encouraging interpersonal relationships through community building
|
||||
and social events for all computing students.
|
||||
|
||||
</Bubble>
|
||||
|
||||
<Bubble>
|
||||
|
||||
## Our <span>Story</span>
|
||||
|
||||
We are students ourselves, coming from all computing backgrounds —
|
||||
Computer Science, Software Engineering, CFM, Mechatronics Engineering, and more.
|
||||
CS Club was born from an unfulfilled need; we felt that although there are so
|
||||
many students at UW that are interested in CS, there wasn't a proper support
|
||||
network in place. We lacked the cohorts provided to engineers, and we felt
|
||||
disconnected from one another.
|
||||
|
||||
By recreating what CS Club means for our community, we're passionate about
|
||||
helping students redefine their university experience here at Waterloo.
|
||||
|
||||
</Bubble>
|
||||
|
||||
<Bubble>
|
||||
|
||||
## Our <span>Mission</span>
|
||||
|
||||
The CS Club team is devoted to providing you with all the resources you could
|
||||
need as a student. We want to create a community that members can call home, to
|
||||
make it a place where you can reach out for career advice, for academic help, or
|
||||
even just to socialize. To fulfil this mission, we'll be running events and
|
||||
initiatives throughout the term, so please check out our [Events](/events/current)
|
||||
page to stay updated!
|
||||
|
||||
</Bubble>
|
||||
|
||||
<Bubble>
|
||||
|
||||
## Our <span>Office</span>
|
||||
|
||||
The CS Club office is located at room **MC 3036/3037**, in the Math & Computer
|
||||
Building of the University of Waterloo.
|
||||
|
||||
- An office favorite is our $0.50 pop for members. We have a fridge in the
|
||||
office which is stocked with many different kinds of pop.
|
||||
- We have lots of informative books, 5 computer terminals, and an array of
|
||||
knowledgeable people to talk to.
|
||||
|
||||
Come visit us on campus in our office! Meet new members and find out what's new
|
||||
in the club.
|
||||
|
||||
<address>
|
||||
|
||||
Computer Science Club <br />
|
||||
Math & Computer 3036/3037 <br />
|
||||
University of Waterloo <br />
|
||||
200 University Avenue West <br />
|
||||
Waterloo, ON N2L 3G1 <br />
|
||||
Canada
|
||||
|
||||
Our office phone number is [(519) 888-4567 x33870](tel:+15198884567,33870)
|
||||
|
||||
</address>
|
||||
|
||||
</Bubble>
|
||||
|
||||
|
||||
|
|
@ -10,10 +10,3 @@
|
|||
.contentContainer {
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
.defaultLayout {
|
||||
margin: 0 auto;
|
||||
max-width: calc(800rem / 16);
|
||||
padding: 0 calc(20rem / 16);
|
||||
padding-bottom: calc(20rem / 16);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ import { ThemeProvider } from "../components/theme";
|
|||
import { Navbar } from "../components/Navbar";
|
||||
import { Footer } from "../components/Footer";
|
||||
import { Link } from "../components/Link";
|
||||
import { DefaultLayout } from "../components/DefaultLayout";
|
||||
import styles from "./_app.module.css";
|
||||
|
||||
import "./_app.css";
|
||||
|
|
@ -32,10 +33,6 @@ export default function App({ Component, pageProps }: AppProps): JSX.Element {
|
|||
);
|
||||
}
|
||||
|
||||
function DefaultLayout(props: { children: React.ReactNode }) {
|
||||
return <div className={styles.defaultLayout}>{props.children}</div>;
|
||||
}
|
||||
|
||||
type PageComponent = NextComponentType<
|
||||
NextPageContext,
|
||||
unknown,
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
# About Us page
|
||||
|
|
@ -0,0 +1,102 @@
|
|||
.title {
|
||||
color: var(--purple-2);
|
||||
font-size: calc(48rem / 16);
|
||||
height: calc(80rem / 16);
|
||||
margin-top: auto;
|
||||
padding-left: calc(20rem / 16);
|
||||
}
|
||||
|
||||
.content {
|
||||
color: black;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.content h2 {
|
||||
color: var(--purple-2);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.content span {
|
||||
color: var(--blue-2);
|
||||
}
|
||||
|
||||
.titleContainer {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: flex-start;
|
||||
max-width: calc(800rem / 16);
|
||||
margin: 0 auto;
|
||||
overflow-y: clip;
|
||||
overflow-x: clip;
|
||||
height: calc(200rem / 16);
|
||||
}
|
||||
|
||||
.codey {
|
||||
transform: rotate(1.91deg);
|
||||
z-index: -1;
|
||||
height: calc(400rem / 16);
|
||||
}
|
||||
|
||||
/*for temp mailing list components*/
|
||||
.mailingList {
|
||||
margin: calc(4rem / 16) auto;
|
||||
max-width: calc(806rem / 16);
|
||||
}
|
||||
|
||||
.mailingList form > * {
|
||||
margin: calc(0.5rem / 16) auto;
|
||||
}
|
||||
|
||||
.mailingList form input {
|
||||
border-radius: calc(16rem / 16);
|
||||
padding: calc(8rem / 16) 0;
|
||||
}
|
||||
|
||||
.mailingList form input[type="text"] {
|
||||
/*temporary hard coding of font*/
|
||||
font-family: Poppins;
|
||||
font-style: normal;
|
||||
padding: 0 calc(8rem / 16);
|
||||
}
|
||||
|
||||
.mailingList h2 {
|
||||
color: var(--blue-2);
|
||||
}
|
||||
/*for temp mailing list components*/
|
||||
|
||||
@media only screen and (max-width: calc(768rem / 16)) {
|
||||
.titleContainer {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
max-width: calc(800rem / 16);
|
||||
margin: 0 auto;
|
||||
overflow-y: clip;
|
||||
height: calc(130rem / 16);
|
||||
}
|
||||
|
||||
.title {
|
||||
font-size: calc(24rem / 16);
|
||||
font-weight: 600;
|
||||
padding-left: calc(0rem / 16);
|
||||
}
|
||||
|
||||
.content h2 {
|
||||
font-size: calc(24rem / 16);
|
||||
}
|
||||
|
||||
.content ul {
|
||||
padding-left: calc(20rem / 16);
|
||||
}
|
||||
|
||||
.content ol {
|
||||
padding-left: calc(16rem / 16);
|
||||
}
|
||||
|
||||
.codey {
|
||||
width: calc(140.21rem / 16);
|
||||
height: calc(124.65rem / 16);
|
||||
padding-left: calc(30rem / 16);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
import React from "react";
|
||||
import { Image } from "../../components/Image";
|
||||
import Content from "../../content/about/index.mdx";
|
||||
import styles from "./index.module.css";
|
||||
import { Button } from "../../components/Button";
|
||||
import { SocialLinks } from "../../components/SocialLinks";
|
||||
|
||||
export default function AboutUs() {
|
||||
return (
|
||||
<>
|
||||
<div className={styles.titleContainer}>
|
||||
<h1 className={styles.title}>About Us!</h1>
|
||||
<Image src="/about/codey.svg" className={styles.codey} />
|
||||
</div>
|
||||
<div className={styles.content}>
|
||||
<Content />
|
||||
</div>
|
||||
<div className={styles.mailingList}>
|
||||
<h2>Connect with us!</h2>
|
||||
<p>
|
||||
Drop by any of our social media outlets to learn more about us, keep
|
||||
up-to-date with our upcoming events, or to chat with our members!
|
||||
</p>
|
||||
<SocialLinks color="gradient" size="big" />
|
||||
<p>Send feedback through our Feedback Form </p>
|
||||
<h2>Join our Mailing List!</h2>
|
||||
<form action="">
|
||||
<div>
|
||||
<input type="text" placeholder="Full Name*" required />
|
||||
</div>
|
||||
<div>
|
||||
<input type="text" placeholder="Email*" required />
|
||||
</div>
|
||||
<Button>Subscribe</Button>
|
||||
</form>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
AboutUs.Layout = function AboutUsLayout(props: { children: React.ReactNode }) {
|
||||
return <div>{props.children}</div>;
|
||||
};
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
import React from "react";
|
||||
import { Image } from "../../components/Image";
|
||||
import Content from "../../content/our-supporters.mdx";
|
||||
import Content from "../../content/about/our-supporters.mdx";
|
||||
import styles from "./our-supporters.module.css";
|
||||
|
||||
export default function OurSupporters() {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,38 @@
|
|||
<svg width="426" height="382" viewBox="0 0 426 382" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M113.558 10.8628C113.558 10.8628 129.8 18.9517 137.681 27.1402C148.899 38.7976 156.201 64.1977 156.201 64.1977L95.7251 76.7795C95.7251 76.7795 93.3614 50.4717 99.0044 35.1866C102.838 24.8021 113.558 10.8628 113.558 10.8628Z" fill="#5CAFF9"/>
|
||||
<path d="M116.672 26.4829C116.672 26.4829 128.173 31.4622 133.689 36.6325C141.541 43.9931 146.382 60.2906 146.382 60.2906L102.911 69.3346C102.911 69.3346 101.618 52.3758 105.888 42.4163C108.789 35.65 116.672 26.4829 116.672 26.4829Z" fill="white"/>
|
||||
<path d="M218.963 14.3746C218.963 14.3746 202.219 21.3645 193.811 29.0104C181.842 39.8953 172.865 64.7529 172.865 64.7529L232.37 81.3321C232.37 81.3321 236.479 55.2399 231.866 39.6132C228.732 28.9965 218.963 14.3746 218.963 14.3746Z" fill="#5CAFF9"/>
|
||||
<path d="M214.018 30.0666C214.018 30.0666 201.325 34.9691 194.996 40.4378C185.986 48.2231 179.407 66.1992 179.407 66.1992L224.958 78.8904C224.958 78.8904 227.812 59.9647 224.127 48.5541C221.623 40.8019 214.018 30.0666 214.018 30.0666Z" fill="white"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M225.972 329.248C212.324 337.127 196.902 341.216 180.143 340.658C117.755 338.579 52.4242 301.928 63.2107 190.376C64.8835 181.907 66.4285 173.77 67.9089 165.973C83.3761 84.5078 91.7944 40.1695 165.302 42.6186C226.107 44.6444 243.27 90.4325 260.863 137.367C266.325 151.939 271.828 166.622 278.692 180.139C321.442 196.993 343.027 230.174 341.747 268.604C340.09 318.317 297.986 329.944 225.972 329.248Z" fill="#5CAFF9"/>
|
||||
<path d="M119.093 217.606L143.895 264.073C143.895 264.073 29.5229 320.806 26.5712 319.808C23.6196 318.81 9.93068 294.977 11.0696 290.766C11.6996 288.437 48.4349 263.725 78.3802 245.514C105.854 225.702 119.093 217.606 119.093 217.606Z" fill="#5CAFF9"/>
|
||||
<mask id="mask0" mask-type="alpha" maskUnits="userSpaceOnUse" x="57" y="39" width="292" height="307">
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M225.458 329.231C211.811 337.11 196.389 341.199 179.629 340.641C117.241 338.562 51.9105 301.911 62.697 190.359C64.3698 181.89 65.9148 173.753 67.3952 165.956C82.8624 84.4907 91.2807 40.1524 164.788 42.6015C225.594 44.6273 242.756 90.4154 260.349 137.35C265.811 151.922 271.315 166.605 278.179 180.123C320.927 196.977 342.512 230.158 341.232 268.587C339.575 318.3 297.472 329.926 225.458 329.231Z" fill="#5CAFF9"/>
|
||||
</mask>
|
||||
<g mask="url(#mask0)">
|
||||
<path d="M148.762 244.382C151.143 310.505 184.546 373.192 126.606 346.736C111.723 345.093 91.1894 308.507 88.8085 242.385C86.4277 176.263 101.887 117.674 144.708 116.133C167.983 115.295 193.505 130.178 185.565 169.697C181.642 189.224 147.959 222.071 148.762 244.382Z" fill="white"/>
|
||||
</g>
|
||||
<ellipse cx="332.275" cy="170.962" rx="56.5131" ry="61.9998" transform="rotate(-33.1205 332.275 170.962)" fill="#5CAFF9"/>
|
||||
<circle cx="100.864" cy="100.31" r="38.6503" transform="rotate(1.9082 100.864 100.31)" stroke="#2A2A62" stroke-width="5"/>
|
||||
<circle cx="193.063" cy="101.185" r="38.6503" transform="rotate(1.9082 193.063 101.185)" stroke="#2A2A62" stroke-width="5"/>
|
||||
<path d="M136.178 111.367C136.178 111.367 142.869 109.943 147.2 110.088C151.531 110.232 158.112 112.098 158.112 112.098L157.893 118.679C157.893 118.679 151.267 117.36 146.962 117.216C142.658 117.073 135.958 117.948 135.958 117.948L136.178 111.367Z" fill="#2A2A62"/>
|
||||
<path d="M271.308 310.166L248.723 247.836C248.723 247.836 266.785 228.637 291.656 225.035C316.528 221.432 337.339 234.08 337.339 234.08C337.339 234.08 409.514 272.235 410.266 274.836C411.018 277.438 403.593 303.893 400.692 306.333C399.087 307.683 370.785 307.246 347.056 302.087C301.614 341.156 271.308 310.166 271.308 310.166Z" fill="#5CAFF9"/>
|
||||
<path d="M172.509 270.177L200.515 322.647C200.515 322.647 110.607 365.763 107.931 364.286C105.254 362.809 90.0591 335.757 90.4265 331.493C90.6297 329.134 118.568 308.459 141.621 293.638C162.323 276.776 172.509 270.177 172.509 270.177Z" fill="#5CAFF9"/>
|
||||
<g clip-path="url(#clip0)">
|
||||
<path d="M170.825 144.56C171.865 161.827 150.758 165.001 137.081 161.745C123.408 158.381 119.112 141.868 121.6 131.827C124.092 121.679 137.091 116.189 150.765 119.552C157.015 122.668 157.987 125.824 161.623 129.822C165.887 134.38 167.178 137.654 170.825 144.56Z" fill="white"/>
|
||||
<path d="M141.115 131.186C146.759 131.374 151.431 128.637 151.55 125.072C151.669 121.507 147.19 118.465 141.545 118.277C135.901 118.089 131.229 120.826 131.11 124.391C130.991 127.956 135.471 130.998 141.115 131.186Z" fill="#2A2A62"/>
|
||||
<path d="M170.128 152.613C167.352 155.105 163.626 157.027 160.134 158.419C155.547 160.312 151.183 161.998 145.503 161.162C131.041 158.849 122.248 148.002 123.833 135.993C124.879 127.196 132.098 120.652 141.425 118.701C128.953 118.07 121.369 125.895 119.895 137.8C118.282 150.67 128.638 163.077 143.1 165.39C154.884 167.29 165.728 161.836 170.128 152.613Z" fill="#2A2A62"/>
|
||||
<path d="M131.13 95.2212C132.088 92.4076 129.216 88.8838 124.714 87.3506C120.212 85.8173 115.786 86.8552 114.828 89.6688C113.87 92.4824 116.742 96.0063 121.244 97.5395C125.746 99.0728 130.172 98.0348 131.13 95.2212Z" fill="white"/>
|
||||
<path d="M178.486 100.648C183.082 99.4252 186.188 96.1051 185.424 93.2326C184.66 90.3602 180.314 89.023 175.718 90.246C171.122 91.469 168.016 94.7891 168.781 97.6615C169.545 100.534 173.89 101.871 178.486 100.648Z" fill="white"/>
|
||||
<path opacity="0.5" d="M140.954 136.026L148.317 144.564L139.384 154.067L131.825 141.753L140.954 136.026Z" fill="#5CAFF9"/>
|
||||
<path d="M141.114 131.184C141.114 131.184 140.05 146.98 156.086 140.837" stroke="#2A2A62" stroke-width="2.01439" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M141.191 128.926C141.191 128.926 140.593 146.892 127.644 137.953" stroke="#2A2A62" stroke-width="2.01439" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M148.396 142.197C148.396 142.197 139.557 168.289 131.334 140.337" stroke="#2A2A62" stroke-width="2.01439" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<path d="M164.211 111.417C162.945 114.669 165.931 117.715 168.068 115.36C169.668 113.679 171.77 112.363 174.34 112.448C176.782 112.53 178.792 113.983 180.276 115.766C182.258 118.086 185.189 115.063 184.136 111.908C183.545 110.328 182.703 108.566 181.464 107.138C175.644 100.357 167.795 104.256 164.905 109.88C164.631 110.391 164.357 110.902 164.211 111.417Z" fill="#2A2A62"/>
|
||||
<path d="M110.422 109.625C109.156 112.877 112.142 115.923 114.279 113.568C115.879 111.887 117.981 110.571 120.551 110.656C122.993 110.738 125.003 112.191 126.487 113.974C128.469 116.294 131.4 113.271 130.347 110.116C129.756 108.536 128.914 106.774 127.675 105.346C121.855 98.5649 114.005 102.464 111.116 108.088C110.842 108.599 110.568 109.11 110.422 109.625Z" fill="#2A2A62"/>
|
||||
</g>
|
||||
<defs>
|
||||
<clipPath id="clip0">
|
||||
<rect width="74.8087" height="78.1455" fill="white" transform="translate(110.945 86.3469) rotate(1.9082)"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 6.7 KiB |
|
|
@ -0,0 +1,3 @@
|
|||
<svg width="1314" height="247" viewBox="0 0 1314 247" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<rect x="-548" y="0.188721" width="1862" height="246" rx="123" fill="#E1EEFA"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 189 B |
Loading…
Reference in New Issue