From b7e6d38f9ac7acbe45b43b8830f0cd76d6e3861a Mon Sep 17 00:00:00 2001 From: Han Pham Date: Sun, 14 Nov 2021 12:59:16 -0800 Subject: [PATCH 1/4] Turned into component --- .../src/components/home/Statement/Statement.tsx | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 blockchain-society-website/src/components/home/Statement/Statement.tsx diff --git a/blockchain-society-website/src/components/home/Statement/Statement.tsx b/blockchain-society-website/src/components/home/Statement/Statement.tsx new file mode 100644 index 0000000..3de209f --- /dev/null +++ b/blockchain-society-website/src/components/home/Statement/Statement.tsx @@ -0,0 +1,12 @@ +function Statement() { + return ( +
+

+ Our mission is our north star, it should determine our pillars and + rarely change +

+
+ ); +} + +export default Statement; From fd0db4d4e2c39b247d5950163de985d44f33ded1 Mon Sep 17 00:00:00 2001 From: Han Pham Date: Sun, 14 Nov 2021 12:59:51 -0800 Subject: [PATCH 2/4] Removed gradient bg --- .../src/components/home/Hero/Hero.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/blockchain-society-website/src/components/home/Hero/Hero.tsx b/blockchain-society-website/src/components/home/Hero/Hero.tsx index 815ae46..023479a 100644 --- a/blockchain-society-website/src/components/home/Hero/Hero.tsx +++ b/blockchain-society-website/src/components/home/Hero/Hero.tsx @@ -9,13 +9,7 @@ import { Fade } from "react-bootstrap"; function Hero() { return (
- {/** Parallax Background */} -
- UW Quad +
From c7e9555e31f047755a9ae34bb66a7f4d45ba7fa2 Mon Sep 17 00:00:00 2001 From: Han Pham Date: Sun, 14 Nov 2021 13:00:22 -0800 Subject: [PATCH 3/4] Redesigned gradient bg --- blockchain-society-website/src/App.tsx | 9 ++--- .../src/components/home/Upcoming/Event.tsx | 4 +-- .../src/components/home/Upcoming/Upcoming.tsx | 33 +++++++++++++------ 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/blockchain-society-website/src/App.tsx b/blockchain-society-website/src/App.tsx index 36d4aad..df846e9 100644 --- a/blockchain-society-website/src/App.tsx +++ b/blockchain-society-website/src/App.tsx @@ -4,6 +4,7 @@ import "./styles/variables/Palette.scss"; import Hero from "./components/home/Hero/Hero"; import "aos/dist/aos.css"; import AOS from "aos"; +import Statement from "./components/home/Statement/Statement"; import Dropdown from "./components/home/Nav/Dropdown"; import About from "./components/home/About/About"; import Faq from "./components/home/Faq/Faq"; @@ -41,14 +42,8 @@ function App() { - + {/* */} -
-

- Our mission is our north star, it should determine our pillars and - rarely change -

-
{/*
Sponsors and Students CTA
diff --git a/blockchain-society-website/src/components/home/Upcoming/Event.tsx b/blockchain-society-website/src/components/home/Upcoming/Event.tsx index 8dfbca6..665b703 100644 --- a/blockchain-society-website/src/components/home/Upcoming/Event.tsx +++ b/blockchain-society-website/src/components/home/Upcoming/Event.tsx @@ -20,9 +20,9 @@ function Event({ title, type, time, month, day, location }: any) { {type} {title}
- + {time} - + {location}
diff --git a/blockchain-society-website/src/components/home/Upcoming/Upcoming.tsx b/blockchain-society-website/src/components/home/Upcoming/Upcoming.tsx index ea358a6..d202eb8 100644 --- a/blockchain-society-website/src/components/home/Upcoming/Upcoming.tsx +++ b/blockchain-society-website/src/components/home/Upcoming/Upcoming.tsx @@ -8,18 +8,31 @@ function Upcoming() { AOS.init(); }, []); return ( -
- - - - - - + + + + + +
); From 6bf9f2b32cec1de3a957c7b4afb6363d2426b835 Mon Sep 17 00:00:00 2001 From: Han Pham Date: Wed, 17 Nov 2021 12:02:40 -0800 Subject: [PATCH 4/4] Fixed overflow footer on mobile view --- blockchain-society-website/src/App.tsx | 2 +- .../src/components/home/Footer/Footer.tsx | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/blockchain-society-website/src/App.tsx b/blockchain-society-website/src/App.tsx index df846e9..c67a588 100644 --- a/blockchain-society-website/src/App.tsx +++ b/blockchain-society-website/src/App.tsx @@ -38,7 +38,7 @@ function App() { }, []); return ( -
+
diff --git a/blockchain-society-website/src/components/home/Footer/Footer.tsx b/blockchain-society-website/src/components/home/Footer/Footer.tsx index 546005d..0133c34 100644 --- a/blockchain-society-website/src/components/home/Footer/Footer.tsx +++ b/blockchain-society-website/src/components/home/Footer/Footer.tsx @@ -7,7 +7,6 @@ import { import { IconContext } from "react-icons/lib"; import { useEffect } from "react"; import AOS from "aos"; -// import "../../../styles/variables/Palette.scss"; function Footer() { useEffect(() => { @@ -28,9 +27,8 @@ function Footer() {

blockchn@uw.edu

-
+

© UW Blockchain Society. 2021. All rights reserved.

-