diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f377b3921..acce1b846 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -70,5 +70,6 @@ jobs: echo "TW5_BUILD_DETAILS=Built from branch '$TW5_BUILD_BRANCH' at commit $(git rev-parse HEAD) of $(git remote get-url origin) at $(date +'%F %T %Z')" >> $GITHUB_ENV - run: "./bin/build-site.sh" - run: "./bin/ci-push.sh" + - run: "./bin/build-tw-org.sh" env: GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }} diff --git a/bin/build-tw-org.sh b/bin/build-tw-org.sh new file mode 100755 index 000000000..7cebb3bc6 --- /dev/null +++ b/bin/build-tw-org.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +# Build tiddlywiki.org assets + +# Default to the version of TiddlyWiki installed in this repo + +if [ -z "$TWORG_BUILD_TIDDLYWIKI" ]; then + TWORG_BUILD_TIDDLYWIKI=./tiddlywiki.js +fi + +echo "Using TWORG_BUILD_TIDDLYWIKI as [$TWORG_BUILD_TIDDLYWIKI]" + +# Set up the build details + +if [ -z "$TWORG_BUILD_DETAILS" ]; then + TWORG_BUILD_DETAILS="$(git symbolic-ref --short HEAD)-$(git rev-parse HEAD) from $(git remote get-url origin)" +fi + +echo "Using TWORG_BUILD_DETAILS as [$TWORG_BUILD_DETAILS]" + +if [ -z "$TWORG_BUILD_COMMIT" ]; then + TWORG_BUILD_COMMIT="$(git rev-parse HEAD)" +fi + +echo "Using TWORG_BUILD_COMMIT as [$TWORG_BUILD_COMMIT]" + +# Set up the build output directory + +if [ -z "$TWORG_BUILD_OUTPUT" ]; then + TWORG_BUILD_OUTPUT=$(mktemp -d) +fi + +mkdir -p $TWORG_BUILD_OUTPUT + +if [ ! -d "$TWORG_BUILD_OUTPUT" ]; then + echo 'A valid TWORG_BUILD_OUTPUT environment variable must be set' + exit 1 +fi + +echo "Using TWORG_BUILD_OUTPUT as [$TWORG_BUILD_OUTPUT]" + +# Pull existing GitHub pages content + +git clone --depth=1 --branch=master "https://github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" output + +# Make the CNAME file that GitHub Pages requires + +echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME + +# Delete any existing static content + +mkdir -p $TWORG_BUILD_OUTPUT/static +rm $TWORG_BUILD_OUTPUT/static/* + +# Put the build details into a .tid file so that it can be included in each build (deleted at the end of this script) + +echo -e -n "title: $:/build\ncommit: $TWORG_BUILD_COMMIT\n\n$TWORG_BUILD_DETAILS\n" > $TWORG_BUILD_OUTPUT/build.tid + +###################################################### +# +# tiddlywiki.org distribution +# +###################################################### + +# /index.html Main site +# /favicon.ico Favicon for main site +# /static.html Static rendering of default tiddlers +# /alltiddlers.html Static rendering of all tiddlers +# /static/* Static single tiddlers +# /static/static.css Static stylesheet +# /static/favicon.ico Favicon for static pages +node $TWORG_BUILD_TIDDLYWIKI \ + editions/tw.org \ + --verbose \ + --version \ + --load $TWORG_BUILD_OUTPUT/build.tid \ + --output $TWORG_BUILD_OUTPUT \ + --build favicon static index \ + || exit 1 + +# Delete the temporary build tiddler + +rm $TWORG_BUILD_OUTPUT/build.tid || exit 1 + +# Push output back to GitHub + +# Exit script immediately if any command fails +set -e + +cd output +git config --global user.email "actions@github.com" +git config --global user.name "GitHub Actions" +git add -A . +git commit --message "GitHub build: $GITHUB_RUN_NUMBER of $TW5_BUILD_BRANCH ($(date +'%F %T %Z'))" +git remote add deploy "https://$GH_TOKEN@github.com/TiddlyWiki/tiddlywiki.org-gh-pages.git" &>/dev/null +git push deploy master &>/dev/null +cd .. diff --git a/editions/tw.org/tiddlers/$__DefaultTiddlers.tid b/editions/tw.org/tiddlers/$__DefaultTiddlers.tid new file mode 100644 index 000000000..6b87b6bfa --- /dev/null +++ b/editions/tw.org/tiddlers/$__DefaultTiddlers.tid @@ -0,0 +1,6 @@ +created: 20220318102404333 +modified: 20220318102424312 +title: $:/DefaultTiddlers +type: text/vnd.tiddlywiki + +HelloThere \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__SiteSubtitle.tid b/editions/tw.org/tiddlers/$__SiteSubtitle.tid new file mode 100644 index 000000000..bc6aa7d9a --- /dev/null +++ b/editions/tw.org/tiddlers/$__SiteSubtitle.tid @@ -0,0 +1,6 @@ +created: 20220318102354724 +modified: 20220318102400979 +title: $:/SiteSubtitle +type: text/vnd.tiddlywiki + +community matters for ~TiddlyWiki \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__SiteTitle.tid b/editions/tw.org/tiddlers/$__SiteTitle.tid new file mode 100644 index 000000000..397f0ca40 --- /dev/null +++ b/editions/tw.org/tiddlers/$__SiteTitle.tid @@ -0,0 +1,6 @@ +created: 20220318102331011 +modified: 20220318104654044 +title: $:/SiteTitle +type: text/vnd.tiddlywiki + +[[tiddlywiki.org|HelloThere]] \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__StoryList.tid b/editions/tw.org/tiddlers/$__StoryList.tid new file mode 100644 index 000000000..55e7524f2 --- /dev/null +++ b/editions/tw.org/tiddlers/$__StoryList.tid @@ -0,0 +1,3 @@ +list: HelloThere +title: $:/StoryList +type: text/vnd.tiddlywiki \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__favicon.ico.png b/editions/tw.org/tiddlers/$__favicon.ico.png new file mode 100644 index 000000000..c6b279307 Binary files /dev/null and b/editions/tw.org/tiddlers/$__favicon.ico.png differ diff --git a/editions/tw.org/tiddlers/$__favicon.ico.png.meta b/editions/tw.org/tiddlers/$__favicon.ico.png.meta new file mode 100644 index 000000000..70e5c86db --- /dev/null +++ b/editions/tw.org/tiddlers/$__favicon.ico.png.meta @@ -0,0 +1,4 @@ +created: 20220318165448102 +modified: 20220318165455332 +title: $:/favicon.ico +type: image/png \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__palette.tid b/editions/tw.org/tiddlers/$__palette.tid new file mode 100644 index 000000000..3f24b6c20 --- /dev/null +++ b/editions/tw.org/tiddlers/$__palette.tid @@ -0,0 +1,6 @@ +created: 20220318102711329 +modified: 20220318103746799 +title: $:/palette +type: text/vnd.tiddlywiki + +$:/palettes/FlowingSun \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__palettes_BlueFlavour b/editions/tw.org/tiddlers/$__palettes_BlueFlavour new file mode 100644 index 000000000..cb0f7ecb3 --- /dev/null +++ b/editions/tw.org/tiddlers/$__palettes_BlueFlavour @@ -0,0 +1,165 @@ +: Background Tones + +base03: #362b00 +base02: #423607 + +: Content Tones + +base01: #756e58 +base00: #837b65 +base0: #969483 +base1: #a1a193 + +: Background Tones + +base2: #d5e8ee +base3: #e3f6fd + +: Accent Colors + +yellow: #b58900 +orange: #cb4b16 +red: #dc322f +magenta: #d33682 +violet: #6c71c4 +blue: #268bd2 +cyan: #2aa198 +green: #859900 + +: Additional Tones (RA) + +base10: #bbc0c4 +violet-muted: #7c81b0 +blue-muted: #4e7baa + +yellow-hot: #ffcc44 +orange-hot: #eb6d20 +red-hot: #ff2222 +blue-hot: #2298ee +green-hot: #98ee22 + +: Palette + +: Do not use colour macro for background and foreground +background: #e3f6fd + download-foreground: <> + dragger-foreground: <> + dropdown-background: <> + modal-background: <> + sidebar-foreground-shadow: <> + tiddler-background: <> + tiddler-border: <> + tiddler-link-background: <> + tab-background-selected: <> + dropdown-tab-background-selected: <> +foreground: #837b65 + dragger-background: <> + tab-foreground: <> + tab-foreground-selected: <> + sidebar-tab-foreground-selected: <> + sidebar-tab-foreground: <> + sidebar-button-foreground: <> + sidebar-controls-foreground: <> + sidebar-foreground: <> +: base03 +: base02 +: base01 + alert-muted-foreground: <> +: base00 + code-foreground: <> + message-foreground: <> + tag-foreground: <> +: base0 + sidebar-tiddler-link-foreground: <> +: base1 + muted-foreground: <> + blockquote-bar: <> + dropdown-border: <> + sidebar-muted-foreground: <> + tiddler-title-foreground: <> + site-title-foreground: <> +: base2 + modal-footer-background: <> + page-background: <> + modal-backdrop: <> + notification-background: <> + code-background: <> + code-border: <> + pre-background: <> + pre-border: <> + sidebar-tab-background-selected: <> + table-header-background: <> + tag-background: <> + tiddler-editor-background: <> + tiddler-info-background: <> + tiddler-info-tab-background: <> + tab-background: <> + dropdown-tab-background: <> +: base3 + alert-background: <> + message-background: <> +: yellow +: orange +: red +: magenta + alert-highlight: <> +: violet + external-link-foreground: <> +: blue +: cyan +: green +: base10 + tiddler-controls-foreground: <> +: violet-muted + external-link-foreground-visited: <> +: blue-muted + primary: <> + download-background: <> + tiddler-link-foreground: <> + +alert-border: #b99e2f +dirty-indicator: #ff0000 +dropzone-background: rgba(0,200,0,0.7) +external-link-background-hover: inherit +external-link-background-visited: inherit +external-link-background: inherit +external-link-foreground-hover: inherit +message-border: #cfd6e6 +modal-border: #999999 +select-tag-background: +select-tag-foreground: +sidebar-controls-foreground-hover: +sidebar-muted-foreground-hover: +sidebar-tab-background: #c5d8de +sidebar-tiddler-link-foreground-hover: +static-alert-foreground: #aaaaaa +tab-border: #cccccc + modal-footer-border: <> + modal-header-border: <> + notification-border: <> + sidebar-tab-border: <> + tab-border-selected: <> + sidebar-tab-border-selected: <> +tab-divider: #d8d8d8 + sidebar-tab-divider: <> +table-border: #dddddd +table-footer-background: #a8a8a8 +tiddler-controls-foreground-hover: #888888 +tiddler-controls-foreground-selected: #444444 +tiddler-editor-border-image: #ffffff +tiddler-editor-border: #cccccc +tiddler-editor-fields-even: #e0e8e0 +tiddler-editor-fields-odd: #f0f4f0 +tiddler-info-border: #dddddd +tiddler-subtitle-foreground: #c0c0c0 +toolbar-new-button: +toolbar-options-button: +toolbar-save-button: +toolbar-info-button: +toolbar-edit-button: +toolbar-close-button: +toolbar-delete-button: +toolbar-cancel-button: +toolbar-done-button: +untagged-background: #999999 +very-muted-foreground: #888888 diff --git a/editions/tw.org/tiddlers/$__palettes_BlueFlavour.meta b/editions/tw.org/tiddlers/$__palettes_BlueFlavour.meta new file mode 100644 index 000000000..fd9464ec2 --- /dev/null +++ b/editions/tw.org/tiddlers/$__palettes_BlueFlavour.meta @@ -0,0 +1,8 @@ +color-scheme: light +created: 20220318103222838 +description: Simple colours +modified: 20220318103723059 +name: Blue Flavour +tags: $:/tags/Palette +title: $:/palettes/BlueFlavour +type: application/x-tiddler-dictionary \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__palettes_FlowingSun b/editions/tw.org/tiddlers/$__palettes_FlowingSun new file mode 100644 index 000000000..7eb0b71ce --- /dev/null +++ b/editions/tw.org/tiddlers/$__palettes_FlowingSun @@ -0,0 +1,165 @@ +: Background Tones + +base03: #36002b +base02: #420736 + +: Content Tones + +base01: #75586e +base00: #83657b +base0: #968394 +base1: #a193a1 + +: Background Tones + +base2: #d5eee8 +base3: #e3fdf6 + +: Accent Colors + +yellow: #b58900 +orange: #cb4b16 +red: #dc322f +magenta: #d33682 +violet: #6c71c4 +blue: #268bd2 +cyan: #2aa198 +green: #859900 + +: Additional Tones (RA) + +base10: #bbc0c4 +violet-muted: #7c81b0 +blue-muted: #4e7baa + +yellow-hot: #ffcc44 +orange-hot: #eb6d20 +red-hot: #ff2222 +blue-hot: #2298ee +green-hot: #98ee22 + +: Palette + +: Do not use colour macro for background and foreground +background: #e3fdf6 + download-foreground: <> + dragger-foreground: <> + dropdown-background: <> + modal-background: <> + sidebar-foreground-shadow: <> + tiddler-background: <> + tiddler-border: <> + tiddler-link-background: <> + tab-background-selected: <> + dropdown-tab-background-selected: <> +foreground: #83657b + dragger-background: <> + tab-foreground: <> + tab-foreground-selected: <> + sidebar-tab-foreground-selected: <> + sidebar-tab-foreground: <> + sidebar-button-foreground: <> + sidebar-controls-foreground: <> + sidebar-foreground: <> +: base03 +: base02 +: base01 + alert-muted-foreground: <> +: base00 + code-foreground: <> + message-foreground: <> + tag-foreground: <> +: base0 + sidebar-tiddler-link-foreground: <> +: base1 + muted-foreground: <> + blockquote-bar: <> + dropdown-border: <> + sidebar-muted-foreground: <> + tiddler-title-foreground: <> + site-title-foreground: <> +: base2 + modal-footer-background: <> + page-background: <> + modal-backdrop: <> + notification-background: <> + code-background: <> + code-border: <> + pre-background: <> + pre-border: <> + sidebar-tab-background-selected: <> + table-header-background: <> + tag-background: <> + tiddler-editor-background: <> + tiddler-info-background: <> + tiddler-info-tab-background: <> + tab-background: <> + dropdown-tab-background: <> +: base3 + alert-background: <> + message-background: <> +: yellow +: orange +: red +: magenta + alert-highlight: <> +: violet + external-link-foreground: <> +: blue +: cyan +: green +: base10 + tiddler-controls-foreground: <> +: violet-muted + external-link-foreground-visited: <> +: blue-muted + primary: <> + download-background: <> + tiddler-link-foreground: <> + +alert-border: #b99e2f +dirty-indicator: #ff0000 +dropzone-background: rgba(0,200,0,0.7) +external-link-background-hover: inherit +external-link-background-visited: inherit +external-link-background: inherit +external-link-foreground-hover: inherit +message-border: #cfd6e6 +modal-border: #999999 +select-tag-background: +select-tag-foreground: +sidebar-controls-foreground-hover: +sidebar-muted-foreground-hover: +sidebar-tab-background: #c5ded8 +sidebar-tiddler-link-foreground-hover: +static-alert-foreground: #aaaaaa +tab-border: #cccccc + modal-footer-border: <> + modal-header-border: <> + notification-border: <> + sidebar-tab-border: <> + tab-border-selected: <> + sidebar-tab-border-selected: <> +tab-divider: #d8d8d8 + sidebar-tab-divider: <> +table-border: #dddddd +table-footer-background: #a8a8a8 +tiddler-controls-foreground-hover: #888888 +tiddler-controls-foreground-selected: #444444 +tiddler-editor-border-image: #ffffff +tiddler-editor-border: #cccccc +tiddler-editor-fields-even: #e0e8e0 +tiddler-editor-fields-odd: #f0f4f0 +tiddler-info-border: #dddddd +tiddler-subtitle-foreground: #c0c0c0 +toolbar-new-button: +toolbar-options-button: +toolbar-save-button: +toolbar-info-button: +toolbar-edit-button: +toolbar-close-button: +toolbar-delete-button: +toolbar-cancel-button: +toolbar-done-button: +untagged-background: #999999 +very-muted-foreground: #888888 diff --git a/editions/tw.org/tiddlers/$__palettes_FlowingSun.meta b/editions/tw.org/tiddlers/$__palettes_FlowingSun.meta new file mode 100644 index 000000000..44227d545 --- /dev/null +++ b/editions/tw.org/tiddlers/$__palettes_FlowingSun.meta @@ -0,0 +1,8 @@ +color-scheme: light +created: 20220318102714713 +description: Easy colours +modified: 20220318103305299 +name: Flowing Sun +tags: $:/tags/Palette +title: $:/palettes/FlowingSun +type: application/x-tiddler-dictionary \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodyfontsize.tid b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodyfontsize.tid new file mode 100644 index 000000000..7ca54d393 --- /dev/null +++ b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodyfontsize.tid @@ -0,0 +1,6 @@ +created: 20220318165540214 +modified: 20220318165540353 +title: $:/themes/tiddlywiki/vanilla/metrics/bodyfontsize +type: text/vnd.tiddlywiki + +17px \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodylineheight.tid b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodylineheight.tid new file mode 100644 index 000000000..05b08e5d7 --- /dev/null +++ b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_bodylineheight.tid @@ -0,0 +1,6 @@ +created: 20220318165545749 +modified: 20220318165545749 +title: $:/themes/tiddlywiki/vanilla/metrics/bodylineheight +type: text/vnd.tiddlywiki + +24px \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid new file mode 100644 index 000000000..13f316466 --- /dev/null +++ b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid @@ -0,0 +1,6 @@ +created: 20220318165613356 +modified: 20220318165613356 +title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth +type: text/vnd.tiddlywiki + +450px \ No newline at end of file diff --git a/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid new file mode 100644 index 000000000..1dd7585b7 --- /dev/null +++ b/editions/tw.org/tiddlers/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid @@ -0,0 +1,6 @@ +created: 20220318165602424 +modified: 20220318165602424 +title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout +type: text/vnd.tiddlywiki + +fluid-fixed \ No newline at end of file diff --git a/editions/tw.org/tiddlers/HelloThere.tid b/editions/tw.org/tiddlers/HelloThere.tid new file mode 100644 index 000000000..e1968ca4b --- /dev/null +++ b/editions/tw.org/tiddlers/HelloThere.tid @@ -0,0 +1,14 @@ +created: 20220318104000046 +modified: 20220319080838250 +title: HelloThere +type: text/vnd.tiddlywiki + +This is the official hub for the TiddlyWiki community. + +Other official TiddlyWiki sites include: + +* [[tiddlywiki.com|https://tiddlywiki.com]] – user documentation +* [[talk.tiddlywiki.org|https://talk.tiddlywiki.org]] – user discussion forum +* [[links.tiddlywiki.org|https://links.tiddlywiki.org]] – collection of links collaboratively curated by the community +* [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] – internal JavaScript documentation + diff --git a/editions/tw.org/tiddlers/Table of Contents.tid b/editions/tw.org/tiddlers/Table of Contents.tid new file mode 100644 index 000000000..b708d2092 --- /dev/null +++ b/editions/tw.org/tiddlers/Table of Contents.tid @@ -0,0 +1,11 @@ +created: 20211230214957666 +modified: 20211230215118758 +tags: $:/tags/SideBar +title: Table of Contents +type: text/vnd.tiddlywiki + +
+ +<> + +
diff --git a/editions/tw.org/tiddlers/TiddlyWiki.tid b/editions/tw.org/tiddlers/TiddlyWiki.tid new file mode 100644 index 000000000..76b8a7c9a --- /dev/null +++ b/editions/tw.org/tiddlers/TiddlyWiki.tid @@ -0,0 +1,8 @@ +created: 20220318170042624 +modified: 20220318170209825 +title: TiddlyWiki +type: text/vnd.tiddlywiki + +TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors. + +See [[tiddlywiki.com|https://tiddlywiki.com]] for more details \ No newline at end of file diff --git a/editions/tw.org/tiddlywiki.info b/editions/tw.org/tiddlywiki.info new file mode 100644 index 000000000..19b9b0947 --- /dev/null +++ b/editions/tw.org/tiddlywiki.info @@ -0,0 +1,31 @@ +{ + "description": "Content for https://tiddlywiki.org", + "plugins": [ + "tiddlywiki/internals", + "tiddlywiki/menubar" + ], + "themes": [ + "tiddlywiki/vanilla", + "tiddlywiki/snowwhite" + ], + "languages": [ + ], + "build": { + "index": [ + "--savetiddlers","[tag[external-image]]","images", + "--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain", + "--setfield","[tag[external-image]]","text","","text/plain", + "--rendertiddler","$:/core/save/all","index.html","text/plain"], + "favicon": [ + "--savetiddler","$:/favicon.ico","favicon.ico", + "--savetiddler","$:/green_favicon.ico","static/favicon.ico"], + "static": [ + "--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain", + "--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain", + "--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain", + "--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"] + }, + "config": { + "retain-original-tiddler-path": true + } +}