diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py index fa0cece24c4b7c200daa09332782ecafe94c5a5a..9b9d2bad71ae90dbea869e345859a7e63f6ed686 100644 --- a/aleksis/core/settings.py +++ b/aleksis/core/settings.py @@ -43,7 +43,7 @@ _settings = LazySettings( ) # Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) SILENCED_SYSTEM_CHECKS = [] @@ -584,6 +584,15 @@ YARN_INSTALLED_APPS = [ "luxon@^2.3.2", "@iconify/iconify@^2.2.1", "@iconify/json@^2.1.30", + "@mdi/font@^6.9.96", + "apollo-boost@^0.4.9", + "deepmerge@^4.2.2", + "graphql@^15.8.0", + "graphql-tag@^2.12.6", + "sass@~1.32", + "vue@^2.7.7", + "vue-apollo@^3.1.0", + "vuetify@^2.6.7", ] merge_app_settings("YARN_INSTALLED_APPS", YARN_INSTALLED_APPS, True) @@ -591,13 +600,13 @@ merge_app_settings("YARN_INSTALLED_APPS", YARN_INSTALLED_APPS, True) WEBPACK_LOADER = { "DEFAULT": { "CACHE": not DEBUG, - "STATS_FILE": os.path.join(BASE_DIR, "..", "webpack-stats.json"), + "STATS_FILE": os.path.join(BASE_DIR, "webpack-stats.json"), "POLL_INTERVAL": 0.1, "IGNORE": [r".+\.hot-update.js", r".+\.map"], } } STATICFILES_DIRS = ( - os.path.join(BASE_DIR, "..", "assets"), + os.path.join(BASE_DIR, "assets"), ) JS_URL = _settings.get("js_assets.url", STATIC_URL) diff --git a/package.json b/package.json index 3e3423dc9a8cdeb2436849dca17e35e482e90a95..7f290c9c0675c95e5bea7084fc42c73f5db93ef5 100644 --- a/package.json +++ b/package.json @@ -16,12 +16,26 @@ "webpack-cli": "^4.10.0" }, "dependencies": { + "@fontsource/roboto": "^4.5.5", + "@iconify/iconify": "^2.2.1", + "@iconify/json": "^2.1.30", + "@materializecss/materialize": "~1.0.0", "@mdi/font": "^6.9.96", + "@sentry/tracing": "^6.19.6", "apollo-boost": "^0.4.9", + "cleave.js": "^1.6.0", "deepmerge": "^4.2.2", "graphql": "^15.8.0", "graphql-tag": "^2.12.6", + "jquery": "^3.6.0", + "jquery-sortablejs": "^1.0.1", + "luxon": "^2.3.2", + "material-design-icons-iconfont": "^6.6.0", + "paper-css": "^0.4.1", "sass": "~1.32", + "select2": "^4.1.0-rc.0", + "select2-materialize": "^0.1.8", + "sortablejs": "^1.15.0", "vue": "^2.7.7", "vue-apollo": "^3.1.0", "vuetify": "^2.6.7"