From e18e8a244c458eb9f5181d061a9e1988a95ec049 Mon Sep 17 00:00:00 2001 From: WinsDominoes Date: Fri, 3 May 2024 10:41:57 +0700 Subject: [PATCH] Changed font, name and more --- app/components/ContactButton.tsx | 21 ++++--- app/components/Navbar.tsx | 7 +-- app/components/Photo.tsx | 4 +- app/components/Timeline.tsx | 2 +- app/education/page.tsx | 91 ----------------------------- app/globals.css | 6 ++ app/hobbies/page.tsx | 2 +- app/layout.tsx | 3 - app/page.tsx | 33 +++++------ app/projects/page.tsx | 2 +- public/fonts/Cantarell-Regular.ttf | Bin 0 -> 42624 bytes 11 files changed, 36 insertions(+), 135 deletions(-) delete mode 100755 app/education/page.tsx create mode 100644 public/fonts/Cantarell-Regular.ttf diff --git a/app/components/ContactButton.tsx b/app/components/ContactButton.tsx index 64cd3b8..0a58c0f 100755 --- a/app/components/ContactButton.tsx +++ b/app/components/ContactButton.tsx @@ -1,5 +1,4 @@ import Link from "next/link"; -import Image from "next/image"; import React from "react"; import * as icons from 'simple-icons'; @@ -17,17 +16,17 @@ const ContactButton: React.FC = ({platform, title, descripti let iconFile; switch (platform.toLowerCase()) { - case 'mastodon': - buttonColor = "#6364FF"; - iconFile = icons.siMastodon.svg; + case 'activitypub': + buttonColor = "#F1007E"; + iconFile = icons.siActivitypub.svg; break; - case 'github': - buttonColor = "#181717"; - iconFile = icons.siGithub.svg; + case 'git': + buttonColor = "#FB923C"; + iconFile = icons.siForgejo.svg; break; - case 'discord': - buttonColor = "#5865F2"; - iconFile = icons.siDiscord.svg; + case 'matrix': + buttonColor = "#000"; + iconFile = icons.siMatrix.svg; break; case 'facebook': buttonColor = "#0866FF"; @@ -56,7 +55,7 @@ const ContactButton: React.FC = ({platform, title, descripti style={ { ['backgroundColor' as any] : buttonColor} } - className="text-white font-bold rounded-lg px-4 py-2.5 shadow-lg flex flex-row gap-2 transition ease-in-out delay-150 hover:scale-110 duration-300"> + className="text-white font-bold rounded-xl px-4 py-2.5 shadow-lg flex flex-row gap-2 transition ease-in-out delay-150 hover:scale-110 duration-300"> { }, { id: 2, - text: "Education", - link: "education" - }, - { - id: 3, text: "Projects", link: "projects" }, { - id: 4, + id: 3, text: "Hobbies", link: "hobbies" } diff --git a/app/components/Photo.tsx b/app/components/Photo.tsx index 6e23fd8..8988460 100755 --- a/app/components/Photo.tsx +++ b/app/components/Photo.tsx @@ -12,7 +12,7 @@ const Photo = ({src, href, alt}: any) => {
{
{

{address}

{period}

-
-
-
-

Education

-

- I have studied in schools located in Bangkok and Chonburi. - I have also completed several academic proficiency tests as well as the General Education Development (GED) Test, a diploma of high school equivalency. -

-
-
- -
-
-

Diplomas & Reports

-
- -
-
-
-
- GED Results -
- Mathematics: 176/200 - Science: 172/200 - English: 166/200 - Social Studies: 180/200 -
-
- -
-
- -
-
-
-
- -
-
-
-
-
-
-
- English Proficiency Tests -
-
-
- -
-
-
-
- -
-
- -
-
-
- -
-

View my reports by clicking on the images!

-
-
-
- -
-

- Past Schools -

-
- -
-
-
-
- - ); -} diff --git a/app/globals.css b/app/globals.css index 1d6a6fb..4d91300 100755 --- a/app/globals.css +++ b/app/globals.css @@ -2,6 +2,12 @@ @tailwind components; @tailwind utilities; +@layer base { + html { + font-family: Cantarell, system-ui, sans-serif; + } +} + .wrapper { border: 3px solid blue; } diff --git a/app/hobbies/page.tsx b/app/hobbies/page.tsx index b09d1f1..d467d33 100755 --- a/app/hobbies/page.tsx +++ b/app/hobbies/page.tsx @@ -241,7 +241,7 @@ export default function Hobbies() {
-
diff --git a/app/projects/page.tsx b/app/projects/page.tsx index cfca32a..02d67b8 100755 --- a/app/projects/page.tsx +++ b/app/projects/page.tsx @@ -239,7 +239,7 @@ export default function Projects() {
-