From 4ebb67a3e91812dbb82e09c1940b2e4f21f5444a Mon Sep 17 00:00:00 2001 From: Albert Wang <56945244+waalbert@users.noreply.github.com> Date: Fri, 8 Sep 2023 17:05:32 -0700 Subject: [PATCH 01/19] feat: apply button * feat: create navigation bar * feat: create footer * refactor: font, dependencies, scss, footer * fix: navbar on mobile * refactor: added routes and other small changes * feat: active page link has corresponding color * feat: add ZotHacks logo * fix: use responsive css and add bold weight * chore: use absolute asset path for navbar background * fix: logo moves upon navbar expansion and navbar is fixed to top of the screen * refactor: clean up css and use bootstrap grid * fix: remove horizontal scroll * fix: switch Twitter to Hack and SVG to PNG * fix: move Hack to front of footer --------- Co-authored-by: Alexander Liu feat: text centered feat: added apply button svg to assets Bootstrap Sass Organization (#17) * feat: bootstrap sass organization * fix: installed bootstrap * fix: import font from Next instead of Google Fonts * fix: update red hex value correctly * linting * fix: custom CSS property for font * fix: sass partials * fix: new sass path, incorporated navbar and footer * fix: removed comment --------- Co-authored-by: Tyler Yu feat: apply button --- apps/sanity/package.json | 2 +- apps/site/next.config.js | 5 + apps/site/package.json | 2 + apps/site/src/app/globals.scss | 10 - apps/site/src/app/layout.tsx | 15 +- apps/site/src/app/page.module.scss | 0 apps/site/src/app/page.tsx | 2 +- apps/site/src/app/resources/page.tsx | 2 +- apps/site/src/app/schedule/page.tsx | 2 +- apps/site/src/assets/icons/facebook.png | Bin 0 -> 69446 bytes apps/site/src/assets/icons/hack.png | Bin 0 -> 64249 bytes apps/site/src/assets/icons/insta.png | Bin 0 -> 74908 bytes apps/site/src/assets/icons/mail.png | Bin 0 -> 46335 bytes apps/site/src/assets/icons/zothacks-logo.png | Bin 0 -> 433491 bytes apps/site/src/assets/images/ApplyButton.svg | 3 + apps/site/src/assets/images/lined_paper.png | Bin 0 -> 145414 bytes .../src/components/Footer/Footer.module.scss | 15 ++ apps/site/src/components/Footer/Footer.tsx | 64 ++++++ .../src/components/NavBar/NavBar.module.scss | 69 ++++++ apps/site/src/components/NavBar/NavBar.tsx | 65 ++++++ apps/site/src/lib/FontProvider.tsx | 20 ++ .../site/src/lib/styles/_bootstrap-utils.scss | 8 + .../{variables.scss => _zothacks-theme.scss} | 9 +- apps/site/src/lib/styles/bootstrap.scss | 25 ++ .../src/views/Landing/Landing.module.scss | 28 +++ apps/site/src/views/Landing/Landing.tsx | 31 ++- apps/site/src/views/Resources/Resources.tsx | 4 +- apps/site/src/views/Schedule/Schedule.tsx | 2 +- apps/site/src/views/index.ts | 2 +- pnpm-lock.yaml | 215 ++++++++++++++---- 30 files changed, 527 insertions(+), 73 deletions(-) delete mode 100644 apps/site/src/app/globals.scss delete mode 100644 apps/site/src/app/page.module.scss create mode 100644 apps/site/src/assets/icons/facebook.png create mode 100644 apps/site/src/assets/icons/hack.png create mode 100644 apps/site/src/assets/icons/insta.png create mode 100644 apps/site/src/assets/icons/mail.png create mode 100644 apps/site/src/assets/icons/zothacks-logo.png create mode 100644 apps/site/src/assets/images/ApplyButton.svg create mode 100644 apps/site/src/assets/images/lined_paper.png create mode 100644 apps/site/src/components/Footer/Footer.module.scss create mode 100644 apps/site/src/components/Footer/Footer.tsx create mode 100644 apps/site/src/components/NavBar/NavBar.module.scss create mode 100644 apps/site/src/components/NavBar/NavBar.tsx create mode 100644 apps/site/src/lib/FontProvider.tsx create mode 100644 apps/site/src/lib/styles/_bootstrap-utils.scss rename apps/site/src/lib/styles/{variables.scss => _zothacks-theme.scss} (69%) create mode 100644 apps/site/src/lib/styles/bootstrap.scss diff --git a/apps/sanity/package.json b/apps/sanity/package.json index e85417aa..f7d81d59 100644 --- a/apps/sanity/package.json +++ b/apps/sanity/package.json @@ -34,4 +34,4 @@ "prettier": "^2.8.8", "typescript": "^4.9.5" } -} \ No newline at end of file +} diff --git a/apps/site/next.config.js b/apps/site/next.config.js index 7ca34f03..af04e66e 100644 --- a/apps/site/next.config.js +++ b/apps/site/next.config.js @@ -1,6 +1,11 @@ +const path = require("path"); + /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, + sassOptions: { + includePaths: [path.join(__dirname, "src", "lib", "styles")], + }, }; module.exports = nextConfig; diff --git a/apps/site/package.json b/apps/site/package.json index 2434e6f8..e794184f 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -14,10 +14,12 @@ "@types/node": "20.4.9", "@types/react": "18.2.20", "@types/react-dom": "^18.2.0", + "bootstrap": "^5.3.1", "eslint": "8.46.0", "eslint-config-next": "^13.4.1", "next": "^13.4.1", "react": "18.2.0", + "react-bootstrap": "^2.8.0", "react-dom": "^18.2.0", "sass": "^1.65.1", "typescript": "5.1.6" diff --git a/apps/site/src/app/globals.scss b/apps/site/src/app/globals.scss deleted file mode 100644 index 7a01bddf..00000000 --- a/apps/site/src/app/globals.scss +++ /dev/null @@ -1,10 +0,0 @@ -@use "~@/lib/styles/variables.scss" as variables; - -body { - background-color: variables.$white; -} - -h1 { - font-family: variables.$fuzzy-bubbles; - font-weight: bold; -} diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index e0df5a4c..38ca90d1 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -1,8 +1,10 @@ -import "./globals.scss"; import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -const inter = Inter({ subsets: ["latin"] }); +import FontProvider from "@/lib/FontProvider"; + +import NavBar from "@/components/NavBar/NavBar"; +import Footer from "@/components/Footer/Footer"; +import "@/lib/styles/bootstrap.scss"; export const metadata: Metadata = { title: "Create Next App", @@ -16,7 +18,12 @@ export default function RootLayout({ }) { return ( - {children} + + + + {children} +