Skip to content
This repository was archived by the owner on Oct 5, 2025. It is now read-only.

New Jumbotron and minor cleanup #84

Open
sdmungov wants to merge 2 commits into
base: main
Choose a base branch
from
Open

New Jumbotron and minor cleanup #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67c66e7
updated the styling for the jumbotron and did some overall cleanup an…
sdmungov Sep 9, 2022
69db2aa
please fix vercel error
sdmungov Sep 9, 2022
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
123 changes: 58 additions & 65 deletions archived_pages/committees/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,78 +1,71 @@
import React from "react";
import Head from "next/head";
import {Wrapper} from "../../styles/containers";
import { Wrapper } from "../../styles/containers";
import HeaderNav from "../../components/headerNav";
import Jumbotron from "../../components/jumbotron";
import {Body} from "../../styles/typography";
import { Body } from "../../styles/typography";
import Footer from "../../components/footer";
import Announce from "../../components/Announce";
import {InformationalWrapper} from "../../app/components/elements"
import CommitteeDisplay
from "../../app/components/CommitteeDisplay";
import { InformationalWrapper } from "../../app/components/elements";
import CommitteeDisplay from "../../app/components/CommitteeDisplay";

const Committees = () => {
return (
<Wrapper>
<Head>
<title>Committees & Cabinets - CIMUN XVIII</title>
<meta
name="description"
content="Chicago International Model United Nations"
/>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Mulish:wght@900&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya:wght@600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya+Sans:wght@500&family=Alegreya:wght@600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya+Sans:wght@500&family=Alegreya:wght@600&family=Source+Sans+Pro&display=swap"
rel="stylesheet"
/>
</Head>
<Announce.DelegateGuide />
<Announce.BackgroundGuides />
<HeaderNav />
<Jumbotron
titleOne=".....COMMITTEES"
titleTwo="& CABINETS"
subTitle="CIMUN XVIII"
height={75}
image="awards.jpg"
<Wrapper>
<Head>
<title>Committees & Cabinets - CIMUN XVIII</title>
<meta
name="description"
content="Chicago International Model United Nations"
/>
<InformationalWrapper>
<Body
align="left"
self="center"
weight={500}
>
As you prepare to join us for CIMUN XVIII, the CIMUN team is excited
to present the committees and cabinets for 2022! Delegates will soon
find themselves present in these committees, working with their
colleagues in committee to help solve global issues and tackle
complex real-world challenges.
<br/><br/>
As usual, delegates will participate in immersive <em>
Present-Day</em> and Historical committees. This year,
CIMUN will feature committees and cabinets from the year of <strong>
1950</strong>. Additionally, delegates may also participate in our
unique <strong>press delegations</strong>, where participating
delegates report on breaking news as events unfold at CIMUN.
<br/><br/>
</Body>
<CommitteeDisplay/>
</InformationalWrapper>
<Footer />
</Wrapper>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="icon" href="/favicon.ico" />
<link rel="preconnect" href="https://fonts.gstatic.com" />
<link
href="https://fonts.googleapis.com/css2?family=Mulish:wght@900&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya:wght@600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya+Sans:wght@500&family=Alegreya:wght@600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Alegreya+Sans:wght@500&family=Alegreya:wght@600&family=Source+Sans+Pro&display=swap"
rel="stylesheet"
/>
</Head>
<Announce.DelegateGuide />
<Announce.BackgroundGuides />
<HeaderNav />
<Jumbotron titleOne="COMMITTEES & CABINETS" subTitle="CIMUN XVIII" />
<InformationalWrapper>
<Body align="left" self="center" weight={500}>
As you prepare to join us for CIMUN XVIII, the CIMUN team is excited
to present the committees and cabinets for 2022! Delegates will soon
find themselves present in these committees, working with their
colleagues in committee to help solve global issues and tackle complex
real-world challenges.
<br />
<br />
As usual, delegates will participate in immersive <em>
Present-Day
</em>{" "}
and Historical committees. This year, CIMUN will feature committees
and cabinets from the year of <strong>1950</strong>. Additionally,
delegates may also participate in our unique{" "}
<strong>press delegations</strong>, where participating delegates
report on breaking news as events unfold at CIMUN.
<br />
<br />
</Body>
<CommitteeDisplay />
</InformationalWrapper>
<Footer />
</Wrapper>
);
};

Expand Down
23 changes: 10 additions & 13 deletions archived_pages/school-registration/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import HeaderNav from "../../components/headerNav";
import Jumbotron from "../../components/jumbotron";
import Footer from "../../components/footer";
import SteppedForm from "../../components/stepped-form";
import { Wrapper, ComponentWrapper} from "../../styles/containers";
import { Wrapper, ComponentWrapper } from "../../styles/containers";
import { SubTitle } from "../../styles/typography";
import {colors} from "../../styles/colors";
import { colors } from "../../styles/colors";
import Announce from "../../components/Announce";

const SchoolRegistration = () => {
Expand Down Expand Up @@ -38,23 +38,20 @@ const SchoolRegistration = () => {
rel="stylesheet"
/>
</Head>
<Announce.DelegateGuide/>
<Announce.BackgroundGuides/>
<Announce.DelegateGuide />
<Announce.BackgroundGuides />
<HeaderNav />
<Jumbotron
titleOne="SCHOOL"
titleTwo="REGISTRATION"
titleOne="SCHOOL REGISTRATION"
subTitle="Register for CIMUN XVIII!"
height={75}
image="awards.jpg"
/>
<ComponentWrapper margins="auto auto -3vw auto">
<SubTitle
align="center"
color={colors.fadedltGray}
width="75%"
self="center"
weight={500}
align="center"
color={colors.fadedltGray}
width="75%"
self="center"
weight={500}
>
{/*<a*/}
{/* href="/registration-information.pdf"*/}
Expand Down
155 changes: 79 additions & 76 deletions components/Announce.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,95 +1,98 @@
import Link from 'next/link';
import React from 'react';
import { Body } from '../styles/typography';
import Link from "next/link";
import React from "react";
import { Body } from "../styles/typography";
import AnnouncementBar from "./elements/AnnouncementBar.elements";
import {colors} from "../styles/colors";
import { colors } from "../styles/colors";

const RegistrationOpen = () => {
return (
<AnnouncementBar backgroundColor={colors.indigo}>
<Body
color={colors.ivory}
weight={600}
align="center"
margins="1rem 0 1rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
Want to bring your school to CIMUN XIX? You're in luck!
{" - "}
<Link href="/school-registration">
<a><u>Register Now</u></a>
</Link>
{/*{" - "}*/}
{/*<Link href="/registration-information.pdf">*/}
{/* <a><u>More Information</u></a>*/}
{/*</Link>*/}
</Body>
</AnnouncementBar>
)
<AnnouncementBar backgroundColor={colors.plum}>
<Body
color={colors.ivory}
weight={600}
align="center"
margins="1rem 0 1rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
Want to bring your school to CIMUN XIX? You're in luck!
{" - "}
<Link href="/school-registration">
<a>
<u>Register Now</u>
</a>
</Link>
{/*{" - "}*/}
{/*<Link href="/registration-information.pdf">*/}
{/* <a><u>More Information</u></a>*/}
{/*</Link>*/}
</Body>
</AnnouncementBar>
);
};

const VirtualConference = () => {
return (
<AnnouncementBar>
<Body
color={colors.ltGray}
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
CIMUN XVIII will take place <em>virtually</em> this year from February 4th to 6th
{" - "}
<Link href="/#letter">
<a><u>Click Here to Read More</u></a>
</Link>
</Body>
</AnnouncementBar>
)
<AnnouncementBar>
<Body
color={colors.ltGray}
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
CIMUN XVIII will take place <em>virtually</em> this year from February
4th to 6th
{" - "}
<Link href="/#letter">
<a>
<u>Click Here to Read More</u>
</a>
</Link>
</Body>
</AnnouncementBar>
);
};

const DelegateGuide = () => {
return (
<AnnouncementBar backgroundColor={colors.accentBlue}>
<Body
color="white"
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
<Link href="DelegateGuide.pdf">
<a
target="_blank"
rel="noopener noreferrer"
>
<strong>DELEGATES!</strong> - Getting ready for CIMUN XVIII?
Click <strong>here</strong> to review our Delegate Guide!
</a>
</Link>
</Body>
</AnnouncementBar>
)
<AnnouncementBar backgroundColor={colors.accentBlue}>
<Body
color="white"
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
<Link href="DelegateGuide.pdf">
<a target="_blank" rel="noopener noreferrer">
<strong>DELEGATES!</strong> - Getting ready for CIMUN XVIII? Click{" "}
<strong>here</strong> to review our Delegate Guide!
</a>
</Link>
</Body>
</AnnouncementBar>
);
};

const BackgroundGuides = () => {
return (
<AnnouncementBar backgroundColor={colors.accentOrange}>
<Body
color="white"
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
<Link href="committees">
<a>
CIMUN XVIII begins Friday, February 4th. Click here to see our Committees & Background Guides!
</a>
</Link>
</Body>
</AnnouncementBar>
)
<AnnouncementBar backgroundColor={colors.accentOrange}>
<Body
color="white"
weight={600}
align="center"
margins="0.5rem 0 0.5rem 0"
mobMargins="0.5rem 0 0.5rem 0"
>
<Link href="committees">
<a>
CIMUN XVIII begins Friday, February 4th. Click here to see our
Committees & Background Guides!
</a>
</Link>
</Body>
</AnnouncementBar>
);
};

const Announce = {
Expand Down
16 changes: 8 additions & 8 deletions components/footer/Footer.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
import styled from 'styled-components'
import { colors } from '../../styles/colors';
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import styled from "styled-components";
import { colors } from "../../styles/colors";

export const StyledFooter = styled.footer`
background-color: ${colors.primaryBlue};
border-top: 1px solid #EAEAEA;
background-color: ${colors.plum};
border-top: 1px solid #eaeaea;
color: white;
font-size: 18px;
padding-bottom: 120px;
Expand Down Expand Up @@ -41,7 +41,7 @@ export const FooterCol = styled.section`
export const FooterColFirst = styled(FooterCol)`
width: 18rem;
padding-bottom: 0.5rem;
`
`;

export const VercelLink = styled.a`
align-self: center;
Expand All @@ -59,7 +59,7 @@ export const Icon = styled(FontAwesomeIcon)`
font-size: 2em;
height: 1em;
margin-left: 0.5rem;
`
`;
export const FootH2 = styled.h2`
margin-top:0;
margin-top: 0;
`;
Loading