1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 10:07:19 +00:00

Introduce a tiddlywiki.org edition

Using its own build script so that we can push it to https://github.com/TiddlyWiki/tiddlywiki.org-gh-pages
This commit is contained in:
jeremy@jermolene.com 2022-03-20 13:36:08 +00:00
parent b5edaae1f4
commit 7cc100b82d
21 changed files with 563 additions and 0 deletions

View File

@ -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 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/build-site.sh"
- run: "./bin/ci-push.sh" - run: "./bin/ci-push.sh"
- run: "./bin/build-tw-org.sh"
env: env:
GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }} GH_TOKEN: ${{ secrets.GITHUBPUSHTOKEN }}

97
bin/build-tw-org.sh Executable file
View File

@ -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 ..

View File

@ -0,0 +1,6 @@
created: 20220318102404333
modified: 20220318102424312
title: $:/DefaultTiddlers
type: text/vnd.tiddlywiki
HelloThere

View File

@ -0,0 +1,6 @@
created: 20220318102354724
modified: 20220318102400979
title: $:/SiteSubtitle
type: text/vnd.tiddlywiki
community matters for ~TiddlyWiki

View File

@ -0,0 +1,6 @@
created: 20220318102331011
modified: 20220318104654044
title: $:/SiteTitle
type: text/vnd.tiddlywiki
[[tiddlywiki.org|HelloThere]]

View File

@ -0,0 +1,3 @@
list: HelloThere
title: $:/StoryList
type: text/vnd.tiddlywiki

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

View File

@ -0,0 +1,4 @@
created: 20220318165448102
modified: 20220318165455332
title: $:/favicon.ico
type: image/png

View File

@ -0,0 +1,6 @@
created: 20220318102711329
modified: 20220318103746799
title: $:/palette
type: text/vnd.tiddlywiki
$:/palettes/FlowingSun

View File

@ -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: <<colour background>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
modal-background: <<colour background>>
sidebar-foreground-shadow: <<colour background>>
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-link-background: <<colour background>>
tab-background-selected: <<colour background>>
dropdown-tab-background-selected: <<colour tab-background-selected>>
foreground: #837b65
dragger-background: <<colour foreground>>
tab-foreground: <<colour foreground>>
tab-foreground-selected: <<colour tab-foreground>>
sidebar-tab-foreground-selected: <<colour tab-foreground-selected>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground: <<colour foreground>>
: base03
: base02
: base01
alert-muted-foreground: <<colour base01>>
: base00
code-foreground: <<colour base00>>
message-foreground: <<colour base00>>
tag-foreground: <<colour base00>>
: base0
sidebar-tiddler-link-foreground: <<colour base0>>
: base1
muted-foreground: <<colour base1>>
blockquote-bar: <<colour muted-foreground>>
dropdown-border: <<colour muted-foreground>>
sidebar-muted-foreground: <<colour muted-foreground>>
tiddler-title-foreground: <<colour muted-foreground>>
site-title-foreground: <<colour tiddler-title-foreground>>
: base2
modal-footer-background: <<colour base2>>
page-background: <<colour base2>>
modal-backdrop: <<colour page-background>>
notification-background: <<colour page-background>>
code-background: <<colour page-background>>
code-border: <<colour code-background>>
pre-background: <<colour page-background>>
pre-border: <<colour pre-background>>
sidebar-tab-background-selected: <<colour page-background>>
table-header-background: <<colour base2>>
tag-background: <<colour base2>>
tiddler-editor-background: <<colour base2>>
tiddler-info-background: <<colour base2>>
tiddler-info-tab-background: <<colour base2>>
tab-background: <<colour base2>>
dropdown-tab-background: <<colour tab-background>>
: base3
alert-background: <<colour base3>>
message-background: <<colour base3>>
: yellow
: orange
: red
: magenta
alert-highlight: <<colour magenta>>
: violet
external-link-foreground: <<colour violet>>
: blue
: cyan
: green
: base10
tiddler-controls-foreground: <<colour base10>>
: violet-muted
external-link-foreground-visited: <<colour violet-muted>>
: blue-muted
primary: <<colour blue-muted>>
download-background: <<colour primary>>
tiddler-link-foreground: <<colour primary>>
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: <<colour tab-border>>
modal-header-border: <<colour tab-border>>
notification-border: <<colour tab-border>>
sidebar-tab-border: <<colour tab-border>>
tab-border-selected: <<colour tab-border>>
sidebar-tab-border-selected: <<colour tab-border-selected>>
tab-divider: #d8d8d8
sidebar-tab-divider: <<colour 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

View File

@ -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

View File

@ -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: <<colour background>>
dragger-foreground: <<colour background>>
dropdown-background: <<colour background>>
modal-background: <<colour background>>
sidebar-foreground-shadow: <<colour background>>
tiddler-background: <<colour background>>
tiddler-border: <<colour background>>
tiddler-link-background: <<colour background>>
tab-background-selected: <<colour background>>
dropdown-tab-background-selected: <<colour tab-background-selected>>
foreground: #83657b
dragger-background: <<colour foreground>>
tab-foreground: <<colour foreground>>
tab-foreground-selected: <<colour tab-foreground>>
sidebar-tab-foreground-selected: <<colour tab-foreground-selected>>
sidebar-tab-foreground: <<colour tab-foreground>>
sidebar-button-foreground: <<colour foreground>>
sidebar-controls-foreground: <<colour foreground>>
sidebar-foreground: <<colour foreground>>
: base03
: base02
: base01
alert-muted-foreground: <<colour base01>>
: base00
code-foreground: <<colour base00>>
message-foreground: <<colour base00>>
tag-foreground: <<colour base00>>
: base0
sidebar-tiddler-link-foreground: <<colour base0>>
: base1
muted-foreground: <<colour base1>>
blockquote-bar: <<colour muted-foreground>>
dropdown-border: <<colour muted-foreground>>
sidebar-muted-foreground: <<colour muted-foreground>>
tiddler-title-foreground: <<colour muted-foreground>>
site-title-foreground: <<colour tiddler-title-foreground>>
: base2
modal-footer-background: <<colour base2>>
page-background: <<colour base2>>
modal-backdrop: <<colour page-background>>
notification-background: <<colour page-background>>
code-background: <<colour page-background>>
code-border: <<colour code-background>>
pre-background: <<colour page-background>>
pre-border: <<colour pre-background>>
sidebar-tab-background-selected: <<colour page-background>>
table-header-background: <<colour base2>>
tag-background: <<colour base2>>
tiddler-editor-background: <<colour base2>>
tiddler-info-background: <<colour base2>>
tiddler-info-tab-background: <<colour base2>>
tab-background: <<colour base2>>
dropdown-tab-background: <<colour tab-background>>
: base3
alert-background: <<colour base3>>
message-background: <<colour base3>>
: yellow
: orange
: red
: magenta
alert-highlight: <<colour magenta>>
: violet
external-link-foreground: <<colour violet>>
: blue
: cyan
: green
: base10
tiddler-controls-foreground: <<colour base10>>
: violet-muted
external-link-foreground-visited: <<colour violet-muted>>
: blue-muted
primary: <<colour blue-muted>>
download-background: <<colour primary>>
tiddler-link-foreground: <<colour primary>>
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: <<colour tab-border>>
modal-header-border: <<colour tab-border>>
notification-border: <<colour tab-border>>
sidebar-tab-border: <<colour tab-border>>
tab-border-selected: <<colour tab-border>>
sidebar-tab-border-selected: <<colour tab-border-selected>>
tab-divider: #d8d8d8
sidebar-tab-divider: <<colour 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

View File

@ -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

View File

@ -0,0 +1,6 @@
created: 20220318165540214
modified: 20220318165540353
title: $:/themes/tiddlywiki/vanilla/metrics/bodyfontsize
type: text/vnd.tiddlywiki
17px

View File

@ -0,0 +1,6 @@
created: 20220318165545749
modified: 20220318165545749
title: $:/themes/tiddlywiki/vanilla/metrics/bodylineheight
type: text/vnd.tiddlywiki
24px

View File

@ -0,0 +1,6 @@
created: 20220318165613356
modified: 20220318165613356
title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth
type: text/vnd.tiddlywiki
450px

View File

@ -0,0 +1,6 @@
created: 20220318165602424
modified: 20220318165602424
title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout
type: text/vnd.tiddlywiki
fluid-fixed

View File

@ -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

View File

@ -0,0 +1,11 @@
created: 20211230214957666
modified: 20211230215118758
tags: $:/tags/SideBar
title: Table of Contents
type: text/vnd.tiddlywiki
<div class="tc-table-of-contents">
<<toc-selective-expandable 'Table of Contents'>>
</div>

View File

@ -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

View File

@ -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
}
}