From c565ca9979b8f92979adbec30ae451d524866b8a Mon Sep 17 00:00:00 2001 From: Chen Hui Jing <1461498+huijing@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:12:57 +0100 Subject: [PATCH 1/7] Reorganise and refactor of pages --- package.json | 6 +- .../AnimatedSummitLogo.astro | 0 src/components/{lander => pages}/Footer.astro | 0 src/components/pages/FoundationFooter.astro | 107 ++++++++++++ src/components/pages/FoundationHeader.astro | 38 +++++ .../LanderHeader.astro} | 5 +- .../{lander => pages}/Section.astro | 0 src/content/docs/{index.mdx => splash.mdx} | 0 src/layouts/HomeLayout.astro | 131 +++++++++++++++ .../{Layout.astro => LanderLayout.astro} | 40 ++--- src/pages/hackathon-2023.astro | 12 +- src/pages/hacktoberfest.astro | 13 +- src/pages/index.astro | 158 ++++++++++++++++++ src/styles/interledger.css | 25 --- src/styles/lander.css | 74 -------- src/styles/pages.css | 93 +++++++++++ 16 files changed, 560 insertions(+), 142 deletions(-) rename src/components/{lander => pages}/AnimatedSummitLogo.astro (100%) rename src/components/{lander => pages}/Footer.astro (100%) create mode 100644 src/components/pages/FoundationFooter.astro create mode 100644 src/components/pages/FoundationHeader.astro rename src/components/{lander/TopBanner.astro => pages/LanderHeader.astro} (93%) rename src/components/{lander => pages}/Section.astro (100%) rename src/content/docs/{index.mdx => splash.mdx} (100%) create mode 100644 src/layouts/HomeLayout.astro rename src/layouts/{Layout.astro => LanderLayout.astro} (69%) create mode 100644 src/pages/index.astro delete mode 100644 src/styles/lander.css create mode 100644 src/styles/pages.css diff --git a/package.json b/package.json index 1058301..be358bb 100644 --- a/package.json +++ b/package.json @@ -9,10 +9,10 @@ "astro": "astro" }, "dependencies": { - "@astrojs/starlight": "^0.12.0", + "@astrojs/starlight": "^0.13.0", "@interledger/docs-design-system": "^0.1.2", - "@types/showdown": "^2.0.3", - "astro": "^3.4.3", + "@types/showdown": "^2.0.6", + "astro": "^3.6.0", "node-html-parser": "^6.1.11", "sharp": "^0.32.6", "showdown": "^2.1.0" diff --git a/src/components/lander/AnimatedSummitLogo.astro b/src/components/pages/AnimatedSummitLogo.astro similarity index 100% rename from src/components/lander/AnimatedSummitLogo.astro rename to src/components/pages/AnimatedSummitLogo.astro diff --git a/src/components/lander/Footer.astro b/src/components/pages/Footer.astro similarity index 100% rename from src/components/lander/Footer.astro rename to src/components/pages/Footer.astro diff --git a/src/components/pages/FoundationFooter.astro b/src/components/pages/FoundationFooter.astro new file mode 100644 index 0000000..bb75ed3 --- /dev/null +++ b/src/components/pages/FoundationFooter.astro @@ -0,0 +1,107 @@ +--- +const currentYear = new Date().getFullYear(); +--- + + + diff --git a/src/components/pages/FoundationHeader.astro b/src/components/pages/FoundationHeader.astro new file mode 100644 index 0000000..3fb1784 --- /dev/null +++ b/src/components/pages/FoundationHeader.astro @@ -0,0 +1,38 @@ +--- +import FoundationLogo from "../FoundationLogo.astro"; +--- +
+
+ + + +
+
+ + diff --git a/src/components/lander/TopBanner.astro b/src/components/pages/LanderHeader.astro similarity index 93% rename from src/components/lander/TopBanner.astro rename to src/components/pages/LanderHeader.astro index 069ada3..0277db7 100644 --- a/src/components/lander/TopBanner.astro +++ b/src/components/pages/LanderHeader.astro @@ -15,8 +15,7 @@ import FoundationLogo from "../FoundationLogo.astro"; diff --git a/src/layouts/Layout.astro b/src/layouts/LanderLayout.astro similarity index 69% rename from src/layouts/Layout.astro rename to src/layouts/LanderLayout.astro index 6c8d42d..f759c60 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/LanderLayout.astro @@ -1,7 +1,7 @@ --- -import TopBanner from '../components/lander/TopBanner.astro'; -import Footer from '../components/lander/Footer.astro'; -import '../styles/lander.css'; +import LanderHeader from '../components/pages/LanderHeader.astro'; +import Footer from '../components/pages/Footer.astro'; +import '../styles/pages.css'; interface Props { title: string; @@ -13,19 +13,19 @@ const { title, description, gradient = "option1" } = Astro.props; --- - + - {title ? `${title} | Interledger` : 'Interledger'} + {title ? `${title} | Interledger Foundation` : 'Interledger Foundation'} - +