From 3766fbc7b8aff9dfac5daf9f467d63adeec7453c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 22 Jan 2019 19:25:12 +0100 Subject: [PATCH] reorganize files --- jest.config.js | 2 +- package.json | 14 ++++++-------- src/bundles/core.ts | 10 ---------- {demo => web}/index.html | 6 +++--- {demo => web/static/libs/almond}/almond.js | 0 {src => web/static}/libs/snabbdom/.gitignore | 0 {src => web/static}/libs/snabbdom/.npmignore | 0 {src => web/static}/libs/snabbdom/.travis.yml | 0 {src => web/static}/libs/snabbdom/LICENSE | 0 {src => web/static}/libs/snabbdom/README.md | 0 .../static}/libs/snabbdom/browserstack-karma.js | 0 {src => web/static}/libs/snabbdom/dist/h.js | 0 {src => web/static}/libs/snabbdom/dist/h.min.js | 0 .../static}/libs/snabbdom/dist/h.min.js.map | 0 .../libs/snabbdom/dist/snabbdom-attributes.js | 0 .../libs/snabbdom/dist/snabbdom-attributes.min.js | 0 .../snabbdom/dist/snabbdom-attributes.min.js.map | 0 .../static}/libs/snabbdom/dist/snabbdom-class.js | 0 .../libs/snabbdom/dist/snabbdom-class.min.js | 0 .../libs/snabbdom/dist/snabbdom-class.min.js.map | 0 .../static}/libs/snabbdom/dist/snabbdom-dataset.js | 0 .../libs/snabbdom/dist/snabbdom-eventlisteners.js | 0 .../snabbdom/dist/snabbdom-eventlisteners.min.js | 0 .../dist/snabbdom-eventlisteners.min.js.map | 0 .../static}/libs/snabbdom/dist/snabbdom-patch.js | 0 .../libs/snabbdom/dist/snabbdom-patch.min.js | 0 .../libs/snabbdom/dist/snabbdom-patch.min.js.map | 0 .../static}/libs/snabbdom/dist/snabbdom-props.js | 0 .../libs/snabbdom/dist/snabbdom-props.min.js | 0 .../libs/snabbdom/dist/snabbdom-props.min.js.map | 0 .../static}/libs/snabbdom/dist/snabbdom-style.js | 0 .../libs/snabbdom/dist/snabbdom-style.min.js | 0 .../libs/snabbdom/dist/snabbdom-style.min.js.map | 0 {src => web/static}/libs/snabbdom/dist/snabbdom.js | 0 .../static}/libs/snabbdom/dist/snabbdom.min.js | 0 .../static}/libs/snabbdom/dist/snabbdom.min.js.map | 0 {src => web/static}/libs/snabbdom/dist/tovnode.js | 0 .../static}/libs/snabbdom/dist/tovnode.min.js | 0 .../static}/libs/snabbdom/dist/tovnode.min.js.map | 0 .../libs/snabbdom/examples/carousel-svg/README.md | 0 .../libs/snabbdom/examples/carousel-svg/build.js | 0 .../libs/snabbdom/examples/carousel-svg/index.html | 0 .../libs/snabbdom/examples/carousel-svg/script.js | 0 .../static}/libs/snabbdom/examples/hero/build.js | 0 .../static}/libs/snabbdom/examples/hero/index.html | 0 .../static}/libs/snabbdom/examples/hero/script.js | 0 .../snabbdom/examples/reorder-animation/build.js | 0 .../snabbdom/examples/reorder-animation/index.html | 0 .../snabbdom/examples/reorder-animation/script.js | 0 .../static}/libs/snabbdom/examples/svg/build.js | 0 .../static}/libs/snabbdom/examples/svg/index.html | 0 .../static}/libs/snabbdom/examples/svg/script.js | 0 {src => web/static}/libs/snabbdom/gulpfile.js | 0 {src => web/static}/libs/snabbdom/karma.conf.js | 0 {src => web/static}/libs/snabbdom/package.json | 0 .../static}/libs/snabbdom/perf/benchmarks.js | 0 {src => web/static}/libs/snabbdom/perf/index.html | 0 {src => web/static}/libs/snabbdom/src/h.ts | 0 .../static}/libs/snabbdom/src/helpers/attachto.ts | 0 {src => web/static}/libs/snabbdom/src/hooks.ts | 0 .../static}/libs/snabbdom/src/htmldomapi.ts | 0 {src => web/static}/libs/snabbdom/src/is.ts | 0 .../libs/snabbdom/src/modules/attributes.ts | 0 .../static}/libs/snabbdom/src/modules/class.ts | 0 .../static}/libs/snabbdom/src/modules/dataset.ts | 0 .../libs/snabbdom/src/modules/eventlisteners.ts | 0 .../static}/libs/snabbdom/src/modules/hero.ts | 0 .../static}/libs/snabbdom/src/modules/module.ts | 0 .../static}/libs/snabbdom/src/modules/props.ts | 0 .../static}/libs/snabbdom/src/modules/style.ts | 0 .../static}/libs/snabbdom/src/snabbdom.bundle.ts | 0 {src => web/static}/libs/snabbdom/src/snabbdom.ts | 0 {src => web/static}/libs/snabbdom/src/thunk.ts | 0 {src => web/static}/libs/snabbdom/src/tovnode.ts | 0 {src => web/static}/libs/snabbdom/src/vnode.ts | 0 {src => web/static}/libs/snabbdom/test/attachto.js | 0 .../static}/libs/snabbdom/test/attributes.js | 0 {src => web/static}/libs/snabbdom/test/core.js | 0 {src => web/static}/libs/snabbdom/test/dataset.js | 0 .../static}/libs/snabbdom/test/eventlisteners.js | 0 .../static}/libs/snabbdom/test/htmldomapi.js | 0 {src => web/static}/libs/snabbdom/test/style.js | 0 {src => web/static}/libs/snabbdom/test/thunk.js | 0 {src => web/static}/libs/snabbdom/testem.json | 0 {src => web/static}/libs/snabbdom/tsconfig.json | 0 {demo => web/static/src/scss}/app.scss | 0 .../widget.ts => web/static/src/ts/core/Widget.ts | 8 ++++---- {src => web/static/src/ts}/core/qweb_vdom.ts | 4 ++-- {src => web/static/src/ts}/core/utils.ts | 0 {demo/src => web/static/src/ts}/env.ts | 4 ++-- {demo/src => web/static/src/ts}/main.ts | 0 .../src => web/static/src/ts}/services/actions.ts | 2 +- {demo/src => web/static/src/ts}/services/router.ts | 0 {demo/src => web/static/src/ts}/widgets/CRM.ts | 2 +- {demo/src => web/static/src/ts}/widgets/Counter.ts | 2 +- {demo/src => web/static/src/ts}/widgets/Discuss.ts | 2 +- {demo/src => web/static/src/ts}/widgets/Navbar.ts | 2 +- .../static/src/ts}/widgets/RootWidget.ts | 2 +- {tests => web/static/tests}/qweb_vdom.test.ts | 8 ++++---- {tests => web/static/tests}/utils.test.ts | 2 +- {tests => web/static/tests}/widget.test.ts | 4 ++-- 101 files changed, 31 insertions(+), 43 deletions(-) delete mode 100644 src/bundles/core.ts rename {demo => web}/index.html (57%) rename {demo => web/static/libs/almond}/almond.js (100%) rename {src => web/static}/libs/snabbdom/.gitignore (100%) rename {src => web/static}/libs/snabbdom/.npmignore (100%) rename {src => web/static}/libs/snabbdom/.travis.yml (100%) rename {src => web/static}/libs/snabbdom/LICENSE (100%) rename {src => web/static}/libs/snabbdom/README.md (100%) rename {src => web/static}/libs/snabbdom/browserstack-karma.js (100%) rename {src => web/static}/libs/snabbdom/dist/h.js (100%) rename {src => web/static}/libs/snabbdom/dist/h.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/h.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-attributes.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-attributes.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-attributes.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-class.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-class.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-class.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-dataset.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-eventlisteners.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-eventlisteners.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-patch.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-patch.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-patch.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-props.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-props.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-props.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-style.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-style.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom-style.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/snabbdom.min.js.map (100%) rename {src => web/static}/libs/snabbdom/dist/tovnode.js (100%) rename {src => web/static}/libs/snabbdom/dist/tovnode.min.js (100%) rename {src => web/static}/libs/snabbdom/dist/tovnode.min.js.map (100%) rename {src => web/static}/libs/snabbdom/examples/carousel-svg/README.md (100%) rename {src => web/static}/libs/snabbdom/examples/carousel-svg/build.js (100%) rename {src => web/static}/libs/snabbdom/examples/carousel-svg/index.html (100%) rename {src => web/static}/libs/snabbdom/examples/carousel-svg/script.js (100%) rename {src => web/static}/libs/snabbdom/examples/hero/build.js (100%) rename {src => web/static}/libs/snabbdom/examples/hero/index.html (100%) rename {src => web/static}/libs/snabbdom/examples/hero/script.js (100%) rename {src => web/static}/libs/snabbdom/examples/reorder-animation/build.js (100%) rename {src => web/static}/libs/snabbdom/examples/reorder-animation/index.html (100%) rename {src => web/static}/libs/snabbdom/examples/reorder-animation/script.js (100%) rename {src => web/static}/libs/snabbdom/examples/svg/build.js (100%) rename {src => web/static}/libs/snabbdom/examples/svg/index.html (100%) rename {src => web/static}/libs/snabbdom/examples/svg/script.js (100%) rename {src => web/static}/libs/snabbdom/gulpfile.js (100%) rename {src => web/static}/libs/snabbdom/karma.conf.js (100%) rename {src => web/static}/libs/snabbdom/package.json (100%) rename {src => web/static}/libs/snabbdom/perf/benchmarks.js (100%) rename {src => web/static}/libs/snabbdom/perf/index.html (100%) rename {src => web/static}/libs/snabbdom/src/h.ts (100%) rename {src => web/static}/libs/snabbdom/src/helpers/attachto.ts (100%) rename {src => web/static}/libs/snabbdom/src/hooks.ts (100%) rename {src => web/static}/libs/snabbdom/src/htmldomapi.ts (100%) rename {src => web/static}/libs/snabbdom/src/is.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/attributes.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/class.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/dataset.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/eventlisteners.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/hero.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/module.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/props.ts (100%) rename {src => web/static}/libs/snabbdom/src/modules/style.ts (100%) rename {src => web/static}/libs/snabbdom/src/snabbdom.bundle.ts (100%) rename {src => web/static}/libs/snabbdom/src/snabbdom.ts (100%) rename {src => web/static}/libs/snabbdom/src/thunk.ts (100%) rename {src => web/static}/libs/snabbdom/src/tovnode.ts (100%) rename {src => web/static}/libs/snabbdom/src/vnode.ts (100%) rename {src => web/static}/libs/snabbdom/test/attachto.js (100%) rename {src => web/static}/libs/snabbdom/test/attributes.js (100%) rename {src => web/static}/libs/snabbdom/test/core.js (100%) rename {src => web/static}/libs/snabbdom/test/dataset.js (100%) rename {src => web/static}/libs/snabbdom/test/eventlisteners.js (100%) rename {src => web/static}/libs/snabbdom/test/htmldomapi.js (100%) rename {src => web/static}/libs/snabbdom/test/style.js (100%) rename {src => web/static}/libs/snabbdom/test/thunk.js (100%) rename {src => web/static}/libs/snabbdom/testem.json (100%) rename {src => web/static}/libs/snabbdom/tsconfig.json (100%) rename {demo => web/static/src/scss}/app.scss (100%) rename src/core/widget.ts => web/static/src/ts/core/Widget.ts (90%) rename {src => web/static/src/ts}/core/qweb_vdom.ts (99%) rename {src => web/static/src/ts}/core/utils.ts (100%) rename {demo/src => web/static/src/ts}/env.ts (71%) rename {demo/src => web/static/src/ts}/main.ts (100%) rename {demo/src => web/static/src/ts}/services/actions.ts (87%) rename {demo/src => web/static/src/ts}/services/router.ts (100%) rename {demo/src => web/static/src/ts}/widgets/CRM.ts (78%) rename {demo/src => web/static/src/ts}/widgets/Counter.ts (92%) rename {demo/src => web/static/src/ts}/widgets/Discuss.ts (95%) rename {demo/src => web/static/src/ts}/widgets/Navbar.ts (92%) rename {demo/src => web/static/src/ts}/widgets/RootWidget.ts (95%) rename {tests => web/static/tests}/qweb_vdom.test.ts (98%) rename {tests => web/static/tests}/utils.test.ts (92%) rename {tests => web/static/tests}/widget.test.ts (98%) diff --git a/jest.config.js b/jest.config.js index 4c3022ce..53234731 100644 --- a/jest.config.js +++ b/jest.config.js @@ -1,5 +1,5 @@ module.exports = { - roots: ["/src", "/tests"], + roots: ["/web/static", "/tests"], transform: { "^.+\\.ts?$": "ts-jest" }, diff --git a/package.json b/package.json index cf8d6013..0881ccda 100644 --- a/package.json +++ b/package.json @@ -6,14 +6,12 @@ "scripts": { "test": "jest", "test:watch": "jest --watch", - "bundle:core": "tsc -m es6 --lib es2017,dom --target esnext --outdir dist src/bundles/core.ts && rollup dist/bundles/core.js --file dist/bundle-core.js --format iife", - "bundle:core:watch": "npm run bundle:core -- --watch", - "demo:build": "cp -r demo/ dist/demo && npm run demo:build:js && npm run demo:build:css", - "demo:build:css": "sass demo/app.scss dist/demo/app.css", - "demo:build:js": "tsc --allowjs -m amd --lib es2017,dom --target esnext --outfile dist/demo/main.js demo/src/main.ts", - "demo:serve": "live-server --entry-file=index.html dist/demo/", - "predemo:dev": "npm run demo:build", - "demo:dev": "npm-run-all --parallel \"demo:build:* -- --watch\" demo:serve" + "build": "cp -r web/ dist/app && npm run build:js && npm run build:css", + "build:css": "sass web/static/src/scss/app.scss dist/app/app.css", + "build:js": "tsc --allowjs -m amd --lib es2017,dom --target esnext --outfile dist/app/main.js web/static/src/ts/main.ts", + "serve": "live-server --entry-file=index.html dist/app/", + "predev": "npm run build", + "dev": "npm-run-all --parallel \"build:* -- --watch\" serve" }, "repository": { "type": "git", diff --git a/src/bundles/core.ts b/src/bundles/core.ts deleted file mode 100644 index 4e6bf491..00000000 --- a/src/bundles/core.ts +++ /dev/null @@ -1,10 +0,0 @@ -import QWeb from "../core/qweb_vdom"; -import * as utils from "../core/utils"; -import Widget from "../core/Widget"; - - -(window).core = { - QWeb, - utils, - Widget -} \ No newline at end of file diff --git a/demo/index.html b/web/index.html similarity index 57% rename from demo/index.html rename to web/index.html index 3d0b6091..5b0b4b81 100644 --- a/demo/index.html +++ b/web/index.html @@ -3,9 +3,9 @@ Odoo Web Core Demo - - - + + + diff --git a/demo/almond.js b/web/static/libs/almond/almond.js similarity index 100% rename from demo/almond.js rename to web/static/libs/almond/almond.js diff --git a/src/libs/snabbdom/.gitignore b/web/static/libs/snabbdom/.gitignore similarity index 100% rename from src/libs/snabbdom/.gitignore rename to web/static/libs/snabbdom/.gitignore diff --git a/src/libs/snabbdom/.npmignore b/web/static/libs/snabbdom/.npmignore similarity index 100% rename from src/libs/snabbdom/.npmignore rename to web/static/libs/snabbdom/.npmignore diff --git a/src/libs/snabbdom/.travis.yml b/web/static/libs/snabbdom/.travis.yml similarity index 100% rename from src/libs/snabbdom/.travis.yml rename to web/static/libs/snabbdom/.travis.yml diff --git a/src/libs/snabbdom/LICENSE b/web/static/libs/snabbdom/LICENSE similarity index 100% rename from src/libs/snabbdom/LICENSE rename to web/static/libs/snabbdom/LICENSE diff --git a/src/libs/snabbdom/README.md b/web/static/libs/snabbdom/README.md similarity index 100% rename from src/libs/snabbdom/README.md rename to web/static/libs/snabbdom/README.md diff --git a/src/libs/snabbdom/browserstack-karma.js b/web/static/libs/snabbdom/browserstack-karma.js similarity index 100% rename from src/libs/snabbdom/browserstack-karma.js rename to web/static/libs/snabbdom/browserstack-karma.js diff --git a/src/libs/snabbdom/dist/h.js b/web/static/libs/snabbdom/dist/h.js similarity index 100% rename from src/libs/snabbdom/dist/h.js rename to web/static/libs/snabbdom/dist/h.js diff --git a/src/libs/snabbdom/dist/h.min.js b/web/static/libs/snabbdom/dist/h.min.js similarity index 100% rename from src/libs/snabbdom/dist/h.min.js rename to web/static/libs/snabbdom/dist/h.min.js diff --git a/src/libs/snabbdom/dist/h.min.js.map b/web/static/libs/snabbdom/dist/h.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/h.min.js.map rename to web/static/libs/snabbdom/dist/h.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-attributes.js b/web/static/libs/snabbdom/dist/snabbdom-attributes.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-attributes.js rename to web/static/libs/snabbdom/dist/snabbdom-attributes.js diff --git a/src/libs/snabbdom/dist/snabbdom-attributes.min.js b/web/static/libs/snabbdom/dist/snabbdom-attributes.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-attributes.min.js rename to web/static/libs/snabbdom/dist/snabbdom-attributes.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-attributes.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-attributes.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-attributes.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-attributes.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-class.js b/web/static/libs/snabbdom/dist/snabbdom-class.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-class.js rename to web/static/libs/snabbdom/dist/snabbdom-class.js diff --git a/src/libs/snabbdom/dist/snabbdom-class.min.js b/web/static/libs/snabbdom/dist/snabbdom-class.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-class.min.js rename to web/static/libs/snabbdom/dist/snabbdom-class.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-class.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-class.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-class.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-class.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-dataset.js b/web/static/libs/snabbdom/dist/snabbdom-dataset.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-dataset.js rename to web/static/libs/snabbdom/dist/snabbdom-dataset.js diff --git a/src/libs/snabbdom/dist/snabbdom-eventlisteners.js b/web/static/libs/snabbdom/dist/snabbdom-eventlisteners.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-eventlisteners.js rename to web/static/libs/snabbdom/dist/snabbdom-eventlisteners.js diff --git a/src/libs/snabbdom/dist/snabbdom-eventlisteners.min.js b/web/static/libs/snabbdom/dist/snabbdom-eventlisteners.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-eventlisteners.min.js rename to web/static/libs/snabbdom/dist/snabbdom-eventlisteners.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-eventlisteners.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-patch.js b/web/static/libs/snabbdom/dist/snabbdom-patch.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-patch.js rename to web/static/libs/snabbdom/dist/snabbdom-patch.js diff --git a/src/libs/snabbdom/dist/snabbdom-patch.min.js b/web/static/libs/snabbdom/dist/snabbdom-patch.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-patch.min.js rename to web/static/libs/snabbdom/dist/snabbdom-patch.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-patch.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-patch.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-patch.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-patch.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-props.js b/web/static/libs/snabbdom/dist/snabbdom-props.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-props.js rename to web/static/libs/snabbdom/dist/snabbdom-props.js diff --git a/src/libs/snabbdom/dist/snabbdom-props.min.js b/web/static/libs/snabbdom/dist/snabbdom-props.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-props.min.js rename to web/static/libs/snabbdom/dist/snabbdom-props.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-props.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-props.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-props.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-props.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom-style.js b/web/static/libs/snabbdom/dist/snabbdom-style.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-style.js rename to web/static/libs/snabbdom/dist/snabbdom-style.js diff --git a/src/libs/snabbdom/dist/snabbdom-style.min.js b/web/static/libs/snabbdom/dist/snabbdom-style.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-style.min.js rename to web/static/libs/snabbdom/dist/snabbdom-style.min.js diff --git a/src/libs/snabbdom/dist/snabbdom-style.min.js.map b/web/static/libs/snabbdom/dist/snabbdom-style.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom-style.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom-style.min.js.map diff --git a/src/libs/snabbdom/dist/snabbdom.js b/web/static/libs/snabbdom/dist/snabbdom.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom.js rename to web/static/libs/snabbdom/dist/snabbdom.js diff --git a/src/libs/snabbdom/dist/snabbdom.min.js b/web/static/libs/snabbdom/dist/snabbdom.min.js similarity index 100% rename from src/libs/snabbdom/dist/snabbdom.min.js rename to web/static/libs/snabbdom/dist/snabbdom.min.js diff --git a/src/libs/snabbdom/dist/snabbdom.min.js.map b/web/static/libs/snabbdom/dist/snabbdom.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/snabbdom.min.js.map rename to web/static/libs/snabbdom/dist/snabbdom.min.js.map diff --git a/src/libs/snabbdom/dist/tovnode.js b/web/static/libs/snabbdom/dist/tovnode.js similarity index 100% rename from src/libs/snabbdom/dist/tovnode.js rename to web/static/libs/snabbdom/dist/tovnode.js diff --git a/src/libs/snabbdom/dist/tovnode.min.js b/web/static/libs/snabbdom/dist/tovnode.min.js similarity index 100% rename from src/libs/snabbdom/dist/tovnode.min.js rename to web/static/libs/snabbdom/dist/tovnode.min.js diff --git a/src/libs/snabbdom/dist/tovnode.min.js.map b/web/static/libs/snabbdom/dist/tovnode.min.js.map similarity index 100% rename from src/libs/snabbdom/dist/tovnode.min.js.map rename to web/static/libs/snabbdom/dist/tovnode.min.js.map diff --git a/src/libs/snabbdom/examples/carousel-svg/README.md b/web/static/libs/snabbdom/examples/carousel-svg/README.md similarity index 100% rename from src/libs/snabbdom/examples/carousel-svg/README.md rename to web/static/libs/snabbdom/examples/carousel-svg/README.md diff --git a/src/libs/snabbdom/examples/carousel-svg/build.js b/web/static/libs/snabbdom/examples/carousel-svg/build.js similarity index 100% rename from src/libs/snabbdom/examples/carousel-svg/build.js rename to web/static/libs/snabbdom/examples/carousel-svg/build.js diff --git a/src/libs/snabbdom/examples/carousel-svg/index.html b/web/static/libs/snabbdom/examples/carousel-svg/index.html similarity index 100% rename from src/libs/snabbdom/examples/carousel-svg/index.html rename to web/static/libs/snabbdom/examples/carousel-svg/index.html diff --git a/src/libs/snabbdom/examples/carousel-svg/script.js b/web/static/libs/snabbdom/examples/carousel-svg/script.js similarity index 100% rename from src/libs/snabbdom/examples/carousel-svg/script.js rename to web/static/libs/snabbdom/examples/carousel-svg/script.js diff --git a/src/libs/snabbdom/examples/hero/build.js b/web/static/libs/snabbdom/examples/hero/build.js similarity index 100% rename from src/libs/snabbdom/examples/hero/build.js rename to web/static/libs/snabbdom/examples/hero/build.js diff --git a/src/libs/snabbdom/examples/hero/index.html b/web/static/libs/snabbdom/examples/hero/index.html similarity index 100% rename from src/libs/snabbdom/examples/hero/index.html rename to web/static/libs/snabbdom/examples/hero/index.html diff --git a/src/libs/snabbdom/examples/hero/script.js b/web/static/libs/snabbdom/examples/hero/script.js similarity index 100% rename from src/libs/snabbdom/examples/hero/script.js rename to web/static/libs/snabbdom/examples/hero/script.js diff --git a/src/libs/snabbdom/examples/reorder-animation/build.js b/web/static/libs/snabbdom/examples/reorder-animation/build.js similarity index 100% rename from src/libs/snabbdom/examples/reorder-animation/build.js rename to web/static/libs/snabbdom/examples/reorder-animation/build.js diff --git a/src/libs/snabbdom/examples/reorder-animation/index.html b/web/static/libs/snabbdom/examples/reorder-animation/index.html similarity index 100% rename from src/libs/snabbdom/examples/reorder-animation/index.html rename to web/static/libs/snabbdom/examples/reorder-animation/index.html diff --git a/src/libs/snabbdom/examples/reorder-animation/script.js b/web/static/libs/snabbdom/examples/reorder-animation/script.js similarity index 100% rename from src/libs/snabbdom/examples/reorder-animation/script.js rename to web/static/libs/snabbdom/examples/reorder-animation/script.js diff --git a/src/libs/snabbdom/examples/svg/build.js b/web/static/libs/snabbdom/examples/svg/build.js similarity index 100% rename from src/libs/snabbdom/examples/svg/build.js rename to web/static/libs/snabbdom/examples/svg/build.js diff --git a/src/libs/snabbdom/examples/svg/index.html b/web/static/libs/snabbdom/examples/svg/index.html similarity index 100% rename from src/libs/snabbdom/examples/svg/index.html rename to web/static/libs/snabbdom/examples/svg/index.html diff --git a/src/libs/snabbdom/examples/svg/script.js b/web/static/libs/snabbdom/examples/svg/script.js similarity index 100% rename from src/libs/snabbdom/examples/svg/script.js rename to web/static/libs/snabbdom/examples/svg/script.js diff --git a/src/libs/snabbdom/gulpfile.js b/web/static/libs/snabbdom/gulpfile.js similarity index 100% rename from src/libs/snabbdom/gulpfile.js rename to web/static/libs/snabbdom/gulpfile.js diff --git a/src/libs/snabbdom/karma.conf.js b/web/static/libs/snabbdom/karma.conf.js similarity index 100% rename from src/libs/snabbdom/karma.conf.js rename to web/static/libs/snabbdom/karma.conf.js diff --git a/src/libs/snabbdom/package.json b/web/static/libs/snabbdom/package.json similarity index 100% rename from src/libs/snabbdom/package.json rename to web/static/libs/snabbdom/package.json diff --git a/src/libs/snabbdom/perf/benchmarks.js b/web/static/libs/snabbdom/perf/benchmarks.js similarity index 100% rename from src/libs/snabbdom/perf/benchmarks.js rename to web/static/libs/snabbdom/perf/benchmarks.js diff --git a/src/libs/snabbdom/perf/index.html b/web/static/libs/snabbdom/perf/index.html similarity index 100% rename from src/libs/snabbdom/perf/index.html rename to web/static/libs/snabbdom/perf/index.html diff --git a/src/libs/snabbdom/src/h.ts b/web/static/libs/snabbdom/src/h.ts similarity index 100% rename from src/libs/snabbdom/src/h.ts rename to web/static/libs/snabbdom/src/h.ts diff --git a/src/libs/snabbdom/src/helpers/attachto.ts b/web/static/libs/snabbdom/src/helpers/attachto.ts similarity index 100% rename from src/libs/snabbdom/src/helpers/attachto.ts rename to web/static/libs/snabbdom/src/helpers/attachto.ts diff --git a/src/libs/snabbdom/src/hooks.ts b/web/static/libs/snabbdom/src/hooks.ts similarity index 100% rename from src/libs/snabbdom/src/hooks.ts rename to web/static/libs/snabbdom/src/hooks.ts diff --git a/src/libs/snabbdom/src/htmldomapi.ts b/web/static/libs/snabbdom/src/htmldomapi.ts similarity index 100% rename from src/libs/snabbdom/src/htmldomapi.ts rename to web/static/libs/snabbdom/src/htmldomapi.ts diff --git a/src/libs/snabbdom/src/is.ts b/web/static/libs/snabbdom/src/is.ts similarity index 100% rename from src/libs/snabbdom/src/is.ts rename to web/static/libs/snabbdom/src/is.ts diff --git a/src/libs/snabbdom/src/modules/attributes.ts b/web/static/libs/snabbdom/src/modules/attributes.ts similarity index 100% rename from src/libs/snabbdom/src/modules/attributes.ts rename to web/static/libs/snabbdom/src/modules/attributes.ts diff --git a/src/libs/snabbdom/src/modules/class.ts b/web/static/libs/snabbdom/src/modules/class.ts similarity index 100% rename from src/libs/snabbdom/src/modules/class.ts rename to web/static/libs/snabbdom/src/modules/class.ts diff --git a/src/libs/snabbdom/src/modules/dataset.ts b/web/static/libs/snabbdom/src/modules/dataset.ts similarity index 100% rename from src/libs/snabbdom/src/modules/dataset.ts rename to web/static/libs/snabbdom/src/modules/dataset.ts diff --git a/src/libs/snabbdom/src/modules/eventlisteners.ts b/web/static/libs/snabbdom/src/modules/eventlisteners.ts similarity index 100% rename from src/libs/snabbdom/src/modules/eventlisteners.ts rename to web/static/libs/snabbdom/src/modules/eventlisteners.ts diff --git a/src/libs/snabbdom/src/modules/hero.ts b/web/static/libs/snabbdom/src/modules/hero.ts similarity index 100% rename from src/libs/snabbdom/src/modules/hero.ts rename to web/static/libs/snabbdom/src/modules/hero.ts diff --git a/src/libs/snabbdom/src/modules/module.ts b/web/static/libs/snabbdom/src/modules/module.ts similarity index 100% rename from src/libs/snabbdom/src/modules/module.ts rename to web/static/libs/snabbdom/src/modules/module.ts diff --git a/src/libs/snabbdom/src/modules/props.ts b/web/static/libs/snabbdom/src/modules/props.ts similarity index 100% rename from src/libs/snabbdom/src/modules/props.ts rename to web/static/libs/snabbdom/src/modules/props.ts diff --git a/src/libs/snabbdom/src/modules/style.ts b/web/static/libs/snabbdom/src/modules/style.ts similarity index 100% rename from src/libs/snabbdom/src/modules/style.ts rename to web/static/libs/snabbdom/src/modules/style.ts diff --git a/src/libs/snabbdom/src/snabbdom.bundle.ts b/web/static/libs/snabbdom/src/snabbdom.bundle.ts similarity index 100% rename from src/libs/snabbdom/src/snabbdom.bundle.ts rename to web/static/libs/snabbdom/src/snabbdom.bundle.ts diff --git a/src/libs/snabbdom/src/snabbdom.ts b/web/static/libs/snabbdom/src/snabbdom.ts similarity index 100% rename from src/libs/snabbdom/src/snabbdom.ts rename to web/static/libs/snabbdom/src/snabbdom.ts diff --git a/src/libs/snabbdom/src/thunk.ts b/web/static/libs/snabbdom/src/thunk.ts similarity index 100% rename from src/libs/snabbdom/src/thunk.ts rename to web/static/libs/snabbdom/src/thunk.ts diff --git a/src/libs/snabbdom/src/tovnode.ts b/web/static/libs/snabbdom/src/tovnode.ts similarity index 100% rename from src/libs/snabbdom/src/tovnode.ts rename to web/static/libs/snabbdom/src/tovnode.ts diff --git a/src/libs/snabbdom/src/vnode.ts b/web/static/libs/snabbdom/src/vnode.ts similarity index 100% rename from src/libs/snabbdom/src/vnode.ts rename to web/static/libs/snabbdom/src/vnode.ts diff --git a/src/libs/snabbdom/test/attachto.js b/web/static/libs/snabbdom/test/attachto.js similarity index 100% rename from src/libs/snabbdom/test/attachto.js rename to web/static/libs/snabbdom/test/attachto.js diff --git a/src/libs/snabbdom/test/attributes.js b/web/static/libs/snabbdom/test/attributes.js similarity index 100% rename from src/libs/snabbdom/test/attributes.js rename to web/static/libs/snabbdom/test/attributes.js diff --git a/src/libs/snabbdom/test/core.js b/web/static/libs/snabbdom/test/core.js similarity index 100% rename from src/libs/snabbdom/test/core.js rename to web/static/libs/snabbdom/test/core.js diff --git a/src/libs/snabbdom/test/dataset.js b/web/static/libs/snabbdom/test/dataset.js similarity index 100% rename from src/libs/snabbdom/test/dataset.js rename to web/static/libs/snabbdom/test/dataset.js diff --git a/src/libs/snabbdom/test/eventlisteners.js b/web/static/libs/snabbdom/test/eventlisteners.js similarity index 100% rename from src/libs/snabbdom/test/eventlisteners.js rename to web/static/libs/snabbdom/test/eventlisteners.js diff --git a/src/libs/snabbdom/test/htmldomapi.js b/web/static/libs/snabbdom/test/htmldomapi.js similarity index 100% rename from src/libs/snabbdom/test/htmldomapi.js rename to web/static/libs/snabbdom/test/htmldomapi.js diff --git a/src/libs/snabbdom/test/style.js b/web/static/libs/snabbdom/test/style.js similarity index 100% rename from src/libs/snabbdom/test/style.js rename to web/static/libs/snabbdom/test/style.js diff --git a/src/libs/snabbdom/test/thunk.js b/web/static/libs/snabbdom/test/thunk.js similarity index 100% rename from src/libs/snabbdom/test/thunk.js rename to web/static/libs/snabbdom/test/thunk.js diff --git a/src/libs/snabbdom/testem.json b/web/static/libs/snabbdom/testem.json similarity index 100% rename from src/libs/snabbdom/testem.json rename to web/static/libs/snabbdom/testem.json diff --git a/src/libs/snabbdom/tsconfig.json b/web/static/libs/snabbdom/tsconfig.json similarity index 100% rename from src/libs/snabbdom/tsconfig.json rename to web/static/libs/snabbdom/tsconfig.json diff --git a/demo/app.scss b/web/static/src/scss/app.scss similarity index 100% rename from demo/app.scss rename to web/static/src/scss/app.scss diff --git a/src/core/widget.ts b/web/static/src/ts/core/Widget.ts similarity index 90% rename from src/core/widget.ts rename to web/static/src/ts/core/Widget.ts index 3a8aac2b..33261899 100644 --- a/src/core/widget.ts +++ b/web/static/src/ts/core/Widget.ts @@ -1,9 +1,9 @@ import QWeb from "./qweb_vdom"; -import { init } from "../libs/snabbdom/src/snabbdom"; -import sdListeners from "../libs/snabbdom/src/modules/eventlisteners"; -import sdAttrs from "../libs/snabbdom/src/modules/attributes"; -import { VNode } from "../libs/snabbdom/src/vnode"; +import { init } from "../../../libs/snabbdom/src/snabbdom"; +import sdListeners from "../../../libs/snabbdom/src/modules/eventlisteners"; +import sdAttrs from "../../../libs/snabbdom/src/modules/attributes"; +import { VNode } from "../../../libs/snabbdom/src/vnode"; const patch = init([sdListeners, sdAttrs]); diff --git a/src/core/qweb_vdom.ts b/web/static/src/ts/core/qweb_vdom.ts similarity index 99% rename from src/core/qweb_vdom.ts rename to web/static/src/ts/core/qweb_vdom.ts index fd1c8e00..759bad52 100644 --- a/src/core/qweb_vdom.ts +++ b/web/static/src/ts/core/qweb_vdom.ts @@ -1,5 +1,5 @@ -import { VNode } from "../libs/snabbdom/src/vnode"; -import h from "../libs/snabbdom/src/h"; +import { VNode } from "../../../libs/snabbdom/src/vnode"; +import h from "../../../libs/snabbdom/src/h"; export type EvalContext = { [key: string]: any }; type RawTemplate = string; diff --git a/src/core/utils.ts b/web/static/src/ts/core/utils.ts similarity index 100% rename from src/core/utils.ts rename to web/static/src/ts/core/utils.ts diff --git a/demo/src/env.ts b/web/static/src/ts/env.ts similarity index 71% rename from demo/src/env.ts rename to web/static/src/ts/env.ts index f0df1c83..c4140778 100644 --- a/demo/src/env.ts +++ b/web/static/src/ts/env.ts @@ -1,5 +1,5 @@ -import { Env } from "../../src/core/Widget"; -import QWeb from "../../src/core/qweb_vdom"; +import { Env } from "./core/Widget"; +import QWeb from "./core/qweb_vdom"; import Router from "./services/router"; import actions from "./services/actions"; diff --git a/demo/src/main.ts b/web/static/src/ts/main.ts similarity index 100% rename from demo/src/main.ts rename to web/static/src/ts/main.ts diff --git a/demo/src/services/actions.ts b/web/static/src/ts/services/actions.ts similarity index 87% rename from demo/src/services/actions.ts rename to web/static/src/ts/services/actions.ts index 322eea08..7022a8a5 100644 --- a/demo/src/services/actions.ts +++ b/web/static/src/ts/services/actions.ts @@ -1,6 +1,6 @@ import CRM from "../widgets/CRM"; import Discuss from "../widgets/Discuss"; -import Widget from "../../../src/core/Widget"; +import Widget from "../core/Widget"; export interface Action { id: number; diff --git a/demo/src/services/router.ts b/web/static/src/ts/services/router.ts similarity index 100% rename from demo/src/services/router.ts rename to web/static/src/ts/services/router.ts diff --git a/demo/src/widgets/CRM.ts b/web/static/src/ts/widgets/CRM.ts similarity index 78% rename from demo/src/widgets/CRM.ts rename to web/static/src/ts/widgets/CRM.ts index 9fcbc4fd..c2cfaea4 100644 --- a/demo/src/widgets/CRM.ts +++ b/web/static/src/ts/widgets/CRM.ts @@ -1,4 +1,4 @@ -import Widget from "../../../src/core/Widget"; +import Widget from "../core/Widget"; const template = `
diff --git a/demo/src/widgets/Counter.ts b/web/static/src/ts/widgets/Counter.ts similarity index 92% rename from demo/src/widgets/Counter.ts rename to web/static/src/ts/widgets/Counter.ts index b30e63ab..e6b4c8d3 100644 --- a/demo/src/widgets/Counter.ts +++ b/web/static/src/ts/widgets/Counter.ts @@ -1,4 +1,4 @@ -import Widget from "../../../src/core/Widget"; +import Widget from "../core/Widget"; const template = `
diff --git a/demo/src/widgets/Discuss.ts b/web/static/src/ts/widgets/Discuss.ts similarity index 95% rename from demo/src/widgets/Discuss.ts rename to web/static/src/ts/widgets/Discuss.ts index 3d2e8c98..d132bac6 100644 --- a/demo/src/widgets/Discuss.ts +++ b/web/static/src/ts/widgets/Discuss.ts @@ -1,4 +1,4 @@ -import Widget from "../../../src/core/Widget"; +import Widget from "../core/Widget"; import Counter from "./Counter"; const template = ` diff --git a/demo/src/widgets/Navbar.ts b/web/static/src/ts/widgets/Navbar.ts similarity index 92% rename from demo/src/widgets/Navbar.ts rename to web/static/src/ts/widgets/Navbar.ts index 537f304c..b474a6e7 100644 --- a/demo/src/widgets/Navbar.ts +++ b/web/static/src/ts/widgets/Navbar.ts @@ -1,4 +1,4 @@ -import Widget from "../../../src/core/Widget"; +import Widget from "../core/Widget"; import { Action } from "../services/actions"; const template = ` diff --git a/demo/src/widgets/RootWidget.ts b/web/static/src/ts/widgets/RootWidget.ts similarity index 95% rename from demo/src/widgets/RootWidget.ts rename to web/static/src/ts/widgets/RootWidget.ts index 252e885d..d7747c1e 100644 --- a/demo/src/widgets/RootWidget.ts +++ b/web/static/src/ts/widgets/RootWidget.ts @@ -1,4 +1,4 @@ -import Widget, { Env } from "../../../src/core/Widget"; +import Widget, { Env } from "../core/Widget"; import Navbar from "./Navbar"; import { Action } from "../services/actions"; diff --git a/tests/qweb_vdom.test.ts b/web/static/tests/qweb_vdom.test.ts similarity index 98% rename from tests/qweb_vdom.test.ts rename to web/static/tests/qweb_vdom.test.ts index 64e24aeb..3be4f494 100644 --- a/tests/qweb_vdom.test.ts +++ b/web/static/tests/qweb_vdom.test.ts @@ -1,7 +1,7 @@ -import QWeb, { EvalContext } from "../src/core/qweb_vdom"; -import { init } from "../src/libs/snabbdom/src/snabbdom"; -import sdAttributes from "../src/libs/snabbdom/src/modules/attributes"; -import sdListeners from "../src/libs/snabbdom/src/modules/eventlisteners"; +import QWeb, { EvalContext } from "../src/ts/core/qweb_vdom"; +import { init } from "../libs/snabbdom/src/snabbdom"; +import sdAttributes from "../libs/snabbdom/src/modules/attributes"; +import sdListeners from "../libs/snabbdom/src/modules/eventlisteners"; const patch = init([sdAttributes, sdListeners]); diff --git a/tests/utils.test.ts b/web/static/tests/utils.test.ts similarity index 92% rename from tests/utils.test.ts rename to web/static/tests/utils.test.ts index 012e96c3..0d3aa159 100644 --- a/tests/utils.test.ts +++ b/web/static/tests/utils.test.ts @@ -1,4 +1,4 @@ -import { escape, htmlTrim } from "../src/core/utils"; +import { escape, htmlTrim } from "../src/ts/core/utils"; describe("escape", () => { test("normal strings", () => { diff --git a/tests/widget.test.ts b/web/static/tests/widget.test.ts similarity index 98% rename from tests/widget.test.ts rename to web/static/tests/widget.test.ts index 89de1b83..81563ff2 100644 --- a/tests/widget.test.ts +++ b/web/static/tests/widget.test.ts @@ -1,5 +1,5 @@ -import Widget from "../src/core/Widget"; -import QWeb from "../src/core/qweb_vdom"; +import Widget from "../src/ts/core/Widget"; +import QWeb from "../src/ts/core/qweb_vdom"; function makeWidget(W: typeof Widget): Widget { const env = {