Merge branch 'master' into feat/push-settings

Morphclue · Dec 6, 2024 · 91cb0c6 · 91cb0c6
2 parents a9bc3ab + 933ada2
commit 91cb0c6
Show file tree

Hide file tree

Showing 16 changed files with 14,846 additions and 12,101 deletions.
diff --git a/.eslint-overrides.json b/.eslint-overrides.json
@@ -8,6 +8,7 @@
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-inferrable-types": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-unused-expressions": "off",
         "@typescript-eslint/no-unused-vars": ["error", {"ignoreRestSiblings": true}],
         "quotes": ["error", "single"],
         "import/order": [

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Node.js LTS
         uses: actions/setup-node@v4
         with:
-          node-version: 'lts/*'
+          node-version: 22
           cache: 'pnpm'
           cache-dependency-path: pnpm-lock.yaml
       - name: Install dependencies

diff --git a/apps/backend/src/mail/mail.module.ts b/apps/backend/src/mail/mail.module.ts
@@ -3,8 +3,8 @@ import {ConfigModule, ConfigService} from '@nestjs/config';
 import {MailerModule} from '@nestjs-modules/mailer';
 import {HandlebarsAdapter} from '@nestjs-modules/mailer/dist/adapters/handlebars.adapter.js';
 
-import {MailService} from './mail/mail.service';
 import {environment} from '../environment';
+import {MailService} from './mail/mail.service';
 
 @Module({
     imports: [MailerModule.forRootAsync({

diff --git a/apps/backend/tsconfig.json b/apps/backend/tsconfig.json
@@ -11,6 +11,8 @@
     }
   ],
   "compilerOptions": {
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "moduleResolution": "NodeNext",
+    "module": "NodeNext"
   }
 }
diff --git a/apps/backend/tsconfig.spec.json b/apps/backend/tsconfig.spec.json
@@ -2,7 +2,6 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "outDir": "../../dist/out-tsc",
-    "module": "commonjs",
     "types": ["jest", "node"]
   },
   "include": [

diff --git a/apps/frontend/src/app/about/features/features.component.ts b/apps/frontend/src/app/about/features/features.component.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 
 import features from './features.json';
 
-const apps = ['Apollusia', 'Doodle', 'DuD-Poll'] as const;
+const apps = ['Apollusia', 'Doodle', 'DuD-Poll', 'Calendly'] as const;
 type App = typeof apps[number];
 
 interface Feature {

diff --git a/apps/frontend/src/app/about/features/features.json b/apps/frontend/src/app/about/features/features.json
@@ -7,7 +7,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": true,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": false
       }
     },
     {
@@ -17,7 +18,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": true,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": false
       }
     },
     {
@@ -27,7 +29,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": true
       }
     },
     {
@@ -37,7 +40,8 @@
       "support": {
         "Apollusia": false,
         "Doodle": false,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": false
       }
     }
   ],
@@ -49,7 +53,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": true,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     },
     {
@@ -59,7 +64,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": "Always",
-        "DuD-Poll": "Always"
+        "DuD-Poll": "Always",
+        "Calendly": false
       }
     },
     {
@@ -69,7 +75,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": "Paid option",
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     },
     {
@@ -79,7 +86,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": true
       }
     },
     {
@@ -89,7 +97,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     },
     {
@@ -99,7 +108,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     }
   ],
@@ -111,7 +121,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": "Repeating the time for every day is possible"
+        "DuD-Poll": "Repeating the time for every day is possible",
+        "Calendly": false
       }
     },
     {
@@ -121,7 +132,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     },
     {
@@ -131,7 +143,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": false,
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": false
       }
     },
     {
@@ -141,7 +154,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": "Paid option",
-        "DuD-Poll": false
+        "DuD-Poll": false,
+        "Calendly": true
       }
     }
   ],
@@ -153,7 +167,8 @@
       "support": {
         "Apollusia": true,
         "Doodle": true,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": true
       }
     },
     {
@@ -163,7 +178,8 @@
       "support": {
         "Apollusia": "Only for creator, but planned. See #60",
         "Doodle": false,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": false
       }
     },
     {
@@ -173,7 +189,8 @@
       "support": {
         "Apollusia": false,
         "Doodle": false,
-        "DuD-Poll": true
+        "DuD-Poll": true,
+        "Calendly": false
       }
     }
   ]

diff --git a/apps/frontend/src/app/app.module.ts b/apps/frontend/src/app/app.module.ts
@@ -1,4 +1,4 @@
-import {HTTP_INTERCEPTORS, HttpClientModule, provideHttpClient, withFetch} from '@angular/common/http';
+import {HTTP_INTERCEPTORS, provideHttpClient, withFetch, withInterceptorsFromDi} from '@angular/common/http';
 import {APP_INITIALIZER, isDevMode, NgModule} from '@angular/core';
 import {ReactiveFormsModule} from '@angular/forms';
 import {BrowserModule, provideClientHydration} from '@angular/platform-browser';
@@ -34,12 +34,12 @@ function initializeKeycloak(keycloak: KeycloakService) {
 
 @NgModule({
   declarations: [AppComponent],
+  bootstrap: [AppComponent],
   imports: [
     BrowserModule,
     AppRoutingModule,
     NgbModule,
     ModalModule,
-    HttpClientModule,
     ReactiveFormsModule,
     AboutModule,
     LegalModule,
@@ -71,10 +71,10 @@ function initializeKeycloak(keycloak: KeycloakService) {
       provide: APP_INITIALIZER,
       useFactory: initializeKeycloak,
       multi: true,
-      deps: [KeycloakService]
-    }
+      deps: [KeycloakService],
+    },
+    provideHttpClient(withInterceptorsFromDi()),
   ],
-  bootstrap: [AppComponent],
 })
 export class AppModule {
 }
diff --git a/apps/frontend/src/app/poll/choose-events/choose-events.component.html b/apps/frontend/src/app/poll/choose-events/choose-events.component.html
@@ -76,6 +76,7 @@ <h1 class="text-center">
           [canParticipate]="!closedReason"
           [token]="token"
           [bestOption]="bestOption"
+          (changed)="onTableChange()"
         ></apollusia-table>
       }
       @case ("events") {

diff --git a/apps/frontend/src/app/poll/choose-events/choose-events.component.ts b/apps/frontend/src/app/poll/choose-events/choose-events.component.ts
@@ -204,4 +204,13 @@ export class ChooseEventsComponent implements OnInit {
   private userVoted(): boolean {
     return this.participants?.some(participant => participant.token === this.token) ?? false;
   }
+
+  onTableChange() {
+    if(this.poll) {
+      this.pollService.getEvents(this.poll._id).subscribe((events)=>{
+        this.pollEvents = events;
+        this.updateHelpers();
+      })
+    }
+  }
 }
diff --git a/apps/frontend/src/app/poll/poll-routing.module.ts b/apps/frontend/src/app/poll/poll-routing.module.ts
@@ -1,11 +1,11 @@
 import {NgModule} from '@angular/core';
 import {RouterModule, Routes} from '@angular/router';
 
+import {AutofillModalComponent, PostponeModalComponent} from '../modals';
 import {ChooseDateComponent} from './choose-date/choose-date.component';
 import {ChooseEventsComponent} from './choose-events/choose-events.component';
 import {CreateEditPollComponent} from './create-poll/create-edit-poll.component';
 import {IcalComponent} from './ical/ical.component';
-import {AutofillModalComponent, PostponeModalComponent} from '../modals';
 
 const routes: Routes = [
   {path: 'create', component: CreateEditPollComponent, title: 'Create Poll | Apollusia'},

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -0,0 +1,24 @@
+version: '3'
+services:
+  database:
+    image: mongo
+    ports:
+      - "27017:27017"
+    volumes:
+      - database:/data/db
+
+  keycloak:
+    image: quay.io/keycloak/keycloak:24.0.3
+    command: [ 'start-dev' ]
+    environment:
+      KC_HOSTNAME: localhost
+      KC_HTTP_RELATIVE_PATH: /auth
+      KEYCLOAK_ADMIN: admin
+      KEYCLOAK_ADMIN_PASSWORD: root
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./libs/keycloak:/opt/keycloak/themes/apollusia
+
+volumes:
+  database:
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,5 +1,5 @@
-import { getJestProjects } from '@nx/jest';
+import { getJestProjectsAsync } from '@nx/jest';
 
-export default {
-  projects: getJestProjects(),
-};
+export default async () => ({
+  projects: await getJestProjectsAsync(),
+});
diff --git a/nx.json b/nx.json
@@ -80,5 +80,6 @@
       "style": "scss"
     },
     "@gitopslovers/nx-sass:library": {}
-  }
+  },
+  "useLegacyCache": true
 }