Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions src/app/(app)/course/layout.tsx

This file was deleted.

19 changes: 19 additions & 0 deletions src/app/(app)/layout.tsx
Original file line number Diff line number Diff line change
@@ -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>
</>
)
}
19 changes: 19 additions & 0 deletions src/app/(marketing)/layout.tsx
Original file line number Diff line number Diff line change
@@ -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 />
</>
)
}
50 changes: 50 additions & 0 deletions src/app/(marketing)/privacy/page.tsx
Original file line number Diff line number Diff line change
@@ -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
7 changes: 2 additions & 5 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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"] })

Expand All @@ -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>
Expand Down
14 changes: 11 additions & 3 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
import React from "react"
import { Text } from "@/components/ui/text"
import Link from "next/link"

const Footer = () => {
return (
<footer className="flex justify-between items-center px-16 py-8">
<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>
)
}
Expand Down
21 changes: 21 additions & 0 deletions src/components/NavbarPlain.tsx
Original file line number Diff line number Diff line change
@@ -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