diff options
| -rw-r--r-- | .github/workflows/deploy.yaml | 10 | ||||
| -rw-r--r-- | _config.ts | 25 | ||||
| -rw-r--r-- | src/_includes/layouts/base.njk | 46 | ||||
| -rw-r--r-- | src/_includes/layouts/index.njk | 28 | ||||
| -rw-r--r-- | src/_includes/layouts/page.njk | 35 | ||||
| -rw-r--r-- | src/guzzle.sass | 12 | ||||
| -rw-r--r-- | src/index.md | 4 | ||||
| -rw-r--r-- | src/js/chrisApp.js | 30 | ||||
| -rw-r--r-- | src/lul.njk | 14 |
9 files changed, 110 insertions, 94 deletions
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 691cf6c..382cdbe 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -21,11 +21,9 @@ jobs: uses: denoland/setup-deno@v1 with: deno-version: v1.31.3 - + - name: build site - run: | - sed -i "s/commit:/commit: $GITHUB_SHA/" src/_includes/layouts/base.njk - deno task build + run: deno task build - name: setup pages uses: actions/configure-pages@v3 @@ -34,7 +32,7 @@ jobs: uses: actions/upload-pages-artifact@v1 with: path: '_site' - + - name: deploy id: deployment - uses: actions/deploy-pages@v1
\ No newline at end of file + uses: actions/deploy-pages@v1 @@ -8,8 +8,8 @@ import sass from "lume/plugins/sass.ts"; import sitemap from "lume/plugins/sitemap.ts"; const site = lume({ - src: "./src", - location: new URL("https://getchoo.github.io"), + src: "./src", + location: new URL("https://getchoo.github.io"), }); site.use(attributes()); @@ -19,7 +19,28 @@ site.use(date()); site.use(remark()); site.use(sass()); site.use(sitemap()); + +const getGitRevision = async () => { + const p = Deno.run({ + cmd: ["git", "rev-parse", "HEAD"], + stdout: "piped", + }); + const [status, output] = await Promise.all([p.status(), p.output()]); + + if (status.success) { + return new TextDecoder().decode(output).trim(); + } + + return null; +}; + +site.data( + "gitRevision", + await getGitRevision(), +); + site.ignore("README.md", "LICENSE", ".gitignore", ".gitattributes"); + site.copy("imgs"); site.copy("files"); site.copy("js"); diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index ba0fca3..b0fb268 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 %} +<!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> - {% block container %} - <div class="container"> - {% block body %} - <div class="content"> - {% block content %} - {{ content | safe }} - {% endblock %} - </div> - {% endblock %} - {% endblock %} - </div> - <br \> + {{ content | safe }} + {% block footer %} <footer> - {% block footer %} - <a href="https://github.com/getchoo/getchoo.github.io">source</a> - commit: - {% endblock %} + <a href="https://github.com/getchoo/getchoo.github.io">source</a> + commit: {{ gitRevision }} </footer> + {% endblock %} </body> -</html>
\ No newline at end of file +</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..7eb4218 --- /dev/null +++ b/src/_includes/layouts/page.njk @@ -0,0 +1,35 @@ +--- +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!" /> + <br> + <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..dc595ad 100644 --- a/src/guzzle.sass +++ b/src/guzzle.sass @@ -6,22 +6,26 @@ $foreground-color: #1e1e2e .container background-color: #b4befe - display: inline-flex + display: flex flex: 1 1 auto flex-direction: column align-items: center justify-content: center - margin-left: 20% - margin-right: 20% + width: fit-content + + margin-left: auto + margin-right: auto margin-top: 8% - padding: 10px + padding: 20px body background-color: $foreground-color font-family: $fonts + padding: 10px 36px + p,li font-size: 16px 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  -[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..d0e249a 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> |