From ec7b06938790fbebd74c27a1884bc8d63d80faeb Mon Sep 17 00:00:00 2001
From: opeyem1a <opeyadeyemi@gmail.com>
Date: Sun, 6 Apr 2025 00:47:35 -0600
Subject: [PATCH] chore: add privacy policy page + cleanup for marketing pages

---
 src/app/(app)/course/layout.tsx      | 17 ----------
 src/app/(app)/layout.tsx             | 19 +++++++++++
 src/app/(marketing)/layout.tsx       | 19 +++++++++++
 src/app/(marketing)/privacy/page.tsx | 50 ++++++++++++++++++++++++++++
 src/app/layout.tsx                   |  7 ++--
 src/components/Footer.tsx            | 14 ++++++--
 src/components/NavbarPlain.tsx       | 21 ++++++++++++
 7 files changed, 122 insertions(+), 25 deletions(-)
 delete mode 100644 src/app/(app)/course/layout.tsx
 create mode 100644 src/app/(app)/layout.tsx
 create mode 100644 src/app/(marketing)/layout.tsx
 create mode 100644 src/app/(marketing)/privacy/page.tsx
 create mode 100644 src/components/NavbarPlain.tsx

diff --git a/src/app/(app)/course/layout.tsx b/src/app/(app)/course/layout.tsx
deleted file mode 100644
index 92a9e1c..0000000
--- a/src/app/(app)/course/layout.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import Navbar from "@/components/Navbar"
-import {Separator} from "@/components/ui/separator"
-import Footer from "@/components/Footer"
-
-export default function CourseLayout({
-  children,
-}: {
-    children: React.ReactNode;
-}) {
-  return (
-    <>
-      {children}
-      <Separator />
-      <Footer />
-    </>
-  )
-}
diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx
new file mode 100644
index 0000000..ca05d29
--- /dev/null
+++ b/src/app/(app)/layout.tsx
@@ -0,0 +1,19 @@
+import { Separator } from "@/components/ui/separator"
+import Footer from "@/components/Footer"
+import { AuthUserContextProvider } from "@/app/(providers)/auth-user-provider"
+
+export default function CourseLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <>
+      <AuthUserContextProvider>
+        {children}
+        <Separator />
+        <Footer />
+      </AuthUserContextProvider>
+    </>
+  )
+}
diff --git a/src/app/(marketing)/layout.tsx b/src/app/(marketing)/layout.tsx
new file mode 100644
index 0000000..94664cd
--- /dev/null
+++ b/src/app/(marketing)/layout.tsx
@@ -0,0 +1,19 @@
+import { Separator } from "@/components/ui/separator"
+import Footer from "@/components/Footer"
+import NavbarPlain from "@/components/NavbarPlain"
+
+export default function PrivacyLayout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  return (
+    <>
+      <NavbarPlain />
+      <Separator />
+      {children}
+      <Separator />
+      <Footer />
+    </>
+  )
+}
diff --git a/src/app/(marketing)/privacy/page.tsx b/src/app/(marketing)/privacy/page.tsx
new file mode 100644
index 0000000..8d20886
--- /dev/null
+++ b/src/app/(marketing)/privacy/page.tsx
@@ -0,0 +1,50 @@
+import PageView from "@/components/views/Page"
+import { Text } from "@/components/ui/text"
+import { Separator } from "@/components/ui/separator"
+
+const PrivacyPolicyPage = () => {
+  return (
+    <PageView title="Privacy policy">
+      <div className="flex flex-col gap-6">
+        <div className="flex flex-col">
+          <Text element="h3" className="font-medium text-lg" id="disclosure">
+            Disclosure
+          </Text>
+          <Text element="p" as="mutedText" className="max-w-[64ch]">
+            Include this disclosure in the syllabus of courses using Study
+            Buddy.
+          </Text>
+        </div>
+        <Separator className="max-w-[64ch]" />
+        <div className="flex flex-col gap-4">
+          <Text element="p" className="max-w-[64ch]">
+            As part of this course, you will have the option to utilize Study
+            Buddy, an application designed to facilitate student pairing for
+            collaborative learning activities.
+          </Text>
+          <Text element="p" className="italic max-w-[64ch]">
+            Your personal information, including your name, Student ID, and
+            course grades, will be collected and used under the authority of
+            section 26(c) of the British Columbia Freedom of Information and
+            Protection of Privacy Act (FIPPA).
+          </Text>
+          <Text element="p" className="italic max-w-[64ch]">
+            By agreeing to use Study Buddy, you authorize the application to
+            access this information from Canvas solely for the purpose of
+            matching you with compatible study partners. The information
+            collected will not be used for any other purpose or shared with
+            third parties external to the University.
+          </Text>
+          <Text element="p" className="italic max-w-[64ch]">
+            Your participation in using Study Buddy is entirely voluntary. If
+            you have any questions or concerns about the collection, use, or
+            disclosure of your personal information, please contact Dr. Bowen
+            Hui at bowen.hui[at]ubc[dot]ca.
+          </Text>
+        </div>
+      </div>
+    </PageView>
+  )
+}
+
+export default PrivacyPolicyPage
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index 15f10cb..e817813 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -3,7 +3,6 @@ import { Manrope } from "next/font/google"
 import "./globals.css"
 import { Toaster } from "@/components/ui/toaster"
 import { QueryClientProvider } from "./(providers)/query-client-provider"
-import { AuthUserContextProvider } from "@/app/(providers)/auth-user-provider"
 
 const manrope = Manrope({ subsets: ["latin"] })
 
@@ -22,10 +21,8 @@ export default function RootLayout({
     <html lang="en">
       <body className={`${manrope.className}`}>
         <QueryClientProvider>
-          <AuthUserContextProvider>
-            {children}
-            <Toaster />
-          </AuthUserContextProvider>
+          {children}
+          <Toaster />
         </QueryClientProvider>
       </body>
     </html>
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 6609714..8527f68 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -1,5 +1,6 @@
 import React from "react"
 import { Text } from "@/components/ui/text"
+import Link from "next/link"
 
 const Footer = () => {
   return (
@@ -7,9 +8,16 @@ const Footer = () => {
       <Text element="p" as="smallText" className="p-0">
         Teamable, 2025.
       </Text>
-      <Text element="p" as="smallText" className="p-0 mt-0">
-        ✨
-      </Text>
+      <div className="flex gap-4 items-center">
+        <Link href="/privacy" className="p-0 mt-0">
+          <Text element="p" as="mutedText" className="p-0 mt-0">
+            Privacy policy
+          </Text>
+        </Link>
+        <Text element="p" as="smallText" className="p-0 mt-0">
+          ✨
+        </Text>
+      </div>
     </footer>
   )
 }
diff --git a/src/components/NavbarPlain.tsx b/src/components/NavbarPlain.tsx
new file mode 100644
index 0000000..fdc56f5
--- /dev/null
+++ b/src/components/NavbarPlain.tsx
@@ -0,0 +1,21 @@
+"use client"
+
+import Logo from "@/components/Logo"
+import { NavigationMenu } from "@/components/ui/navigation-menu"
+import { Text } from "@/components/ui/text"
+import Link from "next/link"
+
+const NavbarPlain = () => {
+  return (
+    <NavigationMenu className="container my-4 mx-0 min-w-full flex justify-between gap-4 sticky">
+      <Link href="/" className="flex gap-2 items-center">
+        <Logo />
+        <Text element="p" className="font-semibold">
+          Teamable
+        </Text>
+      </Link>
+    </NavigationMenu>
+  )
+}
+
+export default NavbarPlain