From 7949fcdc683d07689bad5da5d20bfa3eeb5a6a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Tue, 5 Sep 2023 01:25:00 +0200 Subject: Move frontend code to subdirectories, to simplify command line flags. --- static/Makefile | 17 +- static/_global.scss | 17 - static/_slider_input.scss | 10 - static/_small-calendar.scss | 51 -- static/clock.ts | 136 ---- static/components.ts | 40 - static/components/changelog.ts | 49 -- static/components/date-jump.ts | 40 - static/components/date-time-input.ts | 119 --- static/components/edit-rrule.ts | 75 -- static/components/input-list.ts | 120 --- static/components/popup-element.ts | 201 ----- static/components/slider.ts | 101 --- static/components/tab-group-element.ts | 184 ----- static/components/vevent-block.ts | 99 --- static/components/vevent-description.ts | 38 - static/components/vevent-dl.ts | 35 - static/components/vevent-edit.ts | 179 ----- static/components/vevent.ts | 69 -- static/directory-listing.scss | 5 - static/event-creator.ts | 181 ----- static/formatters.ts | 75 -- static/globals.ts | 60 -- static/jcal.ts | 192 ----- static/lib.ts | 233 ------ static/make-watch | 2 +- static/package-lock.json | 5 +- static/script.ts | 162 ---- static/scss/_global.scss | 17 + static/scss/_slider_input.scss | 10 + static/scss/_small-calendar.scss | 51 ++ static/scss/directory-listing.scss | 5 + static/scss/smallcal.scss | 2 + static/scss/style.scss | 1161 ++++++++++++++++++++++++++++ static/server_connect.ts | 133 ---- static/smallcal.scss | 2 - static/style.scss | 1161 ---------------------------- static/ts/clock.ts | 136 ++++ static/ts/components.ts | 40 + static/ts/components/changelog.ts | 49 ++ static/ts/components/date-jump.ts | 40 + static/ts/components/date-time-input.ts | 119 +++ static/ts/components/edit-rrule.ts | 75 ++ static/ts/components/input-list.ts | 120 +++ static/ts/components/popup-element.ts | 201 +++++ static/ts/components/slider.ts | 101 +++ static/ts/components/tab-group-element.ts | 184 +++++ static/ts/components/vevent-block.ts | 99 +++ static/ts/components/vevent-description.ts | 38 + static/ts/components/vevent-dl.ts | 35 + static/ts/components/vevent-edit.ts | 179 +++++ static/ts/components/vevent.ts | 69 ++ static/ts/event-creator.ts | 181 +++++ static/ts/formatters.ts | 75 ++ static/ts/globals.ts | 60 ++ static/ts/jcal.ts | 192 +++++ static/ts/lib.ts | 233 ++++++ static/ts/script.ts | 162 ++++ static/ts/server_connect.ts | 133 ++++ static/ts/types.ts | 208 +++++ static/ts/vevent.ts | 557 +++++++++++++ static/tsconfig.json | 4 +- static/types.ts | 208 ----- static/vevent.ts | 557 ------------- 64 files changed, 4549 insertions(+), 4543 deletions(-) delete mode 100644 static/_global.scss delete mode 100644 static/_slider_input.scss delete mode 100644 static/_small-calendar.scss delete mode 100644 static/clock.ts delete mode 100644 static/components.ts delete mode 100644 static/components/changelog.ts delete mode 100644 static/components/date-jump.ts delete mode 100644 static/components/date-time-input.ts delete mode 100644 static/components/edit-rrule.ts delete mode 100644 static/components/input-list.ts delete mode 100644 static/components/popup-element.ts delete mode 100644 static/components/slider.ts delete mode 100644 static/components/tab-group-element.ts delete mode 100644 static/components/vevent-block.ts delete mode 100644 static/components/vevent-description.ts delete mode 100644 static/components/vevent-dl.ts delete mode 100644 static/components/vevent-edit.ts delete mode 100644 static/components/vevent.ts delete mode 100644 static/directory-listing.scss delete mode 100644 static/event-creator.ts delete mode 100644 static/formatters.ts delete mode 100644 static/globals.ts delete mode 100644 static/jcal.ts delete mode 100644 static/lib.ts delete mode 100644 static/script.ts create mode 100644 static/scss/_global.scss create mode 100644 static/scss/_slider_input.scss create mode 100644 static/scss/_small-calendar.scss create mode 100644 static/scss/directory-listing.scss create mode 100644 static/scss/smallcal.scss create mode 100644 static/scss/style.scss delete mode 100644 static/server_connect.ts delete mode 100644 static/smallcal.scss delete mode 100644 static/style.scss create mode 100644 static/ts/clock.ts create mode 100644 static/ts/components.ts create mode 100644 static/ts/components/changelog.ts create mode 100644 static/ts/components/date-jump.ts create mode 100644 static/ts/components/date-time-input.ts create mode 100644 static/ts/components/edit-rrule.ts create mode 100644 static/ts/components/input-list.ts create mode 100644 static/ts/components/popup-element.ts create mode 100644 static/ts/components/slider.ts create mode 100644 static/ts/components/tab-group-element.ts create mode 100644 static/ts/components/vevent-block.ts create mode 100644 static/ts/components/vevent-description.ts create mode 100644 static/ts/components/vevent-dl.ts create mode 100644 static/ts/components/vevent-edit.ts create mode 100644 static/ts/components/vevent.ts create mode 100644 static/ts/event-creator.ts create mode 100644 static/ts/formatters.ts create mode 100644 static/ts/globals.ts create mode 100644 static/ts/jcal.ts create mode 100644 static/ts/lib.ts create mode 100644 static/ts/script.ts create mode 100644 static/ts/server_connect.ts create mode 100644 static/ts/types.ts create mode 100644 static/ts/vevent.ts delete mode 100644 static/types.ts delete mode 100644 static/vevent.ts diff --git a/static/Makefile b/static/Makefile index 07c72b2f..17432585 100644 --- a/static/Makefile +++ b/static/Makefile @@ -1,17 +1,18 @@ .PHONY: all install clean watch watch-esbuild doc -TARGETS := style.css smallcal.css script.js directory-listing.css +_TARGETS := style.css smallcal.css script.js directory-listing.css +TARGETS = $(addprefix out/,$(_TARGETS)) WATCH= -TS_FILES = $(shell find . -type f -name \*.ts -not -path */node_modules/*) -JS_FILES = $(TS_FILES:%.ts=%.js) +TS_FILES = $(shell find ts -type f -name \*.ts) +JS_FILES = $(TS_FILES:ts/%.ts=out/%.js) ESBUILD_LOGLEVEL=warning # Variable for adding extra flags ESBUILD_FLAGS = # Used flags __ESBUILD_FLAGS = --log-level=$(ESBUILD_LOGLEVEL) \ - --sourcemap --bundle --outdir=$(CURDIR) \ + --sourcemap --bundle --outdir=$(CURDIR)/out \ $(ESBUILD_FLAGS) export PATH := $(shell npm bin):$(PATH) @@ -19,11 +20,11 @@ export PATH := $(shell npm bin):$(PATH) all: $(TARGETS) # script explicitly named, since that is our entry point -script.js: script.ts $(TS_FILES) +out/script.js: ts/script.ts $(TS_FILES) esbuild $< $(__ESBUILD_FLAGS) watch-esbuild: - $(MAKE) ESBUILD_FLAGS+='--watch' ESBUILD_LOGLEVEL=info -B script.js + $(MAKE) ESBUILD_FLAGS+='--watch' ESBUILD_LOGLEVEL=info -B out/script.js deps.svg: $(TS_FILES) madge --image $@ $^ @@ -38,8 +39,8 @@ install: all clean: -rm $(TARGETS) -%.css: %.scss +out/%.css: scss/%.scss scss -E UTF-8 $(WATCH) -I. $< $@ doc: - typedoc --logLevel Verbose --excludeExternals --entryPointStrategy expand . + typedoc --logLevel Verbose --excludeExternals diff --git a/static/_global.scss b/static/_global.scss deleted file mode 100644 index 58e05155..00000000 --- a/static/_global.scss +++ /dev/null @@ -1,17 +0,0 @@ -$gray: #757575; -$blue: #3399ff; -/* TODO rename this */ -$btn-height: 0.5ex; - -$tablabel-height: 5ex; -$tablabel-margin: 0; - -// "left" or "top" -$popup-style: "left"; - -:root { - /* Each popup can have a different amoutn of tabs. - Override this as appropriate */ - --tabcount: 4; - --background-color: white; -} diff --git a/static/_slider_input.scss b/static/_slider_input.scss deleted file mode 100644 index adae56ae..00000000 --- a/static/_slider_input.scss +++ /dev/null @@ -1,10 +0,0 @@ -/* See components/slider.ts */ - -slider-input { - display: flex; - - input { - min-width: 0; - } -} - diff --git a/static/_small-calendar.scss b/static/_small-calendar.scss deleted file mode 100644 index c4814285..00000000 --- a/static/_small-calendar.scss +++ /dev/null @@ -1,51 +0,0 @@ -.small-calendar { - display: grid; - grid-template-rows: auto; - grid-template-columns: auto; - - grid-auto-flow: dense; - - > * { - text-align: center; - > time { - width: 100%; - text-align: right; - /* padding place in