restructure and fix build

bierteam · Aug 5, 2023 · cec1dcc · cec1dcc
1 parent ec61b98
commit cec1dcc
Show file tree

Hide file tree

Showing 104 changed files with 20,725 additions and 14,479 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,10 +11,9 @@ jobs:
     strategy:
       matrix:
         folder:
-          - beer-import-legacy
-          - pils-legacy
-          - frontend-legacy
-          # - frontend
+          - beer-import
+          - pils
+          - pils-frontend
     steps:
       -
         uses: actions/checkout@v3
@@ -52,8 +51,7 @@ jobs:
   #   strategy:
   #     matrix:
   #       folder:
-  #        - beer-import
-  #        - pils
+  #        - api
   #   steps:
   #     -
   #       uses: actions/checkout@v3
@@ -70,20 +68,18 @@ jobs:
   #       run: go test -v ./...
 
   docker:
-    if: github.ref == 'refs/heads/master' || github.event == 'push'
+    if: github.ref == 'refs/heads/main' || github.event == 'push'
     needs:
       - test-node
       # - test-go
     runs-on: ubuntu-latest
     strategy:
       matrix:
         folder:
-          # - beer-import
-          - beer-import-legacy
-          # - frontend
-          - frontend-legacy
-          # - pils
-          - pils-legacy
+          - beer-import
+          - pils-frontend
+          - pils
+          # - api
 
     steps:
       -
@@ -118,11 +114,11 @@ jobs:
         name: Build and push
         uses: docker/build-push-action@v3
         with:
-          context: .
+          context: ${{ matrix.folder }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
+          platforms: linux/amd64,linux/arm64
           cache-from: type=registry,ref=${{ github.repository }}
           cache-to: type=registry,ref=${{ github.repository }}
           # https://docs.docker.com/build/building/cache/backends/#cache-mode
diff --git a/beer-import/.gitkeep → api/.gitkeep b/beer-import/.gitkeep → api/.gitkeep
diff --git a/beer-import-legacy/.dockerignore → beer-import/.dockerignore b/beer-import-legacy/.dockerignore → beer-import/.dockerignore
diff --git a/beer-import-legacy/.env.example → beer-import/.env.example b/beer-import-legacy/.env.example → beer-import/.env.example
diff --git a/beer-import-legacy/.gitignore → beer-import/.gitignore b/beer-import-legacy/.gitignore → beer-import/.gitignore
diff --git a/beer-import-legacy/Dockerfile → beer-import/Dockerfile b/beer-import-legacy/Dockerfile → beer-import/Dockerfile
diff --git a/beer-import-legacy/models/beer.js → beer-import/models/beer.js b/beer-import-legacy/models/beer.js → beer-import/models/beer.js
diff --git a/beer-import-legacy/models/log.js → beer-import/models/log.js b/beer-import-legacy/models/log.js → beer-import/models/log.js
diff --git a/beer-import-legacy/models/store.js → beer-import/models/store.js b/beer-import-legacy/models/store.js → beer-import/models/store.js
diff --git a/beer-import-legacy/package-lock.json → beer-import/package-lock.json b/beer-import-legacy/package-lock.json → beer-import/package-lock.json
diff --git a/beer-import-legacy/package.json → beer-import/package.json b/beer-import-legacy/package.json → beer-import/package.json
diff --git a/beer-import-legacy/server.js → beer-import/server.js b/beer-import-legacy/server.js → beer-import/server.js
diff --git a/beer-import-legacy/services/dbImport.js → beer-import/services/dbImport.js b/beer-import-legacy/services/dbImport.js → beer-import/services/dbImport.js
diff --git a/beer-import-legacy/services/getData.js → beer-import/services/getData.js b/beer-import-legacy/services/getData.js → beer-import/services/getData.js
diff --git a/beer-import-legacy/services/joinObjects.js → beer-import/services/joinObjects.js b/beer-import-legacy/services/joinObjects.js → beer-import/services/joinObjects.js
diff --git a/beer-import-legacy/services/processData.js → beer-import/services/processData.js b/beer-import-legacy/services/processData.js → beer-import/services/processData.js
diff --git a/beer-import-legacy/services/requestData.js → beer-import/services/requestData.js b/beer-import-legacy/services/requestData.js → beer-import/services/requestData.js
diff --git a/beer-import-legacy/services/updateStores.js → beer-import/services/updateStores.js b/beer-import-legacy/services/updateStores.js → beer-import/services/updateStores.js
diff --git a/beer-import-legacy/services/uriPrettifier.js → beer-import/services/uriPrettifier.js b/beer-import-legacy/services/uriPrettifier.js → beer-import/services/uriPrettifier.js
diff --git a/beer-import-legacy/services/validateKeys.js → beer-import/services/validateKeys.js b/beer-import-legacy/services/validateKeys.js → beer-import/services/validateKeys.js
diff --git a/beer-import-legacy/services/writeLog.js → beer-import/services/writeLog.js b/beer-import-legacy/services/writeLog.js → beer-import/services/writeLog.js
diff --git a/beer-import-legacy/setup.js → beer-import/setup.js b/beer-import-legacy/setup.js → beer-import/setup.js
diff --git a/beer-import-legacy/test/unit/jest.conf.js → beer-import/test/unit/jest.conf.js b/beer-import-legacy/test/unit/jest.conf.js → beer-import/test/unit/jest.conf.js
diff --git a/...acy/test/unit/methods/joinObjects.test.js → ...ort/test/unit/methods/joinObjects.test.js b/...acy/test/unit/methods/joinObjects.test.js → ...ort/test/unit/methods/joinObjects.test.js
diff --git a/...y/test/unit/methods/uriPrettifier.test.js → ...t/test/unit/methods/uriPrettifier.test.js b/...y/test/unit/methods/uriPrettifier.test.js → ...t/test/unit/methods/uriPrettifier.test.js
diff --git a/...cy/test/unit/methods/validateKeys.test.js → ...rt/test/unit/methods/validateKeys.test.js b/...cy/test/unit/methods/validateKeys.test.js → ...rt/test/unit/methods/validateKeys.test.js
diff --git a/frontend-legacy/.dockerignore → pils-frontend/.dockerignore b/frontend-legacy/.dockerignore → pils-frontend/.dockerignore
diff --git a/frontend-legacy/.editorconfig → pils-frontend/.editorconfig b/frontend-legacy/.editorconfig → pils-frontend/.editorconfig
diff --git a/frontend-legacy/.github/renovate.json → pils-frontend/.github/renovate.json b/frontend-legacy/.github/renovate.json → pils-frontend/.github/renovate.json
diff --git a/frontend-legacy/.gitignore → pils-frontend/.gitignore b/frontend-legacy/.gitignore → pils-frontend/.gitignore
diff --git a/frontend-legacy/.gitkeep → pils-frontend/.gitkeep b/frontend-legacy/.gitkeep → pils-frontend/.gitkeep
diff --git a/frontend-legacy/Dockerfile → pils-frontend/Dockerfile b/frontend-legacy/Dockerfile → pils-frontend/Dockerfile
diff --git a/frontend-legacy/build/build.js → pils-frontend/build/build.js b/frontend-legacy/build/build.js → pils-frontend/build/build.js
diff --git a/frontend-legacy/build/check-versions.js → pils-frontend/build/check-versions.js b/frontend-legacy/build/check-versions.js → pils-frontend/build/check-versions.js
diff --git a/frontend-legacy/build/utils.js → pils-frontend/build/utils.js b/frontend-legacy/build/utils.js → pils-frontend/build/utils.js
diff --git a/frontend-legacy/build/vue-loader.conf.js → pils-frontend/build/vue-loader.conf.js b/frontend-legacy/build/vue-loader.conf.js → pils-frontend/build/vue-loader.conf.js
diff --git a/frontend-legacy/build/webpack.base.conf.js → pils-frontend/build/webpack.base.conf.js b/frontend-legacy/build/webpack.base.conf.js → pils-frontend/build/webpack.base.conf.js
diff --git a/frontend-legacy/build/webpack.dev.conf.js → pils-frontend/build/webpack.dev.conf.js b/frontend-legacy/build/webpack.dev.conf.js → pils-frontend/build/webpack.dev.conf.js
diff --git a/frontend-legacy/build/webpack.prod.conf.js → pils-frontend/build/webpack.prod.conf.js b/frontend-legacy/build/webpack.prod.conf.js → pils-frontend/build/webpack.prod.conf.js
diff --git a/frontend-legacy/config/backend.js → pils-frontend/config/backend.js b/frontend-legacy/config/backend.js → pils-frontend/config/backend.js
diff --git a/frontend-legacy/config/dev.env.js → pils-frontend/config/dev.env.js b/frontend-legacy/config/dev.env.js → pils-frontend/config/dev.env.js
diff --git a/frontend-legacy/config/index.js → pils-frontend/config/index.js b/frontend-legacy/config/index.js → pils-frontend/config/index.js
diff --git a/frontend-legacy/config/prod.env.js → pils-frontend/config/prod.env.js b/frontend-legacy/config/prod.env.js → pils-frontend/config/prod.env.js
diff --git a/frontend-legacy/config/test.env.js → pils-frontend/config/test.env.js b/frontend-legacy/config/test.env.js → pils-frontend/config/test.env.js
diff --git a/frontend-legacy/index.html → pils-frontend/index.html b/frontend-legacy/index.html → pils-frontend/index.html
diff --git a/frontend-legacy/nginx.conf → pils-frontend/nginx.conf b/frontend-legacy/nginx.conf → pils-frontend/nginx.conf
diff --git a/frontend-legacy/package-lock.json → pils-frontend/package-lock.json b/frontend-legacy/package-lock.json → pils-frontend/package-lock.json
diff --git a/frontend-legacy/package.json → pils-frontend/package.json b/frontend-legacy/package.json → pils-frontend/package.json
diff --git a/frontend-legacy/public/favicon.ico → pils-frontend/public/favicon.ico b/frontend-legacy/public/favicon.ico → pils-frontend/public/favicon.ico
diff --git a/frontend-legacy/src/App.vue → pils-frontend/src/App.vue b/frontend-legacy/src/App.vue → pils-frontend/src/App.vue
diff --git a/...acy/src/assets/made-with-bulma--black.png → ...end/src/assets/made-with-bulma--black.png b/...acy/src/assets/made-with-bulma--black.png → ...end/src/assets/made-with-bulma--black.png
diff --git a/...gacy/src/assets/made-with-bulma--dark.png → ...tend/src/assets/made-with-bulma--dark.png b/...gacy/src/assets/made-with-bulma--dark.png → ...tend/src/assets/made-with-bulma--dark.png
diff --git a/...src/assets/made-with-bulma--semiblack.png → ...src/assets/made-with-bulma--semiblack.png b/...src/assets/made-with-bulma--semiblack.png → ...src/assets/made-with-bulma--semiblack.png
diff --git a/...src/assets/made-with-bulma--semiwhite.png → ...src/assets/made-with-bulma--semiwhite.png b/...src/assets/made-with-bulma--semiwhite.png → ...src/assets/made-with-bulma--semiwhite.png
diff --git a/...acy/src/assets/made-with-bulma--white.png → ...end/src/assets/made-with-bulma--white.png b/...acy/src/assets/made-with-bulma--white.png → ...end/src/assets/made-with-bulma--white.png
diff --git a/...end-legacy/src/assets/made-with-bulma.png → pils-frontend/src/assets/made-with-bulma.png b/...end-legacy/src/assets/made-with-bulma.png → pils-frontend/src/assets/made-with-bulma.png
diff --git a/frontend-legacy/src/components/Account.vue → pils-frontend/src/components/Account.vue b/frontend-legacy/src/components/Account.vue → pils-frontend/src/components/Account.vue
diff --git a/frontend-legacy/src/components/Discounts.vue → pils-frontend/src/components/Discounts.vue b/frontend-legacy/src/components/Discounts.vue → pils-frontend/src/components/Discounts.vue
diff --git a/frontend-legacy/src/components/Home.vue → pils-frontend/src/components/Home.vue b/frontend-legacy/src/components/Home.vue → pils-frontend/src/components/Home.vue
diff --git a/frontend-legacy/src/components/Import.vue → pils-frontend/src/components/Import.vue b/frontend-legacy/src/components/Import.vue → pils-frontend/src/components/Import.vue
diff --git a/frontend-legacy/src/components/Logging.vue → pils-frontend/src/components/Logging.vue b/frontend-legacy/src/components/Logging.vue → pils-frontend/src/components/Logging.vue
diff --git a/frontend-legacy/src/components/Login.vue → pils-frontend/src/components/Login.vue b/frontend-legacy/src/components/Login.vue → pils-frontend/src/components/Login.vue
diff --git a/frontend-legacy/src/components/NotFound.vue → pils-frontend/src/components/NotFound.vue b/frontend-legacy/src/components/NotFound.vue → pils-frontend/src/components/NotFound.vue
diff --git a/frontend-legacy/src/components/Register.vue → pils-frontend/src/components/Register.vue b/frontend-legacy/src/components/Register.vue → pils-frontend/src/components/Register.vue
diff --git a/...nd-legacy/src/components/Storemapping.vue → ...-frontend/src/components/Storemapping.vue b/...nd-legacy/src/components/Storemapping.vue → ...-frontend/src/components/Storemapping.vue
diff --git a/frontend-legacy/src/components/User.vue → pils-frontend/src/components/User.vue b/frontend-legacy/src/components/User.vue → pils-frontend/src/components/User.vue
diff --git a/frontend-legacy/src/components/Users.vue → pils-frontend/src/components/Users.vue b/frontend-legacy/src/components/Users.vue → pils-frontend/src/components/Users.vue
diff --git a/frontend-legacy/src/main.js → pils-frontend/src/main.js b/frontend-legacy/src/main.js → pils-frontend/src/main.js
diff --git a/frontend-legacy/src/router/index.js → pils-frontend/src/router/index.js b/frontend-legacy/src/router/index.js → pils-frontend/src/router/index.js
diff --git a/frontend-legacy/src/services/Api.js → pils-frontend/src/services/Api.js b/frontend-legacy/src/services/Api.js → pils-frontend/src/services/Api.js