diff options
| -rw-r--r-- | builder/__init__.py | 0 | ||||
| -rw-r--r-- | client/actions.js (renamed from scraper/client/actions.js) | 0 | ||||
| -rw-r--r-- | client/app.js (renamed from scraper/client/app.js) | 0 | ||||
| -rw-r--r-- | client/common/activeLink.component.js (renamed from scraper/client/common/activeLink.component.js) | 0 | ||||
| -rw-r--r-- | client/common/classifier.component.js (renamed from scraper/client/common/classifier.component.js) | 0 | ||||
| -rw-r--r-- | client/common/common.css (renamed from scraper/client/common/common.css) | 0 | ||||
| -rw-r--r-- | client/common/detectionBoxes.component.js (renamed from scraper/client/common/detectionBoxes.component.js) | 0 | ||||
| -rw-r--r-- | client/common/detectionList.component.js (renamed from scraper/client/common/detectionList.component.js) | 0 | ||||
| -rw-r--r-- | client/common/footer.component.js (renamed from scraper/client/common/footer.component.js) | 0 | ||||
| -rw-r--r-- | client/common/gate.component.js (renamed from scraper/client/common/gate.component.js) | 0 | ||||
| -rw-r--r-- | client/common/header.component.js (renamed from scraper/client/common/header.component.js) | 0 | ||||
| -rw-r--r-- | client/common/index.js (renamed from scraper/client/common/index.js) | 0 | ||||
| -rw-r--r-- | client/common/keyframe.component.js (renamed from scraper/client/common/keyframe.component.js) | 0 | ||||
| -rw-r--r-- | client/common/keyframes.component.js (renamed from scraper/client/common/keyframes.component.js) | 0 | ||||
| -rw-r--r-- | client/common/loader.component.js (renamed from scraper/client/common/loader.component.js) | 0 | ||||
| -rw-r--r-- | client/common/sidebar.component.js (renamed from scraper/client/common/sidebar.component.js) | 0 | ||||
| -rw-r--r-- | client/common/table.component.js (renamed from scraper/client/common/table.component.js) | 0 | ||||
| -rw-r--r-- | client/common/video.component.js (renamed from scraper/client/common/video.component.js) | 0 | ||||
| -rw-r--r-- | client/index.js (renamed from scraper/client/index.js) | 0 | ||||
| -rw-r--r-- | client/metadata/index.js (renamed from scraper/client/metadata/index.js) | 0 | ||||
| -rw-r--r-- | client/session.js (renamed from scraper/client/session.js) | 0 | ||||
| -rw-r--r-- | client/store.js (renamed from scraper/client/store.js) | 0 | ||||
| -rw-r--r-- | client/types.js (renamed from scraper/client/types.js) | 0 | ||||
| -rw-r--r-- | client/util.js (renamed from scraper/client/util.js) | 0 | ||||
| -rw-r--r-- | megapixels/app/builder/README.md (renamed from builder/README.md) | 0 | ||||
| -rw-r--r-- | megapixels/app/builder/builder.py (renamed from builder/builder.py) | 0 | ||||
| -rw-r--r-- | megapixels/app/builder/parser.py (renamed from builder/parser.py) | 0 | ||||
| -rw-r--r-- | megapixels/app/builder/paths.py (renamed from builder/paths.py) | 0 | ||||
| -rw-r--r-- | megapixels/app/builder/s3.py (renamed from builder/s3.py) | 0 | ||||
| -rw-r--r-- | megapixels/app/server/create.py | 10 | ||||
| -rw-r--r-- | megapixels/app/settings/app_cfg.py | 15 | ||||
| -rw-r--r-- | megapixels/commands/faiss/build_faiss.py | 2 | ||||
| -rw-r--r-- | old/faiss/requirements.txt (renamed from faiss/requirements.txt) | 0 | ||||
| -rw-r--r-- | old/faiss/run.sh (renamed from faiss/run.sh) | 0 | ||||
| -rw-r--r-- | old/faiss/static/css/app.css (renamed from faiss/static/css/app.css) | 0 | ||||
| -rw-r--r-- | old/faiss/static/favicon.ico (renamed from faiss/static/favicon.ico) | bin | 15086 -> 15086 bytes | |||
| -rw-r--r-- | old/faiss/static/img/play.png (renamed from faiss/static/img/play.png) | bin | 1231 -> 1231 bytes | |||
| -rw-r--r-- | old/faiss/static/index.html (renamed from faiss/static/index.html) | 0 | ||||
| -rw-r--r-- | old/faiss/static/js/app.js (renamed from faiss/static/js/app.js) | 0 | ||||
| -rw-r--r-- | old/faiss/static/js/dataUriToBlob.js (renamed from faiss/static/js/dataUriToBlob.js) | 0 | ||||
| -rw-r--r-- | old/faiss/static/js/metadata-app.js (renamed from faiss/static/js/metadata-app.js) | 0 | ||||
| -rw-r--r-- | old/faiss/static/js/store2.min.js (renamed from faiss/static/js/store2.min.js) | 0 | ||||
| -rw-r--r-- | old/faiss/static/metadata.html (renamed from faiss/static/metadata.html) | 0 | ||||
| -rw-r--r-- | old/faiss/static/search.html (renamed from faiss/static/search.html) | 0 | ||||
| -rw-r--r-- | old/faiss/util.py (renamed from faiss/util.py) | 0 | ||||
| -rw-r--r-- | old/faiss/wsgi.py (renamed from faiss/wsgi.py) | 0 | ||||
| -rw-r--r-- | old/server/app/README.md (renamed from server/app/README.md) | 0 | ||||
| -rw-r--r-- | old/server/app/__init__.py (renamed from server/app/__init__.py) | 0 | ||||
| -rw-r--r-- | old/server/app/basemodels.py (renamed from server/app/basemodels.py) | 0 | ||||
| -rw-r--r-- | old/server/app/favicon.ico (renamed from server/app/favicon.ico) | bin | 318 -> 318 bytes | |||
| -rw-r--r-- | old/server/app/index.html (renamed from server/app/index.html) | 0 | ||||
| -rw-r--r-- | old/server/app/main/__init__.py (renamed from server/app/main/__init__.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/errors.py (renamed from server/app/main/errors.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/forms.py (renamed from server/app/main/forms.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/img_proc_config.py (renamed from server/app/main/img_proc_config.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/paths.py (renamed from server/app/main/paths.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/tasks.py (renamed from server/app/main/tasks.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/utils.py (renamed from server/app/main/utils.py) | 0 | ||||
| -rw-r--r-- | old/server/app/main/views.py (renamed from server/app/main/views.py) | 0 | ||||
| -rw-r--r-- | old/server/app/static/css/bootstrap.min.css (renamed from server/app/static/css/bootstrap.min.css) | 0 | ||||
| -rw-r--r-- | old/server/app/static/css/dullbrown-theme.css (renamed from server/app/static/css/dullbrown-theme.css) | 0 | ||||
| -rw-r--r-- | old/server/app/static/css/projector.css (renamed from server/app/static/css/projector.css) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/app.js (renamed from server/app/static/js/app.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/upload.js (renamed from server/app/static/js/upload.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/util.js (renamed from server/app/static/js/util.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/vendor/ExifReader.js (renamed from server/app/static/js/vendor/ExifReader.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/vendor/canvas-to-blob.js (renamed from server/app/static/js/vendor/canvas-to-blob.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/vendor/jquery-3.3.1.min.js (renamed from server/app/static/js/vendor/jquery-3.3.1.min.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/vendor/nanobar.min.js (renamed from server/app/static/js/vendor/nanobar.min.js) | 0 | ||||
| -rw-r--r-- | old/server/app/static/js/vendor/prefixfree.js (renamed from server/app/static/js/vendor/prefixfree.js) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/403.html (renamed from server/app/templates/403.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/404.html (renamed from server/app/templates/404.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/500.html (renamed from server/app/templates/500.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/base.html (renamed from server/app/templates/base.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/celery.html (renamed from server/app/templates/celery.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/display.html (renamed from server/app/templates/display.html) | 0 | ||||
| -rw-r--r-- | old/server/app/templates/index.html (renamed from server/app/templates/index.html) | 0 | ||||
| -rw-r--r-- | old/server/celery_worker.py (renamed from server/celery_worker.py) | 0 | ||||
| -rw-r--r-- | old/server/config.py (renamed from server/config.py) | 0 | ||||
| -rwxr-xr-x | old/server/deploy.sh (renamed from server/deploy.sh) | 0 | ||||
| -rw-r--r-- | old/server/dulldream.wsgi.py (renamed from server/dulldream.wsgi.py) | 0 | ||||
| -rwxr-xr-x | old/server/run-celery.sh (renamed from server/run-celery.sh) | 0 | ||||
| -rwxr-xr-x | old/server/run-dev.sh (renamed from server/run-dev.sh) | 0 | ||||
| -rwxr-xr-x | old/server/run-gunicorn.sh (renamed from server/run-gunicorn.sh) | 0 | ||||
| -rwxr-xr-x | old/server/run-redis.sh (renamed from server/run-redis.sh) | 0 | ||||
| -rw-r--r-- | old/server/run.py (renamed from server/run.py) | 0 |
86 files changed, 16 insertions, 11 deletions
diff --git a/builder/__init__.py b/builder/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/builder/__init__.py +++ /dev/null diff --git a/scraper/client/actions.js b/client/actions.js index ba899f06..ba899f06 100644 --- a/scraper/client/actions.js +++ b/client/actions.js diff --git a/scraper/client/app.js b/client/app.js index 6c008ec6..6c008ec6 100644 --- a/scraper/client/app.js +++ b/client/app.js diff --git a/scraper/client/common/activeLink.component.js b/client/common/activeLink.component.js index 59f63881..59f63881 100644 --- a/scraper/client/common/activeLink.component.js +++ b/client/common/activeLink.component.js diff --git a/scraper/client/common/classifier.component.js b/client/common/classifier.component.js index af6a4934..af6a4934 100644 --- a/scraper/client/common/classifier.component.js +++ b/client/common/classifier.component.js diff --git a/scraper/client/common/common.css b/client/common/common.css index 4b939df0..4b939df0 100644 --- a/scraper/client/common/common.css +++ b/client/common/common.css diff --git a/scraper/client/common/detectionBoxes.component.js b/client/common/detectionBoxes.component.js index c4872ea8..c4872ea8 100644 --- a/scraper/client/common/detectionBoxes.component.js +++ b/client/common/detectionBoxes.component.js diff --git a/scraper/client/common/detectionList.component.js b/client/common/detectionList.component.js index 416e66d8..416e66d8 100644 --- a/scraper/client/common/detectionList.component.js +++ b/client/common/detectionList.component.js diff --git a/scraper/client/common/footer.component.js b/client/common/footer.component.js index 7c82b44b..7c82b44b 100644 --- a/scraper/client/common/footer.component.js +++ b/client/common/footer.component.js diff --git a/scraper/client/common/gate.component.js b/client/common/gate.component.js index 9bf9287b..9bf9287b 100644 --- a/scraper/client/common/gate.component.js +++ b/client/common/gate.component.js diff --git a/scraper/client/common/header.component.js b/client/common/header.component.js index 84fe306f..84fe306f 100644 --- a/scraper/client/common/header.component.js +++ b/client/common/header.component.js diff --git a/scraper/client/common/index.js b/client/common/index.js index ad9fe5e1..ad9fe5e1 100644 --- a/scraper/client/common/index.js +++ b/client/common/index.js diff --git a/scraper/client/common/keyframe.component.js b/client/common/keyframe.component.js index c77db3ac..c77db3ac 100644 --- a/scraper/client/common/keyframe.component.js +++ b/client/common/keyframe.component.js diff --git a/scraper/client/common/keyframes.component.js b/client/common/keyframes.component.js index 62eda45e..62eda45e 100644 --- a/scraper/client/common/keyframes.component.js +++ b/client/common/keyframes.component.js diff --git a/scraper/client/common/loader.component.js b/client/common/loader.component.js index 6795424b..6795424b 100644 --- a/scraper/client/common/loader.component.js +++ b/client/common/loader.component.js diff --git a/scraper/client/common/sidebar.component.js b/client/common/sidebar.component.js index 487f3289..487f3289 100644 --- a/scraper/client/common/sidebar.component.js +++ b/client/common/sidebar.component.js diff --git a/scraper/client/common/table.component.js b/client/common/table.component.js index 76a1d57c..76a1d57c 100644 --- a/scraper/client/common/table.component.js +++ b/client/common/table.component.js diff --git a/scraper/client/common/video.component.js b/client/common/video.component.js index e5525bf6..e5525bf6 100644 --- a/scraper/client/common/video.component.js +++ b/client/common/video.component.js diff --git a/scraper/client/index.js b/client/index.js index eddc5fb2..eddc5fb2 100644 --- a/scraper/client/index.js +++ b/client/index.js diff --git a/scraper/client/metadata/index.js b/client/metadata/index.js index 0eef814e..0eef814e 100644 --- a/scraper/client/metadata/index.js +++ b/client/metadata/index.js diff --git a/scraper/client/session.js b/client/session.js index 5bfae7eb..5bfae7eb 100644 --- a/scraper/client/session.js +++ b/client/session.js diff --git a/scraper/client/store.js b/client/store.js index 043af351..043af351 100644 --- a/scraper/client/store.js +++ b/client/store.js diff --git a/scraper/client/types.js b/client/types.js index e3c64691..e3c64691 100644 --- a/scraper/client/types.js +++ b/client/types.js diff --git a/scraper/client/util.js b/client/util.js index ad303c64..ad303c64 100644 --- a/scraper/client/util.js +++ b/client/util.js diff --git a/builder/README.md b/megapixels/app/builder/README.md index 1a6d3a1e..1a6d3a1e 100644 --- a/builder/README.md +++ b/megapixels/app/builder/README.md diff --git a/builder/builder.py b/megapixels/app/builder/builder.py index 620fc710..620fc710 100644 --- a/builder/builder.py +++ b/megapixels/app/builder/builder.py diff --git a/builder/parser.py b/megapixels/app/builder/parser.py index dd3643bf..dd3643bf 100644 --- a/builder/parser.py +++ b/megapixels/app/builder/parser.py diff --git a/builder/paths.py b/megapixels/app/builder/paths.py index 356f2f3d..356f2f3d 100644 --- a/builder/paths.py +++ b/megapixels/app/builder/paths.py diff --git a/builder/s3.py b/megapixels/app/builder/s3.py index 41ecdf61..41ecdf61 100644 --- a/builder/s3.py +++ b/megapixels/app/builder/s3.py diff --git a/megapixels/app/server/create.py b/megapixels/app/server/create.py index 9efed669..c1f41dc4 100644 --- a/megapixels/app/server/create.py +++ b/megapixels/app/server/create.py @@ -1,4 +1,4 @@ -from flask import Flask, Blueprint, jsonify +from flask import Flask, Blueprint, jsonify, send_from_directory from flask_sqlalchemy import SQLAlchemy from app.models.sql_factory import connection_url, load_sql_datasets @@ -7,7 +7,7 @@ from app.server.api import api db = SQLAlchemy() def create_app(script_info=None): - app = Flask(__name__, static_url_path='') + app = Flask(__name__, static_folder='static', static_url_path='') app.config['SQLALCHEMY_DATABASE_URI'] = connection_url app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False @@ -15,6 +15,7 @@ def create_app(script_info=None): datasets = load_sql_datasets(replace=False, base_model=db.Model) app.register_blueprint(api, url_prefix='/api') + app.add_url_rule('/<path:file_relative_path_to_root>', 'serve_page', serve_page, methods=['GET']) @app.route('/', methods=['GET']) def index(): @@ -34,3 +35,8 @@ def create_app(script_info=None): return(jsonify(links)) return app + +def serve_page(file_relative_path_to_root): + if file_relative_path_to_root[-1] == '/': + file_relative_path_to_root += 'index.html' + return send_from_directory("static", file_relative_path_to_root) diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py index 0507366f..1d3fbc4c 100644 --- a/megapixels/app/settings/app_cfg.py +++ b/megapixels/app/settings/app_cfg.py @@ -58,6 +58,13 @@ DIR_FAISS_RECIPES = join(DIR_FAISS, 'recipes') DIR_TEST_IMAGES = join(DIR_APP, 'test', 'images') # ----------------------------------------------------------------------------- +# .env config for keys +# ----------------------------------------------------------------------------- + +DIR_DOTENV = join(DIR_APP, '.env') +load_dotenv(dotenv_path=DIR_DOTENV) + +# ----------------------------------------------------------------------------- # Drawing, GUI settings # ----------------------------------------------------------------------------- DIR_ASSETS = join(DIR_APP, 'assets') @@ -69,6 +76,7 @@ FP_FONT = join(DIR_ASSETS, 'font') # ----------------------------------------------------------------------------- DIR_COMMANDS_CV = 'commands/cv' DIR_COMMANDS_ADMIN = 'commands/admin' +DIR_COMMANDS_BUILDER = 'commands/builder' DIR_COMMANDS_DATASETS = 'commands/datasets' DIR_COMMANDS_FAISS = 'commands/faiss' DIR_COMMANDS_MISC = 'commands/misc' @@ -118,10 +126,3 @@ LOGFILE_FORMAT = "%(log_color)s%(levelname)-8s%(reset)s %(cyan)s%(filename)s:%(l # ----------------------------------------------------------------------------- S3_MEDIA_ROOT = 's3://megapixels/v1/media/' S3_METADATA_ROOT = 's3://megapixels/v1/metadata/' - -# ----------------------------------------------------------------------------- -# .env config for keys -# ----------------------------------------------------------------------------- - -DIR_DOTENV = join(DIR_APP, '.env') -load_dotenv(dotenv_path=DIR_DOTENV) diff --git a/megapixels/commands/faiss/build_faiss.py b/megapixels/commands/faiss/build_faiss.py index 96d3f99e..ec94c924 100644 --- a/megapixels/commands/faiss/build_faiss.py +++ b/megapixels/commands/faiss/build_faiss.py @@ -12,8 +12,6 @@ import numpy as np from app.utils.file_utils import load_recipe, load_csv_safe from app.settings import app_cfg as cfg -engine = create_engine('sqlite:///:memory:') - class DefaultRecipe: def __init__(self): self.dim = 128 diff --git a/faiss/requirements.txt b/old/faiss/requirements.txt index 1d60aabc..1d60aabc 100644 --- a/faiss/requirements.txt +++ b/old/faiss/requirements.txt diff --git a/faiss/run.sh b/old/faiss/run.sh index 8f9e77e2..8f9e77e2 100644 --- a/faiss/run.sh +++ b/old/faiss/run.sh diff --git a/faiss/static/css/app.css b/old/faiss/static/css/app.css index a3b24736..a3b24736 100644 --- a/faiss/static/css/app.css +++ b/old/faiss/static/css/app.css diff --git a/faiss/static/favicon.ico b/old/faiss/static/favicon.ico Binary files differindex d97f2f59..d97f2f59 100644 --- a/faiss/static/favicon.ico +++ b/old/faiss/static/favicon.ico diff --git a/faiss/static/img/play.png b/old/faiss/static/img/play.png Binary files differindex 40f76045..40f76045 100644 --- a/faiss/static/img/play.png +++ b/old/faiss/static/img/play.png diff --git a/faiss/static/index.html b/old/faiss/static/index.html index cf59c628..cf59c628 100644 --- a/faiss/static/index.html +++ b/old/faiss/static/index.html diff --git a/faiss/static/js/app.js b/old/faiss/static/js/app.js index 77164c76..77164c76 100644 --- a/faiss/static/js/app.js +++ b/old/faiss/static/js/app.js diff --git a/faiss/static/js/dataUriToBlob.js b/old/faiss/static/js/dataUriToBlob.js index 80189b8d..80189b8d 100644 --- a/faiss/static/js/dataUriToBlob.js +++ b/old/faiss/static/js/dataUriToBlob.js diff --git a/faiss/static/js/metadata-app.js b/old/faiss/static/js/metadata-app.js index fa2265fa..fa2265fa 100644 --- a/faiss/static/js/metadata-app.js +++ b/old/faiss/static/js/metadata-app.js diff --git a/faiss/static/js/store2.min.js b/old/faiss/static/js/store2.min.js index 75e3ca37..75e3ca37 100644 --- a/faiss/static/js/store2.min.js +++ b/old/faiss/static/js/store2.min.js diff --git a/faiss/static/metadata.html b/old/faiss/static/metadata.html index e74e1ee1..e74e1ee1 100644 --- a/faiss/static/metadata.html +++ b/old/faiss/static/metadata.html diff --git a/faiss/static/search.html b/old/faiss/static/search.html index 056d06c1..056d06c1 100644 --- a/faiss/static/search.html +++ b/old/faiss/static/search.html diff --git a/faiss/util.py b/old/faiss/util.py index 97afbc22..97afbc22 100644 --- a/faiss/util.py +++ b/old/faiss/util.py diff --git a/faiss/wsgi.py b/old/faiss/wsgi.py index 371862fb..371862fb 100644 --- a/faiss/wsgi.py +++ b/old/faiss/wsgi.py diff --git a/server/app/README.md b/old/server/app/README.md index 8bc70132..8bc70132 100644 --- a/server/app/README.md +++ b/old/server/app/README.md diff --git a/server/app/__init__.py b/old/server/app/__init__.py index bce3f9ee..bce3f9ee 100644 --- a/server/app/__init__.py +++ b/old/server/app/__init__.py diff --git a/server/app/basemodels.py b/old/server/app/basemodels.py index 475ab0c2..475ab0c2 100644 --- a/server/app/basemodels.py +++ b/old/server/app/basemodels.py diff --git a/server/app/favicon.ico b/old/server/app/favicon.ico Binary files differindex 4d001b21..4d001b21 100644 --- a/server/app/favicon.ico +++ b/old/server/app/favicon.ico diff --git a/server/app/index.html b/old/server/app/index.html index 3c1b0dfd..3c1b0dfd 100644 --- a/server/app/index.html +++ b/old/server/app/index.html diff --git a/server/app/main/__init__.py b/old/server/app/main/__init__.py index a21e2754..a21e2754 100644 --- a/server/app/main/__init__.py +++ b/old/server/app/main/__init__.py diff --git a/server/app/main/errors.py b/old/server/app/main/errors.py index 60b5f227..60b5f227 100644 --- a/server/app/main/errors.py +++ b/old/server/app/main/errors.py diff --git a/server/app/main/forms.py b/old/server/app/main/forms.py index bc1399ad..bc1399ad 100644 --- a/server/app/main/forms.py +++ b/old/server/app/main/forms.py diff --git a/server/app/main/img_proc_config.py b/old/server/app/main/img_proc_config.py index db124978..db124978 100644 --- a/server/app/main/img_proc_config.py +++ b/old/server/app/main/img_proc_config.py diff --git a/server/app/main/paths.py b/old/server/app/main/paths.py index 69c21627..69c21627 100644 --- a/server/app/main/paths.py +++ b/old/server/app/main/paths.py diff --git a/server/app/main/tasks.py b/old/server/app/main/tasks.py index 970e6988..970e6988 100644 --- a/server/app/main/tasks.py +++ b/old/server/app/main/tasks.py diff --git a/server/app/main/utils.py b/old/server/app/main/utils.py index 510e5c23..510e5c23 100644 --- a/server/app/main/utils.py +++ b/old/server/app/main/utils.py diff --git a/server/app/main/views.py b/old/server/app/main/views.py index 11a8ca53..11a8ca53 100644 --- a/server/app/main/views.py +++ b/old/server/app/main/views.py diff --git a/server/app/static/css/bootstrap.min.css b/old/server/app/static/css/bootstrap.min.css index ed3905e0..ed3905e0 100644 --- a/server/app/static/css/bootstrap.min.css +++ b/old/server/app/static/css/bootstrap.min.css diff --git a/server/app/static/css/dullbrown-theme.css b/old/server/app/static/css/dullbrown-theme.css index 98aff038..98aff038 100644 --- a/server/app/static/css/dullbrown-theme.css +++ b/old/server/app/static/css/dullbrown-theme.css diff --git a/server/app/static/css/projector.css b/old/server/app/static/css/projector.css index 401f0dff..401f0dff 100644 --- a/server/app/static/css/projector.css +++ b/old/server/app/static/css/projector.css diff --git a/server/app/static/js/app.js b/old/server/app/static/js/app.js index 454d5c37..454d5c37 100644 --- a/server/app/static/js/app.js +++ b/old/server/app/static/js/app.js diff --git a/server/app/static/js/upload.js b/old/server/app/static/js/upload.js index 27437e43..27437e43 100644 --- a/server/app/static/js/upload.js +++ b/old/server/app/static/js/upload.js diff --git a/server/app/static/js/util.js b/old/server/app/static/js/util.js index 851f634a..851f634a 100644 --- a/server/app/static/js/util.js +++ b/old/server/app/static/js/util.js diff --git a/server/app/static/js/vendor/ExifReader.js b/old/server/app/static/js/vendor/ExifReader.js index a8343ede..a8343ede 100644 --- a/server/app/static/js/vendor/ExifReader.js +++ b/old/server/app/static/js/vendor/ExifReader.js diff --git a/server/app/static/js/vendor/canvas-to-blob.js b/old/server/app/static/js/vendor/canvas-to-blob.js index 32913667..32913667 100644 --- a/server/app/static/js/vendor/canvas-to-blob.js +++ b/old/server/app/static/js/vendor/canvas-to-blob.js diff --git a/server/app/static/js/vendor/jquery-3.3.1.min.js b/old/server/app/static/js/vendor/jquery-3.3.1.min.js index 4d9b3a25..4d9b3a25 100644 --- a/server/app/static/js/vendor/jquery-3.3.1.min.js +++ b/old/server/app/static/js/vendor/jquery-3.3.1.min.js diff --git a/server/app/static/js/vendor/nanobar.min.js b/old/server/app/static/js/vendor/nanobar.min.js index 9329eadc..9329eadc 100644 --- a/server/app/static/js/vendor/nanobar.min.js +++ b/old/server/app/static/js/vendor/nanobar.min.js diff --git a/server/app/static/js/vendor/prefixfree.js b/old/server/app/static/js/vendor/prefixfree.js index 40b6e693..40b6e693 100644 --- a/server/app/static/js/vendor/prefixfree.js +++ b/old/server/app/static/js/vendor/prefixfree.js diff --git a/server/app/templates/403.html b/old/server/app/templates/403.html index f83c6dfc..f83c6dfc 100644 --- a/server/app/templates/403.html +++ b/old/server/app/templates/403.html diff --git a/server/app/templates/404.html b/old/server/app/templates/404.html index a7f7d45a..a7f7d45a 100644 --- a/server/app/templates/404.html +++ b/old/server/app/templates/404.html diff --git a/server/app/templates/500.html b/old/server/app/templates/500.html index b323c12c..b323c12c 100644 --- a/server/app/templates/500.html +++ b/old/server/app/templates/500.html diff --git a/server/app/templates/base.html b/old/server/app/templates/base.html index 16402af8..16402af8 100644 --- a/server/app/templates/base.html +++ b/old/server/app/templates/base.html diff --git a/server/app/templates/celery.html b/old/server/app/templates/celery.html index ddcd25cb..ddcd25cb 100644 --- a/server/app/templates/celery.html +++ b/old/server/app/templates/celery.html diff --git a/server/app/templates/display.html b/old/server/app/templates/display.html index f73a6ca5..f73a6ca5 100644 --- a/server/app/templates/display.html +++ b/old/server/app/templates/display.html diff --git a/server/app/templates/index.html b/old/server/app/templates/index.html index f740bb5b..f740bb5b 100644 --- a/server/app/templates/index.html +++ b/old/server/app/templates/index.html diff --git a/server/celery_worker.py b/old/server/celery_worker.py index 1545a884..1545a884 100644 --- a/server/celery_worker.py +++ b/old/server/celery_worker.py diff --git a/server/config.py b/old/server/config.py index 5042efb6..5042efb6 100644 --- a/server/config.py +++ b/old/server/config.py diff --git a/server/deploy.sh b/old/server/deploy.sh index c2594cab..c2594cab 100755 --- a/server/deploy.sh +++ b/old/server/deploy.sh diff --git a/server/dulldream.wsgi.py b/old/server/dulldream.wsgi.py index ed992528..ed992528 100644 --- a/server/dulldream.wsgi.py +++ b/old/server/dulldream.wsgi.py diff --git a/server/run-celery.sh b/old/server/run-celery.sh index e38174fa..e38174fa 100755 --- a/server/run-celery.sh +++ b/old/server/run-celery.sh diff --git a/server/run-dev.sh b/old/server/run-dev.sh index b4eb2a61..b4eb2a61 100755 --- a/server/run-dev.sh +++ b/old/server/run-dev.sh diff --git a/server/run-gunicorn.sh b/old/server/run-gunicorn.sh index 64debabd..64debabd 100755 --- a/server/run-gunicorn.sh +++ b/old/server/run-gunicorn.sh diff --git a/server/run-redis.sh b/old/server/run-redis.sh index e9ceb845..e9ceb845 100755 --- a/server/run-redis.sh +++ b/old/server/run-redis.sh diff --git a/server/run.py b/old/server/run.py index c4c3e8d7..c4c3e8d7 100644 --- a/server/run.py +++ b/old/server/run.py |
