From e691c3058c614b68999d199997af305ee328c2ac Mon Sep 17 00:00:00 2001 From: liyunze <50455574+liyunze-coding@users.noreply.github.com> Date: Fri, 19 Jan 2024 14:42:33 +0800 Subject: [PATCH] changed from SPA to MPA --- package-lock.json | 6 - package.json | 1 - src/components/elements/Card.astro | 4 +- .../{Contact.astro => ContactComponent.astro} | 0 ...ucation.astro => EducationComponent.astro} | 8 +- .../{Intro.svelte => IntroComponent.svelte} | 15 +- src/components/sections/NavBar.astro | 35 ++- ...ojects.svelte => ProjectsComponent.svelte} | 0 .../{Skills.astro => SkillsComponent.astro} | 24 +- .../{WhatIDo.astro => WhatIDoComponent.astro} | 7 +- src/layouts/Layout.astro | 14 +- src/pages/contact.astro | 55 +++++ src/pages/education.astro | 12 + src/pages/index.astro | 23 +- src/pages/projects.astro | 12 + src/pages/skills.astro | 92 ++++++++ src/pages/what-i-do.astro | 208 ++++++++++++++++++ 17 files changed, 459 insertions(+), 57 deletions(-) rename src/components/sections/{Contact.astro => ContactComponent.astro} (100%) rename src/components/sections/{Education.astro => EducationComponent.astro} (89%) rename src/components/sections/{Intro.svelte => IntroComponent.svelte} (92%) rename src/components/sections/{Projects.svelte => ProjectsComponent.svelte} (100%) rename src/components/sections/{Skills.astro => SkillsComponent.astro} (90%) rename src/components/sections/{WhatIDo.astro => WhatIDoComponent.astro} (88%) create mode 100644 src/pages/contact.astro create mode 100644 src/pages/education.astro create mode 100644 src/pages/projects.astro create mode 100644 src/pages/skills.astro create mode 100644 src/pages/what-i-do.astro diff --git a/package-lock.json b/package-lock.json index 6452429..a9095f2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,6 @@ "@astrojs/svelte": "^4.0.2", "@astrojs/tailwind": "^5.0.0", "astro": "^3.2.0", - "astro-spa": "^1.3.9", "svelte": "^4.2.1", "tailwindcss": "^3.3.3" }, @@ -1222,11 +1221,6 @@ "sharp": "^0.32.5" } }, - "node_modules/astro-spa": { - "version": "1.3.9", - "resolved": "https://registry.npmjs.org/astro-spa/-/astro-spa-1.3.9.tgz", - "integrity": "sha512-VmXMUsKNHA1gjJYq/SO5EqRAmqifOhBOpOAaXnlH5skgTy0tq9fwANJhh1LJpaahPBGqXAaoIw6Gdq/SBRz9Ww==" - }, "node_modules/autoprefixer": { "version": "10.4.16", "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.16.tgz", diff --git a/package.json b/package.json index bc134a8..7ef64f0 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,6 @@ "@astrojs/svelte": "^4.0.2", "@astrojs/tailwind": "^5.0.0", "astro": "^3.2.0", - "astro-spa": "^1.3.9", "svelte": "^4.2.1", "tailwindcss": "^3.3.3" }, diff --git a/src/components/elements/Card.astro b/src/components/elements/Card.astro index 6e7efe3..3574c79 100644 --- a/src/components/elements/Card.astro +++ b/src/components/elements/Card.astro @@ -1,8 +1,8 @@ --- interface Props { primaryColor: string; - bgColor: string; - scaleOnHover: boolean; + bgColor?: string | undefined; + scaleOnHover?: boolean | undefined; } const { primaryColor, bgColor = "#282828", scaleOnHover = false } = Astro.props; diff --git a/src/components/sections/Contact.astro b/src/components/sections/ContactComponent.astro similarity index 100% rename from src/components/sections/Contact.astro rename to src/components/sections/ContactComponent.astro diff --git a/src/components/sections/Education.astro b/src/components/sections/EducationComponent.astro similarity index 89% rename from src/components/sections/Education.astro rename to src/components/sections/EducationComponent.astro index 64c2e17..5dac213 100644 --- a/src/components/sections/Education.astro +++ b/src/components/sections/EducationComponent.astro @@ -7,7 +7,7 @@ import Line from "../elements/NetworkLine.astro";

Education

- +

@@ -26,8 +26,8 @@ import Line from "../elements/NetworkLine.astro";

- - + +

Cambridge IGCSE

@@ -38,7 +38,7 @@ import Line from "../elements/NetworkLine.astro";

Achievements

  • IGCSE 5 A*s, 3 A's
    • -
  • President of Technology Society
    • +
  • President of Magnus Technology Society
  • Technology Manager of Prefects' Board
diff --git a/src/components/sections/Intro.svelte b/src/components/sections/IntroComponent.svelte similarity index 92% rename from src/components/sections/Intro.svelte rename to src/components/sections/IntroComponent.svelte index 92fa76a..3a8b24f 100644 --- a/src/components/sections/Intro.svelte +++ b/src/components/sections/IntroComponent.svelte @@ -94,7 +94,7 @@ text-white flex flex-col" > -
+
I'm Ryan!

- I am born and raised in Malaysia, fluent in Mandarin and English. + I was born and raised in Malaysia, and fluent in Mandarin and + English.

- I'm passionate in developing open source projects to benefit others, - with vast experience in leadership roles. + I'm passionate about developing open source projects that benefit others, + and I have extensive experience in leadership roles.

I'm also well networked with various Twitch streamers and content + >well-connected with various Twitch streamers and content creators, with prominent projects that positively impacted the streaming - community. I'm strongly motivated in the fields of + >, thanks to prominent projects that have had a positive impact on + the streaming community. I'm strongly motivated in the fields of web development, computer vision and data science.

diff --git a/src/components/sections/NavBar.astro b/src/components/sections/NavBar.astro index cccf28b..d98b349 100644 --- a/src/components/sections/NavBar.astro +++ b/src/components/sections/NavBar.astro @@ -2,6 +2,8 @@
@@ -90,6 +93,8 @@ .hamburger-menu { --x-width: calc(var(--hamburger-height) * 1.41421356237); + display: none; + translate: 0 -20px; flex-direction: column; @@ -172,6 +177,12 @@ max-width: 10rem; min-height: 100vh; } + + @media (max-width: 767px) { + .hamburger-menu { + display: flex; + } + }