Compare commits
11 Commits
78dc90de5e
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| bd7588b819 | |||
| 138ad075ea | |||
| c2d70f0988 | |||
| e339b21f66 | |||
| c40af33d1d | |||
| dafbda9509 | |||
| 8a670bd0bb | |||
| bd9c74d6f3 | |||
| 5d5af62baf | |||
| d4396a5acc | |||
| 0ebcf1d5a2 |
@ -26,6 +26,6 @@ jobs:
|
||||
username: ${{ secrets.SSH_USERNAME }}
|
||||
key: ${{ secrets.SSH_KEY }}
|
||||
source: "dist/*"
|
||||
target: /var/www/website/dev
|
||||
target: /srv/website/dev
|
||||
overwrite: true
|
||||
strip_components: 1
|
||||
@ -1,24 +1,23 @@
|
||||
import { defineConfig } from "astro/config";
|
||||
|
||||
import mdx from "@astrojs/mdx";
|
||||
import a11yEmoji from "@fec/remark-a11y-emoji";
|
||||
import wasmPack from 'vite-plugin-wasm-pack';
|
||||
import icon from "astro-icon";
|
||||
|
||||
// https://astro.build/config
|
||||
export default defineConfig({
|
||||
integrations: [mdx()],
|
||||
prefetch: {
|
||||
prefetchAll: true
|
||||
},
|
||||
integrations: [mdx(), icon()],
|
||||
markdown: {
|
||||
remarkPlugins: [
|
||||
a11yEmoji
|
||||
],
|
||||
remarkPlugins: [a11yEmoji],
|
||||
shikiConfig: {
|
||||
theme: "one-dark-pro"
|
||||
}
|
||||
},
|
||||
// Copy wasm-terminal to the build directory
|
||||
vite: {
|
||||
plugins: [
|
||||
wasmPack([],['@c0ntroller/wasm-terminal'])
|
||||
]
|
||||
plugins: [wasmPack([], ['@c0ntroller/wasm-terminal'])]
|
||||
}
|
||||
});
|
||||
11738
package-lock.json
generated
11738
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@ -10,16 +10,18 @@
|
||||
"astro": "astro"
|
||||
},
|
||||
"dependencies": {
|
||||
"@astrojs/check": "^0.3.1",
|
||||
"@astrojs/mdx": "^1.1.5",
|
||||
"@astrojs/check": "^0.5.6",
|
||||
"@astrojs/mdx": "^2.1.1",
|
||||
"@c0ntroller/wasm-terminal": ">=0.1.0",
|
||||
"astro": "^3.6.0",
|
||||
"astro-icon": "^0.8.1",
|
||||
"astro": "^4.4.9",
|
||||
"astro-icon": "^1.1.0",
|
||||
"sass": "^1.69.5",
|
||||
"typescript": "^5.3.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@fec/remark-a11y-emoji": "^4.0.2",
|
||||
"@iconify-json/mdi": "^1.1.64",
|
||||
"@iconify-json/simple-icons": "^1.1.93",
|
||||
"astro-themes": "^0.2.4",
|
||||
"remark-code-extra": "^1.0.1",
|
||||
"vite-plugin-wasm-pack": "0.1.11"
|
||||
|
||||
@ -4,14 +4,15 @@ interface Props {
|
||||
description: string;
|
||||
published?: Date;
|
||||
path: string;
|
||||
slug: string;
|
||||
}
|
||||
|
||||
const { title, description, published, path } = Astro.props;
|
||||
const { title, description, /*published, */path, slug } = Astro.props;
|
||||
---
|
||||
|
||||
<a href={path} class="nostyle">
|
||||
<div class="card">
|
||||
<h3>{title}</h3>
|
||||
<div class="card" transition:name={`markdown-border-${slug}`}>
|
||||
<h3 transition:name={`markdown-title-${slug}`}>{title}</h3>
|
||||
<p>{description}</p>
|
||||
</div>
|
||||
</a>
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
---
|
||||
import { getCollection, getEntry } from "astro:content";
|
||||
import type { CollectionEntry } from "astro:content";
|
||||
import { getCollection, getEntry, type CollectionEntry } from "astro:content";
|
||||
|
||||
interface Props {
|
||||
collectionName: CollectionEntry<"diaryMainPages">["slug"];
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
---
|
||||
import { getCollection, getEntry } from "astro:content";
|
||||
import type { CollectionEntry } from "astro:content";
|
||||
import { getCollection, getEntry, type CollectionEntry } from "astro:content";
|
||||
|
||||
interface Props {
|
||||
collectionName: CollectionEntry<"diaryMainPages">["slug"];
|
||||
@ -104,6 +103,7 @@ select {
|
||||
border-radius: 1em;
|
||||
border: 1px solid var(--blog_content-border);
|
||||
background: var(--blog_background-main);
|
||||
color: var(--blog_color);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
---
|
||||
import { Image } from "astro:assets";
|
||||
import { Icon } from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
import ThemeSwitch from "./ThemeSwitch.astro";
|
||||
import logo from "./logo.png";
|
||||
---
|
||||
|
||||
<nav class="navigation">
|
||||
<a href="/" class="nostyle imgContainer">
|
||||
<Image src={logo} alt="Logo" class="logoImg" />
|
||||
<Image src={logo} alt="Logo" class="logoImg" loading="eager" />
|
||||
</a>
|
||||
<div class="navLink">
|
||||
<a href="/" class="nostyle">
|
||||
@ -15,9 +15,9 @@ import logo from "./logo.png";
|
||||
<span class="linkIcon"
|
||||
><Icon
|
||||
name="mdi:home"
|
||||
size="2em"
|
||||
title="Home and Projects"
|
||||
id="mdi_nav_home"
|
||||
class="icon-2em"
|
||||
/></span
|
||||
>
|
||||
</a>
|
||||
@ -28,7 +28,7 @@ import logo from "./logo.png";
|
||||
<span class="linkIcon"
|
||||
><Icon
|
||||
name="mdi:account"
|
||||
size="2em"
|
||||
class="icon-2em"
|
||||
title="About Me"
|
||||
id="mdi_nav_aboutme"
|
||||
/></span
|
||||
@ -40,7 +40,7 @@ import logo from "./logo.png";
|
||||
<a href="/terminal" class="nostyle">
|
||||
<Icon
|
||||
name="mdi:console"
|
||||
size="2em"
|
||||
class="icon-2em"
|
||||
title="Terminal"
|
||||
id="mdi_nav_terminal"
|
||||
/>
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
---
|
||||
import { Icon } from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
---
|
||||
|
||||
<div class="switch">
|
||||
<Icon name="mdi:language-javascript" title="Theme switching needs JS to be enabled." data-theme-ph />
|
||||
<Icon name="mdi:white-balance-sunny" title="Switch to dark theme" data-theme-sun />
|
||||
<Icon name="mdi:weather-night" title="Switch to light theme" data-theme-moon />
|
||||
<div class="switch" transition:persist="theme-switch">
|
||||
<Icon name="mdi:language-javascript" title="Theme switching needs JS to be enabled." data-theme-ph class="icon-15em" />
|
||||
<Icon name="mdi:white-balance-sunny" title="Switch to dark theme" data-theme-sun class="icon-15em" />
|
||||
<Icon name="mdi:weather-night" title="Switch to light theme" data-theme-moon class="icon-15em" />
|
||||
</div>
|
||||
|
||||
<script>
|
||||
@ -26,18 +26,34 @@ import { Icon } from "astro-icon";
|
||||
|
||||
const switchThemeDark = () => {
|
||||
document.dispatchEvent(new CustomEvent('set-theme', { detail: 'dark' }));
|
||||
moons.forEach(m => m.classList.remove("fadeOut"));
|
||||
moons.forEach(m => m.classList.remove("fadeOut", "fadeOutDone"));
|
||||
moons.forEach(m => m.classList.add("fadeIn"));
|
||||
suns.forEach(s => s.classList.remove("fadeIn"));
|
||||
setTimeout(() => moons.forEach(m => {
|
||||
m.classList.add("fadeInDone");
|
||||
m.classList.remove("fadeIn");
|
||||
}), 250); // After 0.2s animation is completed
|
||||
suns.forEach(s => s.classList.remove("fadeIn", "fadeInDone"));
|
||||
suns.forEach(s => s.classList.add("fadeOut"));
|
||||
setTimeout(() => suns.forEach(s => {
|
||||
s.classList.add("fadeOutDone");
|
||||
s.classList.remove("fadeOut");
|
||||
}), 250); // After 0.2s animation is completed
|
||||
}
|
||||
|
||||
const switchThemeLight = () => {
|
||||
document.dispatchEvent(new CustomEvent('set-theme', { detail: 'light' }));
|
||||
moons.forEach(m => m.classList.remove("fadeIn"));
|
||||
moons.forEach(m => m.classList.remove("fadeIn", "fadeInDone"));
|
||||
moons.forEach(m => m.classList.add("fadeOut"));
|
||||
suns.forEach(s => s.classList.remove("fadeOut"));
|
||||
setTimeout(() => moons.forEach(m => {
|
||||
m.classList.add("fadeOutDone");
|
||||
m.classList.remove("fadeOut");
|
||||
}), 250); // After 0.2s animation is completed
|
||||
suns.forEach(s => s.classList.remove("fadeOut", "fadeOutDone"));
|
||||
suns.forEach(s => s.classList.add("fadeIn"));
|
||||
setTimeout(() => suns.forEach(s => {
|
||||
s.classList.add("fadeInDone");
|
||||
s.classList.remove("fadeIn");
|
||||
}), 250); // After 0.2s animation is completed
|
||||
}
|
||||
|
||||
moons.forEach(m => m.addEventListener("click", switchThemeLight));
|
||||
@ -66,11 +82,21 @@ import { Icon } from "astro-icon";
|
||||
animation-fill-mode: forwards;
|
||||
}
|
||||
|
||||
.fadeOutDone {
|
||||
opacity: 0;
|
||||
transform: translate(0, -100%);
|
||||
}
|
||||
|
||||
.fadeIn {
|
||||
animation: fadeIn 0.2s ease-in-out;
|
||||
animation-fill-mode: forwards;
|
||||
}
|
||||
|
||||
.fadeInDone {
|
||||
opacity: 1;
|
||||
transform: translate(0, 0);
|
||||
}
|
||||
|
||||
.placeHolder {
|
||||
opacity: 1 !important;
|
||||
transform: translate(0, 0) !important;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
---
|
||||
import { Icon } from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
import Skills from "../data/skills.json";
|
||||
|
||||
type Skill = (typeof Skills.cards)[number];
|
||||
@ -40,7 +40,7 @@ const cardStyle = {
|
||||
.map((skill) => (
|
||||
<div class="skillBar">
|
||||
<div class="barName">
|
||||
<Icon name={skill.icon} />
|
||||
<Icon name={skill.icon} class="icon-2em" />
|
||||
</div>
|
||||
<div
|
||||
class="percentBar"
|
||||
@ -61,7 +61,7 @@ const cardStyle = {
|
||||
<>
|
||||
<div class="badge">
|
||||
<span>
|
||||
<Icon name={additional.icon} />
|
||||
<Icon name={additional.icon} class="icon-1em" />
|
||||
</span>
|
||||
<span>{additional.name}</span>
|
||||
</div>
|
||||
@ -202,7 +202,6 @@ const cardStyle = {
|
||||
}
|
||||
|
||||
& > div:first-of-type {
|
||||
height: 2em;
|
||||
grid-row: 1/3;
|
||||
}
|
||||
|
||||
|
||||
@ -5,6 +5,7 @@ const projectsCol = defineCollection({
|
||||
type: "content",
|
||||
schema: z.object({
|
||||
title: z.string(),
|
||||
site_title: z.string().optional(),
|
||||
description: z.string(),
|
||||
descriptionShort: z.string(),
|
||||
repository: z.string().url().optional(),
|
||||
@ -19,6 +20,7 @@ const diaryMainPages = defineCollection({
|
||||
type: "content",
|
||||
schema: z.object({
|
||||
title: z.string(),
|
||||
site_title: z.string().optional(),
|
||||
description: z.string(),
|
||||
descriptionShort: z.string(),
|
||||
repository: z.string().url().optional(),
|
||||
@ -33,6 +35,7 @@ const diarySubPages = defineCollection({
|
||||
type: "content",
|
||||
schema: z.object({
|
||||
title: z.string(),
|
||||
site_title: z.string().optional(),
|
||||
repository: z.string().url().optional(),
|
||||
relatedWebsite: z.string().url().optional(),
|
||||
published: z.date().optional(),
|
||||
|
||||
@ -6,6 +6,4 @@ descriptionShort: "Me learning Rust (German)."
|
||||
relatedWebsite: https://doc.rust-lang.org/book/
|
||||
---
|
||||
|
||||
# Learning Rust
|
||||
|
||||
In this diary I want to document my progress through the [Rust book](https://doc.rust-lang.org/book/) and documenting some stuff for myself.
|
||||
@ -8,8 +8,6 @@ published: 2022-06-13T13:07:27.205Z
|
||||
import { Image } from "astro:assets";
|
||||
import screenshot from "./data_infoscreen/screenshot.jpg";
|
||||
|
||||
# Infoscreen
|
||||
|
||||
This document is about a screen that shows information.
|
||||
Shocking, I know.
|
||||
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
---
|
||||
title: Overleaf Git Sync
|
||||
title: Overleaf Sync with Git
|
||||
description: "Overleaf is a LaTeX editor for the web and honestly great to use. But there is no way to back up your project to a cloud drive or git without paying them money. Even the self-hosted community version has no such functionality. I decided that's BS and made my own script to sync a project to git."
|
||||
descriptionShort: "I created a script that pushes Overleaf projects to a git remote."
|
||||
repository: "https://git.c0ntroller.de/c0ntroller/overleaf-git-sync"
|
||||
published: 2022-10-18T17:56:27+02:00
|
||||
---
|
||||
|
||||
# Overleaf Sync with Git
|
||||
|
||||
## The Problem
|
||||
|
||||
When I was writing some important stuff for uni I wanted as many backups as possible.
|
||||
|
||||
@ -1,13 +1,11 @@
|
||||
---
|
||||
title: Photo Sync
|
||||
title: Google Photo Sync
|
||||
description: "Giving random apps access to your Google Photos can be bad. To still use an album as screensaver etc. I wrote this script. It syncs all your photos to your drive while giving you maximum privacy."
|
||||
descriptionShort: "A script that syncs a Google Photos album to your drive."
|
||||
repository: https://git.c0ntroller.de/c0ntroller/google-photo-album-sync
|
||||
published: 2022-08-08T12:19:20+02:00
|
||||
---
|
||||
|
||||
# Google Photo Sync
|
||||
|
||||
Why give up privacy for a screensaver?
|
||||
|
||||
## Storytime
|
||||
|
||||
@ -6,8 +6,6 @@ repository: "https://git.c0ntroller.de/c0ntroller/simple-callback-server"
|
||||
published: 2022-10-18T17:56:27+02:00
|
||||
---
|
||||
|
||||
# Simple Callback Server
|
||||
|
||||
This is probably my simplest project.
|
||||
|
||||
## What is this?
|
||||
|
||||
@ -6,8 +6,6 @@ repository: https://git.c0ntroller.de/c0ntroller/frontpage
|
||||
published: 2022-10-18T17:56:27+02:00
|
||||
---
|
||||
|
||||
# Terminal
|
||||
|
||||
Hello and welcome to my website. This documentation is for the [cli on my website](https://c0ntroller.de/terminal) so check it out if you haven't!
|
||||
|
||||
## Why did I do this?
|
||||
|
||||
@ -7,8 +7,6 @@ relatedWebsite: https://tu-fast.de/
|
||||
published: 2022-06-23T12:53:07.207Z
|
||||
---
|
||||
|
||||
# TUfast
|
||||
|
||||
My work on a browser extension that is used by multiple thousand students.
|
||||
|
||||
## What is TUfast?
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 0
|
||||
slug: hello-world
|
||||
---
|
||||
|
||||
# Hello world!
|
||||
|
||||
_[Link zum Buch](https://doc.rust-lang.org/book/ch01-02-hello-world.html)_
|
||||
|
||||
## How to `println!`
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 1
|
||||
slug: cargo
|
||||
---
|
||||
|
||||
# Cargo
|
||||
|
||||
_[Link zum Buch](https://doc.rust-lang.org/book/ch01-03-hello-cargo.html)_
|
||||
|
||||
## Was ist Cargo?
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 2
|
||||
slug: higher-lower-game
|
||||
---
|
||||
|
||||
# Erstes Spiel
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch02-00-guessing-game-tutorial.html)
|
||||
|
||||
## Projekt erstellen
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 3
|
||||
slug: konzepte
|
||||
---
|
||||
|
||||
# Konzepte
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch03-00-common-programming-concepts.html)
|
||||
|
||||
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 4
|
||||
slug: ownership
|
||||
---
|
||||
|
||||
# Ownership
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch04-00-understanding-ownership.html)
|
||||
|
||||
## Was ist das?
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 5
|
||||
slug: structs
|
||||
---
|
||||
|
||||
# Structs
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch05-00-structs.html)
|
||||
|
||||
## Was sind Structs
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
---
|
||||
title: Enums & Matching
|
||||
site_title: Enums und Pattern Matching
|
||||
published: 2022-10-18T17:56:26+02:00
|
||||
sorting: 6
|
||||
slug: enums
|
||||
---
|
||||
|
||||
# Enums und Pattern Matching
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch06-00-enums.html)
|
||||
|
||||
## Enums
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 7
|
||||
slug: projektmanagement
|
||||
---
|
||||
|
||||
# How to: Projektmanagement
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch07-00-managing-growing-projects-with-packages-crates-and-modules.html)
|
||||
|
||||
## Packages, Crates, Modules, was?
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 8
|
||||
slug: collections
|
||||
---
|
||||
|
||||
# Standard Collections
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch08-00-common-collections.html)
|
||||
|
||||
## `Vec<T>` - Vektoren
|
||||
|
||||
@ -5,8 +5,6 @@ sorting: 9
|
||||
slug: errors-and-panic
|
||||
---
|
||||
|
||||
# Errors und `panic!`
|
||||
|
||||
[Link zum Buch](https://doc.rust-lang.org/book/ch09-00-error-handling.html)
|
||||
|
||||
## `panic!`
|
||||
|
||||
@ -1,21 +1,24 @@
|
||||
---
|
||||
import Navbar from "../components/LayoutComponents/Navbar.astro";
|
||||
import { ViewTransitions } from 'astro:transitions';
|
||||
import Themes from "astro-themes";
|
||||
import Icon from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
import Navbar from "../components/LayoutComponents/Navbar.astro";
|
||||
import socials from "../data/socials.json";
|
||||
|
||||
interface Props {
|
||||
title: string;
|
||||
showAfterMain?: boolean;
|
||||
mainTransitionName?: string;
|
||||
}
|
||||
|
||||
const { title, showAfterMain } = Astro.props;
|
||||
const { title, showAfterMain, mainTransitionName } = Astro.props;
|
||||
---
|
||||
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<Themes defaultTheme="dark" />
|
||||
<ViewTransitions />
|
||||
|
||||
<meta charset="utf-8" />
|
||||
<meta
|
||||
@ -115,18 +118,18 @@ const { title, showAfterMain } = Astro.props;
|
||||
<title>{title}</title>
|
||||
</head>
|
||||
<body>
|
||||
<span id="top" aria-hidden></span>
|
||||
<header>
|
||||
<span id="top" aria-hidden="true"></span>
|
||||
<header transition:persist="nav">
|
||||
<Navbar />
|
||||
</header>
|
||||
<main>
|
||||
<main transition:name={ mainTransitionName || "main" }>
|
||||
<slot />
|
||||
</main>
|
||||
{showAfterMain ? <div class="after-main">
|
||||
<slot name="after-main" />
|
||||
</div> : null
|
||||
}
|
||||
<footer id="bottom">
|
||||
<footer id="bottom" transition:persist="footer">
|
||||
<span style="visibility:hidden">▲</span>
|
||||
<span class="spacer"></span>
|
||||
<span class="footerContent">
|
||||
@ -134,8 +137,8 @@ const { title, showAfterMain } = Astro.props;
|
||||
<span class="divider">|</span>
|
||||
{socials.flatMap((social, i) => (
|
||||
i !== 0 ?
|
||||
[<span class="divider">|</span>, <a href={social.url} target="_blank" rel="noreferrer" class="socialIcon"><Icon name={social.icon} title={social.name} /></a>] :
|
||||
[<a href={social.url} target="_blank" rel="noreferrer" class="socialIcon"><Icon name={social.icon} title={social.name} /></a>]
|
||||
[<span class="divider">|</span>, <a href={social.url} target="_blank" rel="noreferrer" class="socialIcon"><Icon name={social.icon} title={social.name} class="socialIcon" /></a>] :
|
||||
[<a href={social.url} target="_blank" rel="noreferrer" class="socialIcon"><Icon name={social.icon} title={social.name} class="socialIcon" /></a>]
|
||||
))}
|
||||
<span class="divider">|</span>
|
||||
<a class="nocolor" target="_blank" href="mailto:admin-website@c0ntroller.de" rel="noreferrer">Contact</a>
|
||||
@ -301,4 +304,20 @@ const { title, showAfterMain } = Astro.props;
|
||||
h6 {
|
||||
color: var(--blog_color-accent-dark);
|
||||
}
|
||||
|
||||
.icon-1em {
|
||||
height: 1em;
|
||||
width: 1em;
|
||||
}
|
||||
|
||||
.icon-15em {
|
||||
height: 1.5em;
|
||||
width: 1.5em;
|
||||
}
|
||||
|
||||
.icon-2em {
|
||||
height: 2em;
|
||||
width: 2em;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
@ -1,9 +1,10 @@
|
||||
---
|
||||
import Layout from "./Layout.astro";
|
||||
import { Icon } from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
|
||||
interface Props {
|
||||
title: string;
|
||||
slug: string;
|
||||
published?: Date;
|
||||
srcPath?: string;
|
||||
moreLinks?: {
|
||||
@ -12,20 +13,21 @@ interface Props {
|
||||
}[];
|
||||
}
|
||||
|
||||
const { title, srcPath, published, moreLinks } = Astro.props;
|
||||
const { title, srcPath, published, moreLinks, slug } = Astro.props;
|
||||
const gitUrl = `https://git.c0ntroller.de/c0ntroller/frontpage/src/branch/dev/src/content/${srcPath}`
|
||||
---
|
||||
|
||||
<Layout title={title} showAfterMain={Astro.slots.has("footer-nav")}>
|
||||
<Layout title={title} showAfterMain={Astro.slots.has("footer-nav")} mainTransitionName={`markdown-border-${slug}`}>
|
||||
{Astro.slots.has("main-nav") ?
|
||||
<slot name="main-nav" /> :
|
||||
null}
|
||||
|
||||
{ moreLinks && moreLinks.length !== 0 ?
|
||||
<div class="more">
|
||||
{ moreLinks.map(l => <a href={l.href} referrerpolicy="no-referrer" class="nostyle" style={{ display: "inline-block", width: "2em" }}><Icon name={l.icon} /></a>) }
|
||||
{ moreLinks.map(l => <a href={l.href} referrerpolicy="no-referrer" class="nostyle"><Icon name={l.icon} class="icon-2em" /></a>) }
|
||||
</div>
|
||||
: null}
|
||||
<h1 transition:name={`markdown-title-${slug}`}>{title}</h1>
|
||||
<slot />
|
||||
{ published || srcPath ? <>
|
||||
<hr />
|
||||
|
||||
@ -38,7 +38,7 @@ if (diaryMain.data.repository) {
|
||||
}
|
||||
---
|
||||
|
||||
<MarkdownLayout title={diaryMain.data.title} srcPath={`diaryMainPages/${diaryMain.id}`} moreLinks={moreLinks}>
|
||||
<MarkdownLayout title={diaryMain.data.site_title || diaryMain.data.title} slug={diaryMain.slug} srcPath={`diaryMainPages/${diaryMain.id}`} moreLinks={moreLinks}>
|
||||
<Content />
|
||||
|
||||
<h2>Pages</h2>
|
||||
|
||||
@ -27,7 +27,7 @@ const { entry } = Astro.props;
|
||||
const { Content } = await entry.render();
|
||||
---
|
||||
|
||||
<MarkdownLayout title={entry.data.title} srcPath={`${diary}/${entry.id}`} published={entry.data.published}>
|
||||
<MarkdownLayout title={entry.data.site_title || entry.data.title} slug={entry.slug} srcPath={`${diary}/${entry.id}`} published={entry.data.published}>
|
||||
<DiaryNavTop collectionName="rust" slot="main-nav" />
|
||||
<Content />
|
||||
<DiaryNavBar collectionName="rust" slot="footer-nav" />
|
||||
|
||||
@ -29,12 +29,12 @@ if (entry.data.relatedWebsite) {
|
||||
if (entry.data.repository) {
|
||||
moreLinks.push({
|
||||
href: entry.data.repository,
|
||||
icon: "bi:git",
|
||||
icon: "simple-icons:git",
|
||||
});
|
||||
}
|
||||
|
||||
---
|
||||
|
||||
<MarkdownLayout title={entry.data.title} srcPath={`projects/${entry.id}`} published={entry.data.published} moreLinks={moreLinks}>
|
||||
<MarkdownLayout title={entry.data.site_title || entry.data.title} slug={entry.slug} srcPath={`projects/${entry.id}`} published={entry.data.published} moreLinks={moreLinks}>
|
||||
<Content />
|
||||
</MarkdownLayout>
|
||||
|
||||
@ -22,11 +22,11 @@ const diaries = (await getCollection("diaryMainPages")).sort((a, b) => a.data.la
|
||||
</p>
|
||||
<h2>Projects</h2>
|
||||
<div class="contentList">
|
||||
{ projects.map(p => <ContentCard title={p.data.title} description={p.data.description} path={`/blog/${p.slug}`} />) }
|
||||
{ projects.map(p => <ContentCard title={p.data.title} description={p.data.description} path={`/blog/${p.slug}`} slug={p.slug} />) }
|
||||
</div>
|
||||
<h2>Diaries</h2>
|
||||
<div class="contentList">
|
||||
{ diaries.map(p => <ContentCard title={p.data.title} description={p.data.description} path={`/blog/${p.slug}`} />) }
|
||||
{ diaries.map(p => <ContentCard title={p.data.title} description={p.data.description} path={`/blog/${p.slug}`} slug={p.slug} />) }
|
||||
</div>
|
||||
</Layout>
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
---
|
||||
import { Image } from "astro:assets";
|
||||
import { Icon } from "astro-icon";
|
||||
import { Icon } from "astro-icon/components";
|
||||
import Layout from "../layouts/Layout.astro";
|
||||
import SkillCard from "../components/SkillCard.astro";
|
||||
|
||||
@ -15,7 +15,7 @@ const age = new Date().getFullYear() - 1998 - (new Date().getMonth() <= 10 ? 1 :
|
||||
<Layout title="About me">
|
||||
<h1>This is me.</h1>
|
||||
<div class="photo">
|
||||
<Image src={pic} alt="Me" />
|
||||
<Image src={pic} alt="Me" loading="eager" />
|
||||
</div>
|
||||
<div class="personal">
|
||||
<p class="preText">
|
||||
@ -67,16 +67,16 @@ const age = new Date().getFullYear() - 1998 - (new Date().getMonth() <= 10 ? 1 :
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
class="nocolor"
|
||||
style={{ width: "2em" }}
|
||||
aria-label={`Link to my ${social.name} profile`}
|
||||
>
|
||||
<Icon name={social.icon} />
|
||||
<Icon name={social.icon} class="icon-2em" />
|
||||
</a>
|
||||
))
|
||||
}
|
||||
</div>
|
||||
<h2>Achievements</h2>
|
||||
{achievements.map((achievement) => <div class="achievement">
|
||||
<Icon name={achievement.icon} /><span>{achievement.description}</span>
|
||||
<Icon name={achievement.icon} class="icon-2em" /><span>{achievement.description}</span>
|
||||
</div>)}
|
||||
<h2>Skills</h2>
|
||||
{skills.cards.map((card) => <SkillCard card={card} />)}
|
||||
|
||||
@ -7,7 +7,7 @@ const screenVersion = `${date.getFullYear()}${date.getMonth()+1}${date.getDate()
|
||||
const wasmVersion = wasmData.version;
|
||||
---
|
||||
|
||||
<Layout title="Terminal">
|
||||
<Layout title="Terminal" showAfterMain>
|
||||
<div class="screen" data-terminal-screen>
|
||||
<div data-terminal-output>
|
||||
<noscript><pre>You need to enable JavaScript to use this terminal.</pre></noscript>
|
||||
@ -20,33 +20,50 @@ const wasmVersion = wasmData.version;
|
||||
@@@@@ @@@@@@@@@@
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@ @@@@@@@@@
|
||||
@@@@@@@@@@@@@@@W#MW@@@@@@@@@@@@@@@ @@@@@@@@@
|
||||
@@@@@########*****pkaMB@@@@@@@@mb@@@@@ @@@@@@@
|
||||
@@@@@*************pwdhoh@@@@@$OOOOOw*##@@@@ @ @@@@
|
||||
@@@@@************dOOOOOOOOOO0OOOOOO*******#@@ @ @@@
|
||||
@@@@************pOOOOOOOOOOOOOOZ#**********#@@ @
|
||||
@@@@************oOOOOOOOOOOOOa***************#@
|
||||
@@@@@***********odwwpdda**********************
|
||||
@@@@@**********************************
|
||||
@@@@@@@@@$#*###MMB@@@@@@@@@@@@</pre>
|
||||
@@@@@######## pkaMB@@@@@@@@mb@@@@@ @@@@@@@
|
||||
@@@@@ pwdhoh@@@@@$OOOOOw ##@@@@ @ @@@@
|
||||
@@@@@ dOOOOOOOOOO0OOOOOO #@@ @ @@@
|
||||
@@@@ pOOOOOOOOOOOOOOZ# #@@ @
|
||||
@@@@ oOOOOOOOOOOOOa #@
|
||||
@@@@@ odwwpdda
|
||||
@@@@@
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@</pre>
|
||||
</div>
|
||||
<div class="input"><pre class="user">user@cer0</pre><pre>:</pre><pre class="pwd">/</pre><pre class="dollar">$ </pre><input type="text" data-terminal-input autofocus /></div>
|
||||
<div class="input"><pre class="user">user@cer0</pre><pre>:</pre><pre class="pwd">/</pre><pre class="dollar">$ </pre><input type="text" data-terminal-input /></div>
|
||||
</div>
|
||||
|
||||
<template data-terminal-user-cmd>
|
||||
<pre><pre class="user">user@cer0</pre><pre>:</pre><pre class="pwd"></pre><pre class="dollar">$ </pre><pre class="user-cmd"></pre></pre>
|
||||
</template>
|
||||
|
||||
<div slot="after-main" class="more">
|
||||
Read more about the development of this terminal <a href="/blog/wasm-terminal" class="nocolor">here</a>.
|
||||
</div>
|
||||
</Layout>
|
||||
|
||||
<script>
|
||||
(async () => {
|
||||
const wasm = import("@c0ntroller/wasm-terminal");
|
||||
|
||||
const outputs = document.querySelectorAll("[data-terminal-output]") as NodeListOf<HTMLPreElement>;
|
||||
const outputs = document.querySelectorAll("[data-terminal-output]") as NodeListOf<HTMLDivElement>;
|
||||
const inputs = document.querySelectorAll("[data-terminal-input]") as NodeListOf<HTMLInputElement>;
|
||||
const screens = document.querySelectorAll("[data-terminal-screen]") as NodeListOf<HTMLDivElement>;
|
||||
const template = document.querySelector("[data-terminal-user-cmd]") as HTMLTemplateElement;
|
||||
|
||||
screens.forEach((s) => s.addEventListener("click", () => inputs[0]?.focus()))
|
||||
screens.forEach((s) => s.addEventListener("click", () => inputs[0]?.focus()));
|
||||
|
||||
screens.forEach((screen) => {
|
||||
new MutationObserver((changes) => {
|
||||
const totalNewHeight = changes.reduce((prev, change) => {
|
||||
change.addedNodes.forEach(n => prev += (n as HTMLPreElement).clientHeight || 0);
|
||||
return prev;
|
||||
}, 0);
|
||||
|
||||
if (screen.scrollTop + screen.clientHeight >= screen.scrollHeight - totalNewHeight - 40) {
|
||||
screen.scrollTo(0, screen.scrollHeight);
|
||||
}
|
||||
}).observe(screen, { childList: true, subtree: true });
|
||||
});
|
||||
|
||||
const { default: init, Console } = await wasm;
|
||||
|
||||
@ -69,20 +86,23 @@ const wasmVersion = wasmData.version;
|
||||
inputLine.querySelector(".user-cmd")!.textContent = cmd;
|
||||
inputLine.querySelector(".pwd")!.textContent = prevPwd;
|
||||
outputs.forEach((output) => {
|
||||
output.prepend(inputLine);
|
||||
output.append(inputLine);
|
||||
});
|
||||
|
||||
input.value = "";
|
||||
|
||||
if (cmd) {
|
||||
const resp = c.execute(cmd);
|
||||
|
||||
if (resp) {
|
||||
const outputLine = document.createElement("pre");
|
||||
outputLine.textContent = resp
|
||||
outputs.forEach((output) => {
|
||||
output.prepend(outputLine);
|
||||
output.append(outputLine);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
input.value = "";
|
||||
updatePwd();
|
||||
}
|
||||
});
|
||||
@ -106,7 +126,7 @@ const wasmVersion = wasmData.version;
|
||||
padding: 10px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
overflow-y: scroll;
|
||||
overflow-y: auto;
|
||||
|
||||
pre > pre {
|
||||
display: inline-block;
|
||||
@ -121,7 +141,7 @@ const wasmVersion = wasmData.version;
|
||||
|
||||
[data-terminal-output] {
|
||||
display: flex;
|
||||
flex-direction: column-reverse;
|
||||
flex-direction: column;
|
||||
}
|
||||
}
|
||||
|
||||
@ -148,6 +168,7 @@ const wasmVersion = wasmData.version;
|
||||
input {
|
||||
font-family: "Cascadia Code", monospace;
|
||||
display: inline-block;
|
||||
width: 100%;
|
||||
flex-grow: 2;
|
||||
font-size: 1rem;
|
||||
padding: 0;
|
||||
@ -157,6 +178,7 @@ const wasmVersion = wasmData.version;
|
||||
appearance: none !important;
|
||||
outline: none;
|
||||
caret-shape: block;
|
||||
color: #fff;
|
||||
|
||||
&::-moz-focus-outer, &::-moz-focus-inner, &:focus, &:focus *, &:-moz-focusring, &:-moz-focusring * {
|
||||
border: none !important;
|
||||
@ -166,4 +188,12 @@ const wasmVersion = wasmData.version;
|
||||
}
|
||||
}
|
||||
|
||||
.more {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
font-style: italic;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
</style>
|
||||
Reference in New Issue
Block a user