diff --git a/apps/web/__tests__/__snapshots__/index.snapshot.tsx.snap b/apps/web/__tests__/__snapshots__/index.snapshot.tsx.snap index 23e056bb..7653be8d 100644 --- a/apps/web/__tests__/__snapshots__/index.snapshot.tsx.snap +++ b/apps/web/__tests__/__snapshots__/index.snapshot.tsx.snap @@ -77,12 +77,12 @@ exports[`renders homepage unchanged 1`] = ` class="chakra-stack css-lha1ht" >

Techterview 101: Navigating the Internship World

February 22, 2022

@@ -123,12 +123,12 @@ exports[`renders homepage unchanged 1`] = ` class="chakra-stack css-lha1ht" >

21st Main Committee

March 31, 2021

diff --git a/apps/web/features/layout/components/WebLayout.tsx b/apps/web/features/layout/components/WebLayout.tsx index 2d495585..9aacb24b 100644 --- a/apps/web/features/layout/components/WebLayout.tsx +++ b/apps/web/features/layout/components/WebLayout.tsx @@ -9,16 +9,15 @@ export const WebLayout = ({ children }: WebLayoutProps) => { const navbarProps: NavBarProps = { links: [ { label: "Home", href: "/" }, - { label: "Academics", href: "/academics" }, + { label: "About", href: "/about" }, { label: "Events", href: "/events" }, + { label: "Academics", href: "/academics" }, + { label: "Learn", href: "/learn" }, { label: "Sponsors", href: "/sponsors" }, - { label: "Contact", href: "/contact" }, - { label: "BLOG", href: "/blog", menuLinkStyle: "button.golden" }, ], logoProps: { src: "/scse-logo.png", alt: "scse logo", - text: "NTU School of Computer Science & Engineering Club", }, }; const footerProps: FooterProps = { diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx index e1a4b017..4312a164 100644 --- a/apps/web/pages/_app.tsx +++ b/apps/web/pages/_app.tsx @@ -2,10 +2,12 @@ import "../styles/globals.css"; import type { AppProps } from "next/app"; import { ChakraProvider } from "@chakra-ui/react"; import { theme } from "ui/theme"; -import "@fontsource/roboto/400.css"; -import "@fontsource/roboto/700.css"; -import "@fontsource/roboto-slab/400.css"; -import "@fontsource/poppins/400.css"; +import "@fontsource/work-sans/300.css"; +import "@fontsource/work-sans/400.css"; +import "@fontsource/work-sans/600.css"; +import "@fontsource/work-sans/700.css"; +import "ui/fonts/styles.css"; // for custom fonts not available on @fontsource + import { WebLayout } from "@/features/layout"; const App = ({ Component, pageProps }: AppProps) => { diff --git a/apps/web/pages/learn.tsx b/apps/web/pages/learn.tsx new file mode 100644 index 00000000..9244c871 --- /dev/null +++ b/apps/web/pages/learn.tsx @@ -0,0 +1,17 @@ +import { Flex, Text } from "@chakra-ui/react"; + +const Learn = () => { + return ( + + + Coming Soon... + + + ); +}; + +export default Learn; diff --git a/packages/ui/components/blog-card/BlogCardContent.tsx b/packages/ui/components/blog-card/BlogCardContent.tsx index bc5e8b29..eae628c3 100644 --- a/packages/ui/components/blog-card/BlogCardContent.tsx +++ b/packages/ui/components/blog-card/BlogCardContent.tsx @@ -19,13 +19,13 @@ export const BlogCardContent = ({ color="gray.700" fontSize="2xl" fontFamily="body" - _hover={{ cursor: "pointer", color: "brand.blue" }} + _hover={{ cursor: "pointer", color: "brand.navy.medium" }} > {title} {/* Date */} - + {date} diff --git a/packages/ui/components/blog-card/BlogCardImage.tsx b/packages/ui/components/blog-card/BlogCardImage.tsx index 813c1796..33e4be16 100644 --- a/packages/ui/components/blog-card/BlogCardImage.tsx +++ b/packages/ui/components/blog-card/BlogCardImage.tsx @@ -33,7 +33,7 @@ export const BlogCardImage = ({ alt, src, ...props }: BlogCardImageProps) => { { return ( {
- {children} + {children}