From eef70b50f196b9043106471dec6ea8a416fda855 Mon Sep 17 00:00:00 2001 From: Gerson Junior Date: Tue, 25 Jul 2023 18:02:01 +0100 Subject: [PATCH 1/3] Hero --- app/layout.tsx | 6 +--- app/page.tsx | 10 +++++- components/Hero.tsx | 34 ++++++++++++++++++++ components/Navbar.tsx | 4 +-- public/{cesium.png => cesium-lettering.png} | Bin public/cesium.svg | 1 + tailwind.config.js | 3 +- 7 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 components/Hero.tsx rename public/{cesium.png => cesium-lettering.png} (100%) create mode 100644 public/cesium.svg diff --git a/app/layout.tsx b/app/layout.tsx index 630a833..eb2ffc0 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,4 +1,3 @@ -import Navbar from "@/components/Navbar"; import "./globals.css"; import { Inter } from "next/font/google"; @@ -16,10 +15,7 @@ export default function RootLayout({ }) { return ( - - - {children} - + {children} ); } diff --git a/app/page.tsx b/app/page.tsx index e8778b7..de9a020 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,3 +1,11 @@ +import Hero from "@/components/Hero"; +import Navbar from "@/components/Navbar"; + export default function Home() { - return
; + return ( +
+ + +
+ ); } diff --git a/components/Hero.tsx b/components/Hero.tsx new file mode 100644 index 0000000..c142065 --- /dev/null +++ b/components/Hero.tsx @@ -0,0 +1,34 @@ +import Image from "next/image"; +import logo from "@/public/cesium.svg"; + +export default function Hero() { + return ( +
+
+
CeSIUM
+
+ Centro de Estudante de Engenharia Informática da Universidade do Minho +
+
+
+ + +
+
+ ); +} diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 0d37fdd..241d0fa 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -1,13 +1,13 @@ import Image from "next/image"; -import logo from "@/public/cesium.png"; +import logo from "@/public/cesium-lettering.png"; import Link from "next/link"; const navbar: string[] = ["HOME", "TEAM", "LOGS", "EVENTS", "ABOUT US"]; export default function Navbar() { return ( -
+
{navbar.map((title) => ( diff --git a/public/cesium.png b/public/cesium-lettering.png similarity index 100% rename from public/cesium.png rename to public/cesium-lettering.png diff --git a/public/cesium.svg b/public/cesium.svg new file mode 100644 index 0000000..b434b63 --- /dev/null +++ b/public/cesium.svg @@ -0,0 +1 @@ +cesium \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index 45fb258..ed75534 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -18,7 +18,7 @@ module.exports = { "5xl": ["3rem", { lineHeight: "3.5rem" }], "6xl": ["4rem", { lineHeight: "1" }], "7xl": ["5rem", { lineHeight: "1" }], - "8xl": ["6rem", { lineHeight: "1" }], + "8xl": ["7rem", { lineHeight: "1" }], "9xl": ["8rem", { lineHeight: "1" }], }, extend: { @@ -40,6 +40,7 @@ module.exports = { 800: "#ED8661", 900: "#ED8661", }, + background: "EDE9E8", }, }, }, From 404485e2d3d0847dff825cfd4e9339e0d1e26cba Mon Sep 17 00:00:00 2001 From: Gerson Junior Date: Tue, 25 Jul 2023 22:42:13 +0100 Subject: [PATCH 2/3] Put navbar on layout --- app/layout.tsx | 6 +++++- app/page.tsx | 2 -- components/Navbar.tsx | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/layout.tsx b/app/layout.tsx index eb2ffc0..630a833 100644 --- a/app/layout.tsx +++ b/app/layout.tsx @@ -1,3 +1,4 @@ +import Navbar from "@/components/Navbar"; import "./globals.css"; import { Inter } from "next/font/google"; @@ -15,7 +16,10 @@ export default function RootLayout({ }) { return ( - {children} + + + {children} + ); } diff --git a/app/page.tsx b/app/page.tsx index de9a020..b99dfe5 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -1,10 +1,8 @@ import Hero from "@/components/Hero"; -import Navbar from "@/components/Navbar"; export default function Home() { return (
-
); diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 241d0fa..83ec252 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -7,7 +7,7 @@ const navbar: string[] = ["HOME", "TEAM", "LOGS", "EVENTS", "ABOUT US"]; export default function Navbar() { return ( -
+
{navbar.map((title) => ( From 1f9d3abc2946151ef93d683fd563fb84cd932fc3 Mon Sep 17 00:00:00 2001 From: Gerson Junior Date: Wed, 26 Jul 2023 18:04:53 +0100 Subject: [PATCH 3/3] Fix minor error --- components/Hero.tsx | 10 +--------- components/Navbar.tsx | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/components/Hero.tsx b/components/Hero.tsx index c142065..854e84a 100644 --- a/components/Hero.tsx +++ b/components/Hero.tsx @@ -11,14 +11,7 @@ export default function Hero() {
- +
diff --git a/components/Navbar.tsx b/components/Navbar.tsx index 83ec252..312593f 100644 --- a/components/Navbar.tsx +++ b/components/Navbar.tsx @@ -8,7 +8,7 @@ const navbar: string[] = ["HOME", "TEAM", "LOGS", "EVENTS", "ABOUT US"]; export default function Navbar() { return (
- +
{navbar.map((title) => (