From b06ab1cbb5a26a3e20185adbd48557238cddcdf4 Mon Sep 17 00:00:00 2001 From: Nic Dahlquist Date: Wed, 8 Jul 2020 18:06:38 -0700 Subject: [PATCH 1/3] Fix dockerfile. --- Dockerfile | 19 +++++++++++++ .../Depthy-Icomoon.json | 0 .../Depthy.sublime-project | 0 Gruntfile.js => app/Gruntfile.js | 0 app/{ => app}/.buildignore | 0 app/{ => app}/.htaccess | 0 app/{ => app}/404.html | 0 app/{ => app}/CNAME | 0 app/{ => app}/favicon.png | Bin app/{ => app}/icon.png | Bin app/{ => app}/images/logo.svg | 0 app/{ => app}/index.html | 0 app/{ => app}/logo.png | Bin app/{ => app}/preview.gif | Bin app/{ => app}/robots.txt | 0 app/{ => app}/samples/flowers-alternative.jpg | Bin app/{ => app}/samples/flowers-depth.jpg | Bin app/{ => app}/samples/flowers-image.jpg | Bin app/{ => app}/samples/flowers-thumb.jpg | Bin app/{ => app}/samples/hut-alternative.jpg | Bin app/{ => app}/samples/hut-depth.jpg | Bin app/{ => app}/samples/hut-image.jpg | Bin app/{ => app}/samples/hut-thumb.jpg | Bin app/{ => app}/samples/mango-alternative.jpg | Bin app/{ => app}/samples/mango-depth.jpg | Bin app/{ => app}/samples/mango-image.jpg | Bin app/{ => app}/samples/mango-thumb.jpg | Bin app/{ => app}/samples/shelf-alternative.jpg | Bin app/{ => app}/samples/shelf-depth.jpg | Bin app/{ => app}/samples/shelf-image.jpg | Bin app/{ => app}/samples/shelf-thumb.jpg | Bin app/{ => app}/samples/tunnel-alternative.jpg | Bin app/{ => app}/samples/tunnel-depth.jpg | Bin app/{ => app}/samples/tunnel-image.jpg | Bin app/{ => app}/samples/tunnel-thumb.jpg | Bin app/{ => app}/scripts/app.js | 0 app/{ => app}/scripts/classes/DepthyDrawer.js | 0 app/{ => app}/scripts/classes/DepthyViewer.js | 0 .../scripts/classes/GDepthEncoder.js | 0 app/{ => app}/scripts/classes/dataURITools.js | 0 app/{ => app}/scripts/controllers/draw.js | 0 .../controllers/exportanaglyphmodal.js | 0 .../scripts/controllers/exportgifmodal.js | 0 .../scripts/controllers/exportjpgmodal.js | 0 .../scripts/controllers/exportpngmodal.js | 0 .../scripts/controllers/exportwebmmodal.js | 0 .../scripts/controllers/imageinfomodal.js | 0 app/{ => app}/scripts/controllers/main.js | 0 .../scripts/controllers/sharepngmodal.js | 0 .../scripts/directives/depthyViewer.js | 0 .../scripts/directives/fileselect.js | 0 app/{ => app}/scripts/directives/pixi.js | 0 .../scripts/directives/rangeStepper.js | 0 app/{ => app}/scripts/directives/shareurls.js | 0 .../scripts/directives/visibleClass.js | 0 app/{ => app}/scripts/modernizr-platform.js | 0 app/{ => app}/scripts/modernizr.js | 0 .../scripts/pixi/ColorMatrixFilter2.js | 0 .../scripts/pixi/DepthDisplacementFilter.js | 0 .../scripts/pixi/DepthPerspectiveFilter.glsl | 0 .../scripts/pixi/DepthPerspectiveFilter.js | 0 app/{ => app}/scripts/pixi/utils.js | 0 app/{ => app}/scripts/services/UpdateCheck.js | 0 app/{ => app}/scripts/services/depthy.js | 0 app/{ => app}/scripts/services/depthy.js.orig | 0 app/{ => app}/scripts/services/statemodal.js | 0 .../scripts/vendor/LensBlurDepthExtractor.js | 0 app/{ => app}/scripts/vendor/md5.js | 0 app/{ => app}/styles/_animations.scss | 0 app/{ => app}/styles/_bootstrap-mixins.scss | 0 app/{ => app}/styles/_bootstrap.scss | 0 app/{ => app}/styles/_common.scss | 4 ++- app/{ => app}/styles/_elements.scss | 0 app/{ => app}/styles/_icomoon.scss | 0 app/{ => app}/styles/_mixins.scss | 0 app/{ => app}/styles/_poor.scss | 0 app/{ => app}/styles/_rwd.scss | 0 app/{ => app}/styles/fonts/icomoon.eot | Bin app/{ => app}/styles/fonts/icomoon.svg | 0 app/{ => app}/styles/fonts/icomoon.ttf | Bin app/{ => app}/styles/fonts/icomoon.woff | Bin app/{ => app}/styles/main.scss | 0 app/{ => app}/views/alert-modal.html | 0 app/{ => app}/views/alert-nodepth.html | 0 app/{ => app}/views/alert-noimage.html | 0 app/{ => app}/views/alert-webgl.html | 0 app/{ => app}/views/draw.html | 0 .../views/export-anaglyph-modal.html | 0 app/{ => app}/views/export-gif-modal.html | 0 app/{ => app}/views/export-gif-popup.html | 0 app/{ => app}/views/export-jpg-modal.html | 0 app/{ => app}/views/export-png-modal.html | 0 app/{ => app}/views/export-webm-modal.html | 0 app/{ => app}/views/export-webm-popup.html | 0 app/{ => app}/views/howto-lensblur.html | 0 app/{ => app}/views/image-info-modal.html | 0 app/{ => app}/views/main.html | 0 app/{ => app}/views/options-animation.html | 0 app/{ => app}/views/options-debug.html | 0 app/{ => app}/views/options-movement.html | 0 app/{ => app}/views/options-popup.html | 0 app/{ => app}/views/options-style.html | 0 app/{ => app}/views/share-png-modal.html | 0 app/{ => app}/views/share-popup.html | 0 bower.json => app/bower.json | 7 +++-- karma-e2e.conf.js => app/karma-e2e.conf.js | 0 karma.conf.js => app/karma.conf.js | 0 package.json => app/package.json | 17 ++++++++---- {test => app/test}/.jshintrc | 0 {test => app/test}/runner.html | 0 .../test}/spec/classes/GDepthEncoder.js | 0 .../test}/spec/controllers/exportmodal.js | 0 .../test}/spec/controllers/imageinfomodal.js | 0 {test => app/test}/spec/controllers/main.js | 0 .../test}/spec/controllers/sharepngmodal.js | 0 {test => app/test}/spec/controllers/viewer.js | 0 .../test}/spec/directives/fileselect.js | 0 {test => app/test}/spec/directives/pixi.js | 0 .../test}/spec/services/statemodal.js | 0 docker/Dockerfile | 25 ------------------ docker/sources.list | 5 ---- 121 files changed, 37 insertions(+), 40 deletions(-) create mode 100644 Dockerfile rename Depthy-Icomoon.json => app/Depthy-Icomoon.json (100%) rename Depthy.sublime-project => app/Depthy.sublime-project (100%) rename Gruntfile.js => app/Gruntfile.js (100%) rename app/{ => app}/.buildignore (100%) rename app/{ => app}/.htaccess (100%) rename app/{ => app}/404.html (100%) rename app/{ => app}/CNAME (100%) rename app/{ => app}/favicon.png (100%) rename app/{ => app}/icon.png (100%) rename app/{ => app}/images/logo.svg (100%) rename app/{ => app}/index.html (100%) rename app/{ => app}/logo.png (100%) rename app/{ => app}/preview.gif (100%) rename app/{ => app}/robots.txt (100%) rename app/{ => app}/samples/flowers-alternative.jpg (100%) rename app/{ => app}/samples/flowers-depth.jpg (100%) rename app/{ => app}/samples/flowers-image.jpg (100%) rename app/{ => app}/samples/flowers-thumb.jpg (100%) rename app/{ => app}/samples/hut-alternative.jpg (100%) rename app/{ => app}/samples/hut-depth.jpg (100%) rename app/{ => app}/samples/hut-image.jpg (100%) rename app/{ => app}/samples/hut-thumb.jpg (100%) rename app/{ => app}/samples/mango-alternative.jpg (100%) rename app/{ => app}/samples/mango-depth.jpg (100%) rename app/{ => app}/samples/mango-image.jpg (100%) rename app/{ => app}/samples/mango-thumb.jpg (100%) rename app/{ => app}/samples/shelf-alternative.jpg (100%) rename app/{ => app}/samples/shelf-depth.jpg (100%) rename app/{ => app}/samples/shelf-image.jpg (100%) rename app/{ => app}/samples/shelf-thumb.jpg (100%) rename app/{ => app}/samples/tunnel-alternative.jpg (100%) rename app/{ => app}/samples/tunnel-depth.jpg (100%) rename app/{ => app}/samples/tunnel-image.jpg (100%) rename app/{ => app}/samples/tunnel-thumb.jpg (100%) rename app/{ => app}/scripts/app.js (100%) rename app/{ => app}/scripts/classes/DepthyDrawer.js (100%) rename app/{ => app}/scripts/classes/DepthyViewer.js (100%) rename app/{ => app}/scripts/classes/GDepthEncoder.js (100%) rename app/{ => app}/scripts/classes/dataURITools.js (100%) rename app/{ => app}/scripts/controllers/draw.js (100%) rename app/{ => app}/scripts/controllers/exportanaglyphmodal.js (100%) rename app/{ => app}/scripts/controllers/exportgifmodal.js (100%) rename app/{ => app}/scripts/controllers/exportjpgmodal.js (100%) rename app/{ => app}/scripts/controllers/exportpngmodal.js (100%) rename app/{ => app}/scripts/controllers/exportwebmmodal.js (100%) rename app/{ => app}/scripts/controllers/imageinfomodal.js (100%) rename app/{ => app}/scripts/controllers/main.js (100%) rename app/{ => app}/scripts/controllers/sharepngmodal.js (100%) rename app/{ => app}/scripts/directives/depthyViewer.js (100%) rename app/{ => app}/scripts/directives/fileselect.js (100%) rename app/{ => app}/scripts/directives/pixi.js (100%) rename app/{ => app}/scripts/directives/rangeStepper.js (100%) rename app/{ => app}/scripts/directives/shareurls.js (100%) rename app/{ => app}/scripts/directives/visibleClass.js (100%) rename app/{ => app}/scripts/modernizr-platform.js (100%) rename app/{ => app}/scripts/modernizr.js (100%) rename app/{ => app}/scripts/pixi/ColorMatrixFilter2.js (100%) rename app/{ => app}/scripts/pixi/DepthDisplacementFilter.js (100%) rename app/{ => app}/scripts/pixi/DepthPerspectiveFilter.glsl (100%) rename app/{ => app}/scripts/pixi/DepthPerspectiveFilter.js (100%) rename app/{ => app}/scripts/pixi/utils.js (100%) rename app/{ => app}/scripts/services/UpdateCheck.js (100%) rename app/{ => app}/scripts/services/depthy.js (100%) rename app/{ => app}/scripts/services/depthy.js.orig (100%) rename app/{ => app}/scripts/services/statemodal.js (100%) rename app/{ => app}/scripts/vendor/LensBlurDepthExtractor.js (100%) rename app/{ => app}/scripts/vendor/md5.js (100%) rename app/{ => app}/styles/_animations.scss (100%) rename app/{ => app}/styles/_bootstrap-mixins.scss (100%) rename app/{ => app}/styles/_bootstrap.scss (100%) rename app/{ => app}/styles/_common.scss (99%) rename app/{ => app}/styles/_elements.scss (100%) rename app/{ => app}/styles/_icomoon.scss (100%) rename app/{ => app}/styles/_mixins.scss (100%) rename app/{ => app}/styles/_poor.scss (100%) rename app/{ => app}/styles/_rwd.scss (100%) rename app/{ => app}/styles/fonts/icomoon.eot (100%) rename app/{ => app}/styles/fonts/icomoon.svg (100%) rename app/{ => app}/styles/fonts/icomoon.ttf (100%) rename app/{ => app}/styles/fonts/icomoon.woff (100%) rename app/{ => app}/styles/main.scss (100%) rename app/{ => app}/views/alert-modal.html (100%) rename app/{ => app}/views/alert-nodepth.html (100%) rename app/{ => app}/views/alert-noimage.html (100%) rename app/{ => app}/views/alert-webgl.html (100%) rename app/{ => app}/views/draw.html (100%) rename app/{ => app}/views/export-anaglyph-modal.html (100%) rename app/{ => app}/views/export-gif-modal.html (100%) rename app/{ => app}/views/export-gif-popup.html (100%) rename app/{ => app}/views/export-jpg-modal.html (100%) rename app/{ => app}/views/export-png-modal.html (100%) rename app/{ => app}/views/export-webm-modal.html (100%) rename app/{ => app}/views/export-webm-popup.html (100%) rename app/{ => app}/views/howto-lensblur.html (100%) rename app/{ => app}/views/image-info-modal.html (100%) rename app/{ => app}/views/main.html (100%) rename app/{ => app}/views/options-animation.html (100%) rename app/{ => app}/views/options-debug.html (100%) rename app/{ => app}/views/options-movement.html (100%) rename app/{ => app}/views/options-popup.html (100%) rename app/{ => app}/views/options-style.html (100%) rename app/{ => app}/views/share-png-modal.html (100%) rename app/{ => app}/views/share-popup.html (100%) rename bower.json => app/bower.json (82%) rename karma-e2e.conf.js => app/karma-e2e.conf.js (100%) rename karma.conf.js => app/karma.conf.js (100%) rename package.json => app/package.json (74%) rename {test => app/test}/.jshintrc (100%) rename {test => app/test}/runner.html (100%) rename {test => app/test}/spec/classes/GDepthEncoder.js (100%) rename {test => app/test}/spec/controllers/exportmodal.js (100%) rename {test => app/test}/spec/controllers/imageinfomodal.js (100%) rename {test => app/test}/spec/controllers/main.js (100%) rename {test => app/test}/spec/controllers/sharepngmodal.js (100%) rename {test => app/test}/spec/controllers/viewer.js (100%) rename {test => app/test}/spec/directives/fileselect.js (100%) rename {test => app/test}/spec/directives/pixi.js (100%) rename {test => app/test}/spec/services/statemodal.js (100%) delete mode 100644 docker/Dockerfile delete mode 100644 docker/sources.list diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..06e9f0b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,19 @@ +FROM ubuntu:bionic +MAINTAINER Sébastien M-B + +RUN apt-get update && apt-get install -y git nodejs npm ruby-compass +RUN npm install -g bower grunt-cli + +COPY app/package.json / +RUN npm install + +COPY app/bower.json / +RUN bower install --allow-root --config.interactive=false + + +COPY app/ / + +RUN mv bower_components app/ + +EXPOSE 9000 +ENTRYPOINT grunt serve --stack --force diff --git a/Depthy-Icomoon.json b/app/Depthy-Icomoon.json similarity index 100% rename from Depthy-Icomoon.json rename to app/Depthy-Icomoon.json diff --git a/Depthy.sublime-project b/app/Depthy.sublime-project similarity index 100% rename from Depthy.sublime-project rename to app/Depthy.sublime-project diff --git a/Gruntfile.js b/app/Gruntfile.js similarity index 100% rename from Gruntfile.js rename to app/Gruntfile.js diff --git a/app/.buildignore b/app/app/.buildignore similarity index 100% rename from app/.buildignore rename to app/app/.buildignore diff --git a/app/.htaccess b/app/app/.htaccess similarity index 100% rename from app/.htaccess rename to app/app/.htaccess diff --git a/app/404.html b/app/app/404.html similarity index 100% rename from app/404.html rename to app/app/404.html diff --git a/app/CNAME b/app/app/CNAME similarity index 100% rename from app/CNAME rename to app/app/CNAME diff --git a/app/favicon.png b/app/app/favicon.png similarity index 100% rename from app/favicon.png rename to app/app/favicon.png diff --git a/app/icon.png b/app/app/icon.png similarity index 100% rename from app/icon.png rename to app/app/icon.png diff --git a/app/images/logo.svg b/app/app/images/logo.svg similarity index 100% rename from app/images/logo.svg rename to app/app/images/logo.svg diff --git a/app/index.html b/app/app/index.html similarity index 100% rename from app/index.html rename to app/app/index.html diff --git a/app/logo.png b/app/app/logo.png similarity index 100% rename from app/logo.png rename to app/app/logo.png diff --git a/app/preview.gif b/app/app/preview.gif similarity index 100% rename from app/preview.gif rename to app/app/preview.gif diff --git a/app/robots.txt b/app/app/robots.txt similarity index 100% rename from app/robots.txt rename to app/app/robots.txt diff --git a/app/samples/flowers-alternative.jpg b/app/app/samples/flowers-alternative.jpg similarity index 100% rename from app/samples/flowers-alternative.jpg rename to app/app/samples/flowers-alternative.jpg diff --git a/app/samples/flowers-depth.jpg b/app/app/samples/flowers-depth.jpg similarity index 100% rename from app/samples/flowers-depth.jpg rename to app/app/samples/flowers-depth.jpg diff --git a/app/samples/flowers-image.jpg b/app/app/samples/flowers-image.jpg similarity index 100% rename from app/samples/flowers-image.jpg rename to app/app/samples/flowers-image.jpg diff --git a/app/samples/flowers-thumb.jpg b/app/app/samples/flowers-thumb.jpg similarity index 100% rename from app/samples/flowers-thumb.jpg rename to app/app/samples/flowers-thumb.jpg diff --git a/app/samples/hut-alternative.jpg b/app/app/samples/hut-alternative.jpg similarity index 100% rename from app/samples/hut-alternative.jpg rename to app/app/samples/hut-alternative.jpg diff --git a/app/samples/hut-depth.jpg b/app/app/samples/hut-depth.jpg similarity index 100% rename from app/samples/hut-depth.jpg rename to app/app/samples/hut-depth.jpg diff --git a/app/samples/hut-image.jpg b/app/app/samples/hut-image.jpg similarity index 100% rename from app/samples/hut-image.jpg rename to app/app/samples/hut-image.jpg diff --git a/app/samples/hut-thumb.jpg b/app/app/samples/hut-thumb.jpg similarity index 100% rename from app/samples/hut-thumb.jpg rename to app/app/samples/hut-thumb.jpg diff --git a/app/samples/mango-alternative.jpg b/app/app/samples/mango-alternative.jpg similarity index 100% rename from app/samples/mango-alternative.jpg rename to app/app/samples/mango-alternative.jpg diff --git a/app/samples/mango-depth.jpg b/app/app/samples/mango-depth.jpg similarity index 100% rename from app/samples/mango-depth.jpg rename to app/app/samples/mango-depth.jpg diff --git a/app/samples/mango-image.jpg b/app/app/samples/mango-image.jpg similarity index 100% rename from app/samples/mango-image.jpg rename to app/app/samples/mango-image.jpg diff --git a/app/samples/mango-thumb.jpg b/app/app/samples/mango-thumb.jpg similarity index 100% rename from app/samples/mango-thumb.jpg rename to app/app/samples/mango-thumb.jpg diff --git a/app/samples/shelf-alternative.jpg b/app/app/samples/shelf-alternative.jpg similarity index 100% rename from app/samples/shelf-alternative.jpg rename to app/app/samples/shelf-alternative.jpg diff --git a/app/samples/shelf-depth.jpg b/app/app/samples/shelf-depth.jpg similarity index 100% rename from app/samples/shelf-depth.jpg rename to app/app/samples/shelf-depth.jpg diff --git a/app/samples/shelf-image.jpg b/app/app/samples/shelf-image.jpg similarity index 100% rename from app/samples/shelf-image.jpg rename to app/app/samples/shelf-image.jpg diff --git a/app/samples/shelf-thumb.jpg b/app/app/samples/shelf-thumb.jpg similarity index 100% rename from app/samples/shelf-thumb.jpg rename to app/app/samples/shelf-thumb.jpg diff --git a/app/samples/tunnel-alternative.jpg b/app/app/samples/tunnel-alternative.jpg similarity index 100% rename from app/samples/tunnel-alternative.jpg rename to app/app/samples/tunnel-alternative.jpg diff --git a/app/samples/tunnel-depth.jpg b/app/app/samples/tunnel-depth.jpg similarity index 100% rename from app/samples/tunnel-depth.jpg rename to app/app/samples/tunnel-depth.jpg diff --git a/app/samples/tunnel-image.jpg b/app/app/samples/tunnel-image.jpg similarity index 100% rename from app/samples/tunnel-image.jpg rename to app/app/samples/tunnel-image.jpg diff --git a/app/samples/tunnel-thumb.jpg b/app/app/samples/tunnel-thumb.jpg similarity index 100% rename from app/samples/tunnel-thumb.jpg rename to app/app/samples/tunnel-thumb.jpg diff --git a/app/scripts/app.js b/app/app/scripts/app.js similarity index 100% rename from app/scripts/app.js rename to app/app/scripts/app.js diff --git a/app/scripts/classes/DepthyDrawer.js b/app/app/scripts/classes/DepthyDrawer.js similarity index 100% rename from app/scripts/classes/DepthyDrawer.js rename to app/app/scripts/classes/DepthyDrawer.js diff --git a/app/scripts/classes/DepthyViewer.js b/app/app/scripts/classes/DepthyViewer.js similarity index 100% rename from app/scripts/classes/DepthyViewer.js rename to app/app/scripts/classes/DepthyViewer.js diff --git a/app/scripts/classes/GDepthEncoder.js b/app/app/scripts/classes/GDepthEncoder.js similarity index 100% rename from app/scripts/classes/GDepthEncoder.js rename to app/app/scripts/classes/GDepthEncoder.js diff --git a/app/scripts/classes/dataURITools.js b/app/app/scripts/classes/dataURITools.js similarity index 100% rename from app/scripts/classes/dataURITools.js rename to app/app/scripts/classes/dataURITools.js diff --git a/app/scripts/controllers/draw.js b/app/app/scripts/controllers/draw.js similarity index 100% rename from app/scripts/controllers/draw.js rename to app/app/scripts/controllers/draw.js diff --git a/app/scripts/controllers/exportanaglyphmodal.js b/app/app/scripts/controllers/exportanaglyphmodal.js similarity index 100% rename from app/scripts/controllers/exportanaglyphmodal.js rename to app/app/scripts/controllers/exportanaglyphmodal.js diff --git a/app/scripts/controllers/exportgifmodal.js b/app/app/scripts/controllers/exportgifmodal.js similarity index 100% rename from app/scripts/controllers/exportgifmodal.js rename to app/app/scripts/controllers/exportgifmodal.js diff --git a/app/scripts/controllers/exportjpgmodal.js b/app/app/scripts/controllers/exportjpgmodal.js similarity index 100% rename from app/scripts/controllers/exportjpgmodal.js rename to app/app/scripts/controllers/exportjpgmodal.js diff --git a/app/scripts/controllers/exportpngmodal.js b/app/app/scripts/controllers/exportpngmodal.js similarity index 100% rename from app/scripts/controllers/exportpngmodal.js rename to app/app/scripts/controllers/exportpngmodal.js diff --git a/app/scripts/controllers/exportwebmmodal.js b/app/app/scripts/controllers/exportwebmmodal.js similarity index 100% rename from app/scripts/controllers/exportwebmmodal.js rename to app/app/scripts/controllers/exportwebmmodal.js diff --git a/app/scripts/controllers/imageinfomodal.js b/app/app/scripts/controllers/imageinfomodal.js similarity index 100% rename from app/scripts/controllers/imageinfomodal.js rename to app/app/scripts/controllers/imageinfomodal.js diff --git a/app/scripts/controllers/main.js b/app/app/scripts/controllers/main.js similarity index 100% rename from app/scripts/controllers/main.js rename to app/app/scripts/controllers/main.js diff --git a/app/scripts/controllers/sharepngmodal.js b/app/app/scripts/controllers/sharepngmodal.js similarity index 100% rename from app/scripts/controllers/sharepngmodal.js rename to app/app/scripts/controllers/sharepngmodal.js diff --git a/app/scripts/directives/depthyViewer.js b/app/app/scripts/directives/depthyViewer.js similarity index 100% rename from app/scripts/directives/depthyViewer.js rename to app/app/scripts/directives/depthyViewer.js diff --git a/app/scripts/directives/fileselect.js b/app/app/scripts/directives/fileselect.js similarity index 100% rename from app/scripts/directives/fileselect.js rename to app/app/scripts/directives/fileselect.js diff --git a/app/scripts/directives/pixi.js b/app/app/scripts/directives/pixi.js similarity index 100% rename from app/scripts/directives/pixi.js rename to app/app/scripts/directives/pixi.js diff --git a/app/scripts/directives/rangeStepper.js b/app/app/scripts/directives/rangeStepper.js similarity index 100% rename from app/scripts/directives/rangeStepper.js rename to app/app/scripts/directives/rangeStepper.js diff --git a/app/scripts/directives/shareurls.js b/app/app/scripts/directives/shareurls.js similarity index 100% rename from app/scripts/directives/shareurls.js rename to app/app/scripts/directives/shareurls.js diff --git a/app/scripts/directives/visibleClass.js b/app/app/scripts/directives/visibleClass.js similarity index 100% rename from app/scripts/directives/visibleClass.js rename to app/app/scripts/directives/visibleClass.js diff --git a/app/scripts/modernizr-platform.js b/app/app/scripts/modernizr-platform.js similarity index 100% rename from app/scripts/modernizr-platform.js rename to app/app/scripts/modernizr-platform.js diff --git a/app/scripts/modernizr.js b/app/app/scripts/modernizr.js similarity index 100% rename from app/scripts/modernizr.js rename to app/app/scripts/modernizr.js diff --git a/app/scripts/pixi/ColorMatrixFilter2.js b/app/app/scripts/pixi/ColorMatrixFilter2.js similarity index 100% rename from app/scripts/pixi/ColorMatrixFilter2.js rename to app/app/scripts/pixi/ColorMatrixFilter2.js diff --git a/app/scripts/pixi/DepthDisplacementFilter.js b/app/app/scripts/pixi/DepthDisplacementFilter.js similarity index 100% rename from app/scripts/pixi/DepthDisplacementFilter.js rename to app/app/scripts/pixi/DepthDisplacementFilter.js diff --git a/app/scripts/pixi/DepthPerspectiveFilter.glsl b/app/app/scripts/pixi/DepthPerspectiveFilter.glsl similarity index 100% rename from app/scripts/pixi/DepthPerspectiveFilter.glsl rename to app/app/scripts/pixi/DepthPerspectiveFilter.glsl diff --git a/app/scripts/pixi/DepthPerspectiveFilter.js b/app/app/scripts/pixi/DepthPerspectiveFilter.js similarity index 100% rename from app/scripts/pixi/DepthPerspectiveFilter.js rename to app/app/scripts/pixi/DepthPerspectiveFilter.js diff --git a/app/scripts/pixi/utils.js b/app/app/scripts/pixi/utils.js similarity index 100% rename from app/scripts/pixi/utils.js rename to app/app/scripts/pixi/utils.js diff --git a/app/scripts/services/UpdateCheck.js b/app/app/scripts/services/UpdateCheck.js similarity index 100% rename from app/scripts/services/UpdateCheck.js rename to app/app/scripts/services/UpdateCheck.js diff --git a/app/scripts/services/depthy.js b/app/app/scripts/services/depthy.js similarity index 100% rename from app/scripts/services/depthy.js rename to app/app/scripts/services/depthy.js diff --git a/app/scripts/services/depthy.js.orig b/app/app/scripts/services/depthy.js.orig similarity index 100% rename from app/scripts/services/depthy.js.orig rename to app/app/scripts/services/depthy.js.orig diff --git a/app/scripts/services/statemodal.js b/app/app/scripts/services/statemodal.js similarity index 100% rename from app/scripts/services/statemodal.js rename to app/app/scripts/services/statemodal.js diff --git a/app/scripts/vendor/LensBlurDepthExtractor.js b/app/app/scripts/vendor/LensBlurDepthExtractor.js similarity index 100% rename from app/scripts/vendor/LensBlurDepthExtractor.js rename to app/app/scripts/vendor/LensBlurDepthExtractor.js diff --git a/app/scripts/vendor/md5.js b/app/app/scripts/vendor/md5.js similarity index 100% rename from app/scripts/vendor/md5.js rename to app/app/scripts/vendor/md5.js diff --git a/app/styles/_animations.scss b/app/app/styles/_animations.scss similarity index 100% rename from app/styles/_animations.scss rename to app/app/styles/_animations.scss diff --git a/app/styles/_bootstrap-mixins.scss b/app/app/styles/_bootstrap-mixins.scss similarity index 100% rename from app/styles/_bootstrap-mixins.scss rename to app/app/styles/_bootstrap-mixins.scss diff --git a/app/styles/_bootstrap.scss b/app/app/styles/_bootstrap.scss similarity index 100% rename from app/styles/_bootstrap.scss rename to app/app/styles/_bootstrap.scss diff --git a/app/styles/_common.scss b/app/app/styles/_common.scss similarity index 99% rename from app/styles/_common.scss rename to app/app/styles/_common.scss index 1300428..0994502 100644 --- a/app/styles/_common.scss +++ b/app/app/styles/_common.scss @@ -1,3 +1,5 @@ +@charset "UTF-8"; + html { width: 100%; height: 100%; @@ -455,7 +457,7 @@ logo { font-size: 1rem; background: $brand-neutral-dark; color: $text-color; - padding: $panel-heading-padding; + padding: 10vh; /*$panel-heading-padding; */ } &.empty, &.loading { diff --git a/app/styles/_elements.scss b/app/app/styles/_elements.scss similarity index 100% rename from app/styles/_elements.scss rename to app/app/styles/_elements.scss diff --git a/app/styles/_icomoon.scss b/app/app/styles/_icomoon.scss similarity index 100% rename from app/styles/_icomoon.scss rename to app/app/styles/_icomoon.scss diff --git a/app/styles/_mixins.scss b/app/app/styles/_mixins.scss similarity index 100% rename from app/styles/_mixins.scss rename to app/app/styles/_mixins.scss diff --git a/app/styles/_poor.scss b/app/app/styles/_poor.scss similarity index 100% rename from app/styles/_poor.scss rename to app/app/styles/_poor.scss diff --git a/app/styles/_rwd.scss b/app/app/styles/_rwd.scss similarity index 100% rename from app/styles/_rwd.scss rename to app/app/styles/_rwd.scss diff --git a/app/styles/fonts/icomoon.eot b/app/app/styles/fonts/icomoon.eot similarity index 100% rename from app/styles/fonts/icomoon.eot rename to app/app/styles/fonts/icomoon.eot diff --git a/app/styles/fonts/icomoon.svg b/app/app/styles/fonts/icomoon.svg similarity index 100% rename from app/styles/fonts/icomoon.svg rename to app/app/styles/fonts/icomoon.svg diff --git a/app/styles/fonts/icomoon.ttf b/app/app/styles/fonts/icomoon.ttf similarity index 100% rename from app/styles/fonts/icomoon.ttf rename to app/app/styles/fonts/icomoon.ttf diff --git a/app/styles/fonts/icomoon.woff b/app/app/styles/fonts/icomoon.woff similarity index 100% rename from app/styles/fonts/icomoon.woff rename to app/app/styles/fonts/icomoon.woff diff --git a/app/styles/main.scss b/app/app/styles/main.scss similarity index 100% rename from app/styles/main.scss rename to app/app/styles/main.scss diff --git a/app/views/alert-modal.html b/app/app/views/alert-modal.html similarity index 100% rename from app/views/alert-modal.html rename to app/app/views/alert-modal.html diff --git a/app/views/alert-nodepth.html b/app/app/views/alert-nodepth.html similarity index 100% rename from app/views/alert-nodepth.html rename to app/app/views/alert-nodepth.html diff --git a/app/views/alert-noimage.html b/app/app/views/alert-noimage.html similarity index 100% rename from app/views/alert-noimage.html rename to app/app/views/alert-noimage.html diff --git a/app/views/alert-webgl.html b/app/app/views/alert-webgl.html similarity index 100% rename from app/views/alert-webgl.html rename to app/app/views/alert-webgl.html diff --git a/app/views/draw.html b/app/app/views/draw.html similarity index 100% rename from app/views/draw.html rename to app/app/views/draw.html diff --git a/app/views/export-anaglyph-modal.html b/app/app/views/export-anaglyph-modal.html similarity index 100% rename from app/views/export-anaglyph-modal.html rename to app/app/views/export-anaglyph-modal.html diff --git a/app/views/export-gif-modal.html b/app/app/views/export-gif-modal.html similarity index 100% rename from app/views/export-gif-modal.html rename to app/app/views/export-gif-modal.html diff --git a/app/views/export-gif-popup.html b/app/app/views/export-gif-popup.html similarity index 100% rename from app/views/export-gif-popup.html rename to app/app/views/export-gif-popup.html diff --git a/app/views/export-jpg-modal.html b/app/app/views/export-jpg-modal.html similarity index 100% rename from app/views/export-jpg-modal.html rename to app/app/views/export-jpg-modal.html diff --git a/app/views/export-png-modal.html b/app/app/views/export-png-modal.html similarity index 100% rename from app/views/export-png-modal.html rename to app/app/views/export-png-modal.html diff --git a/app/views/export-webm-modal.html b/app/app/views/export-webm-modal.html similarity index 100% rename from app/views/export-webm-modal.html rename to app/app/views/export-webm-modal.html diff --git a/app/views/export-webm-popup.html b/app/app/views/export-webm-popup.html similarity index 100% rename from app/views/export-webm-popup.html rename to app/app/views/export-webm-popup.html diff --git a/app/views/howto-lensblur.html b/app/app/views/howto-lensblur.html similarity index 100% rename from app/views/howto-lensblur.html rename to app/app/views/howto-lensblur.html diff --git a/app/views/image-info-modal.html b/app/app/views/image-info-modal.html similarity index 100% rename from app/views/image-info-modal.html rename to app/app/views/image-info-modal.html diff --git a/app/views/main.html b/app/app/views/main.html similarity index 100% rename from app/views/main.html rename to app/app/views/main.html diff --git a/app/views/options-animation.html b/app/app/views/options-animation.html similarity index 100% rename from app/views/options-animation.html rename to app/app/views/options-animation.html diff --git a/app/views/options-debug.html b/app/app/views/options-debug.html similarity index 100% rename from app/views/options-debug.html rename to app/app/views/options-debug.html diff --git a/app/views/options-movement.html b/app/app/views/options-movement.html similarity index 100% rename from app/views/options-movement.html rename to app/app/views/options-movement.html diff --git a/app/views/options-popup.html b/app/app/views/options-popup.html similarity index 100% rename from app/views/options-popup.html rename to app/app/views/options-popup.html diff --git a/app/views/options-style.html b/app/app/views/options-style.html similarity index 100% rename from app/views/options-style.html rename to app/app/views/options-style.html diff --git a/app/views/share-png-modal.html b/app/app/views/share-png-modal.html similarity index 100% rename from app/views/share-png-modal.html rename to app/app/views/share-png-modal.html diff --git a/app/views/share-popup.html b/app/app/views/share-popup.html similarity index 100% rename from app/views/share-popup.html rename to app/app/views/share-popup.html diff --git a/bower.json b/app/bower.json similarity index 82% rename from bower.json rename to app/bower.json index 1ea8732..c633ecb 100644 --- a/bower.json +++ b/app/bower.json @@ -4,10 +4,10 @@ "dependencies": { "angular": "~1.2.16", "angular-animate": "~1.2.16", - "angular-ga": "~0.1.0", - "angular-motion": "~0.3.2", + "angular-ga": "~0.1.3", + "angular-motion": "~0.3.4", "angular-sanitize": "~1.2.16", - "angular-strap": "~2.0.1", + "angular-strap": "~2.3.6", "angular-touch": "~1.2.16", "angular-ui-bootstrap": "~0.11.0", "angular-ui-router": "~0.2.10", @@ -18,7 +18,6 @@ "jquery": "~1.11.0", "lodash": "~2.4.1", "pixi.js": "panrafal/pixi.js#build/depthy", - "promise": "http://s3.amazonaws.com/es6-promises/promise-1.0.0.js", "screenfull": "~1.2.1", "iscroll": "~5.1.1", "stats.js": "*", diff --git a/karma-e2e.conf.js b/app/karma-e2e.conf.js similarity index 100% rename from karma-e2e.conf.js rename to app/karma-e2e.conf.js diff --git a/karma.conf.js b/app/karma.conf.js similarity index 100% rename from karma.conf.js rename to app/karma.conf.js diff --git a/package.json b/app/package.json similarity index 74% rename from package.json rename to app/package.json index f41ae14..8f10f19 100644 --- a/package.json +++ b/app/package.json @@ -14,19 +14,19 @@ "grunt-contrib-copy": "~0.5.0", "grunt-contrib-cssmin": "~0.9.0", "grunt-contrib-htmlmin": "~0.3.0", - "grunt-contrib-imagemin": "~0.7.0", + "grunt-contrib-imagemin": "~3.1.0", "grunt-contrib-jshint": "~0.10.0", "grunt-contrib-uglify": "~0.4.0", "grunt-contrib-watch": "~0.6.1", "grunt-google-cdn": "~0.2.2", - "grunt-karma": "~0.8.2", + "grunt-karma": "^0.12.2", "grunt-newer": "~0.7.0", "grunt-ngmin": "~0.0.3", "grunt-rev": "~0.1.0", - "grunt-svgmin": "~0.4.0", + "grunt-svgmin": "~6.0.0", "grunt-usemin": "~2.1.1", "jshint-stylish": "~0.1.3", - "karma": "~0.12.9", + "karma": "^1.6.0", "karma-ng-html2js-preprocessor": "~0.1.0", "karma-ng-scenario": "~0.1.0", "load-grunt-tasks": "~0.4.0", @@ -34,7 +34,14 @@ "grunt-manifest": "~0.4.0", "karma-jasmine": "~0.1.5", "karma-phantomjs-launcher": "~0.1.4", - "karma-chrome-launcher": "~0.1.4" + "karma-chrome-launcher": "~0.1.4", + "imagemin-gifsicle": "~7.0.0", + "imagemin-jpegtran": "~7.0.0", + "imagemin-optipng": "8.0.0", + "imagemin-pngquant": "9.0.0", + "pngquant-bin": "6.0.0", + "optipng-bin": "7.0.0", + "jpegtran-bin": "5.0.2" }, "engines": { "node": ">=0.10.0" diff --git a/test/.jshintrc b/app/test/.jshintrc similarity index 100% rename from test/.jshintrc rename to app/test/.jshintrc diff --git a/test/runner.html b/app/test/runner.html similarity index 100% rename from test/runner.html rename to app/test/runner.html diff --git a/test/spec/classes/GDepthEncoder.js b/app/test/spec/classes/GDepthEncoder.js similarity index 100% rename from test/spec/classes/GDepthEncoder.js rename to app/test/spec/classes/GDepthEncoder.js diff --git a/test/spec/controllers/exportmodal.js b/app/test/spec/controllers/exportmodal.js similarity index 100% rename from test/spec/controllers/exportmodal.js rename to app/test/spec/controllers/exportmodal.js diff --git a/test/spec/controllers/imageinfomodal.js b/app/test/spec/controllers/imageinfomodal.js similarity index 100% rename from test/spec/controllers/imageinfomodal.js rename to app/test/spec/controllers/imageinfomodal.js diff --git a/test/spec/controllers/main.js b/app/test/spec/controllers/main.js similarity index 100% rename from test/spec/controllers/main.js rename to app/test/spec/controllers/main.js diff --git a/test/spec/controllers/sharepngmodal.js b/app/test/spec/controllers/sharepngmodal.js similarity index 100% rename from test/spec/controllers/sharepngmodal.js rename to app/test/spec/controllers/sharepngmodal.js diff --git a/test/spec/controllers/viewer.js b/app/test/spec/controllers/viewer.js similarity index 100% rename from test/spec/controllers/viewer.js rename to app/test/spec/controllers/viewer.js diff --git a/test/spec/directives/fileselect.js b/app/test/spec/directives/fileselect.js similarity index 100% rename from test/spec/directives/fileselect.js rename to app/test/spec/directives/fileselect.js diff --git a/test/spec/directives/pixi.js b/app/test/spec/directives/pixi.js similarity index 100% rename from test/spec/directives/pixi.js rename to app/test/spec/directives/pixi.js diff --git a/test/spec/services/statemodal.js b/app/test/spec/services/statemodal.js similarity index 100% rename from test/spec/services/statemodal.js rename to app/test/spec/services/statemodal.js diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 64bb957..0000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,25 +0,0 @@ -FROM ubuntu:trusty -MAINTAINER Sébastien M-B - -RUN locale-gen en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US:en -ENV LC_ALL en_US.UTF-8 - -ADD sources.list /etc/apt/ - -RUN apt-get update -RUN apt-get install -y git -RUN apt-get install -y nodejs npm ruby-compass - -RUN ln -s /usr/bin/nodejs /usr/bin/node -RUN npm install -g grunt-cli bower - -RUN git clone https://github.com/panrafal/depthy.git -WORKDIR /depthy -RUN npm install -RUN bower install --allow-root --config.interactive=false - -EXPOSE 9000 -ENTRYPOINT grunt serve - diff --git a/docker/sources.list b/docker/sources.list deleted file mode 100644 index 8e4468a..0000000 --- a/docker/sources.list +++ /dev/null @@ -1,5 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu trusty-security main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse - From 8d7ae86ee5619811b44b96c0b6dfeef8659a3e3b Mon Sep 17 00:00:00 2001 From: v-suprun Date: Mon, 27 Jul 2020 23:18:20 +0300 Subject: [PATCH 2/3] Add dataURL webp as frame, not canvas, use whammy compile callback (#2) --- app/app/scripts/services/depthy.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/app/scripts/services/depthy.js b/app/app/scripts/services/depthy.js index 516eda7..c975e4f 100644 --- a/app/app/scripts/services/depthy.js +++ b/app/app/scripts/services/depthy.js @@ -834,7 +834,7 @@ angular.module('depthyApp').provider('depthy', function depthy() { pauseRender: true, }); viewerObj.render(true); - encoder.add(viewerObj.getCanvas()); + encoder.add(viewerObj.getCanvas().toDataURL("image/webp")); ++frame; // wait every 4 frames if (frame % 4 === 0) { @@ -843,10 +843,11 @@ angular.module('depthyApp').provider('depthy', function depthy() { worker(); } } else { - var blob = encoder.compile(); - deferred.resolve(blob); - depthy.viewer.overrideStageSize = null; - $rootScope.$safeApply(); + encoder.compile(false, function(blob) { + deferred.resolve(blob); + depthy.viewer.overrideStageSize = null; + $rootScope.$safeApply(); + }); } } catch (e) { deferred.reject(e); From 7ad3605aa3d8a47e701fa8e0e2dc570c264cea32 Mon Sep 17 00:00:00 2001 From: Nic Dahlquist Date: Tue, 28 Jul 2020 20:14:28 -0700 Subject: [PATCH 3/3] Update readme. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25b193a..f6c734d 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ If you want to simply run depthy locally, you can use [Docker.io](https://www.do Once docker installed, simple run: ``` -$ docker run --rm -t -i -p 9000:9000 essembeh/depthy +$ docker run --rm -t -i -p 9000:9000 ndahlquist/depthy ``` Then go to [localhost:9000](http://localhost:9000)