From d85eb74f6d6267e609d4f989c5ef54686b73e273 Mon Sep 17 00:00:00 2001
From: Damillora
Date: Tue, 19 Mar 2024 23:34:25 +0700
Subject: [PATCH] feat: rework site
---
package-lock.json | 14 +--
package.json | 2 +-
src/lib/components/DjItem.svelte | 83 ++++++++++++++
src/lib/components/SiteHeader.svelte | 20 ++++
src/routes/(pages)/+layout.svelte | 9 ++
src/routes/(pages)/about/+page.svelte | 54 +++++++++
src/routes/{ => (pages)}/contact/+page.svelte | 13 ++-
src/routes/(pages)/dj/+page.svelte | 80 ++++++++++++++
src/routes/{ => (pages)}/games/+page.svelte | 15 ++-
.../{ => (pages)}/projects/+page.svelte | 10 +-
.../projects/altessimo/+page.svelte | 16 +--
.../projects/miracle/+page.svelte | 12 +-
.../{ => (pages)}/projects/rinze/+page.svelte | 23 ++--
.../projects/shallie/+page.svelte | 16 +--
.../projects/shioriko/+page.svelte | 12 +-
.../{ => (pages)}/projects/yuika/+page.svelte | 12 +-
src/routes/+layout.svelte | 22 +---
src/routes/+page.svelte | 39 +++++--
src/routes/about/+page.svelte | 103 ------------------
src/routes/links/+page.svelte | 24 ----
static/images | 2 +-
21 files changed, 363 insertions(+), 218 deletions(-)
create mode 100644 src/lib/components/DjItem.svelte
create mode 100644 src/lib/components/SiteHeader.svelte
create mode 100644 src/routes/(pages)/+layout.svelte
create mode 100644 src/routes/(pages)/about/+page.svelte
rename src/routes/{ => (pages)}/contact/+page.svelte (56%)
create mode 100644 src/routes/(pages)/dj/+page.svelte
rename src/routes/{ => (pages)}/games/+page.svelte (91%)
rename src/routes/{ => (pages)}/projects/+page.svelte (84%)
rename src/routes/{ => (pages)}/projects/altessimo/+page.svelte (72%)
rename src/routes/{ => (pages)}/projects/miracle/+page.svelte (75%)
rename src/routes/{ => (pages)}/projects/rinze/+page.svelte (58%)
rename src/routes/{ => (pages)}/projects/shallie/+page.svelte (71%)
rename src/routes/{ => (pages)}/projects/shioriko/+page.svelte (73%)
rename src/routes/{ => (pages)}/projects/yuika/+page.svelte (80%)
delete mode 100644 src/routes/about/+page.svelte
delete mode 100644 src/routes/links/+page.svelte
diff --git a/package-lock.json b/package-lock.json
index 1e59e24..2890e61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,7 +8,7 @@
"name": "~TODO~",
"version": "0.0.1",
"dependencies": {
- "@damillora/plachta": "^4.0.0",
+ "@damillora/plachta": "^4.1.1",
"@sveltejs/adapter-node": "^1.1.6",
"dayjs": "^1.11.7",
"howler": "^2.2.3",
@@ -155,9 +155,9 @@
}
},
"node_modules/@damillora/plachta": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.0.3.tgz",
- "integrity": "sha512-/mH7xNVgvXxksBCGs+CEFDs2xOpeMKJ8z0PhUwmkUtrWhLBMuIIp1UiSUCRcL1DU7Lxqdel8Hx6Pq1YWWPtJ7Q==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.1.1.tgz",
+ "integrity": "sha512-VRIJHLfgywZ7eSqPiFQWzTy/kx6V0Q9qqwg6N0zgJDxba/gVHVBjHjChrqmym2aDJFsSoinPtzYYFPxi4JRn/A==",
"dependencies": {
"@sveltejs/package": "^2.2.0",
"svelte": "^4.1.2",
@@ -3776,9 +3776,9 @@
}
},
"@damillora/plachta": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.0.3.tgz",
- "integrity": "sha512-/mH7xNVgvXxksBCGs+CEFDs2xOpeMKJ8z0PhUwmkUtrWhLBMuIIp1UiSUCRcL1DU7Lxqdel8Hx6Pq1YWWPtJ7Q==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/@damillora/plachta/-/plachta-4.1.1.tgz",
+ "integrity": "sha512-VRIJHLfgywZ7eSqPiFQWzTy/kx6V0Q9qqwg6N0zgJDxba/gVHVBjHjChrqmym2aDJFsSoinPtzYYFPxi4JRn/A==",
"requires": {
"@sveltejs/package": "^2.2.0",
"svelte": "^4.1.2",
diff --git a/package.json b/package.json
index 533d832..3e007e1 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
},
"type": "module",
"dependencies": {
- "@damillora/plachta": "^4.0.0",
+ "@damillora/plachta": "^4.1.1",
"@sveltejs/adapter-node": "^1.1.6",
"dayjs": "^1.11.7",
"howler": "^2.2.3",
diff --git a/src/lib/components/DjItem.svelte b/src/lib/components/DjItem.svelte
new file mode 100644
index 0000000..5ee1ca5
--- /dev/null
+++ b/src/lib/components/DjItem.svelte
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+ {#if link}
+
+ {title}
+
+ {:else}
+ {title}
+ {/if}
+
+
+
+
+ calendar_month{date}
+
+
+ pin_drop{location}
+
+
+
+
+
+
diff --git a/src/lib/components/SiteHeader.svelte b/src/lib/components/SiteHeader.svelte
new file mode 100644
index 0000000..56502fd
--- /dev/null
+++ b/src/lib/components/SiteHeader.svelte
@@ -0,0 +1,20 @@
+
+
+
\ No newline at end of file
diff --git a/src/routes/(pages)/+layout.svelte b/src/routes/(pages)/+layout.svelte
new file mode 100644
index 0000000..66dc22b
--- /dev/null
+++ b/src/routes/(pages)/+layout.svelte
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/routes/(pages)/about/+page.svelte b/src/routes/(pages)/about/+page.svelte
new file mode 100644
index 0000000..78734b8
--- /dev/null
+++ b/src/routes/(pages)/about/+page.svelte
@@ -0,0 +1,54 @@
+
+
+
+ Damillora: About
+
+
+
+
+
+
+ Hello! My name is Damillora. I'm a programmer by day, and DJ by night. My DJ style is
+ combining electronic dance music with vocals from anime and J-Pop songs.
+ I also sometimes appear on the internet as a VTuber, but currently I am focused on being a DJ and helping out with the Indonesian Denonbu community!
+
+ VTuber Avatar Credits
+ Illustrator: Mira Cassiela (Links)
+ Live2D Rigging: Siauw Adhie (Twitter / X)
+ Where you can find me
+ Mainstream platforms
+
+ Alternative platforms
+
+ GPG public key
+ My public key is accessible here.
+
+
diff --git a/src/routes/contact/+page.svelte b/src/routes/(pages)/contact/+page.svelte
similarity index 56%
rename from src/routes/contact/+page.svelte
rename to src/routes/(pages)/contact/+page.svelte
index 72678d1..56d71ab 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/(pages)/contact/+page.svelte
@@ -1,5 +1,5 @@
@@ -7,7 +7,7 @@
-
+
Contact
You can contact me via various channels.
Email: damillora(at)damillora.com
@@ -17,8 +17,11 @@
- If you're a VTuber and want to collaborate, please send me a Direct Message my way via
- Twitter! I will gladly help set up the things needed.
+ You can also contact me via Twitter for shorter correspondences.
-
+ Discord: damillora
+
+ Please try to contact me via the two channels above first, correspondences will move to Discord when needed! I cannot guarantee any reply if you try to contact me via Discord directly.
+
+
diff --git a/src/routes/(pages)/dj/+page.svelte b/src/routes/(pages)/dj/+page.svelte
new file mode 100644
index 0000000..13b8da3
--- /dev/null
+++ b/src/routes/(pages)/dj/+page.svelte
@@ -0,0 +1,80 @@
+
+
+
+ Damillora: About
+
+
+
+
+
+
+ My specialization is playing vocals from Japanese music on top of club music. Weaving popular
+ songs and hidden gems together, I strive to make your event fun!
+
+
+
+
+
+ Want me for your event?
+
+ If you want me to perform at your event, contact me!
+
+ Event List
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/games/+page.svelte b/src/routes/(pages)/games/+page.svelte
similarity index 91%
rename from src/routes/games/+page.svelte
rename to src/routes/(pages)/games/+page.svelte
index 3797bb8..31cda48 100644
--- a/src/routes/games/+page.svelte
+++ b/src/routes/(pages)/games/+page.svelte
@@ -1,5 +1,5 @@
@@ -8,7 +8,7 @@
-
+
Game Profile
This page lists various IDs from games that I play and/or review.
Game Consoles and Arcade Games
@@ -40,6 +40,14 @@
reviewlink="https://blog.nanao.moe/game-reviews/arknights/"
version="Global server"
/>
+
-->
-
+
diff --git a/src/routes/projects/+page.svelte b/src/routes/(pages)/projects/+page.svelte
similarity index 84%
rename from src/routes/projects/+page.svelte
rename to src/routes/(pages)/projects/+page.svelte
index b8b6ace..0d46eee 100644
--- a/src/routes/projects/+page.svelte
+++ b/src/routes/(pages)/projects/+page.svelte
@@ -1,5 +1,5 @@
@@ -8,10 +8,10 @@
-
- Projects
+
+ Software Projects
- This is a list of projects that I maintain and publicly available on my GitHub.
+ This is a list of software projects that I maintain and publicly available on my GitHub.
Active Projects
-
+
diff --git a/src/routes/projects/altessimo/+page.svelte b/src/routes/(pages)/projects/altessimo/+page.svelte
similarity index 72%
rename from src/routes/projects/altessimo/+page.svelte
rename to src/routes/(pages)/projects/altessimo/+page.svelte
index f3f53b0..812cd47 100644
--- a/src/routes/projects/altessimo/+page.svelte
+++ b/src/routes/(pages)/projects/altessimo/+page.svelte
@@ -1,5 +1,5 @@
@@ -9,12 +9,14 @@
- Altessimo
-
- live
- •
- source code
-
+
+ Altessimo
+
+ live
+ •
+ source code
+
+
Description
diff --git a/src/routes/projects/miracle/+page.svelte b/src/routes/(pages)/projects/miracle/+page.svelte
similarity index 75%
rename from src/routes/projects/miracle/+page.svelte
rename to src/routes/(pages)/projects/miracle/+page.svelte
index 3bde7da..0683dae 100644
--- a/src/routes/projects/miracle/+page.svelte
+++ b/src/routes/(pages)/projects/miracle/+page.svelte
@@ -1,5 +1,5 @@
@@ -9,10 +9,12 @@
- nanao.moe (legacy)
-
- source code
-
+
+ nanao.moe (legacy)
+
+ source code
+
+
Description
diff --git a/src/routes/projects/rinze/+page.svelte b/src/routes/(pages)/projects/rinze/+page.svelte
similarity index 58%
rename from src/routes/projects/rinze/+page.svelte
rename to src/routes/(pages)/projects/rinze/+page.svelte
index 74258ef..c216eee 100644
--- a/src/routes/projects/rinze/+page.svelte
+++ b/src/routes/(pages)/projects/rinze/+page.svelte
@@ -1,5 +1,5 @@
@@ -9,21 +9,24 @@
- nanao.moe
-
- live
- •
- source code
-
+
+ nanao.moe
+
+ live
+ •
+ source code
+
+
Description
- A domain carves a person's place in the Internet. nanao.moe now serves as my primary web page.
- The website contains information about my projects and interests.
+ A domain carves a person's place in the Internet. nanao.moe now serves as my primary web
+ page. The website contains information about my projects and interests.
- nanao.moe is now using the new Mare Serenitatis design language. However, the technology stack remains the same.
+ nanao.moe is now using the new Mare Serenitatis design language. However, the technology
+ stack remains the same.
Technologies
diff --git a/src/routes/projects/shallie/+page.svelte b/src/routes/(pages)/projects/shallie/+page.svelte
similarity index 71%
rename from src/routes/projects/shallie/+page.svelte
rename to src/routes/(pages)/projects/shallie/+page.svelte
index 2aeb065..8dfdede 100644
--- a/src/routes/projects/shallie/+page.svelte
+++ b/src/routes/(pages)/projects/shallie/+page.svelte
@@ -1,5 +1,5 @@
@@ -9,12 +9,14 @@
- Damillora's Virtual Memoir
-
- live
- •
- source code
-
+
+ Damillora's Virtual Memoir
+
+ live
+ •
+ source code
+
+
Description
diff --git a/src/routes/projects/shioriko/+page.svelte b/src/routes/(pages)/projects/shioriko/+page.svelte
similarity index 73%
rename from src/routes/projects/shioriko/+page.svelte
rename to src/routes/(pages)/projects/shioriko/+page.svelte
index 27810ac..139560e 100644
--- a/src/routes/projects/shioriko/+page.svelte
+++ b/src/routes/(pages)/projects/shioriko/+page.svelte
@@ -1,5 +1,5 @@
@@ -9,10 +9,12 @@
- Shioriko
-
- source code
-
+
+ Shioriko
+
+ source code
+
+
Description
diff --git a/src/routes/projects/yuika/+page.svelte b/src/routes/(pages)/projects/yuika/+page.svelte
similarity index 80%
rename from src/routes/projects/yuika/+page.svelte
rename to src/routes/(pages)/projects/yuika/+page.svelte
index 0479ca4..2c4f9af 100644
--- a/src/routes/projects/yuika/+page.svelte
+++ b/src/routes/(pages)/projects/yuika/+page.svelte
@@ -1,5 +1,5 @@
@@ -10,10 +10,12 @@
- Yuika theme
-
- source code
-
+
+ Yuika theme
+
+ source code
+
+
Description
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 86db2b3..f8e05fa 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -3,37 +3,21 @@
Base,
Header,
Hero,
- NavMenu,
- NavDarkMode,
Footer,
NavigationLoading
} from '@damillora/plachta';
import FloatingYuriko from '$lib/components/FloatingYuriko.svelte';
import { isYurikoBirthday } from '$lib/yuriko-birthday.js';
+ import SiteHeader from '$lib/components/SiteHeader.svelte';
-
-
-
+
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index da153b5..f7c8f69 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,18 +1,35 @@
Damillora
-
-
- Welcome to Damillora's website
-
- Welcome to my personal website. I'm a programmer by day, and a DJ by night.
- This site serves as my introduction, and lists my coding projects and game reviews as well.
-
-
-
-
+
+
+
+ Programmer by day, DJ at night
+
+ Welcome to my personal website. I'm a programmer by day, and a DJ by night.
+ This site serves as my introduction, and lists my coding projects and game reviews as well.
+
+
+
+
+
+
+
+ I make various software, including this very website.
+
+
+
+
+
+
+
+ I focus on playing Japanese music vocals on top of club music.
+
+
+
+
\ No newline at end of file
diff --git a/src/routes/about/+page.svelte b/src/routes/about/+page.svelte
deleted file mode 100644
index c394f82..0000000
--- a/src/routes/about/+page.svelte
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
- Damillora: About
-
-
-
-
-
-
- Hello! My name is Damillora. I'm a programmer by day, and DJ by night. My DJ style is
- combining electronic dance music with vocals from anime and J-Pop songs.
- I also sometimes appear on the internet as a VTuber, but currently I am helping out with the Indonesian Denonbu community!
-
- Profile
-
- - Name: Damillora
- - Birthday: February 29
-
- Credits
-
- I am thankful to several for bringing my Virtual YouTuber project to life, and I will list
- them here.
-
- Illustrator: Mira Cassiela
- Virtual artist | L2D artist + freelance character designer and illustrator
-
- YouTube
- •
- Twitter
- •
- Instagram
- •
- Links
-
- Live2D Rigging: Siauw Adhie
-
- Twitter
- •
- YouTube
- •
- Fiverr
-
- Where you can find me
- Publishing media
- I publish content mainly in those sites
-
- Alternative technologies
-
- Mainstream platforms control what you can post, and you can lose access to data rightfully
- yours.
-
- I maintain presence in several altenative platforms and technologies to ensure I have control of
- data I post, to contribute to a possible future, and as a backup when mainstream platforms go down.
-
- If you have a presence in those platforms, I encourage you to use these instead, you will help
- the adoption of those technologies!
-
-
- GPG public key
- My public key is accessible here.
-
-
diff --git a/src/routes/links/+page.svelte b/src/routes/links/+page.svelte
deleted file mode 100644
index a0e9058..0000000
--- a/src/routes/links/+page.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Damillora: Links
-
-
-
-
- Links
-
- Here, I post links that is of my interest, and might be for you too!
- Personal Links
-
-
-
-
-
diff --git a/static/images b/static/images
index 38296b9..4004598 160000
--- a/static/images
+++ b/static/images
@@ -1 +1 @@
-Subproject commit 38296b9cbc72f9a91286b4ca83dba8ad6267ab21
+Subproject commit 40045981b1a76a47b0bcdd4ef3d5280966380f61