Merge pull request #90 from imba28/feat/vue-app

Feat/vue app

Author: imba28

.babelrc

@@ -1,5 +1,7 @@
 _mongo-volume
 .git
-dist
+/dist
 node_modules
-public/dist
+public
+
+/config.*

.dockerignore

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+end_of_line = lf
+
+[*.{js,vue,json}]
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+[Makefile]
+indent_style = tab

.editorconfig

@@ -2,13 +2,27 @@ module.exports = {
   'env': {
     'browser': true,
     'es2021': true,
+    'node': true,
+    'jest/globals': true,
   },
+  'plugins': ['jest'],
   'extends': [
+    'eslint:recommended',
     'google',
+    'plugin:vue/recommended',
   ],
   'parserOptions': {
     'ecmaVersion': 12,
     'sourceType': 'module',
   },
-  'rules': {},
+  'rules': {
+    'max-len': ['error', {'code': 120}],
+    'no-debugger': [process.env.NODE_ENV === 'production' ? 'error' : 'off'],
+    'jest/no-disabled-tests': 'warn',
+    'jest/no-focused-tests': 'error',
+    'jest/no-identical-title': 'error',
+    'jest/prefer-to-have-length': 'warn',
+    'jest/valid-expect': 'error',
+  },
+  'ignorePatterns': ['assets/openapi/**/*.js', 'jest.config.js', 'vue.config.js'],
 };

.eslintrc.js

@@ -5,6 +5,10 @@ on:
     tags:
       - 'v*'
 
+env:
+  go_version: 1.18
+  node_version: 14
+
 jobs:
   docker-release:
     runs-on: ubuntu-latest
@@ -60,17 +64,17 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: ${{ env.node_version }}
       - run: npm ci
       - run: npm run build
 
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: ${{ env.go_version }}
       - name: Build backend
         run: |
-          sed -i "s/dev-build/${{ steps.get_version.outputs.VERSION }}/" internal/template/files/includes/footer.html &&
+          sed -i "s/dev-build/${{ steps.get_version.outputs.VERSION }}/" assets/App.vue
           make bundle
 
       - name: Copy docker-compose.yml

.github/workflows/release.yml

@@ -6,31 +6,59 @@ on:
   pull_request:
     branches: [ 'master' ]
 
+env:
+  go_version: 1.18
+  node_version: 14
+
+  DATABASE_USER: root
+  DATABASE_PASSWORD: example
+  DATABASE_HOST: 127.0.0.1
+
 jobs:
+  openapi-code-generator:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+      - run: make openapi-spec
+
+      - uses: actions/upload-artifact@v3
+        with:
+          name: openapi-files
+          path: |
+            assets/openapi
+            pkg/openapi
+          if-no-files-found: error
+
   frontend:
+    needs: openapi-code-generator
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: ${{ env.node_version }}
+      - uses: actions/download-artifact@v3
+        with:
+          name: openapi-files
+          path: .
+
       - run: make lint-frontend
       - run: make frontend
 
+      - run: make test-frontend
+
   backend:
+    needs: openapi-code-generator
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         mongodb_image: ['mongo:4', 'mongo:5']
 
-    env:
-      DATABASE_USER: root
-      DATABASE_PASSWORD: example
-      DATABASE_HOST: 127.0.0.1
-
     services:
       mongodb:
         env:
@@ -44,10 +72,16 @@ jobs:
       - uses: actions/checkout@v3
         with:
           fetch-depth: 1
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: openapi-files
+          path: .
+
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version: ${{ env.go_version }}
 
       - name: Test
         run: make test
@@ -57,3 +91,55 @@ jobs:
 
       - name: Print coverage
         run: go tool cover -func cover.out | tail -n 1 | awk '{print $3}'
+
+  e2e:
+    needs: [backend, frontend]
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        mongodb_image: [ 'mongo:4', 'mongo:5' ]
+
+    services:
+      mongodb:
+        env:
+          MONGO_INITDB_ROOT_USERNAME: root
+          MONGO_INITDB_ROOT_PASSWORD: example
+        image: ${{ matrix.mongodb_image }}
+        ports:
+          - 27017:27017
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
+      - uses: actions/download-artifact@v3
+        with:
+          name: openapi-files
+          path: .
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ env.node_version }}
+
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.go_version }}
+
+      - name: Run e2e suite
+        env:
+          SPOTIFY_ID: ${{ secrets.SPOTIFY_ID }}
+          SPOTIFY_SECRET: ${{ secrets.SPOTIFY_SECRET }}
+          GENIUS_API_TOKEN: ${{ secrets.GENIUS_API_TOKEN }}
+        run: make test-e2e
+
+      - uses: actions/upload-artifact@v3
+        if: failure()
+        with:
+          name: cypress-files
+          path: |
+            tests/e2e/screenshots
+            tests/e2e/videos

.github/workflows/test.yml

@@ -1,8 +1,19 @@
 _mongo-volume
-dist
 cover.html
 cover.out
 .idea
-spolyr
-spolyr.exe
-node_modules
+/spolyr
+/spolyr.exe
+node_modules
+public
+pkg/openapi
+assets/openapi
+assets/coverage
+
+!/**/.gitkeep
+
+tests/e2e/screenshots
+tests/e2e/videos
+
+/config.*
+/dist/

.gitignore

@@ -0,0 +1,7 @@
+{
+    "editor.codeActionsOnSave": {
+      "source.fixAll.eslint": true
+    },
+    "eslint.validate": ["javascript", "vue"]
+   }
+  

.vscode/settings.json

@@ -1,5 +1,5 @@
 # api build
-FROM golang:1.17 as builder
+FROM golang:1.18 as builder
 
 ARG BUILD_NUMBER=dev
 
@@ -11,11 +11,11 @@ COPY go.sum .
 RUN go mod download
 
 COPY . .
-RUN sed -i "s/dev-build/${BUILD_NUMBER}/" internal/template/files/includes/footer.html && \
+RUN sed -i "s/dev-build/${BUILD_NUMBER}/" assets/App.vue && \
     make build-linux
 
 # frontend build
-FROM node:16-alpine as frontend_builder
+FROM node:14-alpine as frontend_builder
 
 WORKDIR /build
 
@@ -38,7 +38,7 @@ USER spolyr
 
 WORKDIR /app
 COPY --from=builder --chown=spolyr:spolyr /build/spolyr .
-COPY --from=builder --chown=spolyr:spolyr /build/public public
-COPY --from=frontend_builder --chown=spolyr:spolyr /build/public/dist public/dist
+COPY --from=frontend_builder --chown=spolyr:spolyr /build/public public
 
-CMD ["/app/spolyr"]
+ENTRYPOINT ["/app/spolyr"]
+CMD ["web"]

Dockerfile

@@ -1,10 +1,10 @@
 .PHONY: all clean bundle build test frontend
 
 build-linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -a -tags netgo -o spolyr cmd/main.go
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -a -tags netgo -o spolyr ./main.go
 
 build-windows:
-	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -a -tags netgo -o spolyr.exe cmd/main.go
+	CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags="-s -w" -a -tags netgo -o spolyr.exe ./main.go
 
 build: build-linux build-windows
 
@@ -14,18 +14,26 @@ clean:
 	rm -f spolyr-linux-amd64.tar.gz
 	rm -f spolyr-windows-amd64.tar.gz
 	rm -rf dist
+	rm -rf pkg/openapi
 
 bundle: build
 	mkdir -p ./dist
 	tar -czvf dist/spolyr-linux-amd64.tar.gz public spolyr
 	tar -czvf dist/spolyr-windows-amd64.tar.gz public spolyr.exe
 
 test:
-	DATABASE_USER=root DATABASE_PASSWORD=example DATABASE_HOST=127.0.0.1 go test -coverprofile cover.out ./internal/...
+	DATABASE_USER=root DATABASE_PASSWORD=example DATABASE_HOST=127.0.0.1 go test -coverprofile cover.out ./pkg/...
 	go tool cover -html=cover.out -o cover.html
 
 test-units:
-	go test -short ./internal/...
+	go test -short ./pkg/...
+
+test-e2e: build-linux frontend
+	DATABASE_USER=root DATABASE_PASSWORD=example DATABASE_HOST=127.0.0.1 ./spolyr fixtures
+	DATABASE_USER=root DATABASE_PASSWORD=example DATABASE_HOST=127.0.0.1 ./spolyr web > /tmp/backend.log 2>&1 &
+	npm run test:e2e:ci:chromium
+	killall spolyr
+	cat /tmp/backend.log
 
 coverage: test
 	go tool cover -func cover.out | tail -n 1 | awk '{print $3}'
@@ -37,4 +45,16 @@ frontend: node_modules
 	npm run build
 
 lint-frontend: node_modules
-	npm run lint
+	npm run lint
+
+test-frontend: node_modules
+	npm run test:unit
+
+openapi-spec:
+	docker run --rm -v "${PWD}:/local" openapitools/openapi-generator-cli generate -g go-server -i /local/oapi-spec.yaml -o /local/pkg/openapi --additional-properties=outputAsLibrary=true,onlyInterfaces=true,sourceFolder=openapi,addResponseHeaders=true
+	sudo chown -R $(USER): pkg/openapi/
+	sed -i -e 's/"github.com\/gorilla\/mux"//g' pkg/openapi/openapi/api_auth.go
+	sed -i -e 's/"encoding\/json"//g' pkg/openapi/openapi/api_import.go
+	sed -i -e 's/"encoding\/json"//g' -e 's/"github.com\/gorilla\/mux"//g' pkg/openapi/openapi/api_playlists.go
+	docker run --rm -v "${PWD}/oapi-spec.yaml:/local/oapi-spec.yaml" -v "${PWD}/assets/openapi/:/local/assets/openapi/src" openapitools/openapi-generator-cli generate -g javascript -i /local/oapi-spec.yaml -o /local/assets/openapi --additional-properties=usePromises=true,moduleName=@/openapi --global-property models,modelTests=false --global-property apis,apiTests=false --global-property supportingFiles
+