From b0f85de89b0c9c72830896d65b411f63282b7232 Mon Sep 17 00:00:00 2001 From: Antoine Pouille Date: Tue, 24 Sep 2024 18:03:17 +0200 Subject: [PATCH] Webapp: move js libs --- Makefile | 2 +- core/simulation/dune | 4 ++-- gui/{viz => entry_point}/main.js | 0 gui/js_lib/README.md | 9 +++++++++ gui/{shared => js_lib}/flux.js | 0 gui/{shared => js_lib}/graphlogger.js | 0 gui/{shared => js_lib}/parser.js | 0 gui/{ => js_lib}/viz/CONTRIBUTING.md | 0 gui/{ => js_lib}/viz/Kappa.js | 0 gui/js_lib/viz/README.md | 7 +++++++ gui/{ => js_lib}/viz/class.js | 0 gui/{ => js_lib}/viz/common.js | 0 gui/{ => js_lib}/viz/index.html | 0 gui/{ => js_lib}/viz/plot.js | 0 gui/{ => js_lib}/viz/render-contactmap.js | 0 gui/{ => js_lib}/viz/render-dummy.js | 0 gui/{ => js_lib}/viz/render-snapshot.js | 0 gui/{ => js_lib}/viz/render-story.js | 0 gui/{ => js_lib}/viz/tooltip-contactmap.js | 0 gui/{ => js_lib}/viz/tooltip-snapshot.js | 0 gui/{ => js_lib}/viz/utils.js | 0 gui/{viz => resources}/JsSim.css | 0 gui/resources/README.md | 1 + gui/shared/README.md | 3 --- 24 files changed, 20 insertions(+), 6 deletions(-) rename gui/{viz => entry_point}/main.js (100%) create mode 100644 gui/js_lib/README.md rename gui/{shared => js_lib}/flux.js (100%) rename gui/{shared => js_lib}/graphlogger.js (100%) rename gui/{shared => js_lib}/parser.js (100%) rename gui/{ => js_lib}/viz/CONTRIBUTING.md (100%) rename gui/{ => js_lib}/viz/Kappa.js (100%) create mode 100644 gui/js_lib/viz/README.md rename gui/{ => js_lib}/viz/class.js (100%) rename gui/{ => js_lib}/viz/common.js (100%) rename gui/{ => js_lib}/viz/index.html (100%) rename gui/{ => js_lib}/viz/plot.js (100%) rename gui/{ => js_lib}/viz/render-contactmap.js (100%) rename gui/{ => js_lib}/viz/render-dummy.js (100%) rename gui/{ => js_lib}/viz/render-snapshot.js (100%) rename gui/{ => js_lib}/viz/render-story.js (100%) rename gui/{ => js_lib}/viz/tooltip-contactmap.js (100%) rename gui/{ => js_lib}/viz/tooltip-snapshot.js (100%) rename gui/{ => js_lib}/viz/utils.js (100%) rename gui/{viz => resources}/JsSim.css (100%) create mode 100644 gui/resources/README.md delete mode 100644 gui/shared/README.md diff --git a/Makefile b/Makefile index 2ce3d251d6..b29db6e32d 100644 --- 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 gui/shared/*.js) $(wildcard gui/viz/*.js) $(wildcard gui/viz/*.css) gui/resources/favicon.ico gui/entry_point/package.json +RESOURCES_HTML=$(wildcard gui/js_lib/*.js) $(wildcard gui/js_lib/viz/*.js) $(wildcard gui/resources/*.css) gui/resources/favicon.ico gui/entry_point/package.json gui/entry_point/main.js # `APP_EXT` defines where to fetch the js libs. # `local` is to download them from the dev website e.g. github and saving them locally. diff --git a/core/simulation/dune b/core/simulation/dune index 5a0efe9836..4b76e34510 100644 --- a/core/simulation/dune +++ b/core/simulation/dune @@ -19,8 +19,8 @@ (targets resource_strings.ml) (deps ../../dev/load_files_into_ocaml_string_vars.sh - ../../gui/shared/flux.js - ../../gui/viz/common.js) + ../../gui/js_lib/flux.js + ../../gui/js_lib/viz/common.js) (action (with-stdout-to %{targets} diff --git a/gui/viz/main.js b/gui/entry_point/main.js similarity index 100% rename from gui/viz/main.js rename to gui/entry_point/main.js diff --git a/gui/js_lib/README.md b/gui/js_lib/README.md new file mode 100644 index 0000000000..09d3acc129 --- /dev/null +++ b/gui/js_lib/README.md @@ -0,0 +1,9 @@ +This directory contains javascript libraries. + +`viz` contains js libs for vizualization from kappa tools. + +`flux.js` is used by the webapp, and by the html generation in ./core/simulation + +`graphlogger.js` by the webapp. + +`parser.js` might be unused. diff --git a/gui/shared/flux.js b/gui/js_lib/flux.js similarity index 100% rename from gui/shared/flux.js rename to gui/js_lib/flux.js diff --git a/gui/shared/graphlogger.js b/gui/js_lib/graphlogger.js similarity index 100% rename from gui/shared/graphlogger.js rename to gui/js_lib/graphlogger.js diff --git a/gui/shared/parser.js b/gui/js_lib/parser.js similarity index 100% rename from gui/shared/parser.js rename to gui/js_lib/parser.js diff --git a/gui/viz/CONTRIBUTING.md b/gui/js_lib/viz/CONTRIBUTING.md similarity index 100% rename from gui/viz/CONTRIBUTING.md rename to gui/js_lib/viz/CONTRIBUTING.md diff --git a/gui/viz/Kappa.js b/gui/js_lib/viz/Kappa.js similarity index 100% rename from gui/viz/Kappa.js rename to gui/js_lib/viz/Kappa.js diff --git a/gui/js_lib/viz/README.md b/gui/js_lib/viz/README.md new file mode 100644 index 0000000000..95884894f3 --- /dev/null +++ b/gui/js_lib/viz/README.md @@ -0,0 +1,7 @@ +This directory contains js libs for vizualization from kappa tools. + +Some files here are used in the webapp. + +`common.js` is also included by the html generation in `core/simulation` + +`Kappa.js` might be unused, and includes info for kappa language syntax highlighting. diff --git a/gui/viz/class.js b/gui/js_lib/viz/class.js similarity index 100% rename from gui/viz/class.js rename to gui/js_lib/viz/class.js diff --git a/gui/viz/common.js b/gui/js_lib/viz/common.js similarity index 100% rename from gui/viz/common.js rename to gui/js_lib/viz/common.js diff --git a/gui/viz/index.html b/gui/js_lib/viz/index.html similarity index 100% rename from gui/viz/index.html rename to gui/js_lib/viz/index.html diff --git a/gui/viz/plot.js b/gui/js_lib/viz/plot.js similarity index 100% rename from gui/viz/plot.js rename to gui/js_lib/viz/plot.js diff --git a/gui/viz/render-contactmap.js b/gui/js_lib/viz/render-contactmap.js similarity index 100% rename from gui/viz/render-contactmap.js rename to gui/js_lib/viz/render-contactmap.js diff --git a/gui/viz/render-dummy.js b/gui/js_lib/viz/render-dummy.js similarity index 100% rename from gui/viz/render-dummy.js rename to gui/js_lib/viz/render-dummy.js diff --git a/gui/viz/render-snapshot.js b/gui/js_lib/viz/render-snapshot.js similarity index 100% rename from gui/viz/render-snapshot.js rename to gui/js_lib/viz/render-snapshot.js diff --git a/gui/viz/render-story.js b/gui/js_lib/viz/render-story.js similarity index 100% rename from gui/viz/render-story.js rename to gui/js_lib/viz/render-story.js diff --git a/gui/viz/tooltip-contactmap.js b/gui/js_lib/viz/tooltip-contactmap.js similarity index 100% rename from gui/viz/tooltip-contactmap.js rename to gui/js_lib/viz/tooltip-contactmap.js diff --git a/gui/viz/tooltip-snapshot.js b/gui/js_lib/viz/tooltip-snapshot.js similarity index 100% rename from gui/viz/tooltip-snapshot.js rename to gui/js_lib/viz/tooltip-snapshot.js diff --git a/gui/viz/utils.js b/gui/js_lib/viz/utils.js similarity index 100% rename from gui/viz/utils.js rename to gui/js_lib/viz/utils.js diff --git a/gui/viz/JsSim.css b/gui/resources/JsSim.css similarity index 100% rename from gui/viz/JsSim.css rename to gui/resources/JsSim.css diff --git a/gui/resources/README.md b/gui/resources/README.md new file mode 100644 index 0000000000..dad038c4fe --- /dev/null +++ b/gui/resources/README.md @@ -0,0 +1 @@ +Here are resources used to build the webapp diff --git a/gui/shared/README.md b/gui/shared/README.md deleted file mode 100644 index 930bc6dfd6..0000000000 --- a/gui/shared/README.md +++ /dev/null @@ -1,3 +0,0 @@ -This directory contains javascript code both used by -- the webapp ./gui -- html generation in ./core/simulation