diff --git a/.github/workflows/ci-checks.yml b/.github/workflows/ci-checks.yml index be850ff..09bdc15 100644 --- a/.github/workflows/ci-checks.yml +++ b/.github/workflows/ci-checks.yml @@ -35,23 +35,3 @@ jobs: - name: Test run: yarn test - - e2e: - runs-on: ubuntu-latest - steps: - - name: Checkout Code - uses: actions/checkout@v3 - - - name: Build Test Environment, Stage 1 - run: docker-compose -f docker-compose.testing.yml build base backend app-test cypress - - - name: Build Test Quests - run: docker-compose -f docker-compose.testing.yml run --rm backend yarn build:quests - - - name: Run Cypress Tests - env: - GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} - GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} - GITHUB_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }} - GITHUB_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }} - run: docker-compose -f docker-compose.testing.yml run cypress diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml new file mode 100644 index 0000000..bf12175 --- /dev/null +++ b/.github/workflows/e2e.yml @@ -0,0 +1,24 @@ +name: E2E Tests + +on: [push, pull_request] + +jobs: + e2e: + runs-on: ubuntu-latest + steps: + - name: Checkout Code + uses: actions/checkout@v3 + + - name: Build Test Environment, Stage 1 + run: docker-compose -f docker-compose.testing.yml build base backend app-test cypress + + - name: Build Test Quests + run: docker-compose -f docker-compose.testing.yml run --rm backend yarn build:quests + + - name: Run Cypress Tests + env: + GOOGLE_CLIENT_ID: ${{ secrets.GOOGLE_CLIENT_ID }} + GOOGLE_CLIENT_SECRET: ${{ secrets.GOOGLE_CLIENT_SECRET }} + GITHUB_CLIENT_ID: ${{ secrets.GH_CLIENT_ID }} + GITHUB_CLIENT_SECRET: ${{ secrets.GH_CLIENT_SECRET }} + run: docker-compose -f docker-compose.testing.yml run cypress diff --git a/README.md b/README.md index fd56c86..61bc910 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Run mongoDB first: - docker compose -f docker-compose.dev.yml up -d db + docker compose up -d The db will automatically restarts by Docker. diff --git a/app/package.json b/app/package.json index f571179..8a0d3ad 100644 --- a/app/package.json +++ b/app/package.json @@ -16,13 +16,14 @@ "@fortawesome/vue-fontawesome": "^3.0.3", "@linux-odyssey/constants": "*", "@linux-odyssey/file-graph": "*", - "@linux-odyssey/utils": "*", "@linux-odyssey/models": "*", + "@linux-odyssey/utils": "*", "@types/dompurify": "^3.0.5", "axios": "^1.6.0", "dompurify": "^3.0.6", "echarts": "^5.4.3", "marked": "^10.0.0", + "pinia": "^2.1.7", "socket.io-client": "^4.7.1", "validator": "^13.11.0", "vue": "^3.3.4", diff --git a/app/src/components/GameHeaderPart.vue b/app/src/components/GameHeaderPart.vue deleted file mode 100644 index 986b6e0..0000000 --- a/app/src/components/GameHeaderPart.vue +++ /dev/null @@ -1,142 +0,0 @@ - - - diff --git a/app/src/components/QuestMap.vue b/app/src/components/QuestMap.vue index 235edd0..bc75ed7 100644 --- a/app/src/components/QuestMap.vue +++ b/app/src/components/QuestMap.vue @@ -14,7 +14,9 @@ import { import { DAG } from '@linux-odyssey/utils' import api from '../utils/api' import { NodeImage } from '../img/svg.js' +import useUserProfile from '../store/userProfile' +const store = useUserProfile() const marginX = 500 const marginY = 300 const chartContainer = ref(null) @@ -40,16 +42,6 @@ async function getQuests() { } } -async function getProgress() { - try { - const res = await api.get('/users/me') - return res.data.progress - } catch (err) { - console.error(err) - throw err - } -} - const genOption = (nodes: any, edges: any) => ({ renderer: 'svg', tooltip: {}, @@ -163,8 +155,7 @@ function initChart(option: any) { onMounted(async () => { const quests = await getQuests() - const progress = await getProgress() - const option = getOption(quests, progress) + const option = getOption(quests, store.progress) initChart(option) }) diff --git a/app/src/components/game/ControlPalette.vue b/app/src/components/game/ControlPalette.vue index bd2bbf7..b423112 100644 --- a/app/src/components/game/ControlPalette.vue +++ b/app/src/components/game/ControlPalette.vue @@ -1,13 +1,14 @@ + diff --git a/app/src/components/game/TreeChart.vue b/app/src/components/game/TreeChart.vue index 0c85c6d..21de693 100644 --- a/app/src/components/game/TreeChart.vue +++ b/app/src/components/game/TreeChart.vue @@ -1,6 +1,8 @@