Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SCSE-266] Implement v2 Footer Component #92

Merged
merged 4 commits into from
May 20, 2023
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
19 changes: 0 additions & 19 deletions apps/web/__tests__/__snapshots__/index.snapshot.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -144,25 +144,6 @@ exports[`renders homepage unchanged 1`] = `
</div>
</div>
</div>
<div
class="chakra-stack css-ku5d1q"
>
<h2
class="chakra-heading css-df8nxq"
>
Let’s work together
</h2>
<a
class="chakra-button css-qklkzv"
href="./contact"
>
<p
class="chakra-text css-0"
>
Contact Us
</p>
</a>
</div>
<span
hidden=""
id="__chakra_env"
Expand Down

This file was deleted.

1 change: 0 additions & 1 deletion apps/web/features/academics/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export { PYPSection } from './PYPSection';
export { AcademicsFooterContentText } from './AcademicsFooterContentText';
2 changes: 1 addition & 1 deletion apps/web/features/academics/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// Export Components
export { PYPSection, AcademicsFooterContentText } from './components';
export { PYPSection } from './components';
36 changes: 28 additions & 8 deletions apps/web/features/layout/components/WebLayout.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React from "react";
import { FooterProps, Layout, NavBarProps } from "ui";
import { FaGithub, FaInstagram, FaLinkedin } from "react-icons/fa";

interface WebLayoutProps {
children: React.ReactNode
Expand All @@ -16,19 +17,38 @@ export const WebLayout = ({ children }: WebLayoutProps) => {
{ label: "Sponsors", href: "/sponsors" },
],
logoProps: {
src: "/scse-logo.png",
src: "/scse-logo/scse-logo-blue.png",
alt: "scse logo",
},
};
const footerProps: FooterProps = {
links: [
{ label: "Home", href: "/", position: 12 },
{ label: "Academics", href: "/academics", position: 13 },
{ label: "Events", href: "/events", position: 14 },
{ label: "Sponsors", href: "/sponsors", position: 15 },
{ label: "Contact", href: "/contact", position: 16 },
logoProps: {
src: "/scse-logo/scse-logo-red.png",
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: "GitHub", icon: FaGithub, href: "https://github.com/ntuscse" },
],
vercelpoweredProps: {
studentLinksGroup: {
header: "For Students",
links: [
{ label: "Academics", href: "/academics" },
{ 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: "Contact", href: "/contact" },
]
},
vercelPoweredProps: {
href: "https://vercel.com/?utm_source=cse-it&&utm_campaign=oss",
src: "/powered-by-vercel.svg",
alt: "Powered by Vercel Branding",
Expand Down
1 change: 1 addition & 0 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
"react": "18.2.0",
"react-bootstrap": "^2.5.0",
"react-dom": "18.2.0",
"react-icons": "^4.8.0",
"ui": "*"
},
"devDependencies": {
Expand Down
3 changes: 1 addition & 2 deletions apps/web/pages/academics.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Hero } from "ui";
import { AcademicsFooterContentText, PYPSection } from "@/features/academics";
import { PYPSection } from "@/features/academics";

const Academics = () => {
return (
Expand All @@ -9,7 +9,6 @@ const Academics = () => {
backgroundGradient="linear(to-r, whiteAlpha.500, whiteAlpha.500)"
/>
<PYPSection />
<AcademicsFooterContentText />
</>
);
};
Expand Down
9 changes: 1 addition & 8 deletions apps/web/pages/events.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { VStack, Heading } from "@chakra-ui/react";
import { GetStaticProps, GetStaticPropsResult } from "next";
import { FooterContentButton, Hero } from "ui";
import { Hero } from "ui";
import { BlogCardsDisplay, BlogCardsDisplayProps, getAllBlogPosts } from "@/features/blogs";

interface EventsProps {
Expand All @@ -20,13 +20,6 @@ const Events = ({ posts }: EventsProps) => {
<Heading p={5}>Recent/Ongoing Events</Heading>
<BlogCardsDisplay posts={posts} />
</VStack>

{/* Extra Footer Content */}
<FooterContentButton
href="./contact"
label="Contact Us"
title="Let's Talk"
/>
</>
);
};
Expand Down
6 changes: 0 additions & 6 deletions apps/web/pages/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { FooterContentButton } from "ui";
import { VStack } from "@chakra-ui/react";
import { GetStaticProps, GetStaticPropsResult } from "next";
import { HomeHero } from "@/features/home";
Expand All @@ -15,11 +14,6 @@ const Home = ({ posts }: HomeProps) => {
<VStack mx={{ base: 5, lg: 10 }} pt={12}>
<BlogCardsDisplay posts={posts.slice(0, 6)} />
</VStack>
<FooterContentButton
href="./contact"
label="Contact Us"
title="Let’s work together"
/>
</>
);
};
Expand Down
6 changes: 0 additions & 6 deletions apps/web/pages/sponsors.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { FooterContentButton } from "ui";
import { Divider, Heading, VStack } from "@chakra-ui/react";
import { sponsorsData, SponsorsGrid } from "@/features/sponsors";
const Sponsors = () => {
Expand All @@ -18,11 +17,6 @@ const Sponsors = () => {
{/* Sponsors Grid */}
<SponsorsGrid sponsorsData={sponsorsData} />
</VStack>
<FooterContentButton
href="./contact"
label="Contact Us"
title="Want to sponsor us or work on a event together?"
/>
</>
);
};
Expand Down
Binary file added apps/web/public/scse-logo/scse-logo-red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packages/ui/components/footer-content-button/index.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions packages/ui/components/footer-content-text/Announcement.tsx

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 0 additions & 2 deletions packages/ui/components/footer-content-text/index.tsx

This file was deleted.

Loading