Polish build & styles

mpds-io · Sep 22, 2023 · 859d8be · 859d8be
1 parent 3ba946b
commit 859d8be
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/.github/workflows/deploy-to-gh.yml b/.github/workflows/deploy-to-gh.yml
@@ -1,7 +1,9 @@
 name: Build on GitHub
 
 on:
-  workflow_dispatch:
+  push:
+    branches:
+      - master
 
 jobs:
   build-then-deploy:
@@ -23,14 +25,13 @@ jobs:
 
       - name: Save files
         run: |
-          mkdir build
-          cp ermac.min.js jquery.min.js build
-          cp -r webassets build
-          cp example_prod.html build/index.html
-          ls -al build
+          mkdir dist
+          cp ermac.min.js jquery.min.js dist
+          cp -r webassets oauth crystvis dist
+          cp example_prod.html dist/index.html
 
       - name: Deploy
         uses: JamesIves/github-pages-deploy-action@4.1.7
         with:
           branch: gh-pages
-          folder: build
+          folder: dist
diff --git a/deploy/build_js.sh b/deploy/build_js.sh
@@ -4,16 +4,16 @@ ROOT=$(dirname $0)/../
 JSCOMP=$ROOT/third_party/jscomp/compiler.jar
 JSTARGET=$ROOT/ermac.min.js
 
-echo '/* Author: Evgeny Blokhin, Tilde Materials Informatics */' > $JSTARGET
-
 # Desktop (not mobile) GUI
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/browser_chk.js >> $JSTARGET
+
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/jquery.tablesorter.js --compilation_level WHITESPACE_ONLY >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/wNumb.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/nouislider.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/selectize.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/third_party/selectize_preserve_on_blur.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT_NEXT    --js $ROOT/src_js/third_party/optimade_mpds_nlp.js >> $JSTARGET
+
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/wmsettings.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT_NEXT    --js $ROOT/src_js/wmcore.js >> $JSTARGET
 java -jar $JSCOMP --jscomp_off checkTypes --language_in ECMASCRIPT5_STRICT --js $ROOT/src_js/sliders.js >> $JSTARGET

diff --git a/example_prod.html b/example_prod.html
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta charset="utf-8" />
-<link rel="stylesheet" type="text/css" href="webassets/ermac.css?140722" />
+<link rel="stylesheet" type="text/css" href="webassets/ermac.css" />
 <script type="text/javascript" src="jquery.min.js"></script>
 </head>
 <body class="noscroll">

diff --git a/webassets/ermac.css b/webassets/ermac.css