diff --git a/disco/settings.py b/disco/settings.py index b30a446..ab6964f 100644 --- a/disco/settings.py +++ b/disco/settings.py @@ -106,6 +106,7 @@ } INSTALLED_APPS = ( + "disco", "webpack_loader", "django.contrib.admin", "django.contrib.auth", @@ -125,7 +126,6 @@ "django_celery_results", "pgtrigger", # "silk", - "disco", "arches_templating", "arches_for_science", ) @@ -264,7 +264,7 @@ CLUSTER_DISTANCE_MAX = 5000 #meters GRAPH_MODEL_CACHE_TIMEOUT = None -OAUTH_CLIENT_ID = 'vrPZJ8h0KIASrNK0IkjXKK8xMBe5G8hRRdE0dQdj' +OAUTH_CLIENT_ID = '' APP_TITLE = 'Arches | Heritage Data Management' COPYRIGHT_TEXT = 'All Rights Reserved.' diff --git a/disco/urls.py b/disco/urls.py index 40ab183..bba30fc 100644 --- a/disco/urls.py +++ b/disco/urls.py @@ -7,7 +7,6 @@ urlpatterns = [ re_path(r"^", include("arches.urls")), re_path(r"^", include("arches_for_science.urls")), - # re_path(r"^", include("dashboard.urls")), path("reports/", include("arches_templating.urls")), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/package.json b/package.json index 3c406b5..c6982b4 100644 --- a/package.json +++ b/package.json @@ -2,9 +2,9 @@ "name": "disco", "license": "AGPL-3.0-only", "scripts": { - "build_development": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=8192 webpack --config ./webpack/webpack.config.dev.js", - "build_production": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=8192 NODE_ENV=production webpack --config ./webpack/webpack.config.prod.js", - "build_test": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=8192 webpack --config ./webpack/webpack.config.dev.js --env test=true", + "build_development": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=2048 webpack --config ./webpack/webpack.config.dev.js", + "build_production": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=2048 NODE_ENV=production webpack --config ./webpack/webpack.config.prod.js", + "build_test": "npm run eslint:check && npm run ts:check && cross-env NODE_OPTIONS=--max-old-space-size=2048 webpack --config ./webpack/webpack.config.dev.js --env test=true", "eslint:check": "eslint **/src", "eslint:fix": "eslint **/src --fix", "eslint:watch": "nodemon --watch . --ext ts,vue --exec npm run --silent eslint:check", @@ -14,7 +14,7 @@ "prettier:fix": "prettier glass/src --write", "ts:check": "vue-tsc --noEmit", "ts:watch": "vue-tsc --watch --noEmit", - "start": "cross-env NODE_OPTIONS=--max-old-space-size=8192 webpack serve --config ./webpack/webpack.config.dev.js", + "start": "cross-env NODE_OPTIONS=--max-old-space-size=2048 webpack serve --config ./webpack/webpack.config.dev.js", "vitest": "vitest --run --coverage" }, "dependencies": {