Merge branch 'master' into remove-duplicate-docker-compose-files

dreammall-earth · Jul 2, 2024 · a8419fe · a8419fe
2 parents 4067eb5 + b1b0b48
commit a8419fe
Show file tree

Hide file tree

Showing 9 changed files with 220 additions and 4,275 deletions.
diff --git a/.github/workflows/test.code.yml b/.github/workflows/test.code.yml
@@ -3,7 +3,22 @@ name: "dreammall:test:code with defined tests & linters"
 on: [push,pull_request_target]
 
 jobs:
+  files-changed:
+    name: Detect File Changes - admin/
+    runs-on: ubuntu-latest
+    outputs:
+      markdown: ${{ steps.filter.outputs.markdown }}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dorny/paths-filter@v3.0.2
+        id: filter
+        with:
+          filters: |
+            markdown:
+              - '/**/*.md'
+  
   test:
+  if: needs.files-changed.outputs.markdown == 'true'
     name: Test - Code
     needs: files-changed
     runs-on: ubuntu-latest

diff --git a/backend/src/graphql/models/RoomModel.ts b/backend/src/graphql/models/RoomModel.ts
@@ -24,7 +24,7 @@ export class OpenRoom {
   constructor(meeting: MeetingInfo, link: string) {
     this.meetingID = meeting.meetingID
     this.meetingName = meeting.meetingName
-    this.startTime = meeting.startTime
+    this.startTime = meeting.startTime.toString()
     this.participantCount = meeting.participantCount
     this.attendees =
       typeof meeting.attendees !== 'string'
@@ -41,8 +41,8 @@ export class OpenRoom {
   @Field()
   meetingName: string
 
-  @Field(() => Int)
-  startTime: number
+  @Field(() => String)
+  startTime: string
 
   @Field(() => Int)
   participantCount: number

diff --git a/backend/src/graphql/resolvers/RoomResolver.spec.ts b/backend/src/graphql/resolvers/RoomResolver.spec.ts
@@ -559,7 +559,7 @@ describe('RoomResolver', () => {
                       meetingName: 'Dreammall Entwicklung',
                       meetingID: 'Dreammall-Entwicklung',
                       participantCount: 0,
-                      startTime: 1718189,
+                      startTime: '1718189',
                       attendees: [],
                       joinLink: 'https://my-link',
                     },
@@ -650,7 +650,7 @@ describe('RoomResolver', () => {
                       meetingName: 'Dreammall Entwicklung',
                       meetingID: 'Dreammall-Entwicklung',
                       participantCount: 0,
-                      startTime: 1718189,
+                      startTime: '1718189',
                       joinLink: 'https://my-link',
                       attendees: [
                         {
@@ -754,7 +754,7 @@ describe('RoomResolver', () => {
                       meetingName: 'Dreammall Entwicklung',
                       meetingID: 'Dreammall-Entwicklung',
                       participantCount: 0,
-                      startTime: 1718189,
+                      startTime: '1718189',
                       joinLink: 'https://my-link',
                       attendees: [
                         {

diff --git a/frontend/src/pages/auth/+Page.vue b/frontend/src/pages/auth/+Page.vue
@@ -1,14 +1,11 @@
 <template>
-  <DefaultLayout>
-    <div class="h-screen auth-page py-12">{{ $t('auth.content') }}</div>
-  </DefaultLayout>
+  <div class="h-screen auth-page py-12">{{ $t('auth.content') }}</div>
 </template>
 
 <script lang="ts" setup>
 import { navigate } from 'vike/client/router'
 import { inject, onBeforeMount } from 'vue'
 
-import DefaultLayout from '#layouts/DefaultLayout.vue'
 import GlobalErrorHandler from '#plugins/globalErrorHandler'
 import AuthService from '#src/services/AuthService'