move shared and viz in gui directory

Kappa-Dev · Mar 22, 2024 · ec9e896 · ec9e896
1 parent 8ee0a30
commit ec9e896
Show file tree

Hide file tree

Showing 22 changed files with 6 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -15,7 +15,7 @@ SCRIPTSSOURCE = $(wildcard $(MANSCRIPTREP)*.sh)
 SCRIPTSWITNESS = $(SCRIPTSSOURCE:.sh=.witness) $(MANGENREP)version.tex
 MODELS = $(wildcard $(MANKAPPAMODELSREP)*.ka)
 
-RESOURCES_HTML=$(wildcard shared/*.js) $(wildcard viz/*.js) $(wildcard viz/*.css) gui/favicon.ico gui/package.json
+RESOURCES_HTML=$(wildcard gui/shared/*.js) $(wildcard gui/viz/*.js) $(wildcard gui/viz/*.css) gui/favicon.ico gui/package.json
 
 APP_EXT?=cdn
 INDEX_HTML=gui/use-$(APP_EXT).html

diff --git a/core/simulation/dune b/core/simulation/dune
@@ -16,7 +16,7 @@
 ; Generate resource_strings.ml with the content of some files
 (rule
  (targets resource_strings.ml)
- (deps ../../dev/load_files_into_ocaml_string_vars.sh ../../shared/flux.js ../../viz/common.js)
+ (deps ../../dev/load_files_into_ocaml_string_vars.sh ../../gui/shared/flux.js ../../gui/viz/common.js)
  (action
   (with-stdout-to
    %{targets}

diff --git a/dev/update-web.sh b/dev/update-web.sh
@@ -52,7 +52,7 @@ case $1 in
         scp -o UserKnownHostsFile=dev/deploy_hosts -i dev/travis-deploy -r \
             ${PLAYGROUND}/try travis@api.kappalanguage.org:/var/www/tools.kappalanguage.org/
         empty_or_create ${PLAYGROUND}/viz
-        cp viz/* ${PLAYGROUND}/viz/
+        cp gui/viz/* ${PLAYGROUND}/viz/
         scp -o UserKnownHostsFile=dev/deploy_hosts -i dev/travis-deploy -r \
             ${PLAYGROUND}/viz travis@api.kappalanguage.org:/var/www/tools.kappalanguage.org/
         [ -d ${PLAYGROUND}/binaries ] || mkdir ${PLAYGROUND}/binaries

diff --git a/gui/shared/README.md b/gui/shared/README.md
@@ -0,0 +1,3 @@
+This directory contains javascript code both used by
+- the webapp ./gui
+- html generation in ./core/simulation
diff --git a/shared/flux.js → gui/shared/flux.js b/shared/flux.js → gui/shared/flux.js
diff --git a/shared/graphlogger.js → gui/shared/graphlogger.js b/shared/graphlogger.js → gui/shared/graphlogger.js
diff --git a/shared/parser.js → gui/shared/parser.js b/shared/parser.js → gui/shared/parser.js
diff --git a/viz/CONTRIBUTING.md → gui/viz/CONTRIBUTING.md b/viz/CONTRIBUTING.md → gui/viz/CONTRIBUTING.md
diff --git a/viz/JsSim.css → gui/viz/JsSim.css b/viz/JsSim.css → gui/viz/JsSim.css
diff --git a/viz/Kappa.js → gui/viz/Kappa.js b/viz/Kappa.js → gui/viz/Kappa.js
diff --git a/viz/class.js → gui/viz/class.js b/viz/class.js → gui/viz/class.js
diff --git a/viz/common.js → gui/viz/common.js b/viz/common.js → gui/viz/common.js
diff --git a/viz/index.html → gui/viz/index.html b/viz/index.html → gui/viz/index.html
diff --git a/viz/main.js → gui/viz/main.js b/viz/main.js → gui/viz/main.js
diff --git a/viz/plot.js → gui/viz/plot.js b/viz/plot.js → gui/viz/plot.js
diff --git a/viz/render-contactmap.js → gui/viz/render-contactmap.js b/viz/render-contactmap.js → gui/viz/render-contactmap.js
diff --git a/viz/render-dummy.js → gui/viz/render-dummy.js b/viz/render-dummy.js → gui/viz/render-dummy.js
diff --git a/viz/render-snapshot.js → gui/viz/render-snapshot.js b/viz/render-snapshot.js → gui/viz/render-snapshot.js
diff --git a/viz/render-story.js → gui/viz/render-story.js b/viz/render-story.js → gui/viz/render-story.js
diff --git a/viz/tooltip-contactmap.js → gui/viz/tooltip-contactmap.js b/viz/tooltip-contactmap.js → gui/viz/tooltip-contactmap.js
diff --git a/viz/tooltip-snapshot.js → gui/viz/tooltip-snapshot.js b/viz/tooltip-snapshot.js → gui/viz/tooltip-snapshot.js
diff --git a/viz/utils.js → gui/viz/utils.js b/viz/utils.js → gui/viz/utils.js