From 00252a8deec1befc5f96e7683f5078038a2d0e6d Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Fri, 8 Sep 2023 23:36:29 -0700 Subject: [PATCH 1/9] feature: added background petr svg to layout.tsx --- apps/site/src/app/globals.scss | 9 + apps/site/src/app/layout.tsx | 2 + .../assets/background/anteater_background.svg | 645 ++++++++++++++++++ 3 files changed, 656 insertions(+) create mode 100644 apps/site/src/assets/background/anteater_background.svg diff --git a/apps/site/src/app/globals.scss b/apps/site/src/app/globals.scss index 7a01bddf..c0c97e71 100644 --- a/apps/site/src/app/globals.scss +++ b/apps/site/src/app/globals.scss @@ -8,3 +8,12 @@ h1 { font-family: variables.$fuzzy-bubbles; font-weight: bold; } + +.background { + background-image: url('../assets/background/anteater_background.svg'); + background-repeat: 'no-repeat'; + background-size: 'cover'; + background-position: center center; + min-height: 100vh; + min-width: 100vw; +} \ No newline at end of file diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 4feb9abc..8361ec0a 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -22,9 +22,11 @@ export default function RootLayout({ return ( +
{children}
+
); diff --git a/apps/site/src/assets/background/anteater_background.svg b/apps/site/src/assets/background/anteater_background.svg new file mode 100644 index 00000000..6381fa62 --- /dev/null +++ b/apps/site/src/assets/background/anteater_background.svg @@ -0,0 +1,645 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 750b451db5923b38592db4863e5180de8c765602 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Sat, 9 Sep 2023 00:35:47 -0700 Subject: [PATCH 2/9] fix: fixed attachment for infinite scrolling --- apps/site/src/app/globals.scss | 13 ++++++------- apps/site/src/app/layout.tsx | 5 +---- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/apps/site/src/app/globals.scss b/apps/site/src/app/globals.scss index c0c97e71..99c55128 100644 --- a/apps/site/src/app/globals.scss +++ b/apps/site/src/app/globals.scss @@ -10,10 +10,9 @@ h1 { } .background { - background-image: url('../assets/background/anteater_background.svg'); - background-repeat: 'no-repeat'; - background-size: 'cover'; - background-position: center center; - min-height: 100vh; - min-width: 100vw; -} \ No newline at end of file + background-image: url("../assets/background/anteater_background.svg"); + background-repeat: repeat; + background-size: "100% 100%"; + background-position: 50% 25%; + background-attachment: fixed; +} diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 8361ec0a..98a093d4 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -21,12 +21,9 @@ export default function RootLayout({ }) { return ( - -
+ {children} -
-
); From 2884ba036fc5609f8429de87e630f84eb8d4bbc1 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Sat, 9 Sep 2023 00:35:59 -0700 Subject: [PATCH 3/9] fix: 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/views/Resources/Resources.tsx | 4 ++-- apps/site/src/views/Schedule/Schedule.tsx | 2 +- apps/site/src/views/index.ts | 2 +- 7 files changed, 8 insertions(+), 8 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/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 3038f7db5c21a5d7d1408c59cdd1455d828220a5 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Sat, 9 Sep 2023 00:40:44 -0700 Subject: [PATCH 4/9] fix: extraneous background-repeat --- apps/site/src/app/globals.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/site/src/app/globals.scss b/apps/site/src/app/globals.scss index 99c55128..0baef043 100644 --- a/apps/site/src/app/globals.scss +++ b/apps/site/src/app/globals.scss @@ -11,7 +11,6 @@ h1 { .background { background-image: url("../assets/background/anteater_background.svg"); - background-repeat: repeat; background-size: "100% 100%"; background-position: 50% 25%; background-attachment: fixed; From 44411115574df3f7c9bbbff7981965227fe18546 Mon Sep 17 00:00:00 2001 From: Tyler Yu Date: Sat, 9 Sep 2023 00:44:50 -0700 Subject: [PATCH 5/9] fix: extraneous background-size --- apps/site/src/app/globals.scss | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/site/src/app/globals.scss b/apps/site/src/app/globals.scss index 0baef043..76f4b124 100644 --- a/apps/site/src/app/globals.scss +++ b/apps/site/src/app/globals.scss @@ -11,7 +11,6 @@ h1 { .background { background-image: url("../assets/background/anteater_background.svg"); - background-size: "100% 100%"; background-position: 50% 25%; background-attachment: fixed; } From a49d4d0e7ec59e83e2f606642424c8cabcb6b617 Mon Sep 17 00:00:00 2001 From: Sam Der Date: Sun, 10 Sep 2023 19:17:37 -0700 Subject: [PATCH 6/9] fix: readded background --- apps/site/src/app/layout.tsx | 7 +++++-- apps/site/src/lib/styles/globals.scss | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 apps/site/src/lib/styles/globals.scss diff --git a/apps/site/src/app/layout.tsx b/apps/site/src/app/layout.tsx index 38ca90d1..73a6884d 100644 --- a/apps/site/src/app/layout.tsx +++ b/apps/site/src/app/layout.tsx @@ -1,10 +1,13 @@ import type { Metadata } from "next"; +import Container from "react-bootstrap/Container"; + import FontProvider from "@/lib/FontProvider"; import NavBar from "@/components/NavBar/NavBar"; import Footer from "@/components/Footer/Footer"; import "@/lib/styles/bootstrap.scss"; +import "@/lib/styles/globals.scss"; export const metadata: Metadata = { title: "Create Next App", @@ -19,9 +22,9 @@ export default function RootLayout({ return ( - + - {children} + {children}