From 26ee56c141c3d59eb9cc2cc0bb72d8fcbe81ce23 Mon Sep 17 00:00:00 2001 From: longjichen1 Date: Sat, 2 Apr 2022 20:39:47 -0500 Subject: [PATCH 1/2] index section one and public org files --- components/Navbar.js | 2 +- pages/index.js | 6 +++++- public/landing_section_one.svg | 18 ------------------ {images => public/logos}/big_logo.png | Bin public/{ => logos}/logo.png | Bin {images => public/members}/gray_circle.png | Bin {images => public/members}/members_info.json | 0 {images => public/misc}/alumni_companies.png | Bin {images => public/misc}/board_back.png | Bin {images => public/misc}/board_pic.png | Bin {images => public/misc}/code.jpg | Bin {images => public/misc}/coffee.jpg | Bin {images => public/misc}/friends.jpg | Bin {images => public/misc}/laptop_code.jpg | Bin {images => public/misc}/person_icon.png | Bin {images => public/misc}/smile_people.png | Bin {images => public/misc}/v66_1069.png | Bin {images => public/misc}/v66_1072.png | Bin {images => public/svgs}/about_egg.svg | 0 .../svgs}/blue_dashed_stroke.svg | 0 .../svgs}/blue_on_white_bottom.svg | 0 .../svgs}/blue_on_white_curve.svg | 0 {images => public/svgs}/blue_title.svg | 0 {images => public/svgs}/footer_squiggle.svg | 0 {images => public/svgs}/happening_now.svg | 0 .../svgs}/landing_section_one.svg | 0 .../svgs}/landing_section_three_bottom.svg | 0 .../svgs}/landing_section_three_top.svg | 0 {images => public/svgs}/top_bar_header.svg | 0 {images => public/svgs}/yellow_line.svg | 0 {images => public/svgs}/yellow_title.svg | 0 31 files changed, 6 insertions(+), 20 deletions(-) delete mode 100644 public/landing_section_one.svg rename {images => public/logos}/big_logo.png (100%) rename public/{ => logos}/logo.png (100%) rename {images => public/members}/gray_circle.png (100%) rename {images => public/members}/members_info.json (100%) rename {images => public/misc}/alumni_companies.png (100%) rename {images => public/misc}/board_back.png (100%) rename {images => public/misc}/board_pic.png (100%) rename {images => public/misc}/code.jpg (100%) rename {images => public/misc}/coffee.jpg (100%) rename {images => public/misc}/friends.jpg (100%) rename {images => public/misc}/laptop_code.jpg (100%) rename {images => public/misc}/person_icon.png (100%) rename {images => public/misc}/smile_people.png (100%) rename {images => public/misc}/v66_1069.png (100%) rename {images => public/misc}/v66_1072.png (100%) rename {images => public/svgs}/about_egg.svg (100%) rename {images => public/svgs}/blue_dashed_stroke.svg (100%) rename {images => public/svgs}/blue_on_white_bottom.svg (100%) rename {images => public/svgs}/blue_on_white_curve.svg (100%) rename {images => public/svgs}/blue_title.svg (100%) rename {images => public/svgs}/footer_squiggle.svg (100%) rename {images => public/svgs}/happening_now.svg (100%) rename {images => public/svgs}/landing_section_one.svg (100%) rename {images => public/svgs}/landing_section_three_bottom.svg (100%) rename {images => public/svgs}/landing_section_three_top.svg (100%) rename {images => public/svgs}/top_bar_header.svg (100%) rename {images => public/svgs}/yellow_line.svg (100%) rename {images => public/svgs}/yellow_title.svg (100%) diff --git a/components/Navbar.js b/components/Navbar.js index e08497b..0b7c7dd 100644 --- a/components/Navbar.js +++ b/components/Navbar.js @@ -7,7 +7,7 @@ const Navbar = () => {
- Logo + Logo
diff --git a/pages/index.js b/pages/index.js index 45cf102..5121758 100644 --- a/pages/index.js +++ b/pages/index.js @@ -12,7 +12,11 @@ const Home = () => { {/* Logo */} -
+
+
+ +
+
diff --git a/public/landing_section_one.svg b/public/landing_section_one.svg deleted file mode 100644 index 0dd8306..0000000 --- a/public/landing_section_one.svg +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/images/big_logo.png b/public/logos/big_logo.png similarity index 100% rename from images/big_logo.png rename to public/logos/big_logo.png diff --git a/public/logo.png b/public/logos/logo.png similarity index 100% rename from public/logo.png rename to public/logos/logo.png diff --git a/images/gray_circle.png b/public/members/gray_circle.png similarity index 100% rename from images/gray_circle.png rename to public/members/gray_circle.png diff --git a/images/members_info.json b/public/members/members_info.json similarity index 100% rename from images/members_info.json rename to public/members/members_info.json diff --git a/images/alumni_companies.png b/public/misc/alumni_companies.png similarity index 100% rename from images/alumni_companies.png rename to public/misc/alumni_companies.png diff --git a/images/board_back.png b/public/misc/board_back.png similarity index 100% rename from images/board_back.png rename to public/misc/board_back.png diff --git a/images/board_pic.png b/public/misc/board_pic.png similarity index 100% rename from images/board_pic.png rename to public/misc/board_pic.png diff --git a/images/code.jpg b/public/misc/code.jpg similarity index 100% rename from images/code.jpg rename to public/misc/code.jpg diff --git a/images/coffee.jpg b/public/misc/coffee.jpg similarity index 100% rename from images/coffee.jpg rename to public/misc/coffee.jpg diff --git a/images/friends.jpg b/public/misc/friends.jpg similarity index 100% rename from images/friends.jpg rename to public/misc/friends.jpg diff --git a/images/laptop_code.jpg b/public/misc/laptop_code.jpg similarity index 100% rename from images/laptop_code.jpg rename to public/misc/laptop_code.jpg diff --git a/images/person_icon.png b/public/misc/person_icon.png similarity index 100% rename from images/person_icon.png rename to public/misc/person_icon.png diff --git a/images/smile_people.png b/public/misc/smile_people.png similarity index 100% rename from images/smile_people.png rename to public/misc/smile_people.png diff --git a/images/v66_1069.png b/public/misc/v66_1069.png similarity index 100% rename from images/v66_1069.png rename to public/misc/v66_1069.png diff --git a/images/v66_1072.png b/public/misc/v66_1072.png similarity index 100% rename from images/v66_1072.png rename to public/misc/v66_1072.png diff --git a/images/about_egg.svg b/public/svgs/about_egg.svg similarity index 100% rename from images/about_egg.svg rename to public/svgs/about_egg.svg diff --git a/images/blue_dashed_stroke.svg b/public/svgs/blue_dashed_stroke.svg similarity index 100% rename from images/blue_dashed_stroke.svg rename to public/svgs/blue_dashed_stroke.svg diff --git a/images/blue_on_white_bottom.svg b/public/svgs/blue_on_white_bottom.svg similarity index 100% rename from images/blue_on_white_bottom.svg rename to public/svgs/blue_on_white_bottom.svg diff --git a/images/blue_on_white_curve.svg b/public/svgs/blue_on_white_curve.svg similarity index 100% rename from images/blue_on_white_curve.svg rename to public/svgs/blue_on_white_curve.svg diff --git a/images/blue_title.svg b/public/svgs/blue_title.svg similarity index 100% rename from images/blue_title.svg rename to public/svgs/blue_title.svg diff --git a/images/footer_squiggle.svg b/public/svgs/footer_squiggle.svg similarity index 100% rename from images/footer_squiggle.svg rename to public/svgs/footer_squiggle.svg diff --git a/images/happening_now.svg b/public/svgs/happening_now.svg similarity index 100% rename from images/happening_now.svg rename to public/svgs/happening_now.svg diff --git a/images/landing_section_one.svg b/public/svgs/landing_section_one.svg similarity index 100% rename from images/landing_section_one.svg rename to public/svgs/landing_section_one.svg diff --git a/images/landing_section_three_bottom.svg b/public/svgs/landing_section_three_bottom.svg similarity index 100% rename from images/landing_section_three_bottom.svg rename to public/svgs/landing_section_three_bottom.svg diff --git a/images/landing_section_three_top.svg b/public/svgs/landing_section_three_top.svg similarity index 100% rename from images/landing_section_three_top.svg rename to public/svgs/landing_section_three_top.svg diff --git a/images/top_bar_header.svg b/public/svgs/top_bar_header.svg similarity index 100% rename from images/top_bar_header.svg rename to public/svgs/top_bar_header.svg diff --git a/images/yellow_line.svg b/public/svgs/yellow_line.svg similarity index 100% rename from images/yellow_line.svg rename to public/svgs/yellow_line.svg diff --git a/images/yellow_title.svg b/public/svgs/yellow_title.svg similarity index 100% rename from images/yellow_title.svg rename to public/svgs/yellow_title.svg From d55bb9058dfd90248bb42329ae123e43abc19412 Mon Sep 17 00:00:00 2001 From: Zi Nean Teoh Date: Sat, 2 Apr 2022 20:41:36 -0500 Subject: [PATCH 2/2] migrate --- pages/about.js | 47 +++++++++++++++++++++++++++++++++++------ public/about_egg.svg | 18 ++++++++++++++++ public/yellow_title.svg | 3 +++ 3 files changed, 61 insertions(+), 7 deletions(-) create mode 100644 public/about_egg.svg create mode 100644 public/yellow_title.svg diff --git a/pages/about.js b/pages/about.js index 728eaf9..796bfe8 100644 --- a/pages/about.js +++ b/pages/about.js @@ -1,15 +1,48 @@ import React from "react"; import Navbar from "../components/Navbar"; import Footer from "../components/Footer"; +import Image from "next/image"; const about = () => { - return ( -
- -

About page

-
-
- ); + return ( +
+ + +
+
+ About Us +
+
+
+ Our Story +
+
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. + Sed pharetra nulla ex, nec blandit sapien laoreet a. + Mauris a tellus egestas lacus vulputate venenatis in et + elit. Class aptent taciti sociosqu ad litora torquent + per conubia nostra, per inceptos himenaeos. Cras + pharetra vitae nisl vel varius. Pellentesque dapibus + mollis nisi, vel egestas tortor aliquet id. Nunc a + commodo elit. Etiam semper tellus ligula, eget + sollicitudin neque egestas vitae. +
+
+
+ +
+
+ ); }; export default about; diff --git a/public/about_egg.svg b/public/about_egg.svg new file mode 100644 index 0000000..c4c7e7a --- /dev/null +++ b/public/about_egg.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/public/yellow_title.svg b/public/yellow_title.svg new file mode 100644 index 0000000..3f77690 --- /dev/null +++ b/public/yellow_title.svg @@ -0,0 +1,3 @@ + + +