WebApp: Fixing build and docker

This commit is contained in:
Zoe Roux 2021-11-21 20:57:22 +01:00
parent efa94f47dc
commit 071e85689b
No known key found for this signature in database
GPG Key ID: 8BB9CF5EF72AE933
64 changed files with 6 additions and 18 deletions

View File

@ -6,7 +6,7 @@ RUN cmake . && make -j
FROM node:14-alpine as webapp FROM node:14-alpine as webapp
WORKDIR /webapp WORKDIR /webapp
COPY src/Kyoo.WebApp/Front . COPY front .
RUN npm install -g @angular/cli RUN npm install -g @angular/cli
RUN yarn install --frozen-lockfile RUN yarn install --frozen-lockfile
RUN yarn run build --configuration production RUN yarn run build --configuration production

View File

@ -1,14 +1,9 @@
# Editor configuration, see https://editorconfig.org # Editor configuration, see https://editorconfig.org
root = true root = false
[*] [*]
charset = utf-8 charset = utf-8
indent_style = tab indent_style = tab
indent_size = 4
insert_final_newline = true insert_final_newline = true
max_line_length = 120 max_line_length = 120
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.md]
max_line_length = off
trim_trailing_whitespace = false

View File

@ -43,12 +43,7 @@
"./node_modules/jquery/dist/jquery.min.js", "./node_modules/jquery/dist/jquery.min.js",
"./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js", "./node_modules/bootstrap/dist/js/bootstrap.bundle.min.js",
"./node_modules/hls.js/dist/hls.js" "./node_modules/hls.js/dist/hls.js"
], ]
"stylePreprocessorOptions": {
"includePaths": [
"src"
]
}
}, },
"configurations": { "configurations": {
"production": { "production": {
@ -59,7 +54,6 @@
} }
], ],
"optimization": true, "optimization": true,
"outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"namedChunks": false, "namedChunks": false,
"aot": true, "aot": true,

View File

@ -1,7 +1,8 @@
@import "~bootstrap/scss/functions"; @import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables"; @import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins/breakpoints"; @import "~bootstrap/scss/mixins/breakpoints";
@import "variables";
$nav-bar-height: 64px;
#toolbar #toolbar
{ {

View File

@ -1,7 +1,6 @@
@import "~bootstrap/scss/functions"; @import "~bootstrap/scss/functions";
@import "~bootstrap/scss/variables"; @import "~bootstrap/scss/variables";
@import "~bootstrap/scss/mixins/breakpoints"; @import "~bootstrap/scss/mixins/breakpoints";
@import "variables";
a a
{ {

View File

@ -1,5 +1,5 @@
//Roboto font //Roboto font
@import "../static/roboto/sass/roboto.scss"; @import "../../../static/roboto/sass/roboto.scss";
//Bootstrap configuration //Bootstrap configuration
@import "~bootstrap/scss/functions"; @import "~bootstrap/scss/functions";

View File

@ -1 +0,0 @@
$nav-bar-height: 64px;

View File

Before

Width:  |  Height:  |  Size: 298 B

After

Width:  |  Height:  |  Size: 298 B