From 16bb1e3e5658d715ac5cb37f654c560f6f8dd249 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Mon, 15 Sep 2025 09:42:38 +0800 Subject: [PATCH] Rearranged components and styles --- fwt/{components/Background => }/Background.tsx | 8 ++++---- fwt/{components/Box => }/Box.tsx | 5 ++--- fwt/{components/Button => }/Button.tsx | 2 +- fwt/{components/Column => }/Column.tsx | 2 +- fwt/{components/Copyright => }/Copyright.tsx | 0 fwt/{components/Footer => }/Footer.tsx | 2 +- fwt/{components/Form => }/Form.tsx | 2 +- fwt/{components/HTML => }/HTML.tsx | 6 +++--- fwt/{components/Image => }/Image.tsx | 0 fwt/{components/Input => }/Input.tsx | 2 +- fwt/{components/Link => }/Link.tsx | 2 +- fwt/{components/Logo => }/Logo.tsx | 4 ++-- fwt/{components/Navbar => }/Navbar.tsx | 5 ++--- .../OptimizeBackground.tsx | 0 .../Optimizer => Optimizers}/OptimizeImage.tsx | 0 .../Optimizer => Optimizers}/OptimizeLogo.tsx | 0 fwt/{components/Page => }/Page.tsx | 2 +- fwt/{components/Row => }/Row.tsx | 2 +- .../Background => styles}/Background.sass | 0 fwt/{components/Box => styles}/Box.sass | 0 fwt/{components/Button => styles}/Button.sass | 0 fwt/{components/Column => styles}/Column.sass | 0 fwt/{components/Footer => styles}/Footer.sass | 0 fwt/{components/Form => styles}/Form.sass | 0 fwt/{components/HTML => styles}/HTML.sass | 0 fwt/{components/Input => styles}/Input.sass | 0 fwt/{components/Link => styles}/Link.sass | 0 fwt/{components/Navbar => styles}/Navbar.sass | 0 fwt/{components/Page => styles}/Page.sass | 0 fwt/{components/Row => styles}/Row.sass | 0 src/components/Input/Input.tsx | 2 +- src/layouts/Layout.astro | 4 ++-- src/pages/index.astro | 16 ++++++++-------- src/pages/next.astro | 8 ++++---- 34 files changed, 36 insertions(+), 38 deletions(-) rename fwt/{components/Background => }/Background.tsx (87%) rename fwt/{components/Box => }/Box.tsx (75%) rename fwt/{components/Button => }/Button.tsx (98%) rename fwt/{components/Column => }/Column.tsx (92%) rename fwt/{components/Copyright => }/Copyright.tsx (100%) rename fwt/{components/Footer => }/Footer.tsx (88%) rename fwt/{components/Form => }/Form.tsx (90%) rename fwt/{components/HTML => }/HTML.tsx (91%) rename fwt/{components/Image => }/Image.tsx (100%) rename fwt/{components/Input => }/Input.tsx (95%) rename fwt/{components/Link => }/Link.tsx (89%) rename fwt/{components/Logo => }/Logo.tsx (79%) rename fwt/{components/Navbar => }/Navbar.tsx (76%) rename fwt/{components/Optimizer => Optimizers}/OptimizeBackground.tsx (100%) rename fwt/{components/Optimizer => Optimizers}/OptimizeImage.tsx (100%) rename fwt/{components/Optimizer => Optimizers}/OptimizeLogo.tsx (100%) rename fwt/{components/Page => }/Page.tsx (93%) rename fwt/{components/Row => }/Row.tsx (95%) rename fwt/{components/Background => styles}/Background.sass (100%) rename fwt/{components/Box => styles}/Box.sass (100%) rename fwt/{components/Button => styles}/Button.sass (100%) rename fwt/{components/Column => styles}/Column.sass (100%) rename fwt/{components/Footer => styles}/Footer.sass (100%) rename fwt/{components/Form => styles}/Form.sass (100%) rename fwt/{components/HTML => styles}/HTML.sass (100%) rename fwt/{components/Input => styles}/Input.sass (100%) rename fwt/{components/Link => styles}/Link.sass (100%) rename fwt/{components/Navbar => styles}/Navbar.sass (100%) rename fwt/{components/Page => styles}/Page.sass (100%) rename fwt/{components/Row => styles}/Row.sass (100%) diff --git a/fwt/components/Background/Background.tsx b/fwt/Background.tsx similarity index 87% rename from fwt/components/Background/Background.tsx rename to fwt/Background.tsx index 12e21b2..77648b2 100644 --- a/fwt/components/Background/Background.tsx +++ b/fwt/Background.tsx @@ -1,9 +1,9 @@ -import './Background.sass' +import './styles/Background.sass' import { Show, createSignal } from 'solid-js' import fs from 'fs' -import webpPath from '../../images/background.webp' -import avifPath from '../../images/background.avif' -import noBackground from '../../images/no-background.webp' +import webpPath from './images/background.webp' +import avifPath from './images/background.avif' +import noBackground from './images/no-background.webp' interface Props { image?: boolean diff --git a/fwt/components/Box/Box.tsx b/fwt/Box.tsx similarity index 75% rename from fwt/components/Box/Box.tsx rename to fwt/Box.tsx index dc71de3..b897376 100644 --- a/fwt/components/Box/Box.tsx +++ b/fwt/Box.tsx @@ -1,6 +1,5 @@ -import type { ImageMetadata } from 'astro' -import './Box.sass' -import { Show, type JSXElement, createMemo } from 'solid-js' +import './styles/Box.sass' +import { type JSXElement, createMemo } from 'solid-js' interface Props { thickness: number diff --git a/fwt/components/Button/Button.tsx b/fwt/Button.tsx similarity index 98% rename from fwt/components/Button/Button.tsx rename to fwt/Button.tsx index 2de125f..b8367ff 100644 --- a/fwt/components/Button/Button.tsx +++ b/fwt/Button.tsx @@ -1,4 +1,4 @@ -import './Button.sass' +import './styles/Button.sass' import { Show, Switch, Match } from 'solid-js' interface Props { diff --git a/fwt/components/Column/Column.tsx b/fwt/Column.tsx similarity index 92% rename from fwt/components/Column/Column.tsx rename to fwt/Column.tsx index 3f5c786..d59ac96 100644 --- a/fwt/components/Column/Column.tsx +++ b/fwt/Column.tsx @@ -1,5 +1,5 @@ +import './styles/Column.sass' import type { JSXElement } from 'solid-js' -import './Column.sass' interface Props { children: JSXElement diff --git a/fwt/components/Copyright/Copyright.tsx b/fwt/Copyright.tsx similarity index 100% rename from fwt/components/Copyright/Copyright.tsx rename to fwt/Copyright.tsx diff --git a/fwt/components/Footer/Footer.tsx b/fwt/Footer.tsx similarity index 88% rename from fwt/components/Footer/Footer.tsx rename to fwt/Footer.tsx index 2c47f07..00593b6 100644 --- a/fwt/components/Footer/Footer.tsx +++ b/fwt/Footer.tsx @@ -1,4 +1,4 @@ -import './Footer.sass' +import './styles/Footer.sass' import type { JSXElement } from 'solid-js' interface Props { diff --git a/fwt/components/Form/Form.tsx b/fwt/Form.tsx similarity index 90% rename from fwt/components/Form/Form.tsx rename to fwt/Form.tsx index a498c76..d0e63a9 100644 --- a/fwt/components/Form/Form.tsx +++ b/fwt/Form.tsx @@ -1,4 +1,4 @@ -import './Form.sass' +import './styles/Form.sass' import type { JSXElement } from 'solid-js' interface Props { diff --git a/fwt/components/HTML/HTML.tsx b/fwt/HTML.tsx similarity index 91% rename from fwt/components/HTML/HTML.tsx rename to fwt/HTML.tsx index 2f2bfc8..01878fe 100644 --- a/fwt/components/HTML/HTML.tsx +++ b/fwt/HTML.tsx @@ -1,7 +1,7 @@ -import './HTML.sass' +import './styles/HTML.sass' import { type JSXElement, Show } from 'solid-js' -import background1 from '../../images/background.avif' -import background2 from '../../images/background.webp' +import background1 from './images/background.avif' +import background2 from './images/background.webp' interface Props { title: string diff --git a/fwt/components/Image/Image.tsx b/fwt/Image.tsx similarity index 100% rename from fwt/components/Image/Image.tsx rename to fwt/Image.tsx diff --git a/fwt/components/Input/Input.tsx b/fwt/Input.tsx similarity index 95% rename from fwt/components/Input/Input.tsx rename to fwt/Input.tsx index c0f7c97..aa40f02 100644 --- a/fwt/components/Input/Input.tsx +++ b/fwt/Input.tsx @@ -1,4 +1,4 @@ -import './Input.sass' +import './styles/Input.sass' import { createSignal } from 'solid-js' interface Props { diff --git a/fwt/components/Link/Link.tsx b/fwt/Link.tsx similarity index 89% rename from fwt/components/Link/Link.tsx rename to fwt/Link.tsx index 1e7e337..c5b1441 100644 --- a/fwt/components/Link/Link.tsx +++ b/fwt/Link.tsx @@ -1,4 +1,4 @@ -import './Link.sass' +import './styles/Link.sass' interface Props { to: string diff --git a/fwt/components/Logo/Logo.tsx b/fwt/Logo.tsx similarity index 79% rename from fwt/components/Logo/Logo.tsx rename to fwt/Logo.tsx index 5d1af4c..46d053e 100644 --- a/fwt/components/Logo/Logo.tsx +++ b/fwt/Logo.tsx @@ -1,5 +1,5 @@ -import webpPath from '../../images/logo.webp' -import avifPath from '../../images/logo.avif' +import webpPath from './images/logo.webp' +import avifPath from './images/logo.avif' interface Props { size?: number diff --git a/fwt/components/Navbar/Navbar.tsx b/fwt/Navbar.tsx similarity index 76% rename from fwt/components/Navbar/Navbar.tsx rename to fwt/Navbar.tsx index 3b0c688..b207ef8 100644 --- a/fwt/components/Navbar/Navbar.tsx +++ b/fwt/Navbar.tsx @@ -1,6 +1,5 @@ -import './Navbar.sass' -import { Show } from 'solid-js' -import Row from '../Row/Row' +import './styles/Navbar.sass' +import Row from './Row' interface Props { transparent?: boolean diff --git a/fwt/components/Optimizer/OptimizeBackground.tsx b/fwt/Optimizers/OptimizeBackground.tsx similarity index 100% rename from fwt/components/Optimizer/OptimizeBackground.tsx rename to fwt/Optimizers/OptimizeBackground.tsx diff --git a/fwt/components/Optimizer/OptimizeImage.tsx b/fwt/Optimizers/OptimizeImage.tsx similarity index 100% rename from fwt/components/Optimizer/OptimizeImage.tsx rename to fwt/Optimizers/OptimizeImage.tsx diff --git a/fwt/components/Optimizer/OptimizeLogo.tsx b/fwt/Optimizers/OptimizeLogo.tsx similarity index 100% rename from fwt/components/Optimizer/OptimizeLogo.tsx rename to fwt/Optimizers/OptimizeLogo.tsx diff --git a/fwt/components/Page/Page.tsx b/fwt/Page.tsx similarity index 93% rename from fwt/components/Page/Page.tsx rename to fwt/Page.tsx index 62d9a73..da9a2d8 100644 --- a/fwt/components/Page/Page.tsx +++ b/fwt/Page.tsx @@ -1,4 +1,4 @@ -import './Page.sass' +import './styles/Page.sass' import { Show } from 'solid-js' interface Props { diff --git a/fwt/components/Row/Row.tsx b/fwt/Row.tsx similarity index 95% rename from fwt/components/Row/Row.tsx rename to fwt/Row.tsx index 5255e9c..8eaf852 100644 --- a/fwt/components/Row/Row.tsx +++ b/fwt/Row.tsx @@ -1,4 +1,4 @@ -import './Row.sass' +import './styles/Row.sass' import { Show, type JSXElement } from 'solid-js' interface Props { diff --git a/fwt/components/Background/Background.sass b/fwt/styles/Background.sass similarity index 100% rename from fwt/components/Background/Background.sass rename to fwt/styles/Background.sass diff --git a/fwt/components/Box/Box.sass b/fwt/styles/Box.sass similarity index 100% rename from fwt/components/Box/Box.sass rename to fwt/styles/Box.sass diff --git a/fwt/components/Button/Button.sass b/fwt/styles/Button.sass similarity index 100% rename from fwt/components/Button/Button.sass rename to fwt/styles/Button.sass diff --git a/fwt/components/Column/Column.sass b/fwt/styles/Column.sass similarity index 100% rename from fwt/components/Column/Column.sass rename to fwt/styles/Column.sass diff --git a/fwt/components/Footer/Footer.sass b/fwt/styles/Footer.sass similarity index 100% rename from fwt/components/Footer/Footer.sass rename to fwt/styles/Footer.sass diff --git a/fwt/components/Form/Form.sass b/fwt/styles/Form.sass similarity index 100% rename from fwt/components/Form/Form.sass rename to fwt/styles/Form.sass diff --git a/fwt/components/HTML/HTML.sass b/fwt/styles/HTML.sass similarity index 100% rename from fwt/components/HTML/HTML.sass rename to fwt/styles/HTML.sass diff --git a/fwt/components/Input/Input.sass b/fwt/styles/Input.sass similarity index 100% rename from fwt/components/Input/Input.sass rename to fwt/styles/Input.sass diff --git a/fwt/components/Link/Link.sass b/fwt/styles/Link.sass similarity index 100% rename from fwt/components/Link/Link.sass rename to fwt/styles/Link.sass diff --git a/fwt/components/Navbar/Navbar.sass b/fwt/styles/Navbar.sass similarity index 100% rename from fwt/components/Navbar/Navbar.sass rename to fwt/styles/Navbar.sass diff --git a/fwt/components/Page/Page.sass b/fwt/styles/Page.sass similarity index 100% rename from fwt/components/Page/Page.sass rename to fwt/styles/Page.sass diff --git a/fwt/components/Row/Row.sass b/fwt/styles/Row.sass similarity index 100% rename from fwt/components/Row/Row.sass rename to fwt/styles/Row.sass diff --git a/src/components/Input/Input.tsx b/src/components/Input/Input.tsx index 810c1a3..e35b5e6 100644 --- a/src/components/Input/Input.tsx +++ b/src/components/Input/Input.tsx @@ -1,4 +1,4 @@ -import Input from '../../../fwt/components/Input/Input' +import Input from '../../../fwt/Input' import { createSignal } from 'solid-js' const [sample, setSample] = createSignal('') diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 71515ee..32f595f 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -4,9 +4,9 @@ const { title } = Astro.props const websiteName = 'Template' const websiteDescription = 'This is just a template.' -import Background from '../../fwt/components/Background/Background' +import Background from '../../fwt/Background' // import OptimizeBackground from '../../fwt/components/Optimizer/OptimizeBackground' -import HTML from '../../fwt/components/HTML/HTML' +import HTML from '../../fwt/HTML' --- diff --git a/src/pages/index.astro b/src/pages/index.astro index 320fffa..39a888d 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,18 +1,18 @@ --- import Layout from '../layouts/Layout.astro' -import Button from '../../fwt/components/Button/Button' -import Logo from '../../fwt/components/Logo/Logo' +import Button from '../../fwt/Button' +import Logo from '../../fwt/Logo' // import OptimizeLogo from '../../fwt/components/Optimizer/OptimizeLogo' // import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage' -import Link from '../../fwt/components/Link/Link' +import Link from '../../fwt/Link' import Counter from '../components/Counter/Counter' -import Page from '../../fwt/components/Page/Page' -import Footer from '../../fwt/components/Footer/Footer' -import Row from '../../fwt/components/Row/Row' -import Image from '../../fwt/components/Image/Image' +import Page from '../../fwt/Page' +import Footer from '../../fwt/Footer' +import Row from '../../fwt/Row' +import Image from '../../fwt/Image' import PA1 from '../../fwt/images/pat-alcala.avif' import PA2 from '../../fwt/images/pat-alcala.webp' -import Copyright from '../../fwt/components/Copyright/Copyright' +import Copyright from '../../fwt/Copyright' // const sample = import.meta.env.SAMPLE --- diff --git a/src/pages/next.astro b/src/pages/next.astro index 6601aa3..e331521 100644 --- a/src/pages/next.astro +++ b/src/pages/next.astro @@ -1,12 +1,12 @@ --- import Layout from '../layouts/Layout.astro' -import Button from '../../fwt/components/Button/Button' -import Image from '../../fwt/components/Image/Image' -import Page from '../../fwt/components/Page/Page' +import Button from '../../fwt/Button' +import Image from '../../fwt/Image' +import Page from '../../fwt/Page' import sample1 from '../../fwt/images/sample.avif' import sample2 from '../../fwt/images/sample.webp' // import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage' -import Row from '../../fwt/components/Row/Row' +import Row from '../../fwt/Row' // import Column from '../../fwt/components/Column/Column' ---