Preparation for v2

2024-10-07 00:05:06 +02:00 · 2024-10-07 00:05:06 +02:00 · e53bedeec8
commit e53bedeec8
parent 2212218520
21 changed files with 217 additions and 127 deletions
--- a/App/public/v1/Assets/Homepage/desktop.jpg
+++ b/App/public/v1/Assets/Homepage/desktop.jpg
--- a/App/public/v1/Assets/Homepage/thirdimpact.png
+++ b/App/public/v1/Assets/Homepage/thirdimpact.png
--- a/App/public/v1/Assets/VictorMono-Regular.ttf
+++ b/App/public/v1/Assets/VictorMono-Regular.ttf
--- a/App/public/v1/favicon.svg
+++ b/App/public/v1/favicon.svg
--- a/App/public/v2/Assets/background.png
+++ b/App/public/v2/Assets/background.png
--- a/App/public/v2/Assets/border.png
+++ b/App/public/v2/Assets/border.png
--- a/App/public/v2/Assets/header-pic.png
+++ b/App/public/v2/Assets/header-pic.png
--- a/App/src/Components/v1/SubPagesRow.astro
+++ b/App/src/Components/v1/SubPagesRow.astro
@ -4,7 +4,8 @@
 <div>
    <span><a href="/">Home/</a></span>
    <span
-		><a href="https://forge.cakey.me/Cake/Personal_website">GitRepo/</a></span
+        ><a href="https://forge.cakey.me/Cake/Personal_website">GitRepo/</a
+        ></span
    >
 </div>

--- a/App/src/Components/v2/button.astro
+++ b/App/src/Components/v2/button.astro
--- a/App/src/Components/v2/navbar.astro
+++ b/App/src/Components/v2/navbar.astro
@ -0,0 +1,8 @@
+---
+import "../../Styles/v2/navbar.css";
+---
+
+<nav>
+    <a>home</a>
+    <a>blog</a>
+</nav>
--- a/App/src/Components/v2/titlebar.astro
+++ b/App/src/Components/v2/titlebar.astro
@ -0,0 +1,13 @@
+---
+import "../../Styles/v2/titlebar.css";
+
+const { page_title } = Astro.props;
+---
+
+<div id="titlebar">
+    <img src="/v2/Assets/header-pic.png" />
+    <div id="titlebar-title-wrapper">
+        <h1>{page_title}</h1>
+    </div>
+</div>
+
--- a/App/src/Styles/v1/index.css
+++ b/App/src/Styles/v1/index.css
@ -1,6 +1,6 @@
@font-face {
 	font-family: "victor mono";
-    src: url("/Assets/VictorMono-Regular.ttf");
+	src: url("/v1/Assets/VictorMono-Regular.ttf");
 }

 :root {
@ -127,6 +127,7 @@ hr {
 	padding-left: 5px;
 	padding-right: 5px;
 }
+
 .commandline>* {
 	color: var(--highlight-color) !important;
 }
--- a/App/src/Styles/v2/common.css
+++ b/App/src/Styles/v2/common.css
@ -0,0 +1,44 @@
+:root {
+	--background-color: #282a36;
+	--border-color: #44475a;
+	--primary-color: #ff79c6;
+	--secondary-color: #bd93f9;
+	--text-color: #f8f8f2;
+	--link-color: #ffb86c;
+	--highlight-color: #8be9fd;
+
+	--navbar-header-pic-size: 128px;
+}
+
+
+* {
+	box-sizing: border-box;
+	padding: 0;
+	margin: 0;
+}
+
+body {
+	width: 100%;
+	height: 100vh;
+}
+
+
+#main-container {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+
+	height: 100%;
+	width: 100%;
+
+	background: url("/v2/Assets/background.png");
+	background-repeat: repeat;
+}
+
+#header-container {
+	border: 24px solid transparent;
+	border-image: url("/v2/Assets/border.png") 32 round;
+	width: 100%;
+	max-width: 900px;
+	margin-top: 32px;
+}
--- a/App/src/Styles/v2/navbar.css
+++ b/App/src/Styles/v2/navbar.css
--- a/App/src/Styles/v2/titlebar.css
+++ b/App/src/Styles/v2/titlebar.css
@ -0,0 +1,16 @@
+#titlebar {
+	display: flex;
+	align-items: center;
+}
+
+#titlebar>#titlebar-title-wrapper {
+	margin: auto;
+	position: relative;
+	left: calc(0px - calc(var(--navbar-header-pic-size)/2));
+}
+
+#titlebar>img {
+	width: var(--navbar-header-pic-size);
+	height: var(--navbar-header-pic-size);
+	padding: 16px;
+}
--- a/App/src/layouts/default.astro
+++ b/App/src/layouts/default.astro
@ -1,22 +0,0 @@
---
-const { title } = Astro.props;
---
-
-<html lang="en">
-    <head>
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-    </head>
-    <body>
-        <nav>
-            <a href="#">Home</a>
-            <a href="#">Posts</a>
-            <a href="#">Contact</a>
-        </nav>
-        <h1>{title}</h1>
-        <article>
-            <slot />
-            <!-- il tuo contenuto viene inserito qui -->
-        </article>
-    </body>
-</html>
--- a/App/src/layouts/v2/common.astro
+++ b/App/src/layouts/v2/common.astro
@ -0,0 +1,24 @@
+---
+import "../../Styles/v2/common.css";
+const { page_title } = Astro.props;
+import Navbar from "../../Components/v2/navbar.astro";
+import Titlebar from "../../Components/v2/titlebar.astro";
+---
+
+<html lang="en">
+    <head>
+        <meta charset="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+    </head>
+    <body>
+        <div id="main-container">
+            <div id="header-container">
+                <Titlebar page_title={page_title} />
+                <Navbar />
+            </div>
+            <main>
+                <slot />
+            </main>
+        </div>
+    </body>
+</html>
--- a/App/src/pages/index.astro
+++ b/App/src/pages/index.astro
@ -0,0 +1,5 @@
+---
+import CommonLayout from "../layouts/v2/common.astro";
+---
+
+<CommonLayout page_title="cake">pallw</CommonLayout>
--- a/App/src/pages/old/blog.astro
+++ b/App/src/pages/old/blog.astro
@ -10,7 +10,7 @@ const posts = await Astro.glob("./posts/*.md");
 <html lang="en">
    <head>
        <meta charset="utf-8" />
-        <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+        <link rel="icon" type="image/svg+xml" href="/v1/favicon.svg" />
        <meta name="viewport" content="width=device-width" />
        <meta name="generator" content={Astro.generator} />
        <title>Cakey's home directory</title>
--- a/App/src/pages/old/index.astro
+++ b/App/src/pages/old/index.astro
@ -8,7 +8,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro";
 <html lang="en">
    <head>
        <meta charset="utf-8" />
-        <link rel="icon" type="image/svg+xml" href="/favicon.svg" />
+        <link rel="icon" type="image/svg+xml" href="/v1/favicon.svg" />
        <meta name="viewport" content="width=device-width" />
        <meta name="generator" content={Astro.generator} />
        <title>Cakey's home directory</title>
@ -57,7 +57,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro";
                        >Arch</a
                    > with KDE, which is a really nice combo.
                </p>
-                <img src="/Assets/Homepage/desktop.jpg" />
+                <img src="/v1/Assets/Homepage/desktop.jpg" />
            </span>

            <div class="commandline">
@ -74,7 +74,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro";
                    resonates with me so much, both in the anime ending, and the
                    movie.
                </p>
-                <img class="small" src="/Assets/Homepage/thirdimpact.png" />
+                <img class="small" src="/v1/Assets/Homepage/thirdimpact.png" />
            </span>

            <p>