Merge pull request #1 from ryanccn/some-refactors

some refactors
author: seth <[email protected]> 2023-03-17 09:16:29 -0400
committer: GitHub <[email protected]> 2023-03-17 09:16:29 -0400
commit: b33c5d086dddf4462121ac7cfc60e2ac4e0093e2 (patch)
tree: 65abf5cf13cab666ca20202efc9d55917178466f /src
parent: 60006032a9a6aab6495e340aedf47b1ccd957aca (diff)
parent: 9b9488da6add4b0555206e99bb2949f449469777 (diff)
7 files changed, 114 insertions, 118 deletions
diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk
index ba0fca3..cd1e66c 100644
--- a/src/_includes/layouts/base.njk
+++ b/src/_includes/layouts/base.njk
@@ -1,33 +1,21 @@
-{% block header %}
-  <!DOCTYPE html>
-  <html lang="en">
-    <head>
-      <meta charset="utf-8"/>
-      <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-      <title>{{ title }}</title>
-      <meta name="description" content="{{ description }}"/>
-      <meta name="viewport" content="width=device-width, initial-scale=1"/>
-      <link rel="stylesheet" href="/guzzle.css"/>
-    </head>
-  {% endblock %}
-  <body>
-    {% block container %}
-      <div class="container">
-        {% block body %}
-          <div class="content">
-            {% block content %}
-              {{ content | safe }}
-            {% endblock %}
-          </div>
-        {% endblock %}
-      {% endblock %}
-    </div>
-    <br \>
-    <footer>
-      {% block footer %}
-        <a href="https://github.com/getchoo/getchoo.github.io">source</a>
-        commit:
-      {% endblock %}
-    </footer>
-  </body>
-</html>
-\ No newline at end of file
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<meta charset="utf-8" />
+		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+		<title>{{ title }}</title>
+		<meta name="description" content="{{ description }}" />
+		<meta name="viewport" content="width=device-width, initial-scale=1" />
+		<link rel="stylesheet" href="/guzzle.css" />
+		<script type="module" src="/js/chrisApp.js"></script>
+	</head>
+	<body>
+		{{ content | safe }}
+		{% block footer %}
+		<footer>
+			<a href="https://github.com/getchoo/getchoo.github.io">source</a>
+			commit: {{ gitRevision }}
+		</footer>
+		{% endblock %}
+	</body>
+</html>
diff --git a/src/_includes/layouts/index.njk b/src/_includes/layouts/index.njk
deleted file mode 100644
index 858569a..0000000
--- a/src/_includes/layouts/index.njk
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "_includes/layouts/base.njk" %}
-{% block body %}
-  {{ super () }}
-  <div class="gifs">
-    <script type="module" src="/js/chrisApp.js"></script>
-    <img src="/imgs/gifs/legalize.gif" alt="legalize now!"/>
-    <img src="/imgs/gifs/acab.gif" alt="acab"/>
-    <img src="/imgs/gifs/poweredbyfedora.gif" alt="powered by fedora"/>
-    <img src="/imgs/gifs/capitalism.gif" alt="let's crush capitalism!"/>
-    <br/> <img src="/imgs/gifs/anybrowser.gif" alt="best viewed with any browser"/>
-    <img src="/imgs/gifs/weezer.gif" alt="weezer fan"/>
-    <img src="/imgs/gifs/steam.gif" alt="play with steam"/>
-    <img src="/imgs/gifs/vi.gif" alt="made with vi"/>
-    <img src="/imgs/gifs/pride.gif" alt="pride"/>
-    <img src="/imgs/gifs/imagine.gif" alt="imagination"/>
-    <br/> <img src="/imgs/gifs/moz.gif" alt="mozilla is cool"/>
-    <img src="/imgs/gifs/free.gif" alt="completely free software"/>
-    <img src="/imgs/gifs/gimp.gif" alt="graphics by gimp"/>
-    <img src="/imgs/gifs/explorer.gif" alt="marijuana mind explorer"/>
-    <img src="/imgs/gifs/jsfree.gif" alt="javascript free"/>
-    <img src="/imgs/gifs/web3.gif" alt="keep the web free! say no to web3!"/>
-    <img src="/imgs/gifs/tired.gif" alt="tired"/>
-    <img src="/imgs/gifs/arnold.gif" alt="hey arnold!"/>
-    <img src="/imgs/gifs/bob.gif" alt="powered by bob"/>
-    <img src="/imgs/gifs/counterstrike.gif" alt="counter-strike player"/>
-    <img src="/imgs/gifs/chris.gif" alt="chris troll" id="chris_gif"/>
-  </div>
-{% endblock %}
-\ No newline at end of file
diff --git a/src/_includes/layouts/page.njk b/src/_includes/layouts/page.njk
new file mode 100644
index 0000000..c822fd8
--- /dev/null
+++ b/src/_includes/layouts/page.njk
@@ -0,0 +1,34 @@
+---
+layout: "layouts/base.njk"
+---
+
+<div class="container">
+	<div class="content">
+		{{ content | safe }}
+	</div>
+	<div class="gifs">
+		<img src="/imgs/gifs/legalize.gif" width="88" height="31" loading="lazy" decoding="async" alt="legalize now!" />
+		<img src="/imgs/gifs/acab.gif" width="88" height="31" loading="lazy" decoding="async" alt="acab" />
+		<img src="/imgs/gifs/poweredbyfedora.gif" width="88" height="31" loading="lazy" decoding="async" alt="powered by fedora" />
+		<img src="/imgs/gifs/capitalism.gif" width="88" height="31" loading="lazy" decoding="async" alt="let's crush capitalism!" />
+		<br>
+		<img src="/imgs/gifs/anybrowser.gif" width="88" height="31" loading="lazy" decoding="async" alt="best viewed with any browser" />
+		<img src="/imgs/gifs/weezer.gif" width="88" height="31" loading="lazy" decoding="async" alt="weezer fan" />
+		<img src="/imgs/gifs/steam.gif" width="88" height="31" loading="lazy" decoding="async" alt="play with steam" />
+		<img src="/imgs/gifs/vi.gif" width="88" height="31" loading="lazy" decoding="async" alt="made with vi" />
+		<img src="/imgs/gifs/pride.gif" width="88" height="31" loading="lazy" decoding="async" alt="pride" />
+		<img src="/imgs/gifs/imagine.gif" width="88" height="31" loading="lazy" decoding="async" alt="imagination" />
+		<br>
+		<img src="/imgs/gifs/moz.gif" width="88" height="31" loading="lazy" decoding="async" alt="mozilla is cool" />
+		<img src="/imgs/gifs/free.gif" width="88" height="31" loading="lazy" decoding="async" alt="completely free software" />
+		<img src="/imgs/gifs/gimp.gif" width="88" height="31" loading="lazy" decoding="async" alt="graphics by gimp" />
+		<img src="/imgs/gifs/explorer.gif" width="88" height="31" loading="lazy" decoding="async" alt="marijuana mind explorer" />
+		<img src="/imgs/gifs/jsfree.gif" width="88" height="31" loading="lazy" decoding="async" alt="javascript free" />
+		<img src="/imgs/gifs/web3.gif" width="88" height="31" loading="lazy" decoding="async" alt="keep the web free! say no to web3!" />
+		<img src="/imgs/gifs/tired.gif" width="88" height="31" loading="lazy" decoding="async" alt="tired" />
+		<img src="/imgs/gifs/arnold.gif" width="88" height="31" loading="lazy" decoding="async" alt="hey arnold!" />
+		<img src="/imgs/gifs/bob.gif" width="88" height="31" loading="lazy" decoding="async" alt="powered by bob" />
+		<img src="/imgs/gifs/counterstrike.gif" width="88" height="31" loading="lazy" decoding="async" alt="counter-strike player" />
+		<img src="/imgs/gifs/chris.gif" width="88" height="31" loading="lazy" decoding="async" alt="chris troll" id="chris_gif" />
+	</div>
+</div>
diff --git a/src/guzzle.sass b/src/guzzle.sass
index a5403e1..d3ab79b 100644
--- a/src/guzzle.sass
+++ b/src/guzzle.sass
@@ -4,50 +4,54 @@ $fonts: "Fira Code", monospace
 $foreground-color: #1e1e2e
 
 .container
-  background-color: #b4befe
+	background-color: #b4befe
 
-  display: inline-flex
-  flex: 1 1 auto
-  flex-direction: column
-  align-items: center
-  justify-content: center
+	display: flex
+	flex: 1 1 auto
+	flex-direction: column
+	align-items: center
+	justify-content: center
 
-  margin-left: 20%
-  margin-right: 20%
-  margin-top: 8%
+	width: fit-content
 
-  padding: 10px
+	margin-left: auto
+	margin-right: auto
+	margin-top: 8%
+
+	padding: 20px
 
 body
-  background-color: $foreground-color
-  font-family: $fonts
+	background-color: $foreground-color
+	font-family: $fonts
+
+	padding: 10px 36px
 
-  p,li
-    font-size: 16px
+	p,li
+		font-size: 16px
 
-  h
-    font-size: 24px
+	h
+		font-size: 24px
 
 footer
-  font-size: 10px
-  color: white
-  padding: 10px
-  justify-content: center
-  text-align: center
+	font-size: 10px
+	color: white
+	padding: 10px
+	justify-content: center
+	text-align: center
 
 .content
-  display: inline-block
-  text-align: center
-  padding: 5px
-  margin: 5px
+	display: inline-block
+	text-align: center
+	padding: 5px
+	margin: 5px
 
 .gifs
-  background-color: $foreground-color
-  display: inline-block
-  text-align: center
-  padding: 5px
-  margin: 5px
+	background-color: $foreground-color
+	display: inline-block
+	text-align: center
+	padding: 5px
+	margin: 5px
 
 #vidya
-  display: flex
-  justify-content: center
+	display: flex
+	justify-content: center
diff --git a/src/index.md b/src/index.md
index 42048b9..360a17e 100644
--- a/src/index.md
+++ b/src/index.md
@@ -1,5 +1,5 @@
 ---
-layout: layouts/index.njk
+layout: layouts/page.njk
 title: guzzle guzzle
 description: getchoo's website
 ---
@@ -10,4 +10,4 @@ this is under construction. i'm experimenting with lume
 
 ![construction](/imgs/construction.png)
 
-[click here](/lul)
-\ No newline at end of file
+[click here](/lul/)
diff --git a/src/js/chrisApp.js b/src/js/chrisApp.js
index bf51176..4881b7a 100644
--- a/src/js/chrisApp.js
+++ b/src/js/chrisApp.js
@@ -1,23 +1,23 @@
 const chrisURL = "/imgs/chris/";
 
 function randomChris() {
-	const files = [
-		"chis_very_fried.jpg",
-		"chris_medium_fried.jpg",
-		"chris_moshed.jpg",
-		"fried_publisher.jpg",
-		"help_me.png",
-		"nice_chris.png",
-		"nice_publisher.png",
-		"bkender_bauob.jpg",
-		"blurry_chris.jpg",
-	];
+  const files = [
+    "chis_very_fried.jpg",
+    "chris_medium_fried.jpg",
+    "chris_moshed.jpg",
+    "fried_publisher.jpg",
+    "help_me.png",
+    "nice_chris.png",
+    "nice_publisher.png",
+    "bkender_bauob.jpg",
+    "blurry_chris.jpg",
+  ];
 
-	// this chooses a random file from the array
-	const url = chrisURL + files[Math.floor(Math.random() * files.length)];
+  // this chooses a random file from the array
+  const url = chrisURL + files[Math.floor(Math.random() * files.length)];
 
-	window.location.href = url;
+  window.location.href = url;
 }
 
-var chris = document.getElementById("chris_gif");
+const chris = document.getElementById("chris_gif");
 chris.addEventListener("click", randomChris);
diff --git a/src/lul.njk b/src/lul.njk
index 0e19c9f..100220c 100644
--- a/src/lul.njk
+++ b/src/lul.njk
@@ -1,13 +1,11 @@
 ---
 title: fard
 description: xd
+layout: "layouts/base.njk"
 ---
 
-{% extends "_includes/layouts/base.njk" %}
-{% block container %}
-  <div id="vidya">
-    <video width="1280" height="720" controls="controls" autoplay="autoplay" muted="muted">
-      <source src="/files/rickroll.mp4" type="video/mp4"/>
-    </video>
-  </div>
-{% endblock %}
-\ No newline at end of file
+<div id="vidya">
+	<video width="1280" height="720" controls autoplay muted>
+		<source src="/files/rickroll.mp4" type="video/mp4"/>
+	</video>
+</div>
author	seth <[email protected]>	2023-03-17 09:16:29 -0400
committer	GitHub <[email protected]>	2023-03-17 09:16:29 -0400
commit	b33c5d086dddf4462121ac7cfc60e2ac4e0093e2 (patch)
tree	65abf5cf13cab666ca20202efc9d55917178466f /src
parent	60006032a9a6aab6495e340aedf47b1ccd957aca (diff)
parent	9b9488da6add4b0555206e99bb2949f449469777 (diff)