From 4fadb548918fbd04a190dff7fbfaf52aeb7c0388 Mon Sep 17 00:00:00 2001
From: Patrick Alvin Alcala <patrick_alv@yahoo.com>
Date: Thu, 26 Mar 2026 19:08:50 +0800
Subject: [PATCH] Updated

---
 .env                                          |  2 +
 .gitignore                                    |  1 -
 @dasig/components/Background.astro            |  2 +-
 @dasig/components/Button.astro                |  2 +-
 @dasig/components/Display.astro               |  2 +-
 @dasig/components/Footer.astro                |  2 +-
 @dasig/components/HTML.astro                  |  4 +-
 @dasig/components/Modal.astro                 |  2 +-
 {nginx => @dasig/deployment/nginx}/nginx.conf |  0
 @dasig/index.ts                               |  4 -
 @dasig/scripts/functions/encryptRsa.ts        | 17 ----
 @dasig/scripts/node/optimizeImage.ts          | 78 +++++++++----------
 Dockerfile                                    |  2 +-
 {src/styles => design}/breakpoints.sass       |  2 +-
 {src/styles => design}/classes.sass           |  0
 {configs/design => design}/colors.sass        |  0
 {src/styles => design}/fonts.sass             |  0
 {src/styles => design}/functions.sass         |  0
 {configs/design => design}/site.sass          |  0
 {configs/design => design}/sizes.sass         |  0
 docker-compose.yml                            |  7 +-
 podman.container                              |  9 ++-
 src/components/Counter.astro                  |  4 +-
 src/pages/index.astro                         |  2 +-
 24 files changed, 58 insertions(+), 84 deletions(-)
 create mode 100644 .env
 rename {nginx => @dasig/deployment/nginx}/nginx.conf (100%)
 delete mode 100644 @dasig/scripts/functions/encryptRsa.ts
 rename {src/styles => design}/breakpoints.sass (96%)
 rename {src/styles => design}/classes.sass (100%)
 rename {configs/design => design}/colors.sass (100%)
 rename {src/styles => design}/fonts.sass (100%)
 rename {src/styles => design}/functions.sass (100%)
 rename {configs/design => design}/site.sass (100%)
 rename {configs/design => design}/sizes.sass (100%)

diff --git a/.env b/.env
new file mode 100644
index 0000000..5771ced
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+CONTAINER_NAME=dasig-static
+PORT=4320
diff --git a/.gitignore b/.gitignore
index d298c4b..dafeae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,7 +14,6 @@ pnpm-debug.log*
 
 
 # environment variables
-.env
 .env.local
 .env.production
 
diff --git a/@dasig/components/Background.astro b/@dasig/components/Background.astro
index f8f06ef..39a71ae 100644
--- a/@dasig/components/Background.astro
+++ b/@dasig/components/Background.astro
@@ -41,7 +41,7 @@ checkBackground()
 }
 
 <style lang="sass">
-  @use '../../configs/design/site.sass' as design
+  @use '../../design/site.sass' as design
 
   :root
     color-scheme: light dark
diff --git a/@dasig/components/Button.astro b/@dasig/components/Button.astro
index 045ca8b..f7e15a8 100644
--- a/@dasig/components/Button.astro
+++ b/@dasig/components/Button.astro
@@ -41,7 +41,7 @@ const borderRadius = getBorderRadius(edges)
 }
 
 <style lang="sass">
-  @use '/src/styles/fonts.sass' as fonts
+  @use '../../design/fonts.sass' as fonts
   @use 'sass:color'
 
   $primaryColor: #0075BB
diff --git a/@dasig/components/Display.astro b/@dasig/components/Display.astro
index 2fcd2bd..7f4a55f 100644
--- a/@dasig/components/Display.astro
+++ b/@dasig/components/Display.astro
@@ -47,5 +47,5 @@ const { desktop, tablet, mobile } = Astro.props
 }
 
 <style lang="sass">
-  @use '/src/styles/breakpoints.sass'
+  @use '../../design/breakpoints.sass'
 </style>
diff --git a/@dasig/components/Footer.astro b/@dasig/components/Footer.astro
index 1ae0dc6..11c38e0 100644
--- a/@dasig/components/Footer.astro
+++ b/@dasig/components/Footer.astro
@@ -7,7 +7,7 @@
 </footer>
 
 <style lang="sass">
-  @use '../../configs/design/sizes' as view
+  @use '../../design/sizes' as view
 
   .dasig-footer
     padding: 1rem 0
diff --git a/@dasig/components/HTML.astro b/@dasig/components/HTML.astro
index c181a92..0135edd 100644
--- a/@dasig/components/HTML.astro
+++ b/@dasig/components/HTML.astro
@@ -45,8 +45,8 @@ const config = toml.parse(fs.readFileSync('configs/config.site.toml', 'utf8'))
 </html>
 
 <style lang="sass">
-@use '../../configs/design/colors.sass' as colors
-@use '/src/styles/fonts.sass' as fonts
+@use '../../design/colors.sass' as colors
+@use '../../design/fonts.sass' as fonts
 
 .body
   color: colors.$white
diff --git a/@dasig/components/Modal.astro b/@dasig/components/Modal.astro
index 12813a7..ff47b74 100644
--- a/@dasig/components/Modal.astro
+++ b/@dasig/components/Modal.astro
@@ -21,7 +21,7 @@ const { background, color, border } = Astro.props
 }
 
 <style lang="sass">
-  @use '../../configs/design/site' as site
+  @use '../../design/site' as site
   @use 'sass:color'
 
   .modal
diff --git a/nginx/nginx.conf b/@dasig/deployment/nginx/nginx.conf
similarity index 100%
rename from nginx/nginx.conf
rename to @dasig/deployment/nginx/nginx.conf
diff --git a/@dasig/index.ts b/@dasig/index.ts
index 2a62d5c..7066829 100644
--- a/@dasig/index.ts
+++ b/@dasig/index.ts
@@ -16,7 +16,3 @@ export { default as Display } from './components/Display.astro'
 export { default as Padding } from './components/Padding.astro'
 export { default as Modal } from './components/Modal.astro'
 export { default as Input } from './components/Input.astro'
-
-// export { default as OptimizeBackground } from './Optimizers/OptimizeBackground'
-// export { default as OptimizeImage } from './Optimizers/OptimizeImage'
-// export { default as OptimizeLogo } from './Optimizers/OptimizeLogo'
diff --git a/@dasig/scripts/functions/encryptRsa.ts b/@dasig/scripts/functions/encryptRsa.ts
deleted file mode 100644
index b929281..0000000
--- a/@dasig/scripts/functions/encryptRsa.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { JSEncrypt } from "jsencrypt";
-import * as fs from "node:fs";
-import * as toml from "toml";
-
-const config = toml.parse(
-	fs.readFileSync("configs/config.security.toml", "utf-8"),
-);
-const enc = new JSEncrypt();
-const PUBLIC_KEY = config.rsa.public_key;
-
-export default (message: string) => {
-	enc.setPublicKey(PUBLIC_KEY);
-	const encrypted = enc.encrypt(message).toString();
-	const fixedEncrypted = encrypted.replace(/\//g, "~");
-
-	return fixedEncrypted;
-};
diff --git a/@dasig/scripts/node/optimizeImage.ts b/@dasig/scripts/node/optimizeImage.ts
index ba06f43..3110e62 100644
--- a/@dasig/scripts/node/optimizeImage.ts
+++ b/@dasig/scripts/node/optimizeImage.ts
@@ -1,47 +1,39 @@
-import { consola } from "consola";
-import process from "node:process";
-import sharp from "sharp";
-import yargs from "yargs";
-import { hideBin } from "yargs/helpers";
+import { consola } from 'consola'
+import process from 'node:process'
+import sharp from 'sharp'
+import yargs from 'yargs'
+import { hideBin } from 'yargs/helpers'
+;(async () => {
+  const argv = yargs(hideBin(process.argv))
+    .option('name', {
+      alias: 'n',
+      describe: 'Specify the name of the image',
+      type: 'string',
+      demandOption: true,
+    })
+    .option('size', {
+      alias: 's',
+      describe: 'Specify the size of the image',
+      type: 'number',
+      demandOption: true,
+    }).argv
 
-(async () => {
-	const argv = yargs(hideBin(process.argv))
-		.option("name", {
-			alias: "n",
-			describe: "Specify the name of the image",
-			type: "string",
-			demandOption: true,
-		})
-		.option("size", {
-			alias: "s",
-			describe: "Specify the size of the image",
-			type: "number",
-			demandOption: true,
-		}).argv;
+  const name = argv.name
+  const size = argv.size
 
-	const name = argv.name;
-	const size = argv.size;
+  try {
+    const avifOutputPath = `./@dasig/images/${name.toString().split('.').slice(0, -1).join('.')}.avif`
+    const webpOutputPath = `./@dasig/images/${name.toString().split('.').slice(0, -1).join('.')}.webp`
 
-	try {
-		const avifOutputPath = `./@dasig/images/${name.toString().split(".").slice(0, -1).join(".")}.avif`;
-		const webpOutputPath = `./@dasig/images/${name.toString().split(".").slice(0, -1).join(".")}.webp`;
+    const avifBuffer = await sharp(`./src/images/${name}.png`).avif({ quality: 60 }).resize(size).toBuffer()
+    await sharp(avifBuffer).toFile(avifOutputPath)
+    consola.success(`${name} successfully optimized in Avif`)
 
-		const avifBuffer = await sharp(`./src/images/${name}`)
-			.avif({ quality: 60 })
-			.resize(size)
-			.toBuffer();
-		await sharp(avifBuffer).toFile(avifOutputPath);
-		consola.success(`${name} successfully optimized in Avif`);
-
-		const webpBuffer = await sharp(`./src/images/${name}`)
-			.webp({ quality: 75 })
-			.resize(size)
-			.toBuffer();
-		await sharp(webpBuffer).toFile(webpOutputPath);
-		consola.success(`${name} successfully optimized in Webp`);
-	} catch (error: any) {
-		consola.error("Error optimizing image:", error);
-		if (error.message.includes("missing"))
-			consola.error(`${name} could not be found on image folder`);
-	}
-})();
+    const webpBuffer = await sharp(`./src/images/${name}.png`).webp({ quality: 75 }).resize(size).toBuffer()
+    await sharp(webpBuffer).toFile(webpOutputPath)
+    consola.success(`${name} successfully optimized in Webp`)
+  } catch (error: any) {
+    consola.error('Error optimizing image:', error)
+    if (error.message.includes('missing')) consola.error(`${name} could not be found on image folder`)
+  }
+})()
diff --git a/Dockerfile b/Dockerfile
index e00d349..a7dc509 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,6 +7,6 @@ COPY . .
 RUN pnpm build
 
 FROM nginx:stable-alpine AS runtime
-COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
+COPY ./@dasig/deployment/nginx/nginx.conf /etc/nginx/nginx.conf
 COPY --from=build /app/dist /usr/share/nginx/html
 EXPOSE 4321
\ No newline at end of file
diff --git a/src/styles/breakpoints.sass b/design/breakpoints.sass
similarity index 96%
rename from src/styles/breakpoints.sass
rename to design/breakpoints.sass
index e513145..f181751 100644
--- a/src/styles/breakpoints.sass
+++ b/design/breakpoints.sass
@@ -1,4 +1,4 @@
-@use '../../configs/design/sizes.sass' as sizes
+@use '../design/sizes' as sizes
 
 .on-desktop-only
   @media only screen and (min-width: 0px) and (max-width: sizes.$desktop)
diff --git a/src/styles/classes.sass b/design/classes.sass
similarity index 100%
rename from src/styles/classes.sass
rename to design/classes.sass
diff --git a/configs/design/colors.sass b/design/colors.sass
similarity index 100%
rename from configs/design/colors.sass
rename to design/colors.sass
diff --git a/src/styles/fonts.sass b/design/fonts.sass
similarity index 100%
rename from src/styles/fonts.sass
rename to design/fonts.sass
diff --git a/src/styles/functions.sass b/design/functions.sass
similarity index 100%
rename from src/styles/functions.sass
rename to design/functions.sass
diff --git a/configs/design/site.sass b/design/site.sass
similarity index 100%
rename from configs/design/site.sass
rename to design/site.sass
diff --git a/configs/design/sizes.sass b/design/sizes.sass
similarity index 100%
rename from configs/design/sizes.sass
rename to design/sizes.sass
diff --git a/docker-compose.yml b/docker-compose.yml
index 33629ed..ce1d2c3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,9 +1,10 @@
 services:
-  template:
-    container_name: template
+  dasig-static:
+    container_name: ${CONTAINER_NAME}
+    image: localhost/${CONTAINER_NAME}:latest
     restart: unless-stopped
     build:
       context: .
       dockerfile: Dockerfile
     ports:
-      - 4321:4321
+      - ${PORT}:4321
diff --git a/podman.container b/podman.container
index dee0e75..4376b1f 100644
--- a/podman.container
+++ b/podman.container
@@ -1,13 +1,14 @@
 [Unit]
-Description=DASIG-ASTRO
+Description=DASIG-STATIC
 
 [Container]
-ContainerName=dasig-astro
-Image=localhost/dasig-astro
-PublishPort=4321:4321
+ContainerName=${CONTAINER_NAME}
+Image=localhost/${CONTAINER_NAME}:latest
+PublishPort=${PORT}:4321
 
 [Service]
 Restart=always
+EnvironmentFile=dasig.env
 
 [Install]
 WantedBy=multi-user.target default.target
\ No newline at end of file
diff --git a/src/components/Counter.astro b/src/components/Counter.astro
index 40cc17a..8374219 100644
--- a/src/components/Counter.astro
+++ b/src/components/Counter.astro
@@ -33,8 +33,8 @@ const count = 0
 
 <style lang="sass">
   @use 'sass:color'
-  @use '../../configs/design/site' as design
-  @use '../styles/functions.sass' as func
+  @use '../../design/site' as design
+  @use '../../design/functions.sass' as func
 
   .counter
     font-family: inherit
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 844f062..e36b5af 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -25,7 +25,7 @@ import PA2 from '../../@dasig/images/pat-alcala.webp'
 </Layout>
 
 <style lang="sass">
-  @use '../styles/fonts.sass' as fonts
+  @use '../../design/fonts.sass' as fonts
 
   h1, h4
     background: linear-gradient(135deg, #49e1a0 0%, #294e87 100%)