Skip to content

Commit

Permalink
remove routes for launch (#129)
Browse files Browse the repository at this point in the history
  • Loading branch information
RealDyllon authored Oct 7, 2023
1 parent 0e25d62 commit 27947cf
Show file tree
Hide file tree
Showing 9 changed files with 151 additions and 165 deletions.
73 changes: 37 additions & 36 deletions apps/web/features/home/components/HomeHero.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Box, Flex, Icon, Text } from "@chakra-ui/react";
import { FaArrowDown } from 'react-icons/fa';
import { FaArrowDown } from "react-icons/fa";
import Image from "next/image";
import { keyframes } from '@emotion/react';
import { keyframes } from "@emotion/react";
import Link from "next/link";

export const HomeHero = () => {
Expand All @@ -18,10 +18,8 @@ export const HomeHero = () => {
overflow="hidden"
>
{/* Header */}
<Box
marginBottom={["0px", "0px", "0px", "32px"]}
>
<Link href="/" >
<Box marginTop={24} marginBottom={["0px", "0px", "0px", "32px"]}>
<Link href="/">
<Text
as="header"
role="heading"
Expand Down Expand Up @@ -60,24 +58,26 @@ export const HomeHero = () => {
color="transparent"
paddingY={["0px", "0px", "0px", "24px"]}
>
<Link href="/about">
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
cursor="pointer"
>
10,000+<br />Undergraduates
</Text>
</Link>
<Link href="/join">
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
cursor="pointer"
>
8 Sub-Committees
</Text>
</Link>
{/*<Link href="/about">*/}
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
// cursor="pointer"
>
10,000+
<br />
Undergraduates
</Text>
{/*</Link>*/}
{/*<Link href="/join">*/}
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
// cursor="pointer"
>
8 Sub-Committees
</Text>
{/*</Link>*/}
</Flex>

{/* Main Hero Image */}
Expand Down Expand Up @@ -115,20 +115,20 @@ export const HomeHero = () => {
paddingY={["0px", "0px", "0px", "24px"]}
>
{/*<Link href="/events">*/}
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
cursor="pointer"
>
10+ events yearly
</Text>
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
// cursor="pointer"
>
10+ events yearly
</Text>
{/*</Link>*/}

<Link href="/academics">
<Text
textAlign="center"
my={["8px", "8px", "8px", "0px"]}
cursor="pointer"
// cursor="pointer"
>
One-stop place for all your academic needs
</Text>
Expand All @@ -141,16 +141,16 @@ export const HomeHero = () => {
as={FaArrowDown}
boxSize="30px"
_hover={{
cursor: "pointer"
cursor: "pointer",
}}
position="absolute"
bottom={["24px", "24px", "24px", "48px"]}
animation={`${arrowAnimation} 2s infinite`}
onClick={() => {
window.scrollTo({
top: window.innerHeight - 100,
behavior: "smooth"
})
behavior: "smooth",
});
}}
/>

Expand Down Expand Up @@ -193,7 +193,8 @@ export const HomeHero = () => {
);
};

const linearGradientBrand = "linear-gradient(90deg, #254876 13.43%, #DD616B 87.61%)";
const linearGradientBrand =
"linear-gradient(90deg, #254876 13.43%, #DD616B 87.61%)";

const arrowAnimation = keyframes`
0% { transform: translateY(0px) }
Expand Down
57 changes: 41 additions & 16 deletions apps/web/features/home/components/HomeWhoRWe.tsx
Original file line number Diff line number Diff line change
@@ -1,33 +1,58 @@
import { FramedText } from "ui";
import { Text, Grid, GridItem, Box, Button, Flex } from "@chakra-ui/react";
import {
Text,
Grid,
GridItem,
Box,
// Button,
Flex,
} from "@chakra-ui/react";
import Image from "next/image";
import { whoWeAreCopy } from "../../../content/home";

export const HomeWhoRWe = () => {
return(
return (
<>
{/*Heading*/}
<Flex justifyContent='center' direction={"column"} alignItems={'center'} my={'3rem'}>
<FramedText text={'Who We Are'} textColor={'black'}/>
<Grid gridTemplateAreas={{
base: `'image image' 'content content'`,
md: `'content image' 'content image'`
}}
templateColumns = 'repeat(2, 1fr)' gap={'1.5rem'} mx={{ base: '3rem', lg: '6rem' }} maxWidth={'1440px'} >

<Flex
justifyContent="center"
direction={"column"}
alignItems={"center"}
my={"3rem"}
>
<FramedText text={"Who We Are"} textColor={"black"} />
<Grid
gridTemplateAreas={{
base: `'image image' 'content content'`,
md: `'content image' 'content image'`,
}}
templateColumns="repeat(2, 1fr)"
gap={"1.5rem"}
mx={{ base: "3rem", lg: "6rem" }}
maxWidth={"1440px"}
>
{/* Who are we content with the button */}
<GridItem area={'content'} >
<Flex direction={'column'} gap={'1rem'} align={'flex-start'} justify={'center'} h='100%'>
<Text maxWidth={'600px'} fontSize={{ base: '16px', '2xl':'20px' }}>
<GridItem area={"content"}>
<Flex
direction={"column"}
gap={"1rem"}
align={"flex-start"}
justify={"center"}
h="100%"
>
<Text
maxWidth={"600px"}
fontSize={{ base: "16px", "2xl": "20px" }}
>
{whoWeAreCopy}
</Text>
<Button variant={'red-scse'} size={'md'}>Learn More</Button>
{/*<Button variant={'red-scse'} size={'md'}>Learn More</Button>*/}
</Flex>
</GridItem>

{/* Who are we Image */}
<GridItem area={'image'} >
<Flex justifyContent='center'>
<GridItem area={"image"}>
<Flex justifyContent="center">
<Box
position="relative"
boxSize={["260px", "350px", "350px", "400px"]}
Expand Down
32 changes: 20 additions & 12 deletions apps/web/features/layout/components/WebLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ export const WebLayout = ({ children }: WebLayoutProps) => {
const navbarProps: NavBarProps = {
links: [
{ label: "Home", href: "/" },
{ label: "About", href: "/about" },
// { label: "About", href: "/about" },
// { label: "Events", href: "/events" },
{ label: "Academics", href: "/academics" },
{ label: "Learn", href: "/learn" },
{ label: "Sponsors", href: "/sponsors" },
{ label: "Merch", href: "/merch" },
// { label: "Learn", href: "/learn" },
// { label: "Sponsors", href: "/sponsors" },
// { label: "Merch", href: "/merch" },
],
logoProps: {
src: "/scse-logo/scse-logo-blue.png",
Expand All @@ -28,26 +28,34 @@ export const WebLayout = ({ children }: WebLayoutProps) => {
alt: "scse logo",
},
socialLinks: [
{ name: "Instagram", icon: FaInstagram, href: "https://www.instagram.com/ntuscseclub/" },
{ name: "LinkedIn", icon: FaLinkedin, href: "https://sg.linkedin.com/company/ntu-scseclub" },
{
name: "Instagram",
icon: FaInstagram,
href: "https://www.instagram.com/ntuscseclub/",
},
{
name: "LinkedIn",
icon: FaLinkedin,
href: "https://sg.linkedin.com/company/ntu-scseclub",
},
{ name: "GitHub", icon: FaGithub, href: "https://github.com/ntuscse" },
],
studentLinksGroup: {
header: "For Students",
links: [
{ label: "Academics", href: "/academics" },
{ label: "Events", href: "/events" },
{ label: "Join a Subcommittee", href: "/join" },
{ label: "Learn", href: "/learn" },
// { label: "Events", href: "/events" },
// { label: "Join a Subcommittee", href: "/join" },
// { label: "Learn", href: "/learn" },
{ label: "Feedback", href: "/contact" },
]
],
},
companyLinksGroup: {
header: "For Companies",
links: [
{ label: "Sponsor Us", href: "/sponsors" },
// { label: "Sponsor Us", href: "/sponsors" },
{ label: "Contact", href: "/contact" },
]
],
},
vercelPoweredProps: {
href: "https://vercel.com/?utm_source=cse-it&&utm_campaign=oss",
Expand Down
17 changes: 0 additions & 17 deletions apps/web/pages/about.tsx

This file was deleted.

8 changes: 6 additions & 2 deletions apps/web/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { HomeHero, HomeWhoRWe, UpcomingEventRibbon } from "@/features/home";
import {
HomeHero,
HomeWhoRWe,
//UpcomingEventRibbon
} from "@/features/home";
// import { HomeMemories } from "@/features/home";
import { FooterSeparator } from "ui";
import React from "react";
Expand All @@ -10,7 +14,7 @@ const Home = () => {
<HomeWhoRWe />
{/*<HomeMemories />*/}
<FooterSeparator />
<UpcomingEventRibbon href={"/events"} />
{/*<UpcomingEventRibbon href={"/events"} />*/}
</>
);
};
Expand Down
17 changes: 0 additions & 17 deletions apps/web/pages/join.tsx

This file was deleted.

17 changes: 0 additions & 17 deletions apps/web/pages/learn.tsx

This file was deleted.

24 changes: 0 additions & 24 deletions apps/web/pages/sponsors.tsx

This file was deleted.

Loading

1 comment on commit 27947cf

@vercel
Copy link

@vercel vercel bot commented on 27947cf Oct 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

website-ui-storybook – ./packages/ui

storybook.ui.dev.ntuscse.com
website-ui-storybook-cse-it.vercel.app
website-ui-storybook-git-main-cse-it.vercel.app

Please sign in to comment.