From c4c26c0b4ffeee401d0ca2a0a2945350d42228e5 Mon Sep 17 00:00:00 2001 From: sashinexists Date: Thu, 9 Jan 2025 06:13:01 +1100 Subject: [PATCH] misc update --- .dockerignore | 1 + .github/deploy-to-netlify.yaml | 32 ++++ build/.dockerignore | 1 + build/Dockerfile | 3 + build/about.html | 48 +++++ build/favicon.ico | Bin 0 -> 15406 bytes build/fly.toml | 22 +++ build/index.html | 32 ++++ build/now.html | 44 +++++ build/styles/main.css | 188 +++++++++++++++++++ build/subscribe.html | 46 +++++ build/support.html | 44 +++++ build/templates/default.ori.html | 18 ++ build/templates/partials/article.ori.html | 9 + build/templates/partials/footer.ori.html | 3 + build/templates/partials/header.ori.html | 4 + build/templates/partials/navigation.ori.html | 9 + build/templates/partials/view-card.ori.html | 3 + build/templates/partials/view-cards.ori.html | 3 + build/views/all-religions-are-wrong.html | 44 +++++ build/views/index.html | 44 +++++ build/views/there-is-no-god.html | 44 +++++ build/views/we-can-feed-everyone.html | 44 +++++ build/views/we-do-not-need-hierarchies.html | 44 +++++ build/views/we-should-not-eat-animals.html | 47 +++++ package-lock.json | 38 ++-- package.json | 2 +- 27 files changed, 797 insertions(+), 20 deletions(-) create mode 100644 .dockerignore create mode 100644 .github/deploy-to-netlify.yaml create mode 100644 build/.dockerignore create mode 100644 build/Dockerfile create mode 100644 build/about.html create mode 100644 build/favicon.ico create mode 100644 build/fly.toml create mode 100644 build/index.html create mode 100644 build/now.html create mode 100644 build/styles/main.css create mode 100644 build/subscribe.html create mode 100644 build/support.html create mode 100644 build/templates/default.ori.html create mode 100644 build/templates/partials/article.ori.html create mode 100644 build/templates/partials/footer.ori.html create mode 100644 build/templates/partials/header.ori.html create mode 100644 build/templates/partials/navigation.ori.html create mode 100644 build/templates/partials/view-card.ori.html create mode 100644 build/templates/partials/view-cards.ori.html create mode 100644 build/views/all-religions-are-wrong.html create mode 100644 build/views/index.html create mode 100644 build/views/there-is-no-god.html create mode 100644 build/views/we-can-feed-everyone.html create mode 100644 build/views/we-do-not-need-hierarchies.html create mode 100644 build/views/we-should-not-eat-animals.html diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..c2658d7 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules/ diff --git a/.github/deploy-to-netlify.yaml b/.github/deploy-to-netlify.yaml new file mode 100644 index 0000000..483a9e4 --- /dev/null +++ b/.github/deploy-to-netlify.yaml @@ -0,0 +1,32 @@ +name: 'Deploy to Netlify' + +on: + push: + branches: + - main + +jobs: + deploy: + name: 'Deploy to Netlify' + steps: + - uses: actions/checkout@v3 + name: Checkout + - name: Build + run: | + npm --version && node --version + npm ci --no-update-notifier + npm run build + - uses: https://github.com/nwtgck/actions-netlify@v2.0 + name: Deploy + with: + publish-dir: './build' + production-deploy: true + deploy-message: "Deployed from Gitea Action" + enable-commit-comment: false + enable-pull-request-comment: false + overwrites-pull-request-comment: true + enable-github-deployment: false + env: + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }} + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} + timeout-minutes: 1 diff --git a/build/.dockerignore b/build/.dockerignore new file mode 100644 index 0000000..0501d09 --- /dev/null +++ b/build/.dockerignore @@ -0,0 +1 @@ +fly.toml diff --git a/build/Dockerfile b/build/Dockerfile new file mode 100644 index 0000000..46a5e4c --- /dev/null +++ b/build/Dockerfile @@ -0,0 +1,3 @@ +FROM pierrezemb/gostatic +COPY . /srv/http/ +CMD ["-port","8080","-https-promote", "-enable-logging"] diff --git a/build/about.html b/build/about.html new file mode 100644 index 0000000..9b1aca7 --- /dev/null +++ b/build/about.html @@ -0,0 +1,48 @@ + + + + + + + + + + + +
+
+
+

About

+ +
+
+

I am interested in two things:

+
    +
  • How the world works
  • +
  • How we can make it better
  • +
+

My mission is to develop a deep understanding of how our world works — economically, politically, historically — and write to make it common knowledge.

+

I write wanting to address the problems in the world that keep us trapped in cycles of suffering.

+

I want to write a better world.

+ +
+
+
+ + + + diff --git a/build/favicon.ico b/build/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..4d7248348d3ce37afacbc637e2134da93cc2a6fb GIT binary patch literal 15406 zcmeHN`EM0P9N+g|U+xyp21cAV&Aeo0J85!6wX zC_kgkU!zUXfQNYOd1HnQ!Dq^Kc|jw2QAZhveg+m-uBxL3t)Pp#xWNZn z@F*JdUbVTk#_6Mp7w1uZcMYY^HB!^5^)#<;u9RocXT|6XV@m5wcH5pxssx#O^aM!84u3~cxL+}uItG)6D;zB2h1a)G&*yunwk=7~c$A_FyW)vJuOExFuVg_H z9r~`5qB-(CVi6IxMc6iFH|sO}>Dd#ZczzD^cTjSB70qYg1A|8koW2}^OqLa4{7Ozq zRS9hxSx3!hH`1zo%cZYfeToJ(_btOO(*HVlEc+y#@GX3xu}eJC=dQiNM|`hnl+S=u z6|e0ve52ddd!bv(lkcTGh25op?Bu9E2wF)m>@sxY*~bTcs{ius#4n69NiI9NM8qB6 z1YhhT=OR-*;`#{}ou}$PsxWIGD8EP_gD$`h?K>F*@CbV7fG*a_&>ZIy7fq{UW4494 z&xkQVwij3E1{P2MRNZ?zMv)zT#2$DO&SuxwurttB~e5p8dROdMqpf@d{y|&}qpD z_D^6O1LP|@Rr_u5o~4~R`7tW5E~f=+E2xscrFkX%4byp+*%x*`1Y`DerN3XiaXxi^ z)JiAr_tVIO0bNe~+E4r5e}T$ZBm(-{*ghWBZf%!CHM^G4(7j&T`BpQn>t98y+E>up zzLnH|dAqU?f27!^1&#+8%^GpGaG2+w*fJ)fF6Ipv!7K?pjP*u zZIXYqJoaeg1v%7sd<`K7QS_V?c8Ix~M=R}TxjJ_KcLC2CXrX7@ON}&myGQta=x!ga z#C*!~U$AX9jZY`^WzY$}g0g&SzasN}!TiDHa z(vAqPCk}ktChR@@eHYbrtRVP5%^oB7?RV*T@IEcCGT1-AzEbMG(M1J`d_%8`&%~b* zgKJmNd#epHZM@4`77P8YZ)`Pm+cdVlQdgRNoby3(kZrNRcaWP{o}d?b-0i=n8u-KLHF&Z9WRt{N_;0R9kA>w=yI&hJ zt$Yt?hYsjc>uLmI>HjXnB$)j1GXK(zPjoI@SGh;qGg=4UlNB9SsTNJ1KIeB6)1$DeIPLbFY zt$C&)X24caTSlvR->K>3dTM=hEA4%6huC|@z6AcwHV&<&S8V>*o%uNn@a($K zOh<1Wpy7LcVz1KNLs$3M!#vLW*c~6X^1tyCD`wM`3!&ul`fT^xEduwk+uhX9`#<|X z*+skG*(T!9b}_~O#oOrU%>(Yf%m58s@1Ww!!mP2Os%ar@d%2O4yjPC>Qvbd{ZgHHd zHZP>Ek9TStu-Auu&rm*^hMYI`BL8E2=D=(Vx=$=C6*)BW;Gj5fP*hPcCQp!@nQF@~ z&7;0A+eHkH+}uy)yzeM)f_lv|wFj*2M^Oe_)3Vm?s?Ovjja~w2Ob&-Jk6y%y+Pc!5R%`nr1Rz zf^=h?T*JN{;BgcfRX&+Dz72yvc8fVQ)-*wKCe;==HisW8kT1xQHNCZz;&a$-yoSV? zmbQ0OwBxlV+Qj{Q`Hm%2B-W1M + + + + + + + + + + +
+ Welcome to the index page! +
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/now.html b/build/now.html new file mode 100644 index 0000000..abcfa12 --- /dev/null +++ b/build/now.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

Now

+ +
+
+

Now page will be here, along with a link to view previous now pages

+
    +
  • you should write up a new now page
  • +
+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/styles/main.css b/build/styles/main.css new file mode 100644 index 0000000..02542b3 --- /dev/null +++ b/build/styles/main.css @@ -0,0 +1,188 @@ +:root { + /* COLORS */ + --rich-black: #030303; + /*for body background colour*/ + --eerie-black: #171717; + /* for article background colour*/ + --charleston-green: #2c2c2c; + /*for article background rollover*/ + --dark-medium-gray: #aaa; + /* for main body text throughout website*/ + --platinum: #e9e9e9; + /* for titles*/ + --middle-green: #52aa5e; + /* for the main heading and links*/ + --turquoise-green: #a0d0a7; + /* for links in their hover state*/ + --amaranth: #ef2d56; + /* just for the support heart in its hoverstate */ + + /* THEME */ + /* COLOURS */ + --page-title-color: var(--middle-green); + --link-color: var(--middle-green); + --link-hover-color: var(--turquise-green) --body-background-color: var(--rich-black); + --article-background-color: var(--eerie-black); + --text-color: var(--dark-medium-gray); + --nav-link-color: var(--text-color); + --nav-link-color-hover: var(--platinum); + /* FONT SIZES */ + --font-size: 1.7rem; + --page-title-font-size: 3.6rem; + --card-background-hover: var(--charleston-green); + /* PADDING */ + --article-padding: 3rem; + /* OTHER */ + --border-radius: 1rem; +} + + + + + + + +html { + font-size: 10px; + height: 100%; +} + +* { + margin: 0; + padding: 0; + box-sizing: border-box; + -webkit-font-smoothing: antialiased; +} + +body { + background-color: #000; + color: var(--text-color); + font-family: "Ubuntu"; + font-size: var(--font-size); + display: flex; + flex-flow: column nowrap; + justify-content: space-between; + min-height: 100%; + padding: 2rem; + width: 100%; +} + +.page-title { + font-weight: 300; + font-size: var(--page-title-font-size); +} + +.page-title a { + color: var(--page-title-color); + text-decoration: none; +} + +.page-title a:hover { + color: var(--link-hover-color); +} + +.site-header { + margin-bottom: 2rem; + display: flex; + flex-flow: row nowrap; + width: 100%; + align-items: center; + justify-content: space-between; + flex-shrink: 0; + flex-grow: 0; +} + +.page-content { + padding: 2rem; + flex-grow: 1; + display: flex; + flex-flow: column nowrap; + align-items: center; + +} + +.page-content h2 { + font-size: 2.4rem; + font-weight: 300; + margin-top: 3rem; + margin-bottom: 1rem; +} + +.site-footer { + flex-shrink: 0; + flex-grow: 0; + width: 100%; + text-align: center; +} + +.site-navigation ul { + display: flex; + gap: 3rem; + list-style: none; + font-size: 1.4rem; +} + +.site-navigation a { + text-decoration: none; + color: var(--nav-link-color); +} + +.site-navigation a:hover { + text-decoration: none; + color: var(--nav-link-color-hover); +} + +.main { + width: 100%; + text-align: center; +} + +.view-cards { + display: flex; + flex-flow: column nowrap; + align-items: center; + gap: 3rem; +} + +.view-card { + background: var(--article-background-color); + padding: 3rem; + /*replace this with a variable */ + border-radius: var(--border-radius); + text-decoration: none; + color: var(--text-color); + font-size: 3rem; + font-weight: 300; + text-align: center; + width: 70rem; +} + +.view-card:hover { + color: var(--link-color-hover); + background-color: var(--card-background-hover); +} + + +.article { + background-color: var(--article-background-color); + padding: var(--article-padding); + border-radius: var(--border-radius); + width: 90rem; + display: flex; + flex-flow: column nowrap; + gap: 3rem; +} + +.article-header { + display: flex; + flex-flow: row nowrap; + align-items: center; + justify-content: space-between; + width: 100%; +} + +.article-title { + font-weight: 300; + font-size: 2.4rem; + color: var(--page-title-color); +} diff --git a/build/subscribe.html b/build/subscribe.html new file mode 100644 index 0000000..d5bba46 --- /dev/null +++ b/build/subscribe.html @@ -0,0 +1,46 @@ + + + + + + + + + + + +
+
+
+

Subscribe

+ +
+
+
    +
  • to do:
      +
    • move your mailing list from digital ocean to a different platform
    • +
    +
  • +
+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/support.html b/build/support.html new file mode 100644 index 0000000..b345eab --- /dev/null +++ b/build/support.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

Support

+ +
+
+

The support page will be here.

+

You will explain what you are trying to do, what you need, what you will do with the money.

+

You’ll create an open collective page and link it.

+

Maybe also use liberapay

+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/templates/default.ori.html b/build/templates/default.ori.html new file mode 100644 index 0000000..75759fc --- /dev/null +++ b/build/templates/default.ori.html @@ -0,0 +1,18 @@ + + + + + + + + + + + ${ templates/partials/header.ori.html() } +
+ ${ _ } +
+ ${ templates/partials/footer.ori.html() } + + + diff --git a/build/templates/partials/article.ori.html b/build/templates/partials/article.ori.html new file mode 100644 index 0000000..3686c8f --- /dev/null +++ b/build/templates/partials/article.ori.html @@ -0,0 +1,9 @@ +
+
+

${ _/title }

+ +
+
+ ${ mdHtml(_/@text) } +
+
\ No newline at end of file diff --git a/build/templates/partials/footer.ori.html b/build/templates/partials/footer.ori.html new file mode 100644 index 0000000..9c7479d --- /dev/null +++ b/build/templates/partials/footer.ori.html @@ -0,0 +1,3 @@ +
+

Last updated: ${ new:Date() }

+
\ No newline at end of file diff --git a/build/templates/partials/header.ori.html b/build/templates/partials/header.ori.html new file mode 100644 index 0000000..566a792 --- /dev/null +++ b/build/templates/partials/header.ori.html @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/build/templates/partials/navigation.ori.html b/build/templates/partials/navigation.ori.html new file mode 100644 index 0000000..746d89d --- /dev/null +++ b/build/templates/partials/navigation.ori.html @@ -0,0 +1,9 @@ + diff --git a/build/templates/partials/view-card.ori.html b/build/templates/partials/view-card.ori.html new file mode 100644 index 0000000..744b93c --- /dev/null +++ b/build/templates/partials/view-card.ori.html @@ -0,0 +1,3 @@ + + ${ _/title } + \ No newline at end of file diff --git a/build/templates/partials/view-cards.ori.html b/build/templates/partials/view-cards.ori.html new file mode 100644 index 0000000..45ba242 --- /dev/null +++ b/build/templates/partials/view-cards.ori.html @@ -0,0 +1,3 @@ +
+ ${map(data/views, (view)=>templates/partials/view-card.ori.html(view))} +
\ No newline at end of file diff --git a/build/views/all-religions-are-wrong.html b/build/views/all-religions-are-wrong.html new file mode 100644 index 0000000..dd4e47e --- /dev/null +++ b/build/views/all-religions-are-wrong.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

All religions are wrong

+ +
+
+

Why I hold this view

+

insert reasons here for why I believe all religions are wrong

+

Why it matters

+

insert reasons here for why I think it matters

+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/views/index.html b/build/views/index.html new file mode 100644 index 0000000..3e3b976 --- /dev/null +++ b/build/views/index.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+ +
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/views/there-is-no-god.html b/build/views/there-is-no-god.html new file mode 100644 index 0000000..bb9160d --- /dev/null +++ b/build/views/there-is-no-god.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

There is no god

+ +
+
+

Why I hold this view

+

insert reasons here for why I believe there is no god

+

Why it matters

+

insert reasons here for why I think it matters

+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/views/we-can-feed-everyone.html b/build/views/we-can-feed-everyone.html new file mode 100644 index 0000000..e2e945b --- /dev/null +++ b/build/views/we-can-feed-everyone.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

We can feed everyone

+ +
+
+

Why I hold this view

+

We can feed, house and clothe everyone 🏠 +(going to argue that we have the material resources to do so, just lack the will)

+

Why it matters

+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/views/we-do-not-need-hierarchies.html b/build/views/we-do-not-need-hierarchies.html new file mode 100644 index 0000000..66b760b --- /dev/null +++ b/build/views/we-do-not-need-hierarchies.html @@ -0,0 +1,44 @@ + + + + + + + + + + + +
+
+
+

We do not need hierarchies

+ +
+
+

Why I hold this view

+

insert reasons here for why I believe hierarchy is bad

+

Why it matters

+

insert reasons here for why I think it matters

+ +
+
+
+
+

Last updated: Mon Dec 09 2024 14:08:59 GMT+1100 (オーストラリア東部夏時間)

+
+ + + diff --git a/build/views/we-should-not-eat-animals.html b/build/views/we-should-not-eat-animals.html new file mode 100644 index 0000000..3d4ad7a --- /dev/null +++ b/build/views/we-should-not-eat-animals.html @@ -0,0 +1,47 @@ + + + + + + + + + + + +
+
+
+

We should not eat animals

+ +
+
+

Why I hold this view

+
    +
  • insert reasons here for why people should be vegan
  • +
  • thinking about whether I should say animal products instead
  • +
+

Why it matters

+

insert reasons for why this matters

+ +
+
+
+ + + + diff --git a/package-lock.json b/package-lock.json index a00b460..67ae1ce 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "sashinexists", "dependencies": { - "@weborigami/origami": "0.2.1" + "@weborigami/origami": "0.2.2" } }, "node_modules/@emnapi/runtime": { @@ -381,31 +381,31 @@ } }, "node_modules/@weborigami/async-tree": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@weborigami/async-tree/-/async-tree-0.2.1.tgz", - "integrity": "sha512-RH+RCOkT6Oy8GtSKsGUs87izjUTetq8fJ64c7LrqsssEsgMi/ENMdnnO4kVHPW4mvqSMUQqoK0WUyP9hjSrhVQ==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@weborigami/async-tree/-/async-tree-0.2.2.tgz", + "integrity": "sha512-uOVohq9lKWhO+E6u0Z2HPxvpIJaY9eIk15EYL9alHM6gRETpTSZfVlOGjYYD4cQfYdHNhI1Xp+udhmsMH3slCg==", "dependencies": { - "@weborigami/types": "0.2.1" + "@weborigami/types": "0.2.2" } }, "node_modules/@weborigami/language": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@weborigami/language/-/language-0.2.1.tgz", - "integrity": "sha512-syp5L5kHdt4dW4nkjTQa2VMBS94qn+DA524wWY0XpbpyC5h1YMA3s+eOQ29PhdiB9n2xjRhu+ZjxDuLhsv2YaQ==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@weborigami/language/-/language-0.2.2.tgz", + "integrity": "sha512-bZ2OLeU1b9756AbdA2FGG4S0fK4jtx2yvo+J+6EhZS3gB7Rcn/j4wV13J2lM7ASluE8/AaxNXXT4aMrWdT7sfw==", "dependencies": { - "@weborigami/async-tree": "0.2.1", - "@weborigami/types": "0.2.1", + "@weborigami/async-tree": "0.2.2", + "@weborigami/types": "0.2.2", "watcher": "2.3.1" } }, "node_modules/@weborigami/origami": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@weborigami/origami/-/origami-0.2.1.tgz", - "integrity": "sha512-nKJWvasGw469qnC1KOF2uayhjlWdOBXo/NRmp3Z64jDYiKYQ60o9uH0CY3b8wB33mRvu3YREoajFNlVcwvnyqQ==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@weborigami/origami/-/origami-0.2.2.tgz", + "integrity": "sha512-E65VzE2lDRCsrQcDuz0/T2yVqKpHbn4dgLsSb67vePC9jqDqRsKJZ5BkKsiJoVhsqB6Nyv3PDctfoJEQNVQoWg==", "dependencies": { - "@weborigami/async-tree": "0.2.1", - "@weborigami/language": "0.2.1", - "@weborigami/types": "0.2.1", + "@weborigami/async-tree": "0.2.2", + "@weborigami/language": "0.2.2", + "@weborigami/types": "0.2.2", "exif-parser": "0.1.12", "graphviz-wasm": "3.0.2", "highlight.js": "11.10.0", @@ -421,9 +421,9 @@ } }, "node_modules/@weborigami/types": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/@weborigami/types/-/types-0.2.1.tgz", - "integrity": "sha512-+386SPOxoo1Whx3Ga+5XanXVhAz/IdwfFuFGSVhO39qj46FwG4ZEU6qqTRZpNW5tX3ABkO9DvAjqoCmapDxaXQ==" + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@weborigami/types/-/types-0.2.2.tgz", + "integrity": "sha512-nrrmhuNJM7EMnzN95ROH97r18KJ56YZGA5bsvPVAXoAyB0Mm0oFzyvy+eJH3LcZgRVb53i74nXZdgDqNoIeMyw==" }, "node_modules/color": { "version": "4.2.3", diff --git a/package.json b/package.json index b7bc7cc..95779bc 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "sashinexists", "type": "module", "dependencies": { - "@weborigami/origami": "0.2.1" + "@weborigami/origami": "0.2.2" }, "scripts": { "build": "ori copy src/site.ori, clear files:build",