Merge a17t-redesign, kinda ts-ify setup.js
the web ui has been redesigned with the a17t toolkit, which imo looks a lot better than bootstrap. This also brought a complete rework of the web code, which now makes a lot more sense hopefully. the setup page is still stuck with bootstrap, its not much of a priority but i'll rewrite it eventually.
This commit is contained in:
@@ -1,33 +1,30 @@
|
||||
npm:
|
||||
$(info installing npm dependencies)
|
||||
npm install
|
||||
|
||||
configuration:
|
||||
$(info Fixing config-base)
|
||||
python3 config/fixconfig.py -i config/config-base.json -o data/config-base.json
|
||||
-mkdir -p build/data
|
||||
python3 config/fixconfig.py -i config/config-base.json -o build/data/config-base.json
|
||||
$(info Generating config-default.ini)
|
||||
python3 config/generate_ini.py -i config/config-base.json -o data/config-default.ini
|
||||
|
||||
sass:
|
||||
$(info Getting libsass)
|
||||
python3 -m pip install libsass
|
||||
$(info Getting node dependencies)
|
||||
npm install
|
||||
$(info Compiling sass)
|
||||
python3 scss/compile.py
|
||||
python3 config/generate_ini.py -i config/config-base.json -o build/data/config-default.ini
|
||||
|
||||
email:
|
||||
$(info Generating email html)
|
||||
python3 mail/generate.py
|
||||
python3 mail/generate.py -o build/data/
|
||||
|
||||
typescript:
|
||||
$(info Compiling typescript)
|
||||
npx esbuild ts/*.ts ts/modules/*.ts --outdir=data/static --minify
|
||||
-rm -r data/static/ts
|
||||
-rm -r data/static/typings
|
||||
-rm data/static/*.map
|
||||
ts:
|
||||
$(info compiling typescript)
|
||||
-mkdir -p build/data/web/js
|
||||
-npx esbuild ts/*.ts ts/modules/*.ts --outdir=./build/data/web/js/
|
||||
|
||||
ts-debug:
|
||||
-npx tsc -p ts/ --sourceMap
|
||||
-rm -r data/static/ts
|
||||
-rm -r data/static/typings
|
||||
cp -r ts data/static/
|
||||
$(info compiling typescript w/ sourcemaps)
|
||||
-mkdir -p build/data/web/js
|
||||
-npx esbuild ts/*.ts ts/modules/*.ts --sourcemap --outdir=./build/data/web/js/
|
||||
-rm -r build/data/web/js/ts
|
||||
$(info copying typescript)
|
||||
cp -r ts build/data/web/js
|
||||
|
||||
swagger:
|
||||
go get github.com/swaggo/swag/cmd/swag
|
||||
@@ -47,11 +44,22 @@ compress:
|
||||
upx --lzma build/jfa-go
|
||||
|
||||
copy:
|
||||
$(info Copying data)
|
||||
cp -r data build/
|
||||
$(info copying css)
|
||||
-mkdir -p build/data/web/css
|
||||
cp -r css build/data/web/
|
||||
cp node_modules/a17t/dist/a17t.css build/data/web/css/
|
||||
cp -r node_modules/remixicon/fonts/remixicon.css node_modules/remixicon/fonts/remixicon.woff2 build/data/web/css/
|
||||
$(info copying html)
|
||||
cp -r html build/data/
|
||||
$(info copying static data)
|
||||
-mkdir -p build/data/web
|
||||
cp -r static/* build/data/web/
|
||||
$(info copying language files)
|
||||
cp -r lang build/data/
|
||||
|
||||
|
||||
install:
|
||||
cp -r build $(DESTDIR)/jfa-go
|
||||
|
||||
all: configuration sass email version typescript swagger compile copy
|
||||
debug: configuration sass email version ts-debug swagger compile copy
|
||||
all: configuration npm email version ts swagger compile copy
|
||||
debug: configuration npm email version ts-debug swagger compile copy
|
||||
|
||||
Reference in New Issue
Block a user