From ec15fac5789e186075daf40f77ec3b848845d89a Mon Sep 17 00:00:00 2001 From: Akis Date: Tue, 27 Dec 2022 17:28:47 +0200 Subject: [PATCH] use unocss, add blog, ui changes --- docker-compose.yml => compose.yml | 5 +- package.json | 4 +- src/lib/Card/CardInner.svelte | 50 +--- src/lib/Card/CardOuter.svelte | 11 +- src/lib/Card/Link.svelte | 38 +-- src/lib/Card/LinksOuter.svelte | 10 +- src/lib/Footer.svelte | 39 +-- src/lib/Form/Captcha.svelte | 8 +- src/lib/Form/Form.svelte | 36 +-- src/lib/Form/Meta.svelte | 35 +-- src/lib/Form/Note.svelte | 10 +- src/lib/Form/TextArea.svelte | 8 +- src/lib/Hero.svelte | 35 +-- src/lib/LinkButton.svelte | 26 +- src/lib/MDsvexLayout.svelte | 3 +- src/lib/Nav.svelte | 264 ++++++++---------- src/lib/Team.json | 15 +- src/lib/ThemeToggle.svelte | 13 +- src/lib/app.css | 35 +-- src/routes/+error.svelte | 6 + src/routes/+layout.svelte | 3 +- src/routes/+page.server.ts | 20 +- src/routes/+page.svelte | 133 +-------- src/routes/Announcements.svelte | 102 +++++++ src/routes/blog/+layout.server.ts | 10 + src/routes/blog/+layout.svelte | 14 + src/routes/blog/+page.server.ts | 10 + src/routes/blog/+page.svelte | 61 ++++ src/routes/blog/[title]/+page.server.ts | 16 ++ src/routes/blog/[title]/+page.svelte | 26 ++ src/routes/blog/authors/+page.server.ts | 10 + src/routes/blog/authors/+page.svelte | 12 + .../blog/authors/[author]/+page.server.ts | 11 + src/routes/blog/authors/[author]/+page.svelte | 33 +++ src/routes/blog/tags/+page.server.ts | 10 + src/routes/blog/tags/+page.svelte | 12 + src/routes/blog/tags/[tag]/+page.server.ts | 11 + src/routes/blog/tags/[tag]/+page.svelte | 33 +++ src/routes/contact/+page.server.ts | 12 +- src/routes/contact/+page.svelte | 106 ++++--- src/routes/faq/+page.md | 26 -- src/routes/instances/+page.server.ts | 12 +- src/routes/instances/+page.svelte | 68 ++--- src/routes/instances/InstanceLink.svelte | 55 ++-- src/routes/legal/+page.md | 10 + src/routes/team/+page.svelte | 51 +++- src/routes/timeline/+page.svelte | 18 +- static/JetBrainsMono.ttf | Bin 0 -> 230248 bytes static/Raleway.ttf | Bin 309720 -> 0 bytes uno.config.ts | 28 ++ vite.config.ts | 6 +- 51 files changed, 838 insertions(+), 732 deletions(-) rename docker-compose.yml => compose.yml (62%) create mode 100644 src/routes/+error.svelte create mode 100644 src/routes/Announcements.svelte create mode 100644 src/routes/blog/+layout.server.ts create mode 100644 src/routes/blog/+layout.svelte create mode 100644 src/routes/blog/+page.server.ts create mode 100644 src/routes/blog/+page.svelte create mode 100644 src/routes/blog/[title]/+page.server.ts create mode 100644 src/routes/blog/[title]/+page.svelte create mode 100644 src/routes/blog/authors/+page.server.ts create mode 100644 src/routes/blog/authors/+page.svelte create mode 100644 src/routes/blog/authors/[author]/+page.server.ts create mode 100644 src/routes/blog/authors/[author]/+page.svelte create mode 100644 src/routes/blog/tags/+page.server.ts create mode 100644 src/routes/blog/tags/+page.svelte create mode 100644 src/routes/blog/tags/[tag]/+page.server.ts create mode 100644 src/routes/blog/tags/[tag]/+page.svelte delete mode 100644 src/routes/faq/+page.md create mode 100644 static/JetBrainsMono.ttf delete mode 100644 static/Raleway.ttf diff --git a/docker-compose.yml b/compose.yml similarity index 62% rename from docker-compose.yml rename to compose.yml index 5e30726..a4edb1a 100644 --- a/docker-compose.yml +++ b/compose.yml @@ -1,4 +1,3 @@ -version: "3.9" services: website: container_name: website @@ -6,6 +5,4 @@ services: restart: always #build: . ports: - - "80:80" - volumes: - - "./data:/usr/src/app/data" \ No newline at end of file + - "80:80" \ No newline at end of file diff --git a/package.json b/package.json index a6a6183..deb0224 100644 --- a/package.json +++ b/package.json @@ -4,12 +4,10 @@ "scripts": { "dev": "vite", "build": "vite build", - "build:docker": "docker build . -t website", "preview": "vite preview", - "preview:docker": "pnpm build:docker && docker run --rm --name=website -p 80:80 website", "check": "svelte-check --tsconfig ./tsconfig.json", "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch", - "format": "prettier --ignore-path .gitignore --write --plugin-search-dir=. ." + "format": "prettier -w --plugin-search-dir=. ." }, "devDependencies": { "@iconify-json/fa6-solid": "^1.1.9", diff --git a/src/lib/Card/CardInner.svelte b/src/lib/Card/CardInner.svelte index 9e0db0b..63e4909 100644 --- a/src/lib/Card/CardInner.svelte +++ b/src/lib/Card/CardInner.svelte @@ -3,22 +3,26 @@ export let position: any; export let description: any; export let icon: any; - export let positionStyles: any; + export let positionStyles: any; -
-
+
+
{#if icon}
- {title} icon + {title} icon
{/if}
- + {title} {#if position} - - + - {position} {/if} @@ -30,37 +34,3 @@
- - diff --git a/src/lib/Card/CardOuter.svelte b/src/lib/Card/CardOuter.svelte index eb21ff1..36eecd9 100644 --- a/src/lib/Card/CardOuter.svelte +++ b/src/lib/Card/CardOuter.svelte @@ -1,12 +1,3 @@ -
+
- - diff --git a/src/lib/Card/Link.svelte b/src/lib/Card/Link.svelte index 577bb9e..605aaf1 100644 --- a/src/lib/Card/Link.svelte +++ b/src/lib/Card/Link.svelte @@ -4,7 +4,10 @@ export { classes as class }; - + @@ -14,50 +17,29 @@ .picture, .pgp, .link { - background-color: var(--alt); - color: var(--alt-text); - transition: all 0.25s; + @apply bg-alt text-alt-text transition-all duration-250; } .web:hover, .email:hover, .picture:hover, .pgp:hover { - background-color: var(--accent); - color: var(--alt); + @apply bg-accent text-alt; } .matrixcolored { - background-color: var(--alt); - color: var(--alt-text); + @apply bg-alt text-alt-text; } .discordcolored { - background-color: #5865f2; - color: #fff; + @apply bg-[#5865f2] text-white; } .gitcolored { - background-color: #f05032; - color: #fff; + @apply bg-[#f05032] text-white; } .githubcolored { - background-color: var(--alt); - color: var(--alt-text); - } - - a { - border: none; - border-radius: 10px; - padding: 0.5rem; - cursor: pointer; - font-family: var(--font-primary); - color: var(--secondary); - text-decoration: none; - width: fit-content; - font-size: 20px; - display: flex; - align-items: center; + @apply bg-alt text-alt-text; } diff --git a/src/lib/Card/LinksOuter.svelte b/src/lib/Card/LinksOuter.svelte index dcf2e95..71cc61f 100644 --- a/src/lib/Card/LinksOuter.svelte +++ b/src/lib/Card/LinksOuter.svelte @@ -1,11 +1,3 @@ -
+
- - diff --git a/src/lib/Footer.svelte b/src/lib/Footer.svelte index 8d1ea41..017fed7 100644 --- a/src/lib/Footer.svelte +++ b/src/lib/Footer.svelte @@ -1,9 +1,7 @@ - - -