diff --git a/apps/andi/assets/css/app.scss b/apps/andi/assets/css/app.scss index 22e8322e2..60d40a6a7 100644 --- a/apps/andi/assets/css/app.scss +++ b/apps/andi/assets/css/app.scss @@ -9,9 +9,9 @@ src: url('../static/fonts/Roboto/Roboto-Regular.ttf') format('truetype'), url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2') format('woff2'), /* Super Modern Browsers */ - url('../static/fonts/roboto-v30-latin-ext_latin-regular.woff') format('woff'), + url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff') format('woff'), /* Modern Browsers */ url('../static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */ @@ -155,4 +155,4 @@ body { @import "./upload_data_dictionary.scss"; @import "./url_form.scss"; @import "./user.scss"; -@import "./users.scss"; \ No newline at end of file +@import "./users.scss"; diff --git a/apps/andi/assets/package-lock.json b/apps/andi/assets/package-lock.json index 39cf28e20..e6ca776b5 100644 --- a/apps/andi/assets/package-lock.json +++ b/apps/andi/assets/package-lock.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" @@ -5258,56 +5257,6 @@ "punycode": "^2.1.0" } }, - "node_modules/url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "dependencies": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "file-loader": "*", - "webpack": "^4.0.0 || ^5.0.0" - }, - "peerDependenciesMeta": { - "file-loader": { - "optional": true - } - } - }, - "node_modules/url-loader/node_modules/emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true, - "engines": { - "node": ">= 4" - } - }, - "node_modules/url-loader/node_modules/loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "dependencies": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - }, - "engines": { - "node": ">=8.9.0" - } - }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -9423,36 +9372,6 @@ "punycode": "^2.1.0" } }, - "url-loader": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz", - "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==", - "dev": true, - "requires": { - "loader-utils": "^2.0.0", - "mime-types": "^2.1.27", - "schema-utils": "^3.0.0" - }, - "dependencies": { - "emojis-list": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", - "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", - "dev": true - }, - "loader-utils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.2.tgz", - "integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } - } - }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", diff --git a/apps/andi/assets/package.json b/apps/andi/assets/package.json index e8e7e17f5..7e0e6a009 100644 --- a/apps/andi/assets/package.json +++ b/apps/andi/assets/package.json @@ -31,7 +31,6 @@ "sass-loader": "^12.6.0", "serialize-javascript": ">=3.1.0", "terser-webpack-plugin": "^5.3.1", - "url-loader": "^4.1.1", "webpack": "^5.0.0", "webpack-cli": "^4.0.0", "yargs-parser": ">=18.1.2" diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff diff --git a/apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 b/apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 similarity index 100% rename from apps/andi/assets/static/fonts/roboto-v30-latin-ext_latin-regular.woff2 rename to apps/andi/assets/static/fonts/Roboto/roboto-v30-latin-ext_latin-regular.woff2 diff --git a/apps/andi/assets/webpack.config.js b/apps/andi/assets/webpack.config.js index b612f3368..867489b9c 100644 --- a/apps/andi/assets/webpack.config.js +++ b/apps/andi/assets/webpack.config.js @@ -35,15 +35,13 @@ module.exports = (env, options) => ({ ] }, { - test: /\.(woff|svg)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, + test: /\.(woff)(\?v=[a-z0-9]\.[a-z0-9]\.[a-z0-9])?$/, use: [ { loader: 'file-loader', options: { name: '[name].[ext]', - outputPath: '../fonts/', - mimetype: 'font/woff2', - encoding: false + outputPath: '../fonts/' } } ] diff --git a/apps/andi/endpoint.ex b/apps/andi/endpoint.ex deleted file mode 100644 index 92994975e..000000000 --- a/apps/andi/endpoint.ex +++ /dev/null @@ -1,9 +0,0 @@ -defmodule Andi.Endpoint do - use Phoenix.Endpoint, otp_app: :andi - - plug Plug.Static, - at: "/", - from: :andi, - gzip: false, - only: ~w(css fonts images js favicon.ico) -end diff --git a/apps/andi/mix.exs b/apps/andi/mix.exs index c8552024e..6a9cd8fa1 100644 --- a/apps/andi/mix.exs +++ b/apps/andi/mix.exs @@ -4,7 +4,7 @@ defmodule Andi.MixProject do def project do [ app: :andi, - version: "2.4.3", + version: "2.4.4", build_path: "../../_build", config_path: "../../config/config.exs", deps_path: "../../deps",