diff --git a/.drone.yml b/.drone.yml index 6ba90a6d..f9e293d3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -54,7 +54,6 @@ steps: image: golang:alpine commands: - go build -v -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend - - tar chjf deploy/htdocs-frontend.tar.bz2 htdocs-frontend environment: CGO_ENABLED: 0 @@ -66,6 +65,7 @@ steps: - npm install --network-timeout=100000 - sed -i 's!@popperjs/core/dist/esm/popper!@popperjs/core!' node_modules/sveltestrap/src/*.js node_modules/sveltestrap/src/*.svelte - npm run build + - tar chjf ../../deploy/htdocs-frontend.tar.bz2 build - name: build dashboard image: golang:alpine diff --git a/Dockerfile-dashboard b/Dockerfile-dashboard index b1511697..147075ee 100644 --- a/Dockerfile-dashboard +++ b/Dockerfile-dashboard @@ -24,9 +24,9 @@ ENTRYPOINT ["/srv/dashboard", "--bind=:8082"] VOLUME /srv/htdocs-dashboard/ COPY --from=gobuild /go/src/srs.epita.fr/fic-server/dashboard/dashboard /srv/dashboard -COPY dashboard/static/index.html /srv/htdocs-dashboard/ -COPY dashboard/static/css/bootstrap.min.css frontend/static/css/fic.css frontend/static/css/glyphicon.css /srv/htdocs-dashboard/css/ -COPY frontend/static/fonts /srv/htdocs-dashboard/fonts -COPY frontend/static/img/ dashboard/static/img/logo-epita-bw.png dashboard/static/img/sii.png /srv/htdocs-dashboard/img/ -COPY dashboard/static/js/dashboard.js frontend/static/js/angular.min.js dashboard/static/js/angular-animate.min.js frontend/static/js/angular-route.min.js frontend/static/js/angular-sanitize.min.js frontend/static/js/bootstrap.min.js frontend/static/js/common.js frontend/static/js/d3.v3.min.js frontend/static/js/jquery.min.js /srv/htdocs-dashboard/js/ +COPY dashboard/static/index.html frontend/ui/static/favicon.ico /srv/htdocs-dashboard/ +COPY admin/static/css/bootstrap.min.css qa/static/css/fic.css admin/static/css/glyphicon.css /srv/htdocs-dashboard/css/ +COPY admin/static/fonts /srv/htdocs-dashboard/fonts +COPY frontend/ui/static/img/ dashboard/static/img/logo-epita-bw.png dashboard/static/img/sii.png /srv/htdocs-dashboard/img/ +COPY dashboard/static/js/dashboard.js admin/static/js/angular.min.js dashboard/static/js/angular-animate.min.js admin/static/js/angular-route.min.js admin/static/js/angular-sanitize.min.js admin/static/js/bootstrap.min.js admin/static/js/common.js admin/static/js/d3.v3.min.js admin/static/js/jquery.min.js /srv/htdocs-dashboard/js/ COPY admin/static/js/i18n/* /srv/htdocs-dashboard/js/i18n/ diff --git a/Dockerfile-frontend b/Dockerfile-frontend index 7eb9f23d..5fc196fe 100644 --- a/Dockerfile-frontend +++ b/Dockerfile-frontend @@ -24,6 +24,4 @@ CMD ["--bind=:8080"] COPY entrypoint-frontend.sh /usr/sbin/entrypoint.sh -VOLUME /srv/htdocs-frontend/ - COPY --from=gobuild /go/src/srs.epita.fr/fic-server/frontend/frontend /srv/frontend diff --git a/Dockerfile-qa b/Dockerfile-qa index ec451bb2..728c73b5 100644 --- a/Dockerfile-qa +++ b/Dockerfile-qa @@ -24,9 +24,9 @@ ENTRYPOINT ["/srv/qa", "--bind=:8083"] VOLUME /srv/htdocs-qa/ COPY --from=gobuild /go/src/srs.epita.fr/fic-server/qa/qa /srv/qa -COPY qa/static/index.html /srv/htdocs-qa/ -COPY qa/static/css/bootstrap.min.css frontend/static/css/fic.css frontend/static/css/glyphicon.css /srv/htdocs-qa/css/ -COPY frontend/static/fonts /srv/htdocs-qa/fonts -COPY frontend/static/img/ /srv/htdocs-qa/img/ -COPY qa/static/js/qa.js frontend/static/js/angular.min.js qa/static/js/angular-resource.min.js frontend/static/js/angular-route.min.js frontend/static/js/angular-sanitize.min.js frontend/static/js/bootstrap.min.js frontend/static/js/common.js frontend/static/js/i18n frontend/static/js/jquery.min.js /srv/htdocs-qa/js/ +COPY qa/static/index.html frontend/ui/static/favicon.ico /srv/htdocs-qa/ +COPY admin/static/css/bootstrap.min.css qa/static/css/fic.css admin/static/css/glyphicon.css /srv/htdocs-qa/css/ +COPY admin/static/fonts /srv/htdocs-qa/fonts +COPY frontend/ui/static/img/ /srv/htdocs-qa/img/ +COPY qa/static/js/qa.js admin/static/js/angular.min.js qa/static/js/angular-resource.min.js admin/static/js/angular-route.min.js admin/static/js/angular-sanitize.min.js admin/static/js/bootstrap.min.js admin/static/js/common.js admin/static/js/i18n admin/static/js/jquery.min.js /srv/htdocs-qa/js/ COPY qa/static/views/ /srv/htdocs-qa/views/ diff --git a/frontend/ui/src/components/ExerciceVideo.svelte b/frontend/ui/src/components/ExerciceVideo.svelte index 1c9ddc13..a13c20c8 100644 --- a/frontend/ui/src/components/ExerciceVideo.svelte +++ b/frontend/ui/src/components/ExerciceVideo.svelte @@ -21,4 +21,5 @@ +