diff --git a/App/public/Assets/Homepage/desktop.jpg b/App/public/v1/Assets/Homepage/desktop.jpg similarity index 100% rename from App/public/Assets/Homepage/desktop.jpg rename to App/public/v1/Assets/Homepage/desktop.jpg diff --git a/App/public/Assets/Homepage/thirdimpact.png b/App/public/v1/Assets/Homepage/thirdimpact.png similarity index 100% rename from App/public/Assets/Homepage/thirdimpact.png rename to App/public/v1/Assets/Homepage/thirdimpact.png diff --git a/App/public/Assets/VictorMono-Regular.ttf b/App/public/v1/Assets/VictorMono-Regular.ttf similarity index 100% rename from App/public/Assets/VictorMono-Regular.ttf rename to App/public/v1/Assets/VictorMono-Regular.ttf diff --git a/App/public/favicon.svg b/App/public/v1/favicon.svg similarity index 100% rename from App/public/favicon.svg rename to App/public/v1/favicon.svg diff --git a/App/public/v2/Assets/background.png b/App/public/v2/Assets/background.png new file mode 100644 index 0000000..8572315 Binary files /dev/null and b/App/public/v2/Assets/background.png differ diff --git a/App/public/v2/Assets/border.png b/App/public/v2/Assets/border.png new file mode 100644 index 0000000..71886f1 Binary files /dev/null and b/App/public/v2/Assets/border.png differ diff --git a/App/public/v2/Assets/header-pic.png b/App/public/v2/Assets/header-pic.png new file mode 100644 index 0000000..5888e47 Binary files /dev/null and b/App/public/v2/Assets/header-pic.png differ diff --git a/App/src/Components/v1/FriendsRow.astro b/App/src/Components/v1/FriendsRow.astro index 33b506f..7ba4e55 100644 --- a/App/src/Components/v1/FriendsRow.astro +++ b/App/src/Components/v1/FriendsRow.astro @@ -2,16 +2,16 @@ ---
- DD/ + DD/
diff --git a/App/src/Components/v1/SubPagesRow.astro b/App/src/Components/v1/SubPagesRow.astro index 8ddc55b..4399e32 100644 --- a/App/src/Components/v1/SubPagesRow.astro +++ b/App/src/Components/v1/SubPagesRow.astro @@ -2,19 +2,20 @@ ---
- Home/ - GitRepo/ + Home/ + GitRepo/
diff --git a/App/src/Components/v2/button.astro b/App/src/Components/v2/button.astro new file mode 100644 index 0000000..e69de29 diff --git a/App/src/Components/v2/navbar.astro b/App/src/Components/v2/navbar.astro new file mode 100644 index 0000000..4a49e27 --- /dev/null +++ b/App/src/Components/v2/navbar.astro @@ -0,0 +1,8 @@ +--- +import "../../Styles/v2/navbar.css"; +--- + + diff --git a/App/src/Components/v2/titlebar.astro b/App/src/Components/v2/titlebar.astro new file mode 100644 index 0000000..0ab719a --- /dev/null +++ b/App/src/Components/v2/titlebar.astro @@ -0,0 +1,13 @@ +--- +import "../../Styles/v2/titlebar.css"; + +const { page_title } = Astro.props; +--- + +
+ +
+

{page_title}

+
+
+ diff --git a/App/src/Styles/v1/index.css b/App/src/Styles/v1/index.css index 70fa80d..3d8c0d7 100644 --- a/App/src/Styles/v1/index.css +++ b/App/src/Styles/v1/index.css @@ -1,145 +1,146 @@ @font-face { - font-family: "victor mono"; - src: url("/Assets/VictorMono-Regular.ttf"); + font-family: "victor mono"; + src: url("/v1/Assets/VictorMono-Regular.ttf"); } :root { - --background-color: #282a36; - --border-color: #44475a; - --primary-color: #ff79c6; - --secondary-color: #bd93f9; - --text-color: #f8f8f2; - --link-color: #ffb86c; - --highlight-color: #8be9fd; + --background-color: #282a36; + --border-color: #44475a; + --primary-color: #ff79c6; + --secondary-color: #bd93f9; + --text-color: #f8f8f2; + --link-color: #ffb86c; + --highlight-color: #8be9fd; } body { - background-color: var(--background-color); - display: flex; - justify-content: center; - margin: 0; - padding: 0; - font-size: 18px; + background-color: var(--background-color); + display: flex; + justify-content: center; + margin: 0; + padding: 0; + font-size: 18px; } #content { - border-left: var(--border-color) solid; - border-right: var(--border-color) solid; - border-width: 1px; - max-width: 950px; - font-family: "victor mono"; - padding-left: 20px; - padding-right: 20px; - padding-bottom: 50px; - flex-grow: 1; + border-left: var(--border-color) solid; + border-right: var(--border-color) solid; + border-width: 1px; + max-width: 950px; + font-family: "victor mono"; + padding-left: 20px; + padding-right: 20px; + padding-bottom: 50px; + flex-grow: 1; } #content h1 { - color: var(--primary-color); - font-size: 50px; - margin-top: 20px; - margin-bottom: 20px; + color: var(--primary-color); + font-size: 50px; + margin-top: 20px; + margin-bottom: 20px; } #content .mainheader { - display: flex; - flex-direction: row; - justify-content: space-between; - align-items: center; + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; } #content .mainheader img { - margin-top: auto; - border: var(--border-color) solid; - border-radius: 50%; - width: 10%; + margin-top: auto; + border: var(--border-color) solid; + border-radius: 50%; + width: 10%; } #content h1 strong { - color: var(--secondary-color); + color: var(--secondary-color); } #content p { - color: var(--text-color); + color: var(--text-color); } strong { - color: var(--secondary-color); + color: var(--secondary-color); } i { - color: var(--highlight-color); + color: var(--highlight-color); } #content a { - color: var(--link-color); - font-style: normal; - text-decoration: none; + color: var(--link-color); + font-style: normal; + text-decoration: none; } #content a:hover { - background-color: var(--link-color); - color: var(--background-color); + background-color: var(--link-color); + color: var(--background-color); } #content .paragraphwpic { - display: flex; - flex-direction: row; - flex-wrap: wrap; + display: flex; + flex-direction: row; + flex-wrap: wrap; } #content .paragraphwpic p { - width: 30%; - flex-grow: 1; - margin-left: 5px; - margin-right: 5px; - margin-top: 0; + width: 30%; + flex-grow: 1; + margin-left: 5px; + margin-right: 5px; + margin-top: 0; } #content .paragraphwpic img, .small { - max-width: 500px; - width: 90%; - height: 90%; - margin-top: 5px; - border: var(--border-color) solid; - border-width: 1px; - margin-left: 5px; - margin-right: 5px; + max-width: 500px; + width: 90%; + height: 90%; + margin-top: 5px; + border: var(--border-color) solid; + border-width: 1px; + margin-left: 5px; + margin-right: 5px; } #content .paragraphwpic .small { - width: 40%; - height: 40%; + width: 40%; + height: 40%; } hr { - display: block; - height: 1px; - border: 0; - border-top: 1px solid var(--border-color); - margin: 0 0; - padding: 0; + display: block; + height: 1px; + border: 0; + border-top: 1px solid var(--border-color); + margin: 0 0; + padding: 0; } .commandline { - background-color: var(--border-color); - padding-left: 5px; - padding-right: 5px; + background-color: var(--border-color); + padding-left: 5px; + padding-right: 5px; } -.commandline > * { - color: var(--highlight-color) !important; + +.commandline>* { + color: var(--highlight-color) !important; } table { - border-collapse: collapse; - color: var(--link-color); + border-collapse: collapse; + color: var(--link-color); } th, td { - border-bottom: 1px dashed var(--link-color); - border-left: 1px solid var(--link-color); - border-right: 1px solid var(--link-color); - padding: 5px; + border-bottom: 1px dashed var(--link-color); + border-left: 1px solid var(--link-color); + border-right: 1px solid var(--link-color); + padding: 5px; } diff --git a/App/src/Styles/v2/common.css b/App/src/Styles/v2/common.css new file mode 100644 index 0000000..557fc25 --- /dev/null +++ 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; +} diff --git a/App/src/Styles/v2/navbar.css b/App/src/Styles/v2/navbar.css new file mode 100644 index 0000000..e69de29 diff --git a/App/src/Styles/v2/titlebar.css b/App/src/Styles/v2/titlebar.css new file mode 100644 index 0000000..7da148d --- /dev/null +++ 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; +} diff --git a/App/src/layouts/default.astro b/App/src/layouts/default.astro deleted file mode 100644 index 2fc81ba..0000000 --- a/App/src/layouts/default.astro +++ /dev/null @@ -1,22 +0,0 @@ ---- -const { title } = Astro.props; ---- - - - - - - - - -

{title}

-
- - -
- - diff --git a/App/src/layouts/v2/common.astro b/App/src/layouts/v2/common.astro new file mode 100644 index 0000000..cc19e59 --- /dev/null +++ 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"; +--- + + + + + + + +
+
+ + +
+
+ +
+
+ + diff --git a/App/src/pages/index.astro b/App/src/pages/index.astro index e69de29..560973c 100644 --- a/App/src/pages/index.astro +++ b/App/src/pages/index.astro @@ -0,0 +1,5 @@ +--- +import CommonLayout from "../layouts/v2/common.astro"; +--- + +pallw diff --git a/App/src/pages/old/blog.astro b/App/src/pages/v1/blog.astro similarity index 94% rename from App/src/pages/old/blog.astro rename to App/src/pages/v1/blog.astro index fc8bdcd..e1db4d1 100644 --- a/App/src/pages/old/blog.astro +++ b/App/src/pages/v1/blog.astro @@ -10,7 +10,7 @@ const posts = await Astro.glob("./posts/*.md"); - + Cakey's home directory diff --git a/App/src/pages/old/index.astro b/App/src/pages/v1/index.astro similarity index 94% rename from App/src/pages/old/index.astro rename to App/src/pages/v1/index.astro index 93f731e..3f21f27 100644 --- a/App/src/pages/old/index.astro +++ b/App/src/pages/v1/index.astro @@ -8,7 +8,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro"; - + Cakey's home directory @@ -57,7 +57,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro"; >Arch with KDE, which is a really nice combo.

- +
@@ -74,7 +74,7 @@ import FriendsRow from "../../Components/v1/FriendsRow.astro"; resonates with me so much, both in the anime ending, and the movie.

- +