diff --git a/Dockerfile b/Dockerfile index 49ebd45c..51df1e69 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN cmake . && make -j FROM node:14-alpine as webapp WORKDIR /webapp -COPY src/Kyoo.WebApp/Front . +COPY front . RUN npm install -g @angular/cli RUN yarn install --frozen-lockfile RUN yarn run build --configuration production diff --git a/front/.editorconfig b/front/.editorconfig index 4b528d65..a7538428 100644 --- a/front/.editorconfig +++ b/front/.editorconfig @@ -1,14 +1,9 @@ # Editor configuration, see https://editorconfig.org -root = true +root = false [*] charset = utf-8 indent_style = tab -indent_size = 4 insert_final_newline = true max_line_length = 120 trim_trailing_whitespace = true - -[*.md] -max_line_length = off -trim_trailing_whitespace = false diff --git a/front/angular.json b/front/angular.json index 9db87266..c977e86a 100644 --- a/front/angular.json +++ b/front/angular.json @@ -43,12 +43,7 @@ "./node_modules/jquery/dist/jquery.min.js", "./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js", "./node_modules/hls.js/dist/hls.js" - ], - "stylePreprocessorOptions": { - "includePaths": [ - "src" - ] - } + ] }, "configurations": { "production": { @@ -59,7 +54,6 @@ } ], "optimization": true, - "outputHashing": "all", "sourceMap": false, "namedChunks": false, "aot": true, diff --git a/front/projects/host/src/app/app.component.scss b/front/projects/host/src/app/app.component.scss index 09e84b66..fa1c470d 100644 --- a/front/projects/host/src/app/app.component.scss +++ b/front/projects/host/src/app/app.component.scss @@ -1,7 +1,8 @@ @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/variables"; @import "~bootstrap/scss/mixins/breakpoints"; -@import "variables"; + +$nav-bar-height: 64px; #toolbar { diff --git a/front/projects/host/src/app/pages/show-details/show-details.component.scss b/front/projects/host/src/app/pages/show-details/show-details.component.scss index 3daa90b2..27121234 100644 --- a/front/projects/host/src/app/pages/show-details/show-details.component.scss +++ b/front/projects/host/src/app/pages/show-details/show-details.component.scss @@ -1,7 +1,6 @@ @import "~bootstrap/scss/functions"; @import "~bootstrap/scss/variables"; @import "~bootstrap/scss/mixins/breakpoints"; -@import "variables"; a { diff --git a/front/projects/host/src/styles.scss b/front/projects/host/src/styles.scss index 9f6de050..18d1df85 100644 --- a/front/projects/host/src/styles.scss +++ b/front/projects/host/src/styles.scss @@ -1,5 +1,5 @@ //Roboto font -@import "../static/roboto/sass/roboto.scss"; +@import "../../../static/roboto/sass/roboto.scss"; //Bootstrap configuration @import "~bootstrap/scss/functions"; diff --git a/front/projects/host/src/variables.scss b/front/projects/host/src/variables.scss deleted file mode 100644 index 7f9566e4..00000000 --- a/front/projects/host/src/variables.scss +++ /dev/null @@ -1 +0,0 @@ -$nav-bar-height: 64px; diff --git a/front/projects/host/static/iconfont/MaterialIcons-Regular.eot b/front/static/iconfont/MaterialIcons-Regular.eot similarity index 100% rename from front/projects/host/static/iconfont/MaterialIcons-Regular.eot rename to front/static/iconfont/MaterialIcons-Regular.eot diff --git a/front/projects/host/static/iconfont/MaterialIcons-Regular.json b/front/static/iconfont/MaterialIcons-Regular.json similarity index 100% rename from front/projects/host/static/iconfont/MaterialIcons-Regular.json rename to front/static/iconfont/MaterialIcons-Regular.json diff --git a/front/projects/host/static/iconfont/MaterialIcons-Regular.ttf b/front/static/iconfont/MaterialIcons-Regular.ttf similarity index 100% rename from front/projects/host/static/iconfont/MaterialIcons-Regular.ttf rename to front/static/iconfont/MaterialIcons-Regular.ttf diff --git a/front/projects/host/static/iconfont/MaterialIcons-Regular.woff b/front/static/iconfont/MaterialIcons-Regular.woff similarity index 100% rename from front/projects/host/static/iconfont/MaterialIcons-Regular.woff rename to front/static/iconfont/MaterialIcons-Regular.woff diff --git a/front/projects/host/static/iconfont/MaterialIcons-Regular.woff2 b/front/static/iconfont/MaterialIcons-Regular.woff2 similarity index 100% rename from front/projects/host/static/iconfont/MaterialIcons-Regular.woff2 rename to front/static/iconfont/MaterialIcons-Regular.woff2 diff --git a/front/projects/host/static/iconfont/material-icons.css b/front/static/iconfont/material-icons.css similarity index 100% rename from front/projects/host/static/iconfont/material-icons.css rename to front/static/iconfont/material-icons.css diff --git a/front/projects/host/static/more.svg b/front/static/more.svg similarity index 100% rename from front/projects/host/static/more.svg rename to front/static/more.svg diff --git a/front/projects/host/static/roboto/fonts/roboto-100-italic.ttf b/front/static/roboto/fonts/roboto-100-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-italic.ttf rename to front/static/roboto/fonts/roboto-100-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-100-italic.woff b/front/static/roboto/fonts/roboto-100-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-italic.woff rename to front/static/roboto/fonts/roboto-100-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-100-italic.woff2 b/front/static/roboto/fonts/roboto-100-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-italic.woff2 rename to front/static/roboto/fonts/roboto-100-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-100-normal.ttf b/front/static/roboto/fonts/roboto-100-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-normal.ttf rename to front/static/roboto/fonts/roboto-100-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-100-normal.woff b/front/static/roboto/fonts/roboto-100-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-normal.woff rename to front/static/roboto/fonts/roboto-100-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-100-normal.woff2 b/front/static/roboto/fonts/roboto-100-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-100-normal.woff2 rename to front/static/roboto/fonts/roboto-100-normal.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-300-italic.ttf b/front/static/roboto/fonts/roboto-300-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-italic.ttf rename to front/static/roboto/fonts/roboto-300-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-300-italic.woff b/front/static/roboto/fonts/roboto-300-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-italic.woff rename to front/static/roboto/fonts/roboto-300-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-300-italic.woff2 b/front/static/roboto/fonts/roboto-300-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-italic.woff2 rename to front/static/roboto/fonts/roboto-300-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-300-normal.ttf b/front/static/roboto/fonts/roboto-300-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-normal.ttf rename to front/static/roboto/fonts/roboto-300-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-300-normal.woff b/front/static/roboto/fonts/roboto-300-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-normal.woff rename to front/static/roboto/fonts/roboto-300-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-300-normal.woff2 b/front/static/roboto/fonts/roboto-300-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-300-normal.woff2 rename to front/static/roboto/fonts/roboto-300-normal.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-400-italic.ttf b/front/static/roboto/fonts/roboto-400-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-italic.ttf rename to front/static/roboto/fonts/roboto-400-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-400-italic.woff b/front/static/roboto/fonts/roboto-400-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-italic.woff rename to front/static/roboto/fonts/roboto-400-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-400-italic.woff2 b/front/static/roboto/fonts/roboto-400-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-italic.woff2 rename to front/static/roboto/fonts/roboto-400-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-400-normal.ttf b/front/static/roboto/fonts/roboto-400-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-normal.ttf rename to front/static/roboto/fonts/roboto-400-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-400-normal.woff b/front/static/roboto/fonts/roboto-400-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-normal.woff rename to front/static/roboto/fonts/roboto-400-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-400-normal.woff2 b/front/static/roboto/fonts/roboto-400-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-400-normal.woff2 rename to front/static/roboto/fonts/roboto-400-normal.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-500-italic.ttf b/front/static/roboto/fonts/roboto-500-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-italic.ttf rename to front/static/roboto/fonts/roboto-500-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-500-italic.woff b/front/static/roboto/fonts/roboto-500-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-italic.woff rename to front/static/roboto/fonts/roboto-500-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-500-italic.woff2 b/front/static/roboto/fonts/roboto-500-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-italic.woff2 rename to front/static/roboto/fonts/roboto-500-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-500-normal.ttf b/front/static/roboto/fonts/roboto-500-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-normal.ttf rename to front/static/roboto/fonts/roboto-500-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-500-normal.woff b/front/static/roboto/fonts/roboto-500-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-normal.woff rename to front/static/roboto/fonts/roboto-500-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-500-normal.woff2 b/front/static/roboto/fonts/roboto-500-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-500-normal.woff2 rename to front/static/roboto/fonts/roboto-500-normal.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-700-italic.ttf b/front/static/roboto/fonts/roboto-700-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-italic.ttf rename to front/static/roboto/fonts/roboto-700-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-700-italic.woff b/front/static/roboto/fonts/roboto-700-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-italic.woff rename to front/static/roboto/fonts/roboto-700-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-700-italic.woff2 b/front/static/roboto/fonts/roboto-700-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-italic.woff2 rename to front/static/roboto/fonts/roboto-700-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-700-normal.ttf b/front/static/roboto/fonts/roboto-700-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-normal.ttf rename to front/static/roboto/fonts/roboto-700-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-700-normal.woff b/front/static/roboto/fonts/roboto-700-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-normal.woff rename to front/static/roboto/fonts/roboto-700-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-700-normal.woff2 b/front/static/roboto/fonts/roboto-700-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-700-normal.woff2 rename to front/static/roboto/fonts/roboto-700-normal.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-900-italic.ttf b/front/static/roboto/fonts/roboto-900-italic.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-italic.ttf rename to front/static/roboto/fonts/roboto-900-italic.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-900-italic.woff b/front/static/roboto/fonts/roboto-900-italic.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-italic.woff rename to front/static/roboto/fonts/roboto-900-italic.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-900-italic.woff2 b/front/static/roboto/fonts/roboto-900-italic.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-italic.woff2 rename to front/static/roboto/fonts/roboto-900-italic.woff2 diff --git a/front/projects/host/static/roboto/fonts/roboto-900-normal.ttf b/front/static/roboto/fonts/roboto-900-normal.ttf similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-normal.ttf rename to front/static/roboto/fonts/roboto-900-normal.ttf diff --git a/front/projects/host/static/roboto/fonts/roboto-900-normal.woff b/front/static/roboto/fonts/roboto-900-normal.woff similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-normal.woff rename to front/static/roboto/fonts/roboto-900-normal.woff diff --git a/front/projects/host/static/roboto/fonts/roboto-900-normal.woff2 b/front/static/roboto/fonts/roboto-900-normal.woff2 similarity index 100% rename from front/projects/host/static/roboto/fonts/roboto-900-normal.woff2 rename to front/static/roboto/fonts/roboto-900-normal.woff2 diff --git a/front/projects/host/static/roboto/sass/roboto-100-italic.scss b/front/static/roboto/sass/roboto-100-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-100-italic.scss rename to front/static/roboto/sass/roboto-100-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-100-normal.scss b/front/static/roboto/sass/roboto-100-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-100-normal.scss rename to front/static/roboto/sass/roboto-100-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-300-italic.scss b/front/static/roboto/sass/roboto-300-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-300-italic.scss rename to front/static/roboto/sass/roboto-300-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-300-normal.scss b/front/static/roboto/sass/roboto-300-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-300-normal.scss rename to front/static/roboto/sass/roboto-300-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-400-italic.scss b/front/static/roboto/sass/roboto-400-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-400-italic.scss rename to front/static/roboto/sass/roboto-400-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-400-normal.scss b/front/static/roboto/sass/roboto-400-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-400-normal.scss rename to front/static/roboto/sass/roboto-400-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-500-italic.scss b/front/static/roboto/sass/roboto-500-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-500-italic.scss rename to front/static/roboto/sass/roboto-500-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-500-normal.scss b/front/static/roboto/sass/roboto-500-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-500-normal.scss rename to front/static/roboto/sass/roboto-500-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-700-italic.scss b/front/static/roboto/sass/roboto-700-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-700-italic.scss rename to front/static/roboto/sass/roboto-700-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-700-normal.scss b/front/static/roboto/sass/roboto-700-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-700-normal.scss rename to front/static/roboto/sass/roboto-700-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-900-italic.scss b/front/static/roboto/sass/roboto-900-italic.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-900-italic.scss rename to front/static/roboto/sass/roboto-900-italic.scss diff --git a/front/projects/host/static/roboto/sass/roboto-900-normal.scss b/front/static/roboto/sass/roboto-900-normal.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-900-normal.scss rename to front/static/roboto/sass/roboto-900-normal.scss diff --git a/front/projects/host/static/roboto/sass/roboto-mixin.scss b/front/static/roboto/sass/roboto-mixin.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto-mixin.scss rename to front/static/roboto/sass/roboto-mixin.scss diff --git a/front/projects/host/static/roboto/sass/roboto.scss b/front/static/roboto/sass/roboto.scss similarity index 100% rename from front/projects/host/static/roboto/sass/roboto.scss rename to front/static/roboto/sass/roboto.scss