From e11fc8e8c5a95f20568e26f4ab5e4ef6b9b84f32 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Tue, 5 Sep 2023 20:49:33 -0700 Subject: [PATCH 1/9] feat: bootstrap sass organization --- apps/site/src/app/globals.scss | 10 -------- apps/site/src/app/layout.tsx | 6 ++--- apps/site/src/app/page.module.scss | 0 apps/site/src/lib/styles/bootstrap-utils.scss | 8 ++++++ apps/site/src/lib/styles/bootstrap.scss | 25 +++++++++++++++++++ .../{variables.scss => zothacks-theme.scss} | 6 +++++ apps/site/src/views/Landing/Landing.tsx | 2 +- 7 files changed, 42 insertions(+), 15 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/lib/styles/bootstrap-utils.scss create mode 100644 apps/site/src/lib/styles/bootstrap.scss rename apps/site/src/lib/styles/{variables.scss => zothacks-theme.scss} (65%) 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..71ad7056 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -1,8 +1,6 @@ -import "./globals.scss"; import type { Metadata } from "next"; -import { Inter } from "next/font/google"; -const inter = Inter({ subsets: ["latin"] }); +import "@/lib/styles/bootstrap.scss"; export const metadata: Metadata = { title: "Create Next App", @@ -16,7 +14,7 @@ export default function RootLayout({ }) { return ( - {children} + {children} ); } diff --git a/apps/site/src/app/page.module.scss b/apps/site/src/app/page.module.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/site/src/lib/styles/bootstrap-utils.scss b/apps/site/src/lib/styles/bootstrap-utils.scss new file mode 100644 index 00000000..5ebb9e55 --- /dev/null +++ b/apps/site/src/lib/styles/bootstrap-utils.scss @@ -0,0 +1,8 @@ +@import "./zothacks-theme.scss"; + +@import "~bootstrap/scss/functions"; +@import "~bootstrap/scss/variables"; +@import "~bootstrap/scss/variables-dark"; +@import "~bootstrap/scss/maps"; +@import "~bootstrap/scss/mixins"; +@import "~bootstrap/scss/utilities"; \ No newline at end of file diff --git a/apps/site/src/lib/styles/bootstrap.scss b/apps/site/src/lib/styles/bootstrap.scss new file mode 100644 index 00000000..3e126ac4 --- /dev/null +++ b/apps/site/src/lib/styles/bootstrap.scss @@ -0,0 +1,25 @@ +// Core configuration with overrides +@import "./bootstrap-utils.scss"; + +/* Layout & components */ +@import "~bootstrap/scss/root"; +@import "~bootstrap/scss/reboot"; +@import "~bootstrap/scss/type"; + +@import "~bootstrap/scss/images"; +@import "~bootstrap/scss/containers"; +@import "~bootstrap/scss/grid"; + +/* Components */ +@import "~bootstrap/scss/buttons"; +@import "~bootstrap/scss/transitions"; +@import "~bootstrap/scss/nav"; +@import "~bootstrap/scss/navbar"; +@import "~bootstrap/scss/card"; +@import "~bootstrap/scss/accordion"; + +/* Helpers */ +@import "~bootstrap/scss/helpers"; + +/* Utilities */ +@import "~bootstrap/scss/utilities/api"; \ No newline at end of file diff --git a/apps/site/src/lib/styles/variables.scss b/apps/site/src/lib/styles/zothacks-theme.scss similarity index 65% rename from apps/site/src/lib/styles/variables.scss rename to apps/site/src/lib/styles/zothacks-theme.scss index 2b9e53b2..4e781de7 100644 --- a/apps/site/src/lib/styles/variables.scss +++ b/apps/site/src/lib/styles/zothacks-theme.scss @@ -1,4 +1,5 @@ // Common variables for site theme consistency +@import url('https://fonts.googleapis.com/css2?family=Fuzzy+Bubbles:wght@400;700&family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap'); // colors $white: #fafaff; // Paper Background color @@ -17,3 +18,8 @@ $purple: #6600b6; // fonts $fuzzy-bubbles: "Fuzzy Bubbles", cursive; + +// bootstrap overrides +$font-family-base: $fuzzy-bubbles; +$font-size-base: 1.25rem; +$headings-font-weight: 700; \ No newline at end of file diff --git a/apps/site/src/views/Landing/Landing.tsx b/apps/site/src/views/Landing/Landing.tsx index dcdeec57..05533371 100644 --- a/apps/site/src/views/Landing/Landing.tsx +++ b/apps/site/src/views/Landing/Landing.tsx @@ -6,4 +6,4 @@ export default function Landing() {

ZotHacks 2023

); -} \ No newline at end of file +} From fa0fb835faa82727aac369548a74682427fd7df7 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Tue, 5 Sep 2023 21:07:39 -0700 Subject: [PATCH 2/9] fix: installed bootstrap --- apps/site/package.json | 1 + pnpm-lock.yaml | 58 ++++++++++++++++++++++++++---------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/apps/site/package.json b/apps/site/package.json index 2434e6f8..ae5092ec 100644 --- a/apps/site/package.json +++ b/apps/site/package.json @@ -14,6 +14,7 @@ "@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", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index bf899f87..59370057 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ importers: version: 3.0.1 turbo: specifier: latest - version: 1.10.4 + version: 1.10.13 apps/sanity: dependencies: @@ -81,6 +81,9 @@ importers: '@types/react-dom': specifier: ^18.2.0 version: 18.2.3 + bootstrap: + specifier: ^5.3.1 + version: 5.3.1(@popperjs/core@2.11.8) eslint: specifier: 8.46.0 version: 8.46.0 @@ -2270,6 +2273,10 @@ packages: tslib: 2.6.2 dev: false + /@popperjs/core@2.11.8: + resolution: {integrity: sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==} + dev: false + /@portabletext/react@3.0.7(react@18.2.0): resolution: {integrity: sha512-Hx4rohr3rul/IQMDl07nRhdXLeey2fZPE/3Nbn0I+k8Zr5DsqKdkqMgkla3iBNS8h0a0LTSclS5GKVXoQlzrWg==} engines: {node: ^14.13.1 || >=16.0.0} @@ -3565,6 +3572,14 @@ packages: inherits: 2.0.4 readable-stream: 3.6.2 + /bootstrap@5.3.1(@popperjs/core@2.11.8): + resolution: {integrity: sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==} + peerDependencies: + '@popperjs/core': ^2.11.8 + dependencies: + '@popperjs/core': 2.11.8 + dev: false + /bplist-parser@0.2.0: resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==} engines: {node: '>= 5.10.0'} @@ -8340,65 +8355,64 @@ packages: safe-buffer: 5.2.1 dev: false - /turbo-darwin-64@1.10.4: - resolution: {integrity: sha512-oAILq0QZUvOxYZU71SXRsL7DFpqZutPl9CX7+rD48tReHrmhcm3HMeuAFY0S5FD/9fKub04UfAQwVtJSlhvISg==} + /turbo-darwin-64@1.10.13: + resolution: {integrity: sha512-vmngGfa2dlYvX7UFVncsNDMuT4X2KPyPJ2Jj+xvf5nvQnZR/3IeDEGleGVuMi/hRzdinoxwXqgk9flEmAYp0Xw==} cpu: [x64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-darwin-arm64@1.10.4: - resolution: {integrity: sha512-N0XPFLXsZRLE6gKDa5MREpPQp0drOz9PrADaaMXTlspxWS/tmmxyH+ZQ/uGqKC/0mqsNIhZuSFsEVZe1PGaqxw==} + /turbo-darwin-arm64@1.10.13: + resolution: {integrity: sha512-eMoJC+k7gIS4i2qL6rKmrIQGP6Wr9nN4odzzgHFngLTMimok2cGLK3qbJs5O5F/XAtEeRAmuxeRnzQwTl/iuAw==} cpu: [arm64] os: [darwin] requiresBuild: true dev: true optional: true - /turbo-linux-64@1.10.4: - resolution: {integrity: sha512-S8ZVNCPnrBU+GMKKUWcgg4MaTOdL1reOU1XQtDiHfEPskXjLE+10vr65xJJQb6CqO8ARFXUlFSAUfxZRX6WVNA==} + /turbo-linux-64@1.10.13: + resolution: {integrity: sha512-0CyYmnKTs6kcx7+JRH3nPEqCnzWduM0hj8GP/aodhaIkLNSAGAa+RiYZz6C7IXN+xUVh5rrWTnU2f1SkIy7Gdg==} cpu: [x64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-linux-arm64@1.10.4: - resolution: {integrity: sha512-/C6vpo7kd2ae6dR0iZyRuvfjijuixidhwLzV026A+/1gmAMRXYkslBfgOGfoOquHmvqjCeDVTsMWwCY2NRQqtw==} + /turbo-linux-arm64@1.10.13: + resolution: {integrity: sha512-0iBKviSGQQlh2OjZgBsGjkPXoxvRIxrrLLbLObwJo3sOjIH0loGmVIimGS5E323soMfi/o+sidjk2wU1kFfD7Q==} cpu: [arm64] os: [linux] requiresBuild: true dev: true optional: true - /turbo-windows-64@1.10.4: - resolution: {integrity: sha512-fh6X/fJl9gNTu3r7zMmwCychxMlpQMFn32bpioPNIBxrTHCbQYeGSQuw2XWa/RswgNzCY3Xo34emYAKu9btrsw==} + /turbo-windows-64@1.10.13: + resolution: {integrity: sha512-S5XySRfW2AmnTeY1IT+Jdr6Goq7mxWganVFfrmqU+qqq3Om/nr0GkcUX+KTIo9mPrN0D3p5QViBRzulwB5iuUQ==} cpu: [x64] os: [win32] requiresBuild: true dev: true optional: true - /turbo-windows-arm64@1.10.4: - resolution: {integrity: sha512-KzcKGl+bjwaSkxMNTutuoIM+xPuTBA13zJiC2vFM7fQ6XYM0/ZmUekfoxpMnWgSav8vlTk5tRYaPniLcVzLnTQ==} + /turbo-windows-arm64@1.10.13: + resolution: {integrity: sha512-nKol6+CyiExJIuoIc3exUQPIBjP9nIq5SkMJgJuxsot2hkgGrafAg/izVDRDrRduQcXj2s8LdtxJHvvnbI8hEQ==} cpu: [arm64] os: [win32] requiresBuild: true dev: true optional: true - /turbo@1.10.4: - resolution: {integrity: sha512-EVBt762wVGyZAXtp1UWQptRG2N/9TThUJ1tRawvt/pmB62VmdzgDuz80SQYXK5U5yKEID6OJdqAzq8HnIQVA6g==} + /turbo@1.10.13: + resolution: {integrity: sha512-vOF5IPytgQPIsgGtT0n2uGZizR2N3kKuPIn4b5p5DdeLoI0BV7uNiydT7eSzdkPRpdXNnO8UwS658VaI4+YSzQ==} hasBin: true - requiresBuild: true optionalDependencies: - turbo-darwin-64: 1.10.4 - turbo-darwin-arm64: 1.10.4 - turbo-linux-64: 1.10.4 - turbo-linux-arm64: 1.10.4 - turbo-windows-64: 1.10.4 - turbo-windows-arm64: 1.10.4 + turbo-darwin-64: 1.10.13 + turbo-darwin-arm64: 1.10.13 + turbo-linux-64: 1.10.13 + turbo-linux-arm64: 1.10.13 + turbo-windows-64: 1.10.13 + turbo-windows-arm64: 1.10.13 dev: true /type-check@0.4.0: From 6edd034059f85801a39c062e7b3491d0aad09025 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Wed, 6 Sep 2023 09:15:25 -0700 Subject: [PATCH 3/9] fix: import font from Next instead of Google Fonts --- apps/site/src/app/layout.tsx | 5 ++++- apps/site/src/lib/styles/zothacks-theme.scss | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 71ad7056..783e7a18 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -1,7 +1,10 @@ import type { Metadata } from "next"; +import { Fuzzy_Bubbles } from "next/font/google"; import "@/lib/styles/bootstrap.scss"; +const fuzzy = Fuzzy_Bubbles({ weight: ["400", "700"], subsets: ["latin"] }); + export const metadata: Metadata = { title: "Create Next App", description: "Generated by create next app", @@ -14,7 +17,7 @@ export default function RootLayout({ }) { return ( - {children} + {children} ); } diff --git a/apps/site/src/lib/styles/zothacks-theme.scss b/apps/site/src/lib/styles/zothacks-theme.scss index 4e781de7..6cebf326 100644 --- a/apps/site/src/lib/styles/zothacks-theme.scss +++ b/apps/site/src/lib/styles/zothacks-theme.scss @@ -1,5 +1,4 @@ // Common variables for site theme consistency -@import url('https://fonts.googleapis.com/css2?family=Fuzzy+Bubbles:wght@400;700&family=Roboto:ital,wght@0,400;0,700;1,400;1,700&display=swap'); // colors $white: #fafaff; // Paper Background color From bfe6a223d384f6bfbaa5ab35858f3ef2263df7b5 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Wed, 6 Sep 2023 21:39:30 -0700 Subject: [PATCH 4/9] fix: update red hex value correctly --- apps/site/src/lib/styles/zothacks-theme.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/site/src/lib/styles/zothacks-theme.scss b/apps/site/src/lib/styles/zothacks-theme.scss index 6cebf326..9956802d 100644 --- a/apps/site/src/lib/styles/zothacks-theme.scss +++ b/apps/site/src/lib/styles/zothacks-theme.scss @@ -5,7 +5,7 @@ $white: #fafaff; // Paper Background color $beige: #faf4ea; $black: #21242d; // Text color $silver: #e6f2fc; // Line pattern color of paper -$red: #e2b7f7; // ! hex value doesn't match with Figma design +$red: #ff3750; // ! hex value doesn't match with Figma design $pink: #ffa8c3; $orange: #ff5c00; $gold: #ffd600; // accent colors @@ -21,4 +21,4 @@ $fuzzy-bubbles: "Fuzzy Bubbles", cursive; // bootstrap overrides $font-family-base: $fuzzy-bubbles; $font-size-base: 1.25rem; -$headings-font-weight: 700; \ No newline at end of file +$headings-font-weight: 700; From 98c772941a2b6d877b43dc22e3ddab3f5d9d3952 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Wed, 6 Sep 2023 21:39:37 -0700 Subject: [PATCH 5/9] linting --- apps/sanity/package.json | 2 +- 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/lib/styles/bootstrap-utils.scss | 2 +- apps/site/src/lib/styles/bootstrap.scss | 2 +- apps/site/src/views/Resources/Resources.tsx | 4 ++-- apps/site/src/views/Schedule/Schedule.tsx | 2 +- apps/site/src/views/index.ts | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) 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/src/app/page.tsx b/apps/site/src/app/page.tsx index cb8849dc..3a41059c 100644 --- a/apps/site/src/app/page.tsx +++ b/apps/site/src/app/page.tsx @@ -1 +1 @@ -export { Landing as default } from "@/views"; \ No newline at end of file +export { Landing as default } from "@/views"; diff --git a/apps/site/src/app/resources/page.tsx b/apps/site/src/app/resources/page.tsx index 39c14a70..8c26a744 100644 --- a/apps/site/src/app/resources/page.tsx +++ b/apps/site/src/app/resources/page.tsx @@ -1 +1 @@ -export { Resources as default } from "@/views"; \ No newline at end of file +export { Resources as default } from "@/views"; diff --git a/apps/site/src/app/schedule/page.tsx b/apps/site/src/app/schedule/page.tsx index 93a6f4fa..1729d952 100644 --- a/apps/site/src/app/schedule/page.tsx +++ b/apps/site/src/app/schedule/page.tsx @@ -1 +1 @@ -export { Schedule as default } from "@/views"; \ No newline at end of file +export { Schedule as default } from "@/views"; diff --git a/apps/site/src/lib/styles/bootstrap-utils.scss b/apps/site/src/lib/styles/bootstrap-utils.scss index 5ebb9e55..d669ba8c 100644 --- a/apps/site/src/lib/styles/bootstrap-utils.scss +++ b/apps/site/src/lib/styles/bootstrap-utils.scss @@ -5,4 +5,4 @@ @import "~bootstrap/scss/variables-dark"; @import "~bootstrap/scss/maps"; @import "~bootstrap/scss/mixins"; -@import "~bootstrap/scss/utilities"; \ No newline at end of file +@import "~bootstrap/scss/utilities"; diff --git a/apps/site/src/lib/styles/bootstrap.scss b/apps/site/src/lib/styles/bootstrap.scss index 3e126ac4..30a68303 100644 --- a/apps/site/src/lib/styles/bootstrap.scss +++ b/apps/site/src/lib/styles/bootstrap.scss @@ -22,4 +22,4 @@ @import "~bootstrap/scss/helpers"; /* Utilities */ -@import "~bootstrap/scss/utilities/api"; \ No newline at end of file +@import "~bootstrap/scss/utilities/api"; diff --git a/apps/site/src/views/Resources/Resources.tsx b/apps/site/src/views/Resources/Resources.tsx index a6495eb3..76b2c111 100644 --- a/apps/site/src/views/Resources/Resources.tsx +++ b/apps/site/src/views/Resources/Resources.tsx @@ -1,5 +1,5 @@ import "./Resources.module.scss"; export default function Resources() { - return

Resources

-} \ No newline at end of file + return

Resources

; +} diff --git a/apps/site/src/views/Schedule/Schedule.tsx b/apps/site/src/views/Schedule/Schedule.tsx index f3f62500..29d9b621 100644 --- a/apps/site/src/views/Schedule/Schedule.tsx +++ b/apps/site/src/views/Schedule/Schedule.tsx @@ -1,5 +1,5 @@ import "./Schedule.module.scss"; export default function Schedule() { - return

Schedule

+ return

Schedule

; } diff --git a/apps/site/src/views/index.ts b/apps/site/src/views/index.ts index f77fe23d..0ee43c98 100644 --- a/apps/site/src/views/index.ts +++ b/apps/site/src/views/index.ts @@ -1,3 +1,3 @@ export { default as Landing } from "./Landing/Landing"; export { default as Resources } from "./Resources/Resources"; -export { default as Schedule } from "./Schedule/Schedule"; \ No newline at end of file +export { default as Schedule } from "./Schedule/Schedule"; From 20cc9deb7f2b9460d2421d3602f372a28d2266e8 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Thu, 7 Sep 2023 20:12:38 -0700 Subject: [PATCH 6/9] fix: custom CSS property for font --- apps/site/src/app/layout.tsx | 8 ++++---- apps/site/src/lib/FontProvider.tsx | 20 ++++++++++++++++++++ apps/site/src/lib/styles/zothacks-theme.scss | 5 +---- 3 files changed, 25 insertions(+), 8 deletions(-) create mode 100644 apps/site/src/lib/FontProvider.tsx diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 783e7a18..6514303e 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -1,9 +1,8 @@ import type { Metadata } from "next"; -import { Fuzzy_Bubbles } from "next/font/google"; -import "@/lib/styles/bootstrap.scss"; +import FontProvider from "@/lib/FontProvider"; -const fuzzy = Fuzzy_Bubbles({ weight: ["400", "700"], subsets: ["latin"] }); +import "@/lib/styles/bootstrap.scss"; export const metadata: Metadata = { title: "Create Next App", @@ -17,7 +16,8 @@ export default function RootLayout({ }) { return ( - {children} + + {children} ); } diff --git a/apps/site/src/lib/FontProvider.tsx b/apps/site/src/lib/FontProvider.tsx new file mode 100644 index 00000000..e03d9e69 --- /dev/null +++ b/apps/site/src/lib/FontProvider.tsx @@ -0,0 +1,20 @@ +"use client"; + +import { Fuzzy_Bubbles } from "next/font/google"; + +const fuzzy = Fuzzy_Bubbles({ + weight: ["400", "700"], + subsets: ["latin"], +}); + +export default function FontProvider() { + return ( + + ); +} diff --git a/apps/site/src/lib/styles/zothacks-theme.scss b/apps/site/src/lib/styles/zothacks-theme.scss index 6cebf326..f7c7869e 100644 --- a/apps/site/src/lib/styles/zothacks-theme.scss +++ b/apps/site/src/lib/styles/zothacks-theme.scss @@ -15,10 +15,7 @@ $light-blue: #81deeb; $blue: #3902fd; $purple: #6600b6; -// fonts -$fuzzy-bubbles: "Fuzzy Bubbles", cursive; - // bootstrap overrides -$font-family-base: $fuzzy-bubbles; +$font-family-base: var(--next-font-fuzzy-bubbles); $font-size-base: 1.25rem; $headings-font-weight: 700; \ No newline at end of file From 146f9f2f2aa964c8d872865f177a04e0a2045a46 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Fri, 8 Sep 2023 14:27:24 -0700 Subject: [PATCH 7/9] fix: sass partials --- .../lib/styles/{bootstrap-utils.scss => _bootstrap-utils.scss} | 2 +- .../lib/styles/{zothacks-theme.scss => _zothacks-theme.scss} | 0 apps/site/src/lib/styles/bootstrap.scss | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename apps/site/src/lib/styles/{bootstrap-utils.scss => _bootstrap-utils.scss} (86%) rename apps/site/src/lib/styles/{zothacks-theme.scss => _zothacks-theme.scss} (100%) diff --git a/apps/site/src/lib/styles/bootstrap-utils.scss b/apps/site/src/lib/styles/_bootstrap-utils.scss similarity index 86% rename from apps/site/src/lib/styles/bootstrap-utils.scss rename to apps/site/src/lib/styles/_bootstrap-utils.scss index d669ba8c..90a805b9 100644 --- a/apps/site/src/lib/styles/bootstrap-utils.scss +++ b/apps/site/src/lib/styles/_bootstrap-utils.scss @@ -1,4 +1,4 @@ -@import "./zothacks-theme.scss"; +@import "./zothacks-theme"; @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/variables"; diff --git a/apps/site/src/lib/styles/zothacks-theme.scss b/apps/site/src/lib/styles/_zothacks-theme.scss similarity index 100% rename from apps/site/src/lib/styles/zothacks-theme.scss rename to apps/site/src/lib/styles/_zothacks-theme.scss diff --git a/apps/site/src/lib/styles/bootstrap.scss b/apps/site/src/lib/styles/bootstrap.scss index 30a68303..8d096531 100644 --- a/apps/site/src/lib/styles/bootstrap.scss +++ b/apps/site/src/lib/styles/bootstrap.scss @@ -1,5 +1,5 @@ // Core configuration with overrides -@import "./bootstrap-utils.scss"; +@import "./bootstrap-utils"; /* Layout & components */ @import "~bootstrap/scss/root"; From ecfd9557c1e957079b821e9a47d8bbcd259a99e5 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Fri, 8 Sep 2023 17:37:03 -0700 Subject: [PATCH 8/9] fix: new sass path, incorporated navbar and footer --- apps/site/next.config.js | 5 +++++ apps/site/src/app/layout.tsx | 8 +++++++- apps/site/src/components/Footer/Footer.module.scss | 2 -- apps/site/src/components/NavBar/NavBar.module.scss | 12 ++++++------ apps/site/src/lib/styles/_zothacks-theme.scss | 5 ----- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/apps/site/next.config.js b/apps/site/next.config.js index 7ca34f03..ba4626be 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/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 6514303e..38ca90d1 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -2,6 +2,8 @@ import type { Metadata } from "next"; 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 = { @@ -17,7 +19,11 @@ export default function RootLayout({ return ( - {children} + + + {children} +