From 7cf9461e92eee471725c431cd644bdc88a7ac62c Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 10:17:09 -0500 Subject: [PATCH 01/11] Remove generated astro content --- web/src/components/Card.astro | 63 ---------------------------- web/src/layouts/Layout.astro | 27 ++++++------ web/src/pages/index.astro | 77 +---------------------------------- 3 files changed, 15 insertions(+), 152 deletions(-) delete mode 100644 web/src/components/Card.astro diff --git a/web/src/components/Card.astro b/web/src/components/Card.astro deleted file mode 100644 index a1e0ccf..0000000 --- a/web/src/components/Card.astro +++ /dev/null @@ -1,63 +0,0 @@ ---- -interface Props { - title: string; - body: string; - href: string; -} - -const { href, title, body } = Astro.props; ---- - -
  • - -

    - {title} - → -

    -

    - {body} -

    -     -
    • - diff --git a/web/src/layouts/Layout.astro b/web/src/layouts/Layout.astro index 18ffe8a..1a4279c 100644 --- a/web/src/layouts/Layout.astro +++ b/web/src/layouts/Layout.astro @@ -10,7 +10,7 @@ const { title } = Astro.props; - + @@ -22,20 +22,19 @@ const { title } = Astro.props; diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index fd73d19..9248df4 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -1,83 +1,10 @@ --- import Layout from "../layouts/Layout.astro"; -import Card from "../components/Card.astro"; --- - +
    -

    Welcome to Astro

    -

    - To get started, open the directory src/pages in your project.
    - Code Challenge: Tweak the "Welcome to Astro" message above. -

    -
      - - - - - -
    - + From 7f39f1693a846c91aeba71c9408236812365be78 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 12:59:11 -0500 Subject: [PATCH 02/11] Implement rough hero section --- web/src/pages/index.astro | 121 +++++++++++++++++++++++++++++++++++++- 1 file changed, 118 insertions(+), 3 deletions(-) diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index 9248df4..53a1741 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -3,8 +3,123 @@ import Layout from "../layouts/Layout.astro"; --- -
    -
    +
    +
    +
    +

    ryuuart::

    +
    +

    manawave

    +

    ambient::infinity

    +
    +
    +
    +

    + MANAWAVE is a controllable, configurable, and omnidirectional marquee defined with only HTML & CSS. It has zero dependencies and is built on vanilla JavaScript. +

    +
    +
    + + +
    + +
    +
    Primordia
    +
    08.10.23
    +
    +
    +
    +
    - + From fb427dd69e1805d1502dbb6726f48ae13e01fe39 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 14:17:04 -0500 Subject: [PATCH 03/11] Extract hero page to component --- web/src/components/hero/hero.astro | 71 +++++++++++++++++++++++++ web/src/layouts/home/Section.astro | 17 ++++++ web/src/pages/index.astro | 84 ++---------------------------- 3 files changed, 92 insertions(+), 80 deletions(-) create mode 100644 web/src/components/hero/hero.astro create mode 100644 web/src/layouts/home/Section.astro diff --git a/web/src/components/hero/hero.astro b/web/src/components/hero/hero.astro new file mode 100644 index 0000000..ce644fc --- /dev/null +++ b/web/src/components/hero/hero.astro @@ -0,0 +1,71 @@ +--- +import Section from "../../layouts/home/Section.astro"; +--- + +
    +
    +

    ryuuart::

    +
    +

    manawave

    +

    ambient::infinity

    +
    +
    +
    +

    + MANAWAVE is a controllable, configurable, and omnidirectional marquee + defined with only HTML & CSS. It has zero dependencies and is built on + vanilla JavaScript. +

    +
    +
    + + +
    +
    +
    Primordia
    +
    08.10.23
    +
    +
    + + diff --git a/web/src/layouts/home/Section.astro b/web/src/layouts/home/Section.astro new file mode 100644 index 0000000..bb9938c --- /dev/null +++ b/web/src/layouts/home/Section.astro @@ -0,0 +1,17 @@ +--- +const { class: className } = Astro.props; +--- + +
    + +
    + + diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index 53a1741..f6bc66f 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -1,33 +1,12 @@ --- import Layout from "../layouts/Layout.astro"; +import HeroSection from "../components/hero/hero.astro"; ---
    -
    -
    -

    ryuuart::

    -
    -

    manawave

    -

    ambient::infinity

    -
    -
    -
    -

    - MANAWAVE is a controllable, configurable, and omnidirectional marquee defined with only HTML & CSS. It has zero dependencies and is built on vanilla JavaScript. -

    -
    -
    - - -
    - -
    -
    Primordia
    -
    08.10.23
    -
    -
    +
    @@ -43,69 +22,14 @@ import Layout from "../layouts/Layout.astro"; auto [poem-end realms-start] auto [realms-end]; } + - section { - grid-column: 1 / 6; - - display: grid; - gap: 0.5rem; - grid-template-columns: repeat(5, 1fr); - } - - section.hero { - grid-row: hero-start / hero-end; - - grid-template-rows: auto 1fr auto auto; - } - - header { - grid-area: 1 / 2 / 2 / 6; - - display: grid; - grid-template-columns: auto auto; - } - - header * { - margin: 0; - } - - header > .author { - margin-right: 0.5rem; - } - - header h1 { - text-transform: uppercase; - } - - .cta-desc { - grid-area: 3 / 2 / 4 / 5; - } - - .cta { - grid-area: 4 / 2/ 5 / 5; - } - - .primordia { - grid-area: 3 / 1 / 4 / 2; - - display: flex; - flex-direction: column; - justify-content: end; - } - + diff --git a/web/src/components/hero/hero.astro b/web/src/components/hero/hero.astro index ce644fc..6213554 100644 --- a/web/src/components/hero/hero.astro +++ b/web/src/components/hero/hero.astro @@ -1,15 +1,11 @@ --- import Section from "../../layouts/home/Section.astro"; +import Header from "../hero/header.astro"; +import Primordia from "../hero/primordia.astro"; ---
    -
    -

    ryuuart::

    -
    -

    manawave

    -

    ambient::infinity

    -
    -
    +

    MANAWAVE is a controllable, configurable, and omnidirectional marquee @@ -21,10 +17,7 @@ import Section from "../../layouts/home/Section.astro";

    -
    -
    Primordia
    -
    08.10.23
    -
    +
    diff --git a/web/src/components/hero/primordia.astro b/web/src/components/hero/primordia.astro new file mode 100644 index 0000000..067fb26 --- /dev/null +++ b/web/src/components/hero/primordia.astro @@ -0,0 +1,14 @@ +
    +
    Primordia
    +
    08.10.23
    +
    + + From cf0bca3b2759cf5f6f9a30281f3ad7c73d20f697 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 14:24:09 -0500 Subject: [PATCH 05/11] Scope hero page components --- .../components/{ => home}/hero/header.astro | 0 web/src/components/{ => home}/hero/hero.astro | 2 +- .../{ => home}/hero/primordia.astro | 0 web/src/pages/index.astro | 21 ++++++++++--------- 4 files changed, 12 insertions(+), 11 deletions(-) rename web/src/components/{ => home}/hero/header.astro (100%) rename web/src/components/{ => home}/hero/hero.astro (92%) rename web/src/components/{ => home}/hero/primordia.astro (100%) diff --git a/web/src/components/hero/header.astro b/web/src/components/home/hero/header.astro similarity index 100% rename from web/src/components/hero/header.astro rename to web/src/components/home/hero/header.astro diff --git a/web/src/components/hero/hero.astro b/web/src/components/home/hero/hero.astro similarity index 92% rename from web/src/components/hero/hero.astro rename to web/src/components/home/hero/hero.astro index 6213554..5c25929 100644 --- a/web/src/components/hero/hero.astro +++ b/web/src/components/home/hero/hero.astro @@ -1,5 +1,5 @@ --- -import Section from "../../layouts/home/Section.astro"; +import Section from "../../../layouts/home/Section.astro"; import Header from "../hero/header.astro"; import Primordia from "../hero/primordia.astro"; --- diff --git a/web/src/components/hero/primordia.astro b/web/src/components/home/hero/primordia.astro similarity index 100% rename from web/src/components/hero/primordia.astro rename to web/src/components/home/hero/primordia.astro diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index f6bc66f..6221eeb 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -1,13 +1,13 @@ --- import Layout from "../layouts/Layout.astro"; -import HeroSection from "../components/hero/hero.astro"; +import HeroSection from "../components/home/hero/hero.astro"; --- -
    -
    - -
    +
    +
    + +
    @@ -32,7 +33,7 @@ import HeroSection from "../components/hero/hero.astro"; .separator--rinf_c2 { grid-row: hero-start / realms-end; - grid-column: 2 / span 1; + grid-column: 2 / span 1; } .behind { @@ -44,6 +45,6 @@ import HeroSection from "../components/hero/hero.astro"; } .vr { - border-left: 1px solid var(--color-fg); + border-left: 1px solid var(--color-fg); } From b2fa77ba15e5b512ef9e38da91fdd18411eec235 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 14:45:17 -0500 Subject: [PATCH 06/11] Layout poem page --- web/src/components/home/poem/Poem.astro | 32 +++++++++++++++++++++++++ web/src/pages/index.astro | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 web/src/components/home/poem/Poem.astro diff --git a/web/src/components/home/poem/Poem.astro b/web/src/components/home/poem/Poem.astro new file mode 100644 index 0000000..79be1e2 --- /dev/null +++ b/web/src/components/home/poem/Poem.astro @@ -0,0 +1,32 @@ +--- +import Section from "../../../layouts/home/Section.astro"; +--- + +
    +
    +

    + Within manawave's embrace,
    + A realm seer's gaze takes flight,
    + Five realms unveiled, they trace,
    + Seeking truths in cosmic light. +

    +
    +
    +
    + + diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index 6221eeb..1e74efa 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -1,12 +1,14 @@ --- import Layout from "../layouts/Layout.astro"; import HeroSection from "../components/home/hero/hero.astro"; +import PoemSection from "../components/home/poem/Poem.astro"; ---
    +
    From ffb5d56ec8cc433c463ae3f4ef12dda25098a5ea Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 14:46:19 -0500 Subject: [PATCH 07/11] Fix hero component naming conventions --- web/src/components/home/hero/hero.astro | 4 ++-- web/src/pages/index.astro | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/src/components/home/hero/hero.astro b/web/src/components/home/hero/hero.astro index 5c25929..3528a54 100644 --- a/web/src/components/home/hero/hero.astro +++ b/web/src/components/home/hero/hero.astro @@ -1,7 +1,7 @@ --- import Section from "../../../layouts/home/Section.astro"; -import Header from "../hero/header.astro"; -import Primordia from "../hero/primordia.astro"; +import Header from "./Header.astro"; +import Primordia from "./Primordia.astro"; ---
    diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index 1e74efa..f42542a 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -1,6 +1,6 @@ --- import Layout from "../layouts/Layout.astro"; -import HeroSection from "../components/home/hero/hero.astro"; +import HeroSection from "../components/home/hero/Hero.astro"; import PoemSection from "../components/home/poem/Poem.astro"; --- From 16ac367ce5b16ad4f8f2876f5ea1ceea6be10f78 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 15:34:09 -0500 Subject: [PATCH 08/11] Layout realms section --- .../components/home/realms/RealmItem.astro | 33 ++++++++++++ web/src/components/home/realms/Realms.astro | 52 +++++++++++++++++++ web/src/components/home/realms/realms.json | 27 ++++++++++ web/src/pages/index.astro | 2 + 4 files changed, 114 insertions(+) create mode 100644 web/src/components/home/realms/RealmItem.astro create mode 100644 web/src/components/home/realms/Realms.astro create mode 100644 web/src/components/home/realms/realms.json diff --git a/web/src/components/home/realms/RealmItem.astro b/web/src/components/home/realms/RealmItem.astro new file mode 100644 index 0000000..b30443b --- /dev/null +++ b/web/src/components/home/realms/RealmItem.astro @@ -0,0 +1,33 @@ +--- +const { title, tagline, url } = Astro.props; +--- + +
    +
    +
    +
    + {title} +
    +

    {tagline}

    +
    +
    + + diff --git a/web/src/components/home/realms/Realms.astro b/web/src/components/home/realms/Realms.astro new file mode 100644 index 0000000..7b69d22 --- /dev/null +++ b/web/src/components/home/realms/Realms.astro @@ -0,0 +1,52 @@ +--- +import Section from "../../../layouts/home/Section.astro"; +import realmsData from "./realms.json"; +import RealmItem from "./RealmItem.astro"; +--- + +
    +
    +

    ryuuart::

    +
    +
    +

    5 Realms

    +

    visions • dreams • self

    +
    +
      + { + realmsData.map((i) => ( +
    • + +
      • + )) + } +
    +
    + + diff --git a/web/src/components/home/realms/realms.json b/web/src/components/home/realms/realms.json new file mode 100644 index 0000000..8c37c4b --- /dev/null +++ b/web/src/components/home/realms/realms.json @@ -0,0 +1,27 @@ +[ + { + "title": "Sebonzakura", + "tagline": "1000 cherry dream petals", + "url": "/sebonzakura" + }, + { + "title": "hyperpink", + "tagline": "prima donna", + "url": "/sebonzakura" + }, + { + "title": "Hero", + "tagline": "another self", + "url": "/sebonzakura" + }, + { + "title": "#HYPERTRANCE", + "tagline": "infinite evolution —", + "url": "/sebonzakura" + }, + { + "title": "flarewater", + "tagline": "elemental flavor", + "url": "/sebonzakura" + } +] diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index f42542a..fdbdf4c 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -2,6 +2,7 @@ import Layout from "../layouts/Layout.astro"; import HeroSection from "../components/home/hero/Hero.astro"; import PoemSection from "../components/home/poem/Poem.astro"; +import RealmsSection from "../components/home/realms/Realms.astro"; --- @@ -9,6 +10,7 @@ import PoemSection from "../components/home/poem/Poem.astro";
    +     From 4d127373778bbbe28573b6cb3a39c858f53e44bc Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 15:38:14 -0500 Subject: [PATCH 09/11] Add copyright --- web/src/pages/index.astro | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/web/src/pages/index.astro b/web/src/pages/index.astro index fdbdf4c..d97c2aa 100644 --- a/web/src/pages/index.astro +++ b/web/src/pages/index.astro @@ -11,6 +11,9 @@ import RealmsSection from "../components/home/realms/Realms.astro"; +
    +

    Copyright © 2023 Long Nguyen. All rights reserved.

    +
    @@ -25,7 +28,13 @@ import RealmsSection from "../components/home/realms/Realms.astro"; [hero-start] auto [hero-end poem-start] auto [poem-end realms-start] - auto [realms-end]; + auto [realms-end] + auto; + } + + footer { + grid-area: realms-end / 2 / span 1 / 6; + display: grid; } @@ -36,7 +45,7 @@ import RealmsSection from "../components/home/realms/Realms.astro"; } .separator--rinf_c2 { - grid-row: hero-start / realms-end; + grid-row: hero-start / span realms-end 2; grid-column: 2 / span 1; } From 7c4c4a7598eda8e540aa81f844f4fe3b6e5448c2 Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 15:43:31 -0500 Subject: [PATCH 10/11] Fix git filename case --- web/src/components/home/hero/{hero.astro => Hero.astro} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename web/src/components/home/hero/{hero.astro => Hero.astro} (100%) diff --git a/web/src/components/home/hero/hero.astro b/web/src/components/home/hero/Hero.astro similarity index 100% rename from web/src/components/home/hero/hero.astro rename to web/src/components/home/hero/Hero.astro From 636ddbcbd7ff532e06ed0388c7e36b35a755236a Mon Sep 17 00:00:00 2001 From: Long Nguyen Date: Wed, 9 Aug 2023 15:46:35 -0500 Subject: [PATCH 11/11] Fix more git filename cases --- web/src/components/home/hero/{header.astro => Header.astro} | 0 web/src/components/home/hero/{primordia.astro => Primordia.astro} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename web/src/components/home/hero/{header.astro => Header.astro} (100%) rename web/src/components/home/hero/{primordia.astro => Primordia.astro} (100%) diff --git a/web/src/components/home/hero/header.astro b/web/src/components/home/hero/Header.astro similarity index 100% rename from web/src/components/home/hero/header.astro rename to web/src/components/home/hero/Header.astro diff --git a/web/src/components/home/hero/primordia.astro b/web/src/components/home/hero/Primordia.astro similarity index 100% rename from web/src/components/home/hero/primordia.astro rename to web/src/components/home/hero/Primordia.astro