From 1ca54527071226cf509f97e2718e6aad67a2aa96 Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Sun, 9 Jul 2023 20:40:53 +0200 Subject: [PATCH] Rename frontend as receiver --- .dockerignore | 6 +-- ...nd.yml => .drone-manifest-fic-receiver.yml | 8 ++-- .drone.yml | 40 +++++++++--------- Dockerfile-dashboard | 2 +- Dockerfile-frontend-ui | 2 +- Dockerfile-nginx | 6 +-- Dockerfile-frontend => Dockerfile-receiver | 10 ++--- README.md | 6 +-- admin/static/views/home.html | 4 +- configs/nginx/base/demo.conf | 12 +++--- configs/nginx/base/docker.conf | 12 +++--- configs/nginx/base/prod.conf | 12 +++--- docker-compose.yml | 8 ++-- ...oint-frontend.sh => entrypoint-receiver.sh | 2 +- fickit-frontend.yml | 20 ++++----- flake.nix | 6 +-- frontend/.gitignore | 1 - frontend/{ui => fic}/.eslintrc.cjs | 0 frontend/{ui => fic}/.gitignore | 0 frontend/{ui => fic}/.prettierrc | 0 frontend/{ui => fic}/jsconfig.json | 0 frontend/{ui => fic}/package-lock.json | 0 frontend/{ui => fic}/package.json | 0 frontend/{ui => fic}/src/app.html | 0 frontend/{ui => fic}/src/fic.scss | 0 frontend/{ui => fic}/src/global.d.ts | 0 .../src/lib/components/CardTheme.svelte | 0 .../src/lib/components/Clock.svelte | 0 .../src/lib/components/DateFormat.svelte | 0 .../lib/components/ExerciceDownloads.svelte | 0 .../src/lib/components/ExerciceFlags.svelte | 0 .../src/lib/components/ExerciceHints.svelte | 0 .../src/lib/components/ExerciceSolved.svelte | 0 .../src/lib/components/ExerciceVideo.svelte | 0 .../src/lib/components/FileSize.svelte | 0 .../src/lib/components/FlagKey.svelte | 0 .../src/lib/components/FlagMCQ.svelte | 0 .../src/lib/components/FormIssue.svelte | 0 .../src/lib/components/Header.svelte | 0 .../src/lib/components/HeaderClock.svelte | 0 .../src/lib/components/HeaderIssues.svelte | 0 .../src/lib/components/HeaderPartners.svelte | 0 .../src/lib/components/NavTags.svelte | 0 .../src/lib/components/NavThemes.svelte | 0 .../RegistrationFormCreateTeam.svelte | 0 .../RegistrationFormJoinTeam.svelte | 0 .../components/RegistrationRowMember.svelte | 0 .../src/lib/components/ResolutionModal.svelte | 0 .../src/lib/components/ScoreGrid.svelte | 0 .../src/lib/components/TeamChangeName.svelte | 0 .../lib/components/TeamChangePassword.svelte | 0 .../src/lib/components/TeamMembers.svelte | 0 .../src/lib/components/ThemeNav.svelte | 0 .../src/lib/stores/challengeinfo.js | 0 frontend/{ui => fic}/src/lib/stores/common.js | 0 .../{ui => fic}/src/lib/stores/exercices.js | 0 frontend/{ui => fic}/src/lib/stores/issues.js | 0 frontend/{ui => fic}/src/lib/stores/my.js | 0 .../{ui => fic}/src/lib/stores/myresponses.js | 0 .../{ui => fic}/src/lib/stores/mythemes.js | 0 .../{ui => fic}/src/lib/stores/settings.js | 0 frontend/{ui => fic}/src/lib/stores/teams.js | 0 frontend/{ui => fic}/src/lib/stores/themes.js | 0 frontend/{ui => fic}/src/routes/+error.svelte | 0 frontend/{ui => fic}/src/routes/+layout.js | 0 .../{ui => fic}/src/routes/+layout.svelte | 0 frontend/{ui => fic}/src/routes/+page.svelte | 0 .../{ui => fic}/src/routes/[theme]/+layout.js | 0 .../src/routes/[theme]/+layout.svelte | 0 .../src/routes/[theme]/+page.svelte | 0 .../src/routes/[theme]/[exercice]/+layout.js | 0 .../routes/[theme]/[exercice]/+layout.svelte | 0 .../routes/[theme]/[exercice]/+page.svelte | 0 .../{ui => fic}/src/routes/edit/+page.svelte | 0 .../{ui => fic}/src/routes/issues/+page.js | 0 .../src/routes/issues/+page.svelte | 0 .../{ui => fic}/src/routes/rank/+page.svelte | 0 .../src/routes/register/+page.svelte | 0 .../{ui => fic}/src/routes/rules/+page.svelte | 0 .../src/routes/tags/[tag]/+page.js | 0 .../src/routes/tags/[tag]/+page.svelte | 0 frontend/{ui => fic}/static/e404.html | 0 frontend/{ui => fic}/static/e404.json | 0 frontend/{ui => fic}/static/e413.html | 0 frontend/{ui => fic}/static/e413.json | 0 frontend/{ui => fic}/static/e500.html | 0 frontend/{ui => fic}/static/e500.json | 0 .../{ui => fic}/static/img/icon-danger.ico | Bin frontend/{ui => fic}/static/img/icon-dark.ico | Bin frontend/{ui => fic}/static/img/icon-info.ico | Bin .../{ui => fic}/static/img/icon-light.ico | Bin .../{ui => fic}/static/img/icon-primary.ico | Bin .../{ui => fic}/static/img/icon-secondary.ico | Bin .../{ui => fic}/static/img/icon-success.ico | Bin .../{ui => fic}/static/img/icon-warning.ico | Bin frontend/{ui => fic}/svelte.config.js | 0 frontend/{ui => fic}/vite.config.js | 0 receiver/.gitignore | 1 + {frontend => receiver}/chbase.sh | 0 {frontend => receiver}/chname.go | 0 {frontend => receiver}/choices.go | 0 {frontend => receiver}/hint.go | 0 {frontend => receiver}/issue.go | 0 {frontend => receiver}/main.go | 2 +- {frontend => receiver}/register.go | 0 {frontend => receiver}/resolution.go | 0 {frontend => receiver}/save.go | 0 {frontend => receiver}/settings.go | 0 {frontend => receiver}/static.go | 0 {frontend => receiver}/submissions.go | 0 {frontend => receiver}/submit.go | 0 111 files changed, 79 insertions(+), 81 deletions(-) rename .drone-manifest-fic-frontend.yml => .drone-manifest-fic-receiver.yml (62%) rename Dockerfile-frontend => Dockerfile-receiver (51%) rename entrypoint-frontend.sh => entrypoint-receiver.sh (97%) delete mode 100644 frontend/.gitignore rename frontend/{ui => fic}/.eslintrc.cjs (100%) rename frontend/{ui => fic}/.gitignore (100%) rename frontend/{ui => fic}/.prettierrc (100%) rename frontend/{ui => fic}/jsconfig.json (100%) rename frontend/{ui => fic}/package-lock.json (100%) rename frontend/{ui => fic}/package.json (100%) rename frontend/{ui => fic}/src/app.html (100%) rename frontend/{ui => fic}/src/fic.scss (100%) rename frontend/{ui => fic}/src/global.d.ts (100%) rename frontend/{ui => fic}/src/lib/components/CardTheme.svelte (100%) rename frontend/{ui => fic}/src/lib/components/Clock.svelte (100%) rename frontend/{ui => fic}/src/lib/components/DateFormat.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ExerciceDownloads.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ExerciceFlags.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ExerciceHints.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ExerciceSolved.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ExerciceVideo.svelte (100%) rename frontend/{ui => fic}/src/lib/components/FileSize.svelte (100%) rename frontend/{ui => fic}/src/lib/components/FlagKey.svelte (100%) rename frontend/{ui => fic}/src/lib/components/FlagMCQ.svelte (100%) rename frontend/{ui => fic}/src/lib/components/FormIssue.svelte (100%) rename frontend/{ui => fic}/src/lib/components/Header.svelte (100%) rename frontend/{ui => fic}/src/lib/components/HeaderClock.svelte (100%) rename frontend/{ui => fic}/src/lib/components/HeaderIssues.svelte (100%) rename frontend/{ui => fic}/src/lib/components/HeaderPartners.svelte (100%) rename frontend/{ui => fic}/src/lib/components/NavTags.svelte (100%) rename frontend/{ui => fic}/src/lib/components/NavThemes.svelte (100%) rename frontend/{ui => fic}/src/lib/components/RegistrationFormCreateTeam.svelte (100%) rename frontend/{ui => fic}/src/lib/components/RegistrationFormJoinTeam.svelte (100%) rename frontend/{ui => fic}/src/lib/components/RegistrationRowMember.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ResolutionModal.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ScoreGrid.svelte (100%) rename frontend/{ui => fic}/src/lib/components/TeamChangeName.svelte (100%) rename frontend/{ui => fic}/src/lib/components/TeamChangePassword.svelte (100%) rename frontend/{ui => fic}/src/lib/components/TeamMembers.svelte (100%) rename frontend/{ui => fic}/src/lib/components/ThemeNav.svelte (100%) rename frontend/{ui => fic}/src/lib/stores/challengeinfo.js (100%) rename frontend/{ui => fic}/src/lib/stores/common.js (100%) rename frontend/{ui => fic}/src/lib/stores/exercices.js (100%) rename frontend/{ui => fic}/src/lib/stores/issues.js (100%) rename frontend/{ui => fic}/src/lib/stores/my.js (100%) rename frontend/{ui => fic}/src/lib/stores/myresponses.js (100%) rename frontend/{ui => fic}/src/lib/stores/mythemes.js (100%) rename frontend/{ui => fic}/src/lib/stores/settings.js (100%) rename frontend/{ui => fic}/src/lib/stores/teams.js (100%) rename frontend/{ui => fic}/src/lib/stores/themes.js (100%) rename frontend/{ui => fic}/src/routes/+error.svelte (100%) rename frontend/{ui => fic}/src/routes/+layout.js (100%) rename frontend/{ui => fic}/src/routes/+layout.svelte (100%) rename frontend/{ui => fic}/src/routes/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/[theme]/+layout.js (100%) rename frontend/{ui => fic}/src/routes/[theme]/+layout.svelte (100%) rename frontend/{ui => fic}/src/routes/[theme]/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/[theme]/[exercice]/+layout.js (100%) rename frontend/{ui => fic}/src/routes/[theme]/[exercice]/+layout.svelte (100%) rename frontend/{ui => fic}/src/routes/[theme]/[exercice]/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/edit/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/issues/+page.js (100%) rename frontend/{ui => fic}/src/routes/issues/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/rank/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/register/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/rules/+page.svelte (100%) rename frontend/{ui => fic}/src/routes/tags/[tag]/+page.js (100%) rename frontend/{ui => fic}/src/routes/tags/[tag]/+page.svelte (100%) rename frontend/{ui => fic}/static/e404.html (100%) rename frontend/{ui => fic}/static/e404.json (100%) rename frontend/{ui => fic}/static/e413.html (100%) rename frontend/{ui => fic}/static/e413.json (100%) rename frontend/{ui => fic}/static/e500.html (100%) rename frontend/{ui => fic}/static/e500.json (100%) rename frontend/{ui => fic}/static/img/icon-danger.ico (100%) rename frontend/{ui => fic}/static/img/icon-dark.ico (100%) rename frontend/{ui => fic}/static/img/icon-info.ico (100%) rename frontend/{ui => fic}/static/img/icon-light.ico (100%) rename frontend/{ui => fic}/static/img/icon-primary.ico (100%) rename frontend/{ui => fic}/static/img/icon-secondary.ico (100%) rename frontend/{ui => fic}/static/img/icon-success.ico (100%) rename frontend/{ui => fic}/static/img/icon-warning.ico (100%) rename frontend/{ui => fic}/svelte.config.js (100%) rename frontend/{ui => fic}/vite.config.js (100%) create mode 100644 receiver/.gitignore rename {frontend => receiver}/chbase.sh (100%) rename {frontend => receiver}/chname.go (100%) rename {frontend => receiver}/choices.go (100%) rename {frontend => receiver}/hint.go (100%) rename {frontend => receiver}/issue.go (100%) rename {frontend => receiver}/main.go (99%) rename {frontend => receiver}/register.go (100%) rename {frontend => receiver}/resolution.go (100%) rename {frontend => receiver}/save.go (100%) rename {frontend => receiver}/settings.go (100%) rename {frontend => receiver}/static.go (100%) rename {frontend => receiver}/submissions.go (100%) rename {frontend => receiver}/submit.go (100%) diff --git a/.dockerignore b/.dockerignore index 3b828c22..e3a6f436 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,10 +2,10 @@ admin/admin backend/backend dashboard/dashboard evdist/evdist -frontend/frontend +receiver/receiver repochecker/repochecker -frontend/ui/build -frontend/ui/node_modules +frontend/fic/build +frontend/fic/node_modules qa/ui/build qa/ui/node_modules fickit-backend-initrd.img diff --git a/.drone-manifest-fic-frontend.yml b/.drone-manifest-fic-receiver.yml similarity index 62% rename from .drone-manifest-fic-frontend.yml rename to .drone-manifest-fic-receiver.yml index 23a9aa80..eda2fe25 100644 --- a/.drone-manifest-fic-frontend.yml +++ b/.drone-manifest-fic-receiver.yml @@ -1,4 +1,4 @@ -image: nemunaire/fic-frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} +image: nemunaire/fic-receiver:{{#if build.tag}}{{trimPrefix "v" build.tag}}{{else}}latest{{/if}} {{#if build.tags}} tags: {{#each build.tags}} @@ -6,16 +6,16 @@ tags: {{/each}} {{/if}} manifests: - - image: nemunaire/fic-frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 + - image: nemunaire/fic-receiver:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-amd64 platform: architecture: amd64 os: linux - - image: nemunaire/fic-frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 + - image: nemunaire/fic-receiver:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm64 platform: architecture: arm64 os: linux variant: v8 - - image: nemunaire/fic-frontend:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm + - image: nemunaire/fic-receiver:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm platform: architecture: arm os: linux diff --git a/.drone.yml b/.drone.yml index c08b45f5..32b08bf7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -19,7 +19,7 @@ steps: - go get -v -d srs.epita.fr/fic-server/admin - go get -v -d srs.epita.fr/fic-server/backend - go get -v -d srs.epita.fr/fic-server/evdist - - go get -v -d srs.epita.fr/fic-server/frontend + - go get -v -d srs.epita.fr/fic-server/receiver - go get -v -d srs.epita.fr/fic-server/dashboard - go get -v -d srs.epita.fr/fic-server/repochecker - go get -v -d srs.epita.fr/fic-server/repochecker/epita @@ -50,7 +50,7 @@ steps: - go vet -v -buildvcs=false srs.epita.fr/fic-server/admin - go vet -v -buildvcs=false srs.epita.fr/fic-server/backend - go vet -v -buildvcs=false srs.epita.fr/fic-server/evdist - - go vet -v -buildvcs=false srs.epita.fr/fic-server/frontend + - go vet -v -buildvcs=false srs.epita.fr/fic-server/receiver - go vet -v -buildvcs=false srs.epita.fr/fic-server/dashboard - go vet -v -buildvcs=false srs.epita.fr/fic-server/repochecker - go vet -v -buildvcs=false srs.epita.fr/fic-server/repochecker/epita @@ -84,21 +84,21 @@ steps: environment: CGO_ENABLED: 0 - - name: build frontend + - name: build receiver image: golang:alpine commands: - - go build -v -buildvcs=false -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend + - go build -v -buildvcs=false -o deploy/receiver-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/receiver environment: CGO_ENABLED: 0 - - name: build frontend ui + - name: build frontend fic ui image: node:20-alpine commands: - - cd frontend/ui + - cd frontend/fic - 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 + - tar chjf ../../deploy/htdocs-frontend-fic.tar.bz2 build - name: build dashboard image: golang:alpine @@ -206,17 +206,17 @@ steps: branch: - master - - name: docker frontend + - name: docker receiver image: plugins/docker settings: username: from_secret: docker_username password: from_secret: docker_password - repo: nemunaire/fic-frontend + repo: nemunaire/fic-receiver auto_tag: true auto_tag_suffix: ${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} - dockerfile: Dockerfile-frontend + dockerfile: Dockerfile-receiver when: branch: - master @@ -353,7 +353,7 @@ steps: - go get -v -d srs.epita.fr/fic-server/admin - go get -v -d srs.epita.fr/fic-server/backend - go get -v -d srs.epita.fr/fic-server/evdist - - go get -v -d srs.epita.fr/fic-server/frontend + - go get -v -d srs.epita.fr/fic-server/receiver - go get -v -d srs.epita.fr/fic-server/dashboard - name: build admin @@ -378,17 +378,17 @@ steps: environment: CGO_ENABLED: 0 - - name: build frontend + - name: build receiver image: golang:alpine commands: - - go build -v -buildvcs=false -o deploy/frontend-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/frontend + - go build -v -buildvcs=false -o deploy/receiver-${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} srs.epita.fr/fic-server/receiver environment: CGO_ENABLED: 0 - - name: build frontend ui + - name: build frontend fic ui image: node:20-alpine commands: - - cd frontend/ui + - cd frontend/fic - 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 @@ -502,17 +502,17 @@ steps: branch: - master - - name: docker frontend + - name: docker receiver image: plugins/docker settings: username: from_secret: docker_username password: from_secret: docker_password - repo: nemunaire/fic-frontend + repo: nemunaire/fic-receiver auto_tag: true auto_tag_suffix: ${DRONE_STAGE_OS}-${DRONE_STAGE_ARCH} - dockerfile: Dockerfile-frontend + dockerfile: Dockerfile-receiver when: branch: - master @@ -620,12 +620,12 @@ steps: password: from_secret: docker_password - - name: publish frontend + - name: publish receiver image: plugins/manifest settings: auto_tag: true ignore_missing: true - spec: .drone-manifest-fic-frontend.yml + spec: .drone-manifest-fic-receiver.yml username: from_secret: docker_username password: diff --git a/Dockerfile-dashboard b/Dockerfile-dashboard index 04ac1f32..826f0153 100644 --- a/Dockerfile-dashboard +++ b/Dockerfile-dashboard @@ -27,6 +27,6 @@ COPY --from=gobuild /go/src/srs.epita.fr/fic-server/dashboard/dashboard /srv/das COPY dashboard/static/index.html /srv/htdocs-dashboard/ COPY admin/static/css/bootstrap.min.css dashboard/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/srs.png /srv/htdocs-dashboard/img/ +COPY frontend/fic/static/img/ dashboard/static/img/srs.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-ui b/Dockerfile-frontend-ui index 6a62faf6..1419da97 100644 --- a/Dockerfile-frontend-ui +++ b/Dockerfile-frontend-ui @@ -2,7 +2,7 @@ FROM node:20-alpine as nodebuild WORKDIR /ui -COPY frontend/ui/ . +COPY frontend/fic/ . RUN 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 && \ diff --git a/Dockerfile-nginx b/Dockerfile-nginx index 396f175d..0f3bd530 100644 --- a/Dockerfile-nginx +++ b/Dockerfile-nginx @@ -2,9 +2,7 @@ FROM node:19-alpine3.15 as nodebuild WORKDIR /ui -RUN apk --no-cache add python2 build-base - -COPY frontend/ui/ . +COPY frontend/fic/ . RUN 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 && \ @@ -14,7 +12,7 @@ RUN npm install --network-timeout=100000 && \ FROM nginx:stable-alpine ENV FIC_BASEURL=/ \ - HOST_FRONTEND=frontend:8080 HOST_ADMIN=admin:8081 HOST_DASHBOARD=dashboard:8082 HOST_QA=qa:8083 \ + HOST_RECEIVER=receiver:8080 HOST_ADMIN=admin:8081 HOST_DASHBOARD=dashboard:8082 HOST_QA=qa:8083 \ PATH_FILES=/srv/FILES PATH_STARTINGBLOCK=/srv/STARTINGBLOCK PATH_STATIC=/srv/htdocs-frontend PATH_SETTINGS=/srv/SETTINGSDIST PATH_SYNC=/srv/SYNC PATH_TEAMS=/srv/TEAMS EXPOSE 80 diff --git a/Dockerfile-frontend b/Dockerfile-receiver similarity index 51% rename from Dockerfile-frontend rename to Dockerfile-receiver index f36004ed..cfd365f6 100644 --- a/Dockerfile-frontend +++ b/Dockerfile-receiver @@ -7,10 +7,10 @@ WORKDIR /go/src/srs.epita.fr/fic-server/ COPY go.mod go.sum ./ COPY settings settings/ COPY libfic ./libfic/ -COPY frontend ./frontend/ +COPY receiver ./receiver/ -RUN go get -d -v ./frontend && \ - go build -v -buildvcs=false -o ./frontend/frontend ./frontend +RUN go get -d -v ./receiver && \ + go build -v -buildvcs=false -o ./receiver/receiver ./receiver FROM alpine:3.18 @@ -22,6 +22,6 @@ WORKDIR /srv ENTRYPOINT ["/usr/sbin/entrypoint.sh"] CMD ["--bind=:8080"] -COPY entrypoint-frontend.sh /usr/sbin/entrypoint.sh +COPY entrypoint-receiver.sh /usr/sbin/entrypoint.sh -COPY --from=gobuild /go/src/srs.epita.fr/fic-server/frontend/frontend /srv/frontend +COPY --from=gobuild /go/src/srs.epita.fr/fic-server/receiver/receiver /srv/receiver diff --git a/README.md b/README.md index 915d9ef6..e64ae0a1 100644 --- a/README.md +++ b/README.md @@ -18,13 +18,13 @@ micro-services : - `evdist` is an inotify reacting service that handles settings changes during the challenge (eg. a 30 minutes event where hints are free, ...). -- `frontend` is only responsible for receiving submissions. It is the +- `qa` is an interface dedicated to challenge development, it stores + reports to be treated by challenges creators. +- `receiver` is only responsible for receiving submissions. It is the only dynamic part accessibe to players, so it's codebase is reduce to the minimum. It does not parse or try to understand players submissions, it just write it down to a file in the file system. Parsing and treatment is made by the `backend`. -- `qa` is an interface dedicated to challenge development, it stores - reports to be treated by challenges creators. - `remote/challenge-sync-airbus` is an inotify reacting service that allows us to synchronize scores and exercice validations with the Airbus scoring platform. diff --git a/admin/static/views/home.html b/admin/static/views/home.html index 3105513b..d14a7855 100644 --- a/admin/static/views/home.html +++ b/admin/static/views/home.html @@ -6,8 +6,8 @@ Version de l'API : {{ v.version }}

- Latence frontend-backend :
- Dernière synchronisation du frontend : {{ t.frontend | date:"mediumTime" }} + Latence frontal :
+ Dernière synchronisation du frontal : {{ t.frontend | date:"mediumTime" }}