From 3e50802ef3a036033245ed393f2feac1a6995a97 Mon Sep 17 00:00:00 2001 From: Patrick Alvin Alcala Date: Fri, 29 Aug 2025 08:44:09 +0800 Subject: [PATCH] Updated --- .../components/Background/Background.sass | 0 .../components/Background/Background.tsx | 6 +++--- .../components/Button/Button.sass | 0 .../components/Button/Button.tsx | 0 .../components/Image/Image.tsx | 0 .../components/Link/Link.tsx | 0 .../components/Logo/Logo.tsx | 4 ++-- .../Optimizer/OptimizeBackground.tsx | 4 ++-- .../components/Optimizer/OptimizeImage.tsx | 4 ++-- .../components/Optimizer/OptimizeLogo.tsx | 4 ++-- .../components/Page/Page.sass | 0 .../components/Page/Page.tsx | 0 {src/templates => fwt}/images/background.avif | Bin {src/templates => fwt}/images/background.webp | Bin {src/templates => fwt}/images/logo.avif | Bin {src/templates => fwt}/images/logo.webp | Bin .../images/no-background.webp | Bin {src/templates => fwt}/images/sample.avif | Bin {src/templates => fwt}/images/sample.webp | Bin quadlet.container => podman.container | 0 public/favicon.svg | 9 -------- src/layouts/Layout.astro | 4 ++-- src/pages/index.astro | 10 ++++----- src/pages/next.astro | 20 +++++++++--------- tests/{pages => }/index.spec.ts | 0 tests/{pages => }/next.spec.ts | 0 26 files changed, 28 insertions(+), 37 deletions(-) rename {src/templates => fwt}/components/Background/Background.sass (100%) rename {src/templates => fwt}/components/Background/Background.tsx (87%) rename {src/templates => fwt}/components/Button/Button.sass (100%) rename {src/templates => fwt}/components/Button/Button.tsx (100%) rename {src/templates => fwt}/components/Image/Image.tsx (100%) rename {src/templates => fwt}/components/Link/Link.tsx (100%) rename {src/templates => fwt}/components/Logo/Logo.tsx (75%) rename {src/templates => fwt}/components/Optimizer/OptimizeBackground.tsx (78%) rename {src/templates => fwt}/components/Optimizer/OptimizeImage.tsx (72%) rename {src/templates => fwt}/components/Optimizer/OptimizeLogo.tsx (82%) rename {src/templates => fwt}/components/Page/Page.sass (100%) rename {src/templates => fwt}/components/Page/Page.tsx (100%) rename {src/templates => fwt}/images/background.avif (100%) rename {src/templates => fwt}/images/background.webp (100%) rename {src/templates => fwt}/images/logo.avif (100%) rename {src/templates => fwt}/images/logo.webp (100%) rename {src/templates => fwt}/images/no-background.webp (100%) rename {src/templates => fwt}/images/sample.avif (100%) rename {src/templates => fwt}/images/sample.webp (100%) rename quadlet.container => podman.container (100%) delete mode 100644 public/favicon.svg rename tests/{pages => }/index.spec.ts (100%) rename tests/{pages => }/next.spec.ts (100%) diff --git a/src/templates/components/Background/Background.sass b/fwt/components/Background/Background.sass similarity index 100% rename from src/templates/components/Background/Background.sass rename to fwt/components/Background/Background.sass diff --git a/src/templates/components/Background/Background.tsx b/fwt/components/Background/Background.tsx similarity index 87% rename from src/templates/components/Background/Background.tsx rename to fwt/components/Background/Background.tsx index e33e37d..12e21b2 100644 --- a/src/templates/components/Background/Background.tsx +++ b/fwt/components/Background/Background.tsx @@ -1,9 +1,9 @@ import './Background.sass' import { Show, createSignal } from 'solid-js' import fs from 'fs' -import webpPath from '../../../templates/images/background.webp' -import avifPath from '../../../templates/images/background.avif' -import noBackground from '../../../templates/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/src/templates/components/Button/Button.sass b/fwt/components/Button/Button.sass similarity index 100% rename from src/templates/components/Button/Button.sass rename to fwt/components/Button/Button.sass diff --git a/src/templates/components/Button/Button.tsx b/fwt/components/Button/Button.tsx similarity index 100% rename from src/templates/components/Button/Button.tsx rename to fwt/components/Button/Button.tsx diff --git a/src/templates/components/Image/Image.tsx b/fwt/components/Image/Image.tsx similarity index 100% rename from src/templates/components/Image/Image.tsx rename to fwt/components/Image/Image.tsx diff --git a/src/templates/components/Link/Link.tsx b/fwt/components/Link/Link.tsx similarity index 100% rename from src/templates/components/Link/Link.tsx rename to fwt/components/Link/Link.tsx diff --git a/src/templates/components/Logo/Logo.tsx b/fwt/components/Logo/Logo.tsx similarity index 75% rename from src/templates/components/Logo/Logo.tsx rename to fwt/components/Logo/Logo.tsx index d293b1a..5d1af4c 100644 --- a/src/templates/components/Logo/Logo.tsx +++ b/fwt/components/Logo/Logo.tsx @@ -1,5 +1,5 @@ -import webpPath from '../../../templates/images/logo.webp' -import avifPath from '../../../templates/images/logo.avif' +import webpPath from '../../images/logo.webp' +import avifPath from '../../images/logo.avif' interface Props { size?: number diff --git a/src/templates/components/Optimizer/OptimizeBackground.tsx b/fwt/components/Optimizer/OptimizeBackground.tsx similarity index 78% rename from src/templates/components/Optimizer/OptimizeBackground.tsx rename to fwt/components/Optimizer/OptimizeBackground.tsx index 2c004f5..1c27caf 100644 --- a/src/templates/components/Optimizer/OptimizeBackground.tsx +++ b/fwt/components/Optimizer/OptimizeBackground.tsx @@ -2,8 +2,8 @@ import sharp from 'sharp' const convertBackground = async () => { const inputSrc = 'src/assets/images/background.png' - const webpOutput = 'src/templates/images/background.webp' - const avifOutput = 'src/templates/images/background.avif' + const webpOutput = 'fwt/images/background.webp' + const avifOutput = 'fwt/images/background.avif' const avifBuffer = await sharp(inputSrc).avif({ quality: 60 }).resize(1920).toBuffer() await sharp(avifBuffer).toFile(avifOutput) diff --git a/src/templates/components/Optimizer/OptimizeImage.tsx b/fwt/components/Optimizer/OptimizeImage.tsx similarity index 72% rename from src/templates/components/Optimizer/OptimizeImage.tsx rename to fwt/components/Optimizer/OptimizeImage.tsx index 4edf349..00afd77 100644 --- a/src/templates/components/Optimizer/OptimizeImage.tsx +++ b/fwt/components/Optimizer/OptimizeImage.tsx @@ -6,8 +6,8 @@ interface Props { } const convertImage = async (props: Props) => { - const avifOutputPath = `src/templates/images/${props.src.split('.').slice(0, -1).join('.')}.avif` - const webpOutputPath = `src/templates/images/${props.src.split('.').slice(0, -1).join('.')}.webp` + const avifOutputPath = `fwt/images/${props.src.split('.').slice(0, -1).join('.')}.avif` + const webpOutputPath = `fwt/images/${props.src.split('.').slice(0, -1).join('.')}.webp` const avifBuffer = await sharp(`src/assets/images/${props.src}`).avif({ quality: 60 }).resize(props.size).toBuffer() await sharp(avifBuffer).toFile(avifOutputPath) diff --git a/src/templates/components/Optimizer/OptimizeLogo.tsx b/fwt/components/Optimizer/OptimizeLogo.tsx similarity index 82% rename from src/templates/components/Optimizer/OptimizeLogo.tsx rename to fwt/components/Optimizer/OptimizeLogo.tsx index 83172d8..e3e8014 100644 --- a/src/templates/components/Optimizer/OptimizeLogo.tsx +++ b/fwt/components/Optimizer/OptimizeLogo.tsx @@ -6,8 +6,8 @@ interface Props { const convertLogo = async (props: Props) => { const inputSrc = 'src/assets/images/logo.png' - const webpImage = 'src/templates/images/logo.webp' - const avifImage = 'src/templates/images/logo.avif' + const webpImage = 'fwt/images/logo.webp' + const avifImage = 'fwt/images/logo.avif' const avifBuffer = await sharp(inputSrc).avif({ quality: 60 }).resize(props.size).toBuffer() await sharp(avifBuffer).toFile(avifImage) diff --git a/src/templates/components/Page/Page.sass b/fwt/components/Page/Page.sass similarity index 100% rename from src/templates/components/Page/Page.sass rename to fwt/components/Page/Page.sass diff --git a/src/templates/components/Page/Page.tsx b/fwt/components/Page/Page.tsx similarity index 100% rename from src/templates/components/Page/Page.tsx rename to fwt/components/Page/Page.tsx diff --git a/src/templates/images/background.avif b/fwt/images/background.avif similarity index 100% rename from src/templates/images/background.avif rename to fwt/images/background.avif diff --git a/src/templates/images/background.webp b/fwt/images/background.webp similarity index 100% rename from src/templates/images/background.webp rename to fwt/images/background.webp diff --git a/src/templates/images/logo.avif b/fwt/images/logo.avif similarity index 100% rename from src/templates/images/logo.avif rename to fwt/images/logo.avif diff --git a/src/templates/images/logo.webp b/fwt/images/logo.webp similarity index 100% rename from src/templates/images/logo.webp rename to fwt/images/logo.webp diff --git a/src/templates/images/no-background.webp b/fwt/images/no-background.webp similarity index 100% rename from src/templates/images/no-background.webp rename to fwt/images/no-background.webp diff --git a/src/templates/images/sample.avif b/fwt/images/sample.avif similarity index 100% rename from src/templates/images/sample.avif rename to fwt/images/sample.avif diff --git a/src/templates/images/sample.webp b/fwt/images/sample.webp similarity index 100% rename from src/templates/images/sample.webp rename to fwt/images/sample.webp diff --git a/quadlet.container b/podman.container similarity index 100% rename from quadlet.container rename to podman.container diff --git a/public/favicon.svg b/public/favicon.svg deleted file mode 100644 index f157bd1..0000000 --- a/public/favicon.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro index 966c07b..18af47b 100644 --- a/src/layouts/Layout.astro +++ b/src/layouts/Layout.astro @@ -4,8 +4,8 @@ const { title } = Astro.props const websiteName = 'Template' const websiteDescription = 'This is just a template.' -import Background from '../templates/components/Background/Background' -import OptimizeBackground from '../templates/components/Optimizer/OptimizeBackground' +import Background from '../../fwt/components/Background/Background' +import OptimizeBackground from '../../fwt/components/Optimizer/OptimizeBackground' --- diff --git a/src/pages/index.astro b/src/pages/index.astro index 7a2a55b..5b00d64 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -1,11 +1,11 @@ --- import Layout from '../layouts/Layout.astro' -import Button from '../templates/components/Button/Button' -import Logo from '../templates/components/Logo/Logo' -import OptimizeLogo from '../templates/components/Optimizer/OptimizeLogo' -import Link from '../templates/components/Link/Link' +import Button from '../../fwt/components/Button/Button' +import Logo from '../../fwt/components/Logo/Logo' +import OptimizeLogo from '../../fwt/components/Optimizer/OptimizeLogo' +import Link from '../../fwt/components/Link/Link' import Counter from '../components/Counter/Counter' -import Page from '../templates/components/Page/Page' +import Page from '../../fwt/components/Page/Page' --- diff --git a/src/pages/next.astro b/src/pages/next.astro index 73233e2..c3b3cf4 100644 --- a/src/pages/next.astro +++ b/src/pages/next.astro @@ -1,11 +1,11 @@ --- import Layout from '../layouts/Layout.astro' -import Button from '../templates/components/Button/Button.tsx' -import Image from '../templates/components/Image/Image' -import Page from '../templates/components/Page/Page' -import sampleA from '../templates/images/sample.avif' -import sampleW from '../templates/images/sample.webp' -import OptimizeImage from '../templates/components/Optimizer/OptimizeImage' +import Button from '../../fwt/components/Button/Button' +import Image from '../../fwt/components/Image/Image' +import Page from '../../fwt/components/Page/Page' +import sample1 from '../../fwt/images/sample.avif' +import sample2 from '../../fwt/images/sample.webp' +import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage.tsx' --- @@ -15,10 +15,10 @@ import OptimizeImage from '../templates/components/Optimizer/OptimizeImage'
- Example Image - Example Image - Example Image - Example Image + Example Image + Example Image + Example Image + Example Image
diff --git a/tests/pages/index.spec.ts b/tests/index.spec.ts similarity index 100% rename from tests/pages/index.spec.ts rename to tests/index.spec.ts diff --git a/tests/pages/next.spec.ts b/tests/next.spec.ts similarity index 100% rename from tests/pages/next.spec.ts rename to tests/next.spec.ts