-
-
+ @switch (connectionRequest().state) {
+ @case (0) {
-
-
-
+ }
+ @case (1) {
-
-
-
+ }
+ @case (2) {
-
-
+ }
+ }
@if (connectionRequest().state === 0) {
@@ -20,8 +18,7 @@
{{ connectionRequest().requestEmail === myEmail() ? 'You' : connectionRequest().requestEmail }}
requested a connection to
{{ connectionRequest().ownerEmail === myEmail() ? 'you' : connectionRequest().ownerEmail }}
- for
- player
+ for player
{{ connectionRequest().externalName }}
}
diff --git a/src/app/welcome/components/connection-request/connection-request.component.ts b/src/app/welcome/components/connection-request/connection-request.component.ts
index d1a8fd6..e1c62ad 100644
--- a/src/app/welcome/components/connection-request/connection-request.component.ts
+++ b/src/app/welcome/components/connection-request/connection-request.component.ts
@@ -7,7 +7,6 @@ import { ConnectionRequestState } from '../../../shared/enums/connection-request
import { MatDialog } from '@angular/material/dialog';
import { MapPlayerComponent } from '../../../dialogs/map-player/map-player.component';
import { DEFAULT_DIALOG_POSITION } from '../../../shared/const/app.const';
-import { NgIf, NgSwitch, NgSwitchCase } from '@angular/common';
import { NotificationService } from '../../../shared/services/notification.service';
@Component({
@@ -15,7 +14,6 @@ import { NotificationService } from '../../../shared/services/notification.servi
templateUrl: './connection-request.component.html',
styleUrls: ['./connection-request.component.scss'],
standalone: true,
- imports: [NgSwitch, NgSwitchCase, NgIf]
})
export class ConnectionRequestComponent {
diff --git a/src/app/welcome/components/dialogs/connect-to-other-user-dialog/connect-to-other-user-dialog.component.ts b/src/app/welcome/components/dialogs/connect-to-other-user-dialog/connect-to-other-user-dialog.component.ts
index 85e5c0d..40ca35e 100644
--- a/src/app/welcome/components/dialogs/connect-to-other-user-dialog/connect-to-other-user-dialog.component.ts
+++ b/src/app/welcome/components/dialogs/connect-to-other-user-dialog/connect-to-other-user-dialog.component.ts
@@ -16,7 +16,12 @@ import { NotificationService } from '../../../../shared/services/notification.se
templateUrl: './connect-to-other-user-dialog.component.html',
styleUrls: ['./connect-to-other-user-dialog.component.scss'],
standalone: true,
- imports: [FormsModule, MatFormFieldModule, MatInputModule, MatButtonModule]
+ imports: [
+ FormsModule,
+ MatFormFieldModule,
+ MatInputModule,
+ MatButtonModule
+ ]
})
export class ConnectToOtherUserDialogComponent {
diff --git a/src/app/welcome/components/dialogs/thats-me-dialog/thats-me-dialog.component.ts b/src/app/welcome/components/dialogs/thats-me-dialog/thats-me-dialog.component.ts
index 0fca3f9..68bbb82 100644
--- a/src/app/welcome/components/dialogs/thats-me-dialog/thats-me-dialog.component.ts
+++ b/src/app/welcome/components/dialogs/thats-me-dialog/thats-me-dialog.component.ts
@@ -2,13 +2,12 @@ import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { Player } from '../../../../shared/interfaces/player.interface';
import { PlayerApiService } from '../../../../shared/services/api/player-api.service';
-import { AuthService, User } from '@auth0/auth0-angular';
+import { User } from '@auth0/auth0-angular';
import { filter, switchMap, take, tap } from 'rxjs/operators';
import { TriggerService } from '../../../../shared/services/util/trigger.service';
import { MatButtonModule } from '@angular/material/button';
import { FormsModule } from '@angular/forms';
import { UserImageRoundComponent } from '../../../../shared/components/user-image-round/user-image-round.component';
-import { NgIf } from '@angular/common';
import { AuthUtilService } from '../../../../shared/services/auth-util.service';
import { UserWithImageComponent } from '../../../../shared/components/user-with-image/user-with-image.component';
@@ -17,7 +16,12 @@ import { UserWithImageComponent } from '../../../../shared/components/user-with-
templateUrl: './thats-me-dialog.component.html',
styleUrls: ['./thats-me-dialog.component.scss'],
standalone: true,
- imports: [UserImageRoundComponent, FormsModule, MatButtonModule, NgIf, UserWithImageComponent]
+ imports: [
+ UserImageRoundComponent,
+ FormsModule,
+ MatButtonModule,
+ UserWithImageComponent
+ ]
})
export class ThatsMeDialogComponent {
diff --git a/src/app/welcome/welcome-page/welcome-page.component.ts b/src/app/welcome/welcome-page/welcome-page.component.ts
index a92320d..b819b03 100644
--- a/src/app/welcome/welcome-page/welcome-page.component.ts
+++ b/src/app/welcome/welcome-page/welcome-page.component.ts
@@ -16,7 +16,7 @@ import { PlayerApiService } from '../../shared/services/api/player-api.service';
import { ConnectionRequestComponent } from '../components/connection-request/connection-request.component';
import { MatButtonModule } from '@angular/material/button';
import { UserImageRoundComponent } from '../../shared/components/user-image-round/user-image-round.component';
-import { AsyncPipe, JsonPipe, NgFor, NgIf } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
import { AppHeaderComponent } from '../../shared/components/app-header/app-header.component';
import { AuthUtilService } from '../../shared/services/auth-util.service';
import { IPayPalConfig, NgxPayPalModule } from 'ngx-paypal';
@@ -30,13 +30,10 @@ import { UserListComponent } from './components/user-list/user-list.component';
imports: [
MatDialogModule,
AppHeaderComponent,
- NgIf,
UserImageRoundComponent,
- NgFor,
MatButtonModule,
ConnectionRequestComponent,
AsyncPipe,
- JsonPipe,
NgxPayPalModule,
UserListComponent
]
diff --git a/src/main.ts b/src/main.ts
index 88fbc97..a9963f1 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -3,8 +3,6 @@ import { enableProdMode, importProvidersFrom, inject, LOCALE_ID } from '@angular
import { environment } from './environments/environment';
import { AppComponent } from './app/app.component';
import { AuthGuard, AuthModule } from '@auth0/auth0-angular';
-import { FormlyMaterialModule } from '@ngx-formly/material';
-import { FormlyModule } from '@ngx-formly/core';
import { provideAnimations } from '@angular/platform-browser/animations';
import { bootstrapApplication, BrowserModule } from '@angular/platform-browser';
import { CanActivateFn, provideRouter, Router, Routes, withRouterConfig } from '@angular/router';
@@ -31,7 +29,6 @@ import { AuthInterceptorService } from './app/shared/interceptors/auth-intercept
import { AuthUtilService } from './app/shared/services/auth-util.service';
import { combineLatest } from 'rxjs';
import { map, tap } from 'rxjs/operators';
-import { FormlyMatDatepickerModule } from '@ngx-formly/material/datepicker';
import { MatNativeDateModule } from '@angular/material/core';
import {
BlindStructureTabComponent
@@ -200,10 +197,7 @@ bootstrapApplication(AppComponent, {
providers: [
importProvidersFrom(
BrowserModule,
- FormlyModule.forRoot(),
- FormlyMaterialModule,
MatNativeDateModule,
- FormlyMatDatepickerModule,
AuthModule.forRoot({
domain: 'https://pokermanager.eu.auth0.com',
clientId: 'NVE3fYgdsVQUYnJ0IEnDobzkKKaaBw9j',
diff --git a/src/styles.scss b/src/styles.scss
index 0cd75ea..48f31c2 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -253,8 +253,9 @@ a.contents {
form a {
display: flex;
- margin-top: 12px;
- margin-bottom: 20px;
+ margin-top: -10px;
+ margin-bottom: 40px;
+ padding-left: 20px;
align-items: center;
text-decoration: none !important;
@@ -263,6 +264,18 @@ form a {
}
}
+form mat-checkbox {
+ margin-bottom: 16px;
+}
+
+form p {
+ margin-top: -10px;
+ margin-bottom: 40px;
+ font-size: 12px;
+ color: #444444;
+ padding-left: 20px;
+}
+
.relative {
position: relative;
}