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 5008ddfc..00000000 Binary files a/landing_page/dist/static/images/.DS_Store and /dev/null differ diff --git a/landing_page/.gitignore b/website/.gitignore similarity index 100% rename from landing_page/.gitignore rename to website/.gitignore diff --git a/landing_page/Dockerfile b/website/Dockerfile similarity index 100% rename from landing_page/Dockerfile rename to website/Dockerfile diff --git a/landing_page/README.md b/website/README.md similarity index 100% rename from landing_page/README.md rename to website/README.md diff --git a/landing_page/dist/choose-map.html b/website/dist/choose-map.html similarity index 100% rename from landing_page/dist/choose-map.html rename to website/dist/choose-map.html diff --git a/landing_page/dist/index.html b/website/dist/index.html similarity index 100% rename from landing_page/dist/index.html rename to website/dist/index.html diff --git a/landing_page/dist/static/images/Bitmap2.png b/website/dist/static/images/Bitmap2.png similarity index 100% rename from landing_page/dist/static/images/Bitmap2.png rename to website/dist/static/images/Bitmap2.png diff --git a/landing_page/dist/static/images/Bitmap3.png b/website/dist/static/images/Bitmap3.png similarity index 100% rename from landing_page/dist/static/images/Bitmap3.png rename to website/dist/static/images/Bitmap3.png diff --git a/landing_page/dist/static/images/Logo TCM.png b/website/dist/static/images/Logo TCM.png similarity index 100% rename from landing_page/dist/static/images/Logo TCM.png rename to website/dist/static/images/Logo TCM.png diff --git a/landing_page/dist/static/images/amstrad.png b/website/dist/static/images/amstrad.png similarity index 100% rename from landing_page/dist/static/images/amstrad.png rename to website/dist/static/images/amstrad.png diff --git a/landing_page/dist/static/images/atari.png b/website/dist/static/images/atari.png similarity index 100% rename from landing_page/dist/static/images/atari.png rename to website/dist/static/images/atari.png diff --git a/landing_page/dist/static/images/bitmap.png b/website/dist/static/images/bitmap.png similarity index 100% rename from landing_page/dist/static/images/bitmap.png rename to website/dist/static/images/bitmap.png diff --git a/landing_page/dist/static/images/check.png b/website/dist/static/images/check.png similarity index 100% rename from landing_page/dist/static/images/check.png rename to website/dist/static/images/check.png diff --git a/landing_page/dist/static/images/choose_character.png b/website/dist/static/images/choose_character.png similarity index 100% rename from landing_page/dist/static/images/choose_character.png rename to website/dist/static/images/choose_character.png diff --git a/landing_page/dist/static/images/cloud.png b/website/dist/static/images/cloud.png similarity index 100% rename from landing_page/dist/static/images/cloud.png rename to website/dist/static/images/cloud.png diff --git a/landing_page/dist/static/images/facebook.png b/website/dist/static/images/facebook.png similarity index 100% rename from landing_page/dist/static/images/facebook.png rename to website/dist/static/images/facebook.png diff --git a/landing_page/dist/static/images/female-character.gif b/website/dist/static/images/female-character.gif similarity index 100% rename from landing_page/dist/static/images/female-character.gif rename to website/dist/static/images/female-character.gif diff --git a/landing_page/dist/static/images/floppy.png b/website/dist/static/images/floppy.png similarity index 100% rename from landing_page/dist/static/images/floppy.png rename to website/dist/static/images/floppy.png diff --git a/landing_page/dist/static/images/interact.png b/website/dist/static/images/interact.png similarity index 100% rename from landing_page/dist/static/images/interact.png rename to website/dist/static/images/interact.png diff --git a/landing_page/dist/static/images/linkedin.png b/website/dist/static/images/linkedin.png similarity index 100% rename from landing_page/dist/static/images/linkedin.png rename to website/dist/static/images/linkedin.png diff --git a/landing_page/dist/static/images/logo.png b/website/dist/static/images/logo.png similarity index 100% rename from landing_page/dist/static/images/logo.png rename to website/dist/static/images/logo.png diff --git a/landing_page/dist/static/images/male-character.gif b/website/dist/static/images/male-character.gif similarity index 100% rename from landing_page/dist/static/images/male-character.gif rename to website/dist/static/images/male-character.gif diff --git a/landing_page/dist/static/images/maps/coders.png b/website/dist/static/images/maps/coders.png similarity index 100% rename from landing_page/dist/static/images/maps/coders.png rename to website/dist/static/images/maps/coders.png diff --git a/landing_page/dist/static/images/maps/creative.png b/website/dist/static/images/maps/creative.png similarity index 100% rename from landing_page/dist/static/images/maps/creative.png rename to website/dist/static/images/maps/creative.png diff --git a/landing_page/dist/static/images/maps/dungeon.png b/website/dist/static/images/maps/dungeon.png similarity index 100% rename from landing_page/dist/static/images/maps/dungeon.png rename to website/dist/static/images/maps/dungeon.png diff --git a/landing_page/dist/static/images/maps/fantasy.png b/website/dist/static/images/maps/fantasy.png similarity index 100% rename from landing_page/dist/static/images/maps/fantasy.png rename to website/dist/static/images/maps/fantasy.png diff --git a/landing_page/dist/static/images/maps/office.png b/website/dist/static/images/maps/office.png similarity index 100% rename from landing_page/dist/static/images/maps/office.png rename to website/dist/static/images/maps/office.png diff --git a/landing_page/dist/static/images/maps/pub.png b/website/dist/static/images/maps/pub.png similarity index 100% rename from landing_page/dist/static/images/maps/pub.png rename to website/dist/static/images/maps/pub.png diff --git a/landing_page/dist/static/images/maps/school.png b/website/dist/static/images/maps/school.png similarity index 100% rename from landing_page/dist/static/images/maps/school.png rename to website/dist/static/images/maps/school.png diff --git a/landing_page/dist/static/images/maps/street.png b/website/dist/static/images/maps/street.png similarity index 100% rename from landing_page/dist/static/images/maps/street.png rename to website/dist/static/images/maps/street.png diff --git a/landing_page/dist/static/images/maps/tcm.png b/website/dist/static/images/maps/tcm.png similarity index 100% rename from landing_page/dist/static/images/maps/tcm.png rename to website/dist/static/images/maps/tcm.png diff --git a/landing_page/dist/static/images/play.png b/website/dist/static/images/play.png similarity index 100% rename from landing_page/dist/static/images/play.png rename to website/dist/static/images/play.png diff --git a/landing_page/dist/static/images/sinclair-2.png b/website/dist/static/images/sinclair-2.png similarity index 100% rename from landing_page/dist/static/images/sinclair-2.png rename to website/dist/static/images/sinclair-2.png diff --git a/landing_page/dist/static/images/step 1.png b/website/dist/static/images/step 1.png similarity index 100% rename from landing_page/dist/static/images/step 1.png rename to website/dist/static/images/step 1.png diff --git a/landing_page/dist/static/images/step 2.png b/website/dist/static/images/step 2.png similarity index 100% rename from landing_page/dist/static/images/step 2.png rename to website/dist/static/images/step 2.png diff --git a/landing_page/dist/static/images/step 3.png b/website/dist/static/images/step 3.png similarity index 100% rename from landing_page/dist/static/images/step 3.png rename to website/dist/static/images/step 3.png diff --git a/landing_page/dist/static/images/super-nintendo.png b/website/dist/static/images/super-nintendo.png similarity index 100% rename from landing_page/dist/static/images/super-nintendo.png rename to website/dist/static/images/super-nintendo.png diff --git a/landing_page/dist/static/images/twitter.png b/website/dist/static/images/twitter.png similarity index 100% rename from landing_page/dist/static/images/twitter.png rename to website/dist/static/images/twitter.png diff --git a/landing_page/package-lock.json b/website/package-lock.json similarity index 100% rename from landing_page/package-lock.json rename to website/package-lock.json diff --git a/landing_page/package.json b/website/package.json similarity index 100% rename from landing_page/package.json rename to website/package.json diff --git a/landing_page/postcss.config.js b/website/postcss.config.js similarity index 100% rename from landing_page/postcss.config.js rename to website/postcss.config.js diff --git a/landing_page/src/fonts/04B_03.woff b/website/src/fonts/04B_03.woff similarity index 100% rename from landing_page/src/fonts/04B_03.woff rename to website/src/fonts/04B_03.woff diff --git a/landing_page/src/fonts/OpenSans-Regular.ttf b/website/src/fonts/OpenSans-Regular.ttf similarity index 100% rename from landing_page/src/fonts/OpenSans-Regular.ttf rename to website/src/fonts/OpenSans-Regular.ttf diff --git a/landing_page/src/fonts/VCR_OSD.ttf b/website/src/fonts/VCR_OSD.ttf similarity index 100% rename from landing_page/src/fonts/VCR_OSD.ttf rename to website/src/fonts/VCR_OSD.ttf diff --git a/landing_page/src/fonts/ka1.ttf b/website/src/fonts/ka1.ttf similarity index 100% rename from landing_page/src/fonts/ka1.ttf rename to website/src/fonts/ka1.ttf diff --git a/landing_page/src/images/BG-briques.png b/website/src/images/BG-briques.png similarity index 100% rename from landing_page/src/images/BG-briques.png rename to website/src/images/BG-briques.png diff --git a/landing_page/src/images/Desktop HD.png b/website/src/images/Desktop HD.png similarity index 100% rename from landing_page/src/images/Desktop HD.png rename to website/src/images/Desktop HD.png diff --git a/landing_page/src/images/Group-4.png b/website/src/images/Group-4.png similarity index 100% rename from landing_page/src/images/Group-4.png rename to website/src/images/Group-4.png diff --git a/landing_page/src/images/Group-5.png b/website/src/images/Group-5.png similarity index 100% rename from landing_page/src/images/Group-5.png rename to website/src/images/Group-5.png diff --git a/landing_page/src/images/Rectangle.png b/website/src/images/Rectangle.png similarity index 100% rename from landing_page/src/images/Rectangle.png rename to website/src/images/Rectangle.png diff --git a/landing_page/src/images/bg-briques.jpg b/website/src/images/bg-briques.jpg similarity index 100% rename from landing_page/src/images/bg-briques.jpg rename to website/src/images/bg-briques.jpg diff --git a/landing_page/src/images/bg-step.png b/website/src/images/bg-step.png similarity index 100% rename from landing_page/src/images/bg-step.png rename to website/src/images/bg-step.png diff --git a/landing_page/src/images/btn-bg-2.png b/website/src/images/btn-bg-2.png similarity index 100% rename from landing_page/src/images/btn-bg-2.png rename to website/src/images/btn-bg-2.png diff --git a/landing_page/src/images/btn-bg-3.png b/website/src/images/btn-bg-3.png similarity index 100% rename from landing_page/src/images/btn-bg-3.png rename to website/src/images/btn-bg-3.png diff --git a/landing_page/src/images/btn-bg-bw.png b/website/src/images/btn-bg-bw.png similarity index 100% rename from landing_page/src/images/btn-bg-bw.png rename to website/src/images/btn-bg-bw.png diff --git a/landing_page/src/images/btn-bg-light.png b/website/src/images/btn-bg-light.png similarity index 100% rename from landing_page/src/images/btn-bg-light.png rename to website/src/images/btn-bg-light.png diff --git a/landing_page/src/images/btn-bg.png b/website/src/images/btn-bg.png similarity index 100% rename from landing_page/src/images/btn-bg.png rename to website/src/images/btn-bg.png diff --git a/landing_page/src/images/cat.jpg b/website/src/images/cat.jpg similarity index 100% rename from landing_page/src/images/cat.jpg rename to website/src/images/cat.jpg diff --git a/landing_page/src/images/chosse-map.png b/website/src/images/chosse-map.png similarity index 100% rename from landing_page/src/images/chosse-map.png rename to website/src/images/chosse-map.png diff --git a/landing_page/src/images/cloud.png b/website/src/images/cloud.png similarity index 100% rename from landing_page/src/images/cloud.png rename to website/src/images/cloud.png diff --git a/landing_page/src/images/demo.png b/website/src/images/demo.png similarity index 100% rename from landing_page/src/images/demo.png rename to website/src/images/demo.png diff --git a/landing_page/src/images/header.png b/website/src/images/header.png similarity index 100% rename from landing_page/src/images/header.png rename to website/src/images/header.png diff --git a/landing_page/src/images/lets-go-explore.png b/website/src/images/lets-go-explore.png similarity index 100% rename from landing_page/src/images/lets-go-explore.png rename to website/src/images/lets-go-explore.png diff --git a/landing_page/src/images/people-love.png b/website/src/images/people-love.png similarity index 100% rename from landing_page/src/images/people-love.png rename to website/src/images/people-love.png diff --git a/landing_page/src/images/pixelated.png b/website/src/images/pixelated.png similarity index 100% rename from landing_page/src/images/pixelated.png rename to website/src/images/pixelated.png diff --git a/landing_page/src/images/playicon.png b/website/src/images/playicon.png similarity index 100% rename from landing_page/src/images/playicon.png rename to website/src/images/playicon.png diff --git a/landing_page/src/images/rect_3.png b/website/src/images/rect_3.png similarity index 100% rename from landing_page/src/images/rect_3.png rename to website/src/images/rect_3.png diff --git a/landing_page/src/images/select-char.png b/website/src/images/select-char.png similarity index 100% rename from landing_page/src/images/select-char.png rename to website/src/images/select-char.png diff --git a/landing_page/src/images/sinclair.png b/website/src/images/sinclair.png similarity index 100% rename from landing_page/src/images/sinclair.png rename to website/src/images/sinclair.png diff --git a/landing_page/src/images/sky.jpg b/website/src/images/sky.jpg similarity index 100% rename from landing_page/src/images/sky.jpg rename to website/src/images/sky.jpg diff --git a/landing_page/src/images/start.png b/website/src/images/start.png similarity index 100% rename from landing_page/src/images/start.png rename to website/src/images/start.png diff --git a/landing_page/src/images/used-by-millions.png b/website/src/images/used-by-millions.png similarity index 100% rename from landing_page/src/images/used-by-millions.png rename to website/src/images/used-by-millions.png diff --git a/landing_page/src/javascript/index.js b/website/src/javascript/index.js similarity index 100% rename from landing_page/src/javascript/index.js rename to website/src/javascript/index.js diff --git a/landing_page/src/sass/_choose-map.scss b/website/src/sass/_choose-map.scss similarity index 100% rename from landing_page/src/sass/_choose-map.scss rename to website/src/sass/_choose-map.scss diff --git a/landing_page/src/sass/_custom.scss b/website/src/sass/_custom.scss similarity index 100% rename from landing_page/src/sass/_custom.scss rename to website/src/sass/_custom.scss diff --git a/landing_page/src/sass/styles.scss b/website/src/sass/styles.scss similarity index 100% rename from landing_page/src/sass/styles.scss rename to website/src/sass/styles.scss diff --git a/landing_page/webpack.config.js b/website/webpack.config.js similarity index 100% rename from landing_page/webpack.config.js rename to website/webpack.config.js diff --git a/landing_page/yarn-error.log b/website/yarn-error.log similarity index 100% rename from landing_page/yarn-error.log rename to website/yarn-error.log