From 3bd2c2b48abd8e42d57b2628c5c6b0657a5c43b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Thu, 4 Jun 2020 14:06:50 +0200 Subject: [PATCH] Renaming landing_page directory to website --- .github/workflows/build-and-deploy.yml | 4 ++-- docker-compose.yaml | 2 +- landing_page/dist/static/images/.DS_Store | Bin 6148 -> 0 bytes {landing_page => website}/.gitignore | 0 {landing_page => website}/Dockerfile | 0 {landing_page => website}/README.md | 0 {landing_page => website}/dist/choose-map.html | 0 {landing_page => website}/dist/index.html | 0 .../dist/static/images/Bitmap2.png | Bin .../dist/static/images/Bitmap3.png | Bin .../dist/static/images/Logo TCM.png | Bin .../dist/static/images/amstrad.png | Bin .../dist/static/images/atari.png | Bin .../dist/static/images/bitmap.png | Bin .../dist/static/images/check.png | Bin .../dist/static/images/choose_character.png | Bin .../dist/static/images/cloud.png | Bin .../dist/static/images/facebook.png | Bin .../dist/static/images/female-character.gif | Bin .../dist/static/images/floppy.png | Bin .../dist/static/images/interact.png | Bin .../dist/static/images/linkedin.png | Bin .../dist/static/images/logo.png | Bin .../dist/static/images/male-character.gif | Bin .../dist/static/images/maps/coders.png | Bin .../dist/static/images/maps/creative.png | Bin .../dist/static/images/maps/dungeon.png | Bin .../dist/static/images/maps/fantasy.png | Bin .../dist/static/images/maps/office.png | Bin .../dist/static/images/maps/pub.png | Bin .../dist/static/images/maps/school.png | Bin .../dist/static/images/maps/street.png | Bin .../dist/static/images/maps/tcm.png | Bin .../dist/static/images/play.png | Bin .../dist/static/images/sinclair-2.png | Bin .../dist/static/images/step 1.png | Bin .../dist/static/images/step 2.png | Bin .../dist/static/images/step 3.png | Bin .../dist/static/images/super-nintendo.png | Bin .../dist/static/images/twitter.png | Bin {landing_page => website}/package-lock.json | 0 {landing_page => website}/package.json | 0 {landing_page => website}/postcss.config.js | 0 {landing_page => website}/src/fonts/04B_03.woff | Bin .../src/fonts/OpenSans-Regular.ttf | Bin {landing_page => website}/src/fonts/VCR_OSD.ttf | Bin {landing_page => website}/src/fonts/ka1.ttf | Bin .../src/images/BG-briques.png | Bin .../src/images/Desktop HD.png | Bin {landing_page => website}/src/images/Group-4.png | Bin {landing_page => website}/src/images/Group-5.png | Bin .../src/images/Rectangle.png | Bin .../src/images/bg-briques.jpg | Bin {landing_page => website}/src/images/bg-step.png | Bin .../src/images/btn-bg-2.png | Bin .../src/images/btn-bg-3.png | Bin .../src/images/btn-bg-bw.png | Bin .../src/images/btn-bg-light.png | Bin {landing_page => website}/src/images/btn-bg.png | Bin {landing_page => website}/src/images/cat.jpg | Bin .../src/images/chosse-map.png | Bin {landing_page => website}/src/images/cloud.png | Bin {landing_page => website}/src/images/demo.png | Bin {landing_page => website}/src/images/header.png | Bin .../src/images/lets-go-explore.png | Bin .../src/images/people-love.png | Bin .../src/images/pixelated.png | Bin .../src/images/playicon.png | Bin {landing_page => website}/src/images/rect_3.png | Bin .../src/images/select-char.png | Bin .../src/images/sinclair.png | Bin {landing_page => website}/src/images/sky.jpg | Bin {landing_page => website}/src/images/start.png | Bin .../src/images/used-by-millions.png | Bin .../src/javascript/index.js | 0 .../src/sass/_choose-map.scss | 0 {landing_page => website}/src/sass/_custom.scss | 0 {landing_page => website}/src/sass/styles.scss | 0 {landing_page => website}/webpack.config.js | 0 {landing_page => website}/yarn-error.log | 0 80 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 landing_page/dist/static/images/.DS_Store rename {landing_page => website}/.gitignore (100%) rename {landing_page => website}/Dockerfile (100%) rename {landing_page => website}/README.md (100%) rename {landing_page => website}/dist/choose-map.html (100%) rename {landing_page => website}/dist/index.html (100%) rename {landing_page => website}/dist/static/images/Bitmap2.png (100%) rename {landing_page => website}/dist/static/images/Bitmap3.png (100%) rename {landing_page => website}/dist/static/images/Logo TCM.png (100%) rename {landing_page => website}/dist/static/images/amstrad.png (100%) rename {landing_page => website}/dist/static/images/atari.png (100%) rename {landing_page => website}/dist/static/images/bitmap.png (100%) rename {landing_page => website}/dist/static/images/check.png (100%) rename {landing_page => website}/dist/static/images/choose_character.png (100%) rename {landing_page => website}/dist/static/images/cloud.png (100%) rename {landing_page => website}/dist/static/images/facebook.png (100%) rename {landing_page => website}/dist/static/images/female-character.gif (100%) rename {landing_page => website}/dist/static/images/floppy.png (100%) rename {landing_page => website}/dist/static/images/interact.png (100%) rename {landing_page => website}/dist/static/images/linkedin.png (100%) rename {landing_page => website}/dist/static/images/logo.png (100%) rename {landing_page => website}/dist/static/images/male-character.gif (100%) rename {landing_page => website}/dist/static/images/maps/coders.png (100%) rename {landing_page => website}/dist/static/images/maps/creative.png (100%) rename {landing_page => website}/dist/static/images/maps/dungeon.png (100%) rename {landing_page => website}/dist/static/images/maps/fantasy.png (100%) rename {landing_page => website}/dist/static/images/maps/office.png (100%) rename {landing_page => website}/dist/static/images/maps/pub.png (100%) rename {landing_page => website}/dist/static/images/maps/school.png (100%) rename {landing_page => website}/dist/static/images/maps/street.png (100%) rename {landing_page => website}/dist/static/images/maps/tcm.png (100%) rename {landing_page => website}/dist/static/images/play.png (100%) rename {landing_page => website}/dist/static/images/sinclair-2.png (100%) rename {landing_page => website}/dist/static/images/step 1.png (100%) rename {landing_page => website}/dist/static/images/step 2.png (100%) rename {landing_page => website}/dist/static/images/step 3.png (100%) rename {landing_page => website}/dist/static/images/super-nintendo.png (100%) rename {landing_page => website}/dist/static/images/twitter.png (100%) rename {landing_page => website}/package-lock.json (100%) rename {landing_page => website}/package.json (100%) rename {landing_page => website}/postcss.config.js (100%) rename {landing_page => website}/src/fonts/04B_03.woff (100%) rename {landing_page => website}/src/fonts/OpenSans-Regular.ttf (100%) rename {landing_page => website}/src/fonts/VCR_OSD.ttf (100%) rename {landing_page => website}/src/fonts/ka1.ttf (100%) rename {landing_page => website}/src/images/BG-briques.png (100%) rename {landing_page => website}/src/images/Desktop HD.png (100%) rename {landing_page => website}/src/images/Group-4.png (100%) rename {landing_page => website}/src/images/Group-5.png (100%) rename {landing_page => website}/src/images/Rectangle.png (100%) rename {landing_page => website}/src/images/bg-briques.jpg (100%) rename {landing_page => website}/src/images/bg-step.png (100%) rename {landing_page => website}/src/images/btn-bg-2.png (100%) rename {landing_page => website}/src/images/btn-bg-3.png (100%) rename {landing_page => website}/src/images/btn-bg-bw.png (100%) rename {landing_page => website}/src/images/btn-bg-light.png (100%) rename {landing_page => website}/src/images/btn-bg.png (100%) rename {landing_page => website}/src/images/cat.jpg (100%) rename {landing_page => website}/src/images/chosse-map.png (100%) rename {landing_page => website}/src/images/cloud.png (100%) rename {landing_page => website}/src/images/demo.png (100%) rename {landing_page => website}/src/images/header.png (100%) rename {landing_page => website}/src/images/lets-go-explore.png (100%) rename {landing_page => website}/src/images/people-love.png (100%) rename {landing_page => website}/src/images/pixelated.png (100%) rename {landing_page => website}/src/images/playicon.png (100%) rename {landing_page => website}/src/images/rect_3.png (100%) rename {landing_page => website}/src/images/select-char.png (100%) rename {landing_page => website}/src/images/sinclair.png (100%) rename {landing_page => website}/src/images/sky.jpg (100%) rename {landing_page => website}/src/images/start.png (100%) rename {landing_page => website}/src/images/used-by-millions.png (100%) rename {landing_page => website}/src/javascript/index.js (100%) rename {landing_page => website}/src/sass/_choose-map.scss (100%) rename {landing_page => website}/src/sass/_custom.scss (100%) rename {landing_page => website}/src/sass/styles.scss (100%) rename {landing_page => website}/webpack.config.js (100%) rename {landing_page => website}/yarn-error.log (100%) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 4019cdff..e79fe2a9 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -71,8 +71,8 @@ jobs: - name: "Build and push back image" uses: docker/build-push-action@v1 with: - dockerfile: landing_page/Dockerfile - path: landing_page/ + dockerfile: website/Dockerfile + path: website/ username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} repository: thecodingmachine/workadventure-website diff --git a/docker-compose.yaml b/docker-compose.yaml index fb953bb9..4eaa149f 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -47,7 +47,7 @@ services: STARTUP_COMMAND_2: npm run watch & APACHE_DOCUMENT_ROOT: dist/ volumes: - - ./landing_page:/var/www/html + - ./website:/var/www/html labels: - "traefik.http.routers.website.rule=Host(`workadventure.localhost`)" - "traefik.http.services.website.loadbalancer.server.port=80" diff --git a/landing_page/dist/static/images/.DS_Store b/landing_page/dist/static/images/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0