From acb35d5dac5095ba90600bb3e60d08f3dd7bafd7 Mon Sep 17 00:00:00 2001 From: gil Date: Wed, 12 Jun 2024 11:02:17 -0500 Subject: [PATCH] Move layouts and partials to their own folders, delete sigils --- src/_data/meta.js | 2 +- src/_includes/{ => layouts}/base.njk | 2 +- src/_includes/{ => layouts}/landing.njk | 2 +- src/_includes/{ => layouts}/page.njk | 6 ++--- src/_includes/{ => partials}/footer.njk | 1 + src/_includes/{ => partials}/header.njk | 2 +- src/about.md | 32 ------------------------ src/css/css.json | 3 --- src/css/global.css | 4 +-- src/extra.md | 2 +- src/font/font.json | 3 --- src/img/book-border.png | Bin 1179 -> 0 bytes src/img/img.json | 3 --- src/img/sigil-a.png | Bin 242 -> 0 bytes src/img/sigil-da.png | Bin 143 -> 0 bytes src/img/sigil-la.png | Bin 137 -> 0 bytes src/img/sigil-nga.png | Bin 242 -> 0 bytes src/img/sigil-pa.png | Bin 204 -> 0 bytes src/img/sigil-sa.png | Bin 225 -> 0 bytes src/img/sigil-ta.png | Bin 199 -> 0 bytes src/index.md | 4 +-- src/main.md | 13 ++++++++++ src/ograph.md | 2 +- src/poems/index.md | 2 +- src/poems/poems.json | 1 - src/scss/global.scss | 4 +-- src/src.json | 3 +++ 27 files changed, 33 insertions(+), 58 deletions(-) rename src/_includes/{ => layouts}/base.njk (72%) rename src/_includes/{ => layouts}/landing.njk (84%) rename src/_includes/{ => layouts}/page.njk (52%) rename src/_includes/{ => partials}/footer.njk (88%) rename src/_includes/{ => partials}/header.njk (67%) delete mode 100644 src/about.md delete mode 100644 src/css/css.json delete mode 100644 src/font/font.json delete mode 100644 src/img/book-border.png delete mode 100644 src/img/img.json delete mode 100644 src/img/sigil-a.png delete mode 100644 src/img/sigil-da.png delete mode 100644 src/img/sigil-la.png delete mode 100644 src/img/sigil-nga.png delete mode 100644 src/img/sigil-pa.png delete mode 100644 src/img/sigil-sa.png delete mode 100644 src/img/sigil-ta.png create mode 100644 src/main.md create mode 100644 src/src.json diff --git a/src/_data/meta.js b/src/_data/meta.js index 990a7da..b7117e2 100644 --- a/src/_data/meta.js +++ b/src/_data/meta.js @@ -1,5 +1,5 @@ module.exports = { siteName: "Gil's Nexus", siteDescription: "", - authorName: "gil", + authorName: "Gil", }; diff --git a/src/_includes/base.njk b/src/_includes/layouts/base.njk similarity index 72% rename from src/_includes/base.njk rename to src/_includes/layouts/base.njk index af125e0..79aa453 100644 --- a/src/_includes/base.njk +++ b/src/_includes/layouts/base.njk @@ -6,7 +6,7 @@ {% if title %}{{ title }} | {% endif %}{{ meta.siteName }} - {% if layout != "landing.njk" %}{% else %}{% endif %} + {{ content | safe }} diff --git a/src/_includes/landing.njk b/src/_includes/layouts/landing.njk similarity index 84% rename from src/_includes/landing.njk rename to src/_includes/layouts/landing.njk index b357615..bebeb71 100644 --- a/src/_includes/landing.njk +++ b/src/_includes/layouts/landing.njk @@ -10,7 +10,7 @@
{{ content | safe }}
Enter
diff --git a/src/_includes/page.njk b/src/_includes/layouts/page.njk similarity index 52% rename from src/_includes/page.njk rename to src/_includes/layouts/page.njk index 8cffb67..420fcd2 100644 --- a/src/_includes/page.njk +++ b/src/_includes/layouts/page.njk @@ -1,11 +1,11 @@ --- -layout: base.njk +layout: layouts/base.njk --- -{% include "header.njk" %} +{% include "partials/header.njk" %}

{{ title }}

{{ content | safe }}
-{% include "footer.njk" %} \ No newline at end of file +{% include "partials/footer.njk" %} \ No newline at end of file diff --git a/src/_includes/footer.njk b/src/_includes/partials/footer.njk similarity index 88% rename from src/_includes/footer.njk rename to src/_includes/partials/footer.njk index ce8ccdb..d3e4f17 100644 --- a/src/_includes/footer.njk +++ b/src/_includes/partials/footer.njk @@ -1,4 +1,5 @@ \ No newline at end of file diff --git a/src/_includes/header.njk b/src/_includes/partials/header.njk similarity index 67% rename from src/_includes/header.njk rename to src/_includes/partials/header.njk index 8e33165..ec1da44 100644 --- a/src/_includes/header.njk +++ b/src/_includes/partials/header.njk @@ -1,4 +1,4 @@
- +
\ No newline at end of file diff --git a/src/about.md b/src/about.md deleted file mode 100644 index 4eeadbf..0000000 --- a/src/about.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -layout: page.njk -date: Last Modified -eleventyNavigation: - key: About ---- - -Me, a brown-haired, brown-eyed man with round glasses, smiling. The picture is filtered to mimic the Game Boy Camera and create a retro vibe. - -# About me - -## The basics - -Sigil Nga Name: Gil -Sigil Pa Pronouns: he, they -Sigil Ta Age: 25 -Sigil La Creating: Software & games -Sigil Sa Writing: Poems, fiction, essays -Sigil Da Formerly: Electrical engineering student, student activist -Sigil A Building: [Ograph Collective](../ograph) - -## Social links - -- [Hot takes](https://hol.ogra.ph/@gil) fresh off the ol' brain (Sharkey) -- [Hard-coded spells](https://ide.ogra.ph/gil) (code projects) to cast (Forgejo) -- It's [really me](https://aut.ogra.ph/aspe:keyoxide.org:7IW4QEA4DIBL3YORQH3HTEGDKM), I swear! (Keyoxide) -- Peruse the [scrapbook](https://pixelfed.social/kalanggam) (Pixelfed) -- Check out my [bookshelf](https://bookwyrm.social/user/kalanggam) (Bookwyrm) - -## Support me - -Buy Me A Coffee diff --git a/src/css/css.json b/src/css/css.json deleted file mode 100644 index 15680bc..0000000 --- a/src/css/css.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "eleventyExcludeFromCollections": true -} \ No newline at end of file diff --git a/src/css/global.css b/src/css/global.css index 5ed8f97..24f3353 100644 --- a/src/css/global.css +++ b/src/css/global.css @@ -106,8 +106,8 @@ article { main.page, article.page { border: 32px solid transparent; - border-image: url(../img/nine-patch.png) 32 round; - -webkit-border-image: url(../img/nine-patch.png) 32 round; + border-image: url(/img/nine-patch.png) 32 round; + -webkit-border-image: url(/img/nine-patch.png) 32 round; background-color: rgb(255, 252, 240); color: #802659; box-shadow: 0 8px rgb(52, 51, 49); diff --git a/src/extra.md b/src/extra.md index 6b84412..61e3ebc 100644 --- a/src/extra.md +++ b/src/extra.md @@ -1,6 +1,6 @@ --- title: Extra -layout: page.njk +layout: layouts/page.njk date: Last Modified eleventyNavigation: key: Extra diff --git a/src/font/font.json b/src/font/font.json deleted file mode 100644 index 15680bc..0000000 --- a/src/font/font.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "eleventyExcludeFromCollections": true -} \ No newline at end of file diff --git a/src/img/book-border.png b/src/img/book-border.png deleted file mode 100644 index 07482879e39af190824ef9ddfd4696617fc05c85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1179 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>Ugp~(`KdGATW{y-&->&CD(JEH8alC1mDbekG&&ebecf zW7~M={_p}*Xd_iSjBz+5W0D@ROi)F`?DuLItw}6 zV{tHcXuZ$(b`#5Se$V@CcUcy5CVdXJUsi3qSU}`lF~ds!bxsQydEG>tn%GPvq!f5~ zGng_QgdLe%7BU{Xz>t{HU|`|^78ht^<8U4jVL`(McXhk(tNl67Yp!t1KFFXj)>?4C zuY~A^hiprXHS1p;E7NANt~oGkU!3FysZPbZ*(*-7+%8;VaQAiM#(aSt&Sf{5{_OeP zd~}~<^2*0t@&ytL+ShLn-I`=7WX!iEbi?8B`?__rH8|quZ@V;qU)+4#T2rCJ=U$dI z?{|9raF=WYSNzl0dzz1(dug_hzvt0|ecZce-e+jgpZ)%I?H=8u?Pu4sp5LkV-i%9O zuIEFm+Gp$cSN`j`+avjJ_4VW(Hv0{xsrUz|IbOalKBr~<<@AX6^_|VXa~NN&;E(Il zef&(Tb?J?wwf+D1KmYXS(9b>hK5J(&OyKDmqI)SoL?E?1WDoxefusF3euSSD2Yj z888^^Uce<4Agjt75Ps0nSAbW;HATov%k2`SoH&#&}!;7_RPIgb}mnY;aiiI!VCLJ3!brae2kvJr>oJsT3tlM zZh`25(qBA>FBYzOQYZM=&Yyru|8ec-x%~z{~Pb4xBqtS_x*n6ib|iK zU$6PA|1CFL87{OW@$~j3*nd16zy0v_nIDdE%~nWdoUs4<&p)@^?(*#j{b}*@WJLJG z*IVT|Bxa=YFTarQ6wg_v@4#D|$==j7|HCHrti=p{ld418b02fX+iyraD0gz%2KK0z zw|DMqwtaAhPwqrJKZ7iH@n(Mpu5-*wzP&i8{bymPaqwhb+Zkm^hopPx#tVu*cR7i>KmP-!6AP7Xk``_8FOd6GO__%XcO$1)15=wdiik9j6am4!0jp>Tr2dD^in@aNP42rI z>N{syS7sg5Amw_nYp|;BT%NoJ`i)t4+x!8$?e6#xN8Oou%sgXVyXIL2NDbYJ sw~?Oi%yt!7id@?jQg~VQz|tG>2f|SuESYYn`Tzg`07*qoM6N<$f*3+)R{#J2 diff --git a/src/img/sigil-da.png b/src/img/sigil-da.png deleted file mode 100644 index 753a4d5d51c22b65a25329cdc174762d49915edd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0dV^7dGW-ieFoV_yF|6a)})M}m11X1+2|MCUo5V2@?Fz6jWYT0Tk?!z>}(M5O?p~Q e+S5n&#f(K~Sq*j`y=@LOj=|H_&t;ucLK6TF4=Q~C diff --git a/src/img/sigil-nga.png b/src/img/sigil-nga.png deleted file mode 100644 index 73a0498b0522633e27061908d257bb49224baa6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 242 zcmVPx#tVu*cR7i=E@gv}F0jtDmoBx>1&ktE?RpmB>Go8n&3KUk zeZedc3);O80E8R{l6B&laU`MHGZg9tLa-Us15`a*iFOSTn5EFbpfF0hXflyNIu9&0 z_7Q{B<<6Ax->{nee$@t5c2BZMztmweWpqy`3Ztx;XtK~B1%XjgiOi>wwa=z7_NML{ s%eW0R!nT4$o-)$=V|mpN5EIhM#Gnx-_$DvCU75||;qDoJrgQ|m&VX-!5EQe8=^8ckCb_1PM2BzUY612WnVE);cZ z)ahZ1l;E{WmdKI;Vst0QC+> AZ2$lO diff --git a/src/img/sigil-sa.png b/src/img/sigil-sa.png deleted file mode 100644 index d175ed9fa67fa7e50865341ddb6bdb997ae169b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0d7uFU#@^4m<+G3F6 zDzYN+%*y72vSOC^1T=2xaGYR~`Z&*Uf?1vKfkP1|SfAeZXsBxlE6Mp~6!bN8%V&lk X%o@s{celm^oyp+o>gTe~DWM4fBFR%T diff --git a/src/img/sigil-ta.png b/src/img/sigil-ta.png deleted file mode 100644 index da33ec31361b2ac5d2a83752c50543ad26d8470c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^(jd&i1|)m0dVJ>vkH+s(h6bg!TOy+0TKsZFmmFvlV8}^Y zA$|DJG68O5N1ii0sfOZH4&Dh6;dT_%;i=px^5o#938IS~#Cq7y8fblKy|_?Nt?{0L w + +# Home + +## Support me + +Buy Me A Coffee diff --git a/src/ograph.md b/src/ograph.md index 156cfe0..981d4e2 100644 --- a/src/ograph.md +++ b/src/ograph.md @@ -1,6 +1,6 @@ --- title: Ograph Collective -layout: page.njk +layout: layouts/page.njk date: Last Modified eleventyNavigation: key: Ograph diff --git a/src/poems/index.md b/src/poems/index.md index 2e6e970..63bd5a0 100644 --- a/src/poems/index.md +++ b/src/poems/index.md @@ -1,6 +1,6 @@ --- title: Poetry -layout: page.njk +layout: layouts/page.njk permalink: /poetry/ override:tags: [] eleventyNavigation: diff --git a/src/poems/poems.json b/src/poems/poems.json index dc01a49..b32662e 100644 --- a/src/poems/poems.json +++ b/src/poems/poems.json @@ -1,4 +1,3 @@ { - "layout": "page.njk", "tags": "poems" } \ No newline at end of file diff --git a/src/scss/global.scss b/src/scss/global.scss index a5d711e..a2a20a9 100644 --- a/src/scss/global.scss +++ b/src/scss/global.scss @@ -43,8 +43,8 @@ article { &.page { border: 32px solid transparent; - border-image: url(../img/nine-patch.png) 32 round; - -webkit-border-image: url(../img/nine-patch.png) 32 round; + border-image: url(/img/nine-patch.png) 32 round; + -webkit-border-image: url(/img/nine-patch.png) 32 round; background-color: #{colors.$paper}; color: $fg; box-shadow: 0 8px #{colors.$base-850}; diff --git a/src/src.json b/src/src.json new file mode 100644 index 0000000..9cfa3b3 --- /dev/null +++ b/src/src.json @@ -0,0 +1,3 @@ +{ + "layout": "layouts/page.njk" +} \ No newline at end of file