From 1610e77bf1b29f670beb02bb3746765f263f0235 Mon Sep 17 00:00:00 2001 From: Shreya Date: Wed, 24 Feb 2021 21:00:11 -0800 Subject: [PATCH 1/8] First commit --- .DS_Store | Bin 0 -> 6148 bytes .gitignore | 3 +++ .vscode/settings.json | 3 +++ frontend/components/layout.js | 2 +- frontend/components/utils/event.js | 9 +++++++++ frontend/components/utils/schedule.js | 22 ++++++++++++++++++++++ frontend/components/window.js | 9 +++++++++ frontend/css/index.css | 3 +++ frontend/jsconfig.json | 9 +++++++++ frontend/pages/_app.js | 2 +- frontend/pages/index.js | 3 +++ frontend/public/flag.png | Bin 0 -> 453 bytes frontend/public/livestream_icon.png | Bin 0 -> 233 bytes 13 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 .DS_Store create mode 100644 .gitignore create mode 100644 .vscode/settings.json create mode 100644 frontend/components/utils/event.js create mode 100644 frontend/components/utils/schedule.js create mode 100644 frontend/components/window.js create mode 100644 frontend/css/index.css create mode 100644 frontend/jsconfig.json create mode 100644 frontend/public/flag.png create mode 100644 frontend/public/livestream_icon.png diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d8055fa3cf825d14fa69e91e386d64283d7f9dec GIT binary patch literal 6148 zcmeHK&2G~`5T0$*vT^yz0f}CaEF>fjK~2;`R8>fB2#4N^jNkyMwd;^ra=cdJG=gB{ zS3sQL4R{T1JOOXP0UiKmb{BB4i#SvWRXft`H{P9@&3qg0dI5lSr$HN_0RSA8ux4RX zAv8`}k|o`99+Al$DfA(RU@sC!C2!MV7%&X{Zw%18%i$S}LExKPcz^v!_&7!z!w%|= zZ&J{z@b_nvMEigAlPH{|t=1>Dv|L+RJ;%AltqayucPM6V>ZQ|3*Bd{kr+qIS`r3XV zMD)}4{D)zGcF?$dSH!6o#{IDj4ud|rJb4txftYp0G!7;*kE;eauk-prV|_kvZ+AAE z_V%r;Y0o>IR@2_vyq#rre&u@m&fekZ`HT6>?A2RY3NYNbq+HVY1Ky!gA|@KN-6Jtd z$Z74(#zvLTNc4J|4BR#I*H^!O*sb;p{>m>I{+jdRwSAhp^t+DTaU6+wfMZmT1p^3i zF^4b(A8vvN2_&>B7Z&wB`V|+oGNxEBtlZB|%Kcl-yPvtadzY%LW>XRVETh)P0!xk4F&jXsX0K}YdAsuUcv$v|{8 U<_fU~#e4`z8cbst_@@kf2eKNpMF0Q* literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dcb3cf8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*/.DS_STORE +/frontend/node_modules +/frontend/.next \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..3b66410 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "git.ignoreLimitWarning": true +} \ No newline at end of file diff --git a/frontend/components/layout.js b/frontend/components/layout.js index 22c80b1..4f16d7a 100644 --- a/frontend/components/layout.js +++ b/frontend/components/layout.js @@ -1,6 +1,6 @@ import Header from "./header"; import Footer from "./footer"; -import Menu from "@components/menu" +import Menu from "@components/menu"; export default function Layout(props) { return ( diff --git a/frontend/components/utils/event.js b/frontend/components/utils/event.js new file mode 100644 index 0000000..eaeea5b --- /dev/null +++ b/frontend/components/utils/event.js @@ -0,0 +1,9 @@ +export default function Event() { + return ( +
+

FRIDAY

+

Serverless Functions w/ Emily and Chloe

+

Feb 4th @ 4PM EST

+
+ ); + } \ No newline at end of file diff --git a/frontend/components/utils/schedule.js b/frontend/components/utils/schedule.js new file mode 100644 index 0000000..0b27702 --- /dev/null +++ b/frontend/components/utils/schedule.js @@ -0,0 +1,22 @@ +import Event from '@components/utils/event' + +export default function Schedule() { + return ( +
+
+
+ {/*image size needs to be*/} + +

Livestreams

+
+

Practice step-by-step guides to help you achieve a specific goal.

+
+ + + +
+
+ +
+ ); +} \ No newline at end of file diff --git a/frontend/components/window.js b/frontend/components/window.js new file mode 100644 index 0000000..c7a4e4d --- /dev/null +++ b/frontend/components/window.js @@ -0,0 +1,9 @@ +import Schedule from '@components/utils/schedule' + +export default function Window() { + return ( +
+ +
+ ); +} \ No newline at end of file diff --git a/frontend/css/index.css b/frontend/css/index.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/frontend/css/index.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/frontend/jsconfig.json b/frontend/jsconfig.json new file mode 100644 index 0000000..b502eba --- /dev/null +++ b/frontend/jsconfig.json @@ -0,0 +1,9 @@ +{ + "compilerOptions": { + "baseUrl": ".", + "paths": { + "@components/*": ["components/*"] + } + } + } + \ No newline at end of file diff --git a/frontend/pages/_app.js b/frontend/pages/_app.js index 15a23b3..351ac5b 100644 --- a/frontend/pages/_app.js +++ b/frontend/pages/_app.js @@ -1,6 +1,6 @@ -import "../css/index.css"; import Head from "next/head"; import Layout from "@components/layout"; +import "../css/index.css"; function MyApp({ Component, pageProps }) { return ( diff --git a/frontend/pages/index.js b/frontend/pages/index.js index 1e23c70..30d34c5 100644 --- a/frontend/pages/index.js +++ b/frontend/pages/index.js @@ -3,6 +3,8 @@ import Button from "@components/utils/button.js"; import Box from "@components/utils/box" import About from "@components/utils/about" import Layout from "@components/layout" +import Window from "@components/window" + export default function IndexPage() { return ( @@ -16,6 +18,7 @@ export default function IndexPage() { + ); diff --git a/frontend/public/flag.png b/frontend/public/flag.png new file mode 100644 index 0000000000000000000000000000000000000000..54c5a8969230eb6bf5586ca100cbc4a89cdb66c9 GIT binary patch literal 453 zcmV;$0XqJPP)oeXshb3Yf9;a@^{y4esLFLkkN`dsnSCiqVeON4ZE`do)YK3gXgcPmB0rD}&uourenn!W>e`CO4HI5ie{lgCy&PO%8o#iA_%C3xT*DHkLUeYd4q6I& zPyS806o8e&`#5uc_tt$W)`13{hBz1&;eeqNDgEzEnY2%#72JAVgzJ*W$h;)8oD(&M*y2VYw2v*LqjQ{MT7Wk;uUoH=y9N~BJWqxplW z$uimdtdDlE2eJuDE>KQCabniu78dV~;aw6^c81TTy%TpI(rLO-zp(hnv$id=IxHJv Z#b?b)-ab*SHxlR)22WQ%mvv4FO#oR8P0RoQ literal 0 HcmV?d00001 From bcb37245be27389a00fe2d43861b13080c54b216 Mon Sep 17 00:00:00 2001 From: Shreya Date: Wed, 24 Feb 2021 22:53:54 -0800 Subject: [PATCH 2/8] redoing boxes --- frontend/components/layout.js | 12 ++++++------ frontend/components/menu.js | 2 +- frontend/components/utils/about.js | 2 +- frontend/components/utils/box.js | 21 ++++++++++----------- frontend/components/utils/sidebarsection.js | 2 +- frontend/components/window.js | 5 +++-- frontend/pages/index.js | 7 +++---- frontend/pages/test.js | 21 +++++++++++++++++++++ 8 files changed, 46 insertions(+), 26 deletions(-) create mode 100644 frontend/pages/test.js diff --git a/frontend/components/layout.js b/frontend/components/layout.js index 4f16d7a..d8ddd4d 100644 --- a/frontend/components/layout.js +++ b/frontend/components/layout.js @@ -6,12 +6,12 @@ export default function Layout(props) { return (
-
- -
- {props.children} -
- +
+ +
+ {props.children} +
+
); diff --git a/frontend/components/menu.js b/frontend/components/menu.js index 0396ef7..a1e7599 100644 --- a/frontend/components/menu.js +++ b/frontend/components/menu.js @@ -2,7 +2,7 @@ import Section from '@components/utils/sidebarsection' export default function Menu() { return ( -