From 0adf1cf9a2fc3fb6e270f67166c44a587a477dc5 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:17:52 +0800 Subject: some refactors --- src/_includes/layouts/base.njk | 70 ++++++++++++------------------------------ src/_includes/layouts/page.njk | 35 +++++++++++++++++++++ src/index.md | 6 ++-- src/js/chrisApp.js | 30 +++++++++--------- src/lul.njk | 15 ++++----- 5 files changed, 79 insertions(+), 77 deletions(-) create mode 100644 src/_includes/layouts/page.njk diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index f23e0b3..8688c95 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -1,53 +1,21 @@ -{% block header %} - - - - - - {{ title }} - - - - - {% endblock %} + + + + + + {{ title }} + + + + + -

- {% block content %} - {{ content | safe }} - {% endblock %} -

- {% block footer %} -

- - legalize now!

- {% endblock %} -

+ {{ content | safe }} + {% block footer %} + + {% 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" +--- + +

+ {{ content | safe }} +

+
+

diff --git a/src/index.md b/src/index.md index 193f881..360a17e 100644 --- a/src/index.md +++ b/src/index.md @@ -1,5 +1,5 @@ --- -layout: layouts/base.njk +layout: layouts/page.njk title: guzzle guzzle description: getchoo's website --- @@ -8,4 +8,6 @@ description: getchoo's website this is under construction. i'm experimenting with lume -![construction](/imgs/construction.png) \ No newline at end of file +![construction](/imgs/construction.png) + +[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 db2aa35..d0e249a 100644 --- a/src/lul.njk +++ b/src/lul.njk @@ -1,14 +1,11 @@ --- title: fard description: xd +layout: "layouts/base.njk" --- -{% extends "_includes/layouts/base.njk" %} -{% block body %} -

-{% endblock %} -{% block footer %}{% endblock %} \ No newline at end of file +

-- cgit v1.2.3 From 03c5675b909d07561777d2a1e88a856cec5f6ff6 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:44:47 +0800 Subject: refactor: retrieve Git revision from Lume --- .github/workflows/deploy.yaml | 10 ++++------ _config.ts | 25 +++++++++++++++++++++++-- src/_includes/layouts/base.njk | 2 +- src/_includes/layouts/index.njk | 28 ---------------------------- 4 files changed, 28 insertions(+), 37 deletions(-) delete mode 100644 src/_includes/layouts/index.njk 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 diff --git a/_config.ts b/_config.ts index d457326..1a2f473 100644 --- a/_config.ts +++ b/_config.ts @@ -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 8688c95..b0fb268 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -14,7 +14,7 @@ {% block footer %} {% endblock %} 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 () }} -

- -

-{% endblock %} \ No newline at end of file -- cgit v1.2.3 From 72aaaa572802768f72bb72619d0ac66bfa5affb6 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:53:54 +0800 Subject: fix: stylistic changes --- src/guzzle.sass | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/guzzle.sass b/src/guzzle.sass index a5403e1..ebd7f8d 100644 --- a/src/guzzle.sass +++ b/src/guzzle.sass @@ -6,22 +6,24 @@ $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% - margin-top: 8% + width: fit-content - padding: 10px + margin-left: auto + margin-right: auto + margin-top: 8% body background-color: $foreground-color font-family: $fonts + padding: 10px 36px + p,li font-size: 16px -- cgit v1.2.3 From 681eda28c92996ea84d88f8dc3bf8041fde5bd39 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 17 Mar 2023 20:58:57 +0800 Subject: design: increase main content padding --- src/guzzle.sass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/guzzle.sass b/src/guzzle.sass index ebd7f8d..dc595ad 100644 --- a/src/guzzle.sass +++ b/src/guzzle.sass @@ -18,6 +18,8 @@ $foreground-color: #1e1e2e margin-right: auto margin-top: 8% + padding: 20px + body background-color: $foreground-color font-family: $fonts -- cgit v1.2.3 From a229a61dde13bb23dcf1359a5bc693e9836e0e09 Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 17 Mar 2023 13:06:19 +0000 Subject: fix: remove line break in gifs --- src/_includes/layouts/page.njk | 1 - 1 file changed, 1 deletion(-) diff --git a/src/_includes/layouts/page.njk b/src/_includes/layouts/page.njk index 7eb4218..801a129 100644 --- a/src/_includes/layouts/page.njk +++ b/src/_includes/layouts/page.njk @@ -27,7 +27,6 @@ layout: "layouts/base.njk"

-- cgit v1.2.3 From 0601dcac61c88622a9c1b745f1e2812a4659714f Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 17 Mar 2023 21:09:45 +0800 Subject: t a b s --- .github/workflows/deploy.yaml | 50 +++++++++++++++---------------- src/_includes/layouts/base.njk | 36 +++++++++++----------- src/_includes/layouts/page.njk | 58 +++++++++++++++++------------------ src/guzzle.sass | 68 +++++++++++++++++++++--------------------- src/lul.njk | 6 ++-- 5 files changed, 109 insertions(+), 109 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 382cdbe..b79089c 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,38 +1,38 @@ name: deploy to gh pages on: - push: - branches: [main] - workflow_dispatch: + push: + branches: [main] + workflow_dispatch: permissions: - contents: read - pages: write - id-token: write + contents: read + pages: write + id-token: write jobs: - build: - runs-on: ubuntu-latest + build: + runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 + steps: + - uses: actions/checkout@v3 - - name: setup deno - uses: denoland/setup-deno@v1 - with: - deno-version: v1.31.3 + - name: setup deno + uses: denoland/setup-deno@v1 + with: + deno-version: v1.31.3 - - name: build site - run: deno task build + - name: build site + run: deno task build - - name: setup pages - uses: actions/configure-pages@v3 + - name: setup pages + uses: actions/configure-pages@v3 - - name: upload artifact - uses: actions/upload-pages-artifact@v1 - with: - path: '_site' + - name: upload artifact + uses: actions/upload-pages-artifact@v1 + with: + path: '_site' - - name: deploy - id: deployment - uses: actions/deploy-pages@v1 + - name: deploy + id: deployment + uses: actions/deploy-pages@v1 diff --git a/src/_includes/layouts/base.njk b/src/_includes/layouts/base.njk index b0fb268..cd1e66c 100644 --- a/src/_includes/layouts/base.njk +++ b/src/_includes/layouts/base.njk @@ -1,21 +1,21 @@ - - - - {{ title }} - - - - - - - {{ content | safe }} - {% block footer %} - - {% endblock %} - + + + + {{ title }} + + + + + + + {{ content | safe }} + {% block footer %} + + {% endblock %} + diff --git a/src/_includes/layouts/page.njk b/src/_includes/layouts/page.njk index 7eb4218..1ae8d58 100644 --- a/src/_includes/layouts/page.njk +++ b/src/_includes/layouts/page.njk @@ -3,33 +3,33 @@ layout: "layouts/base.njk" ---

- {{ content | safe }} -

-
-

+ {{ content | safe }} +

+
+

diff --git a/src/guzzle.sass b/src/guzzle.sass index dc595ad..d3ab79b 100644 --- a/src/guzzle.sass +++ b/src/guzzle.sass @@ -4,54 +4,54 @@ $fonts: "Fira Code", monospace $foreground-color: #1e1e2e .container - background-color: #b4befe + background-color: #b4befe - display: 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 - width: fit-content + width: fit-content - margin-left: auto - margin-right: auto - margin-top: 8% + margin-left: auto + margin-right: auto + margin-top: 8% - padding: 20px + padding: 20px body - background-color: $foreground-color - font-family: $fonts + background-color: $foreground-color + font-family: $fonts - padding: 10px 36px + 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/lul.njk b/src/lul.njk index d0e249a..100220c 100644 --- a/src/lul.njk +++ b/src/lul.njk @@ -5,7 +5,7 @@ layout: "layouts/base.njk" ---

-- cgit v1.2.3