Merge pull request #1688 from citizenos/development

FIX #1644
citizenos · Nov 21, 2024 · 1641654 · 1641654
2 parents c37e54d + df36524
commit 1641654
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/account/components/add-email/add-email.component.ts b/src/app/account/components/add-email/add-email.component.ts
@@ -1,5 +1,5 @@
 import { AuthService } from '@services/auth.service';
-import { Component, OnInit, Inject } from '@angular/core';
+import { Component, Inject } from '@angular/core';
 import { Router } from '@angular/router';
 import { UserService } from '@services/user.service';
 import { NotificationService } from '@services/notification.service';
@@ -16,26 +16,23 @@ export interface AddEmailData {
   templateUrl: './add-email.component.html',
   styleUrls: ['./add-email.component.scss']
 })
-export class AddEmailComponent implements OnInit {
+export class AddEmailComponent {
   user!: User;
   form = new UntypedFormGroup({
     email: new UntypedFormControl('', Validators.email),
   });
   errors?: any;
   wWidth = window.innerWidth;
-  constructor(@Inject(DIALOG_DATA) private data: AddEmailData,
-    @Inject(DialogRef<AddEmailComponent>) private emailDialog: DialogRef<AddEmailComponent> ,
-    private dialog: DialogService,
-    private AuthService: AuthService,
-    private Notification: NotificationService,
-    @Inject(Router) private router: Router,
-    private UserService: UserService) {
+  constructor(@Inject(DIALOG_DATA) private readonly data: AddEmailData,
+    @Inject(DialogRef<AddEmailComponent>) private readonly emailDialog: DialogRef<AddEmailComponent> ,
+    private readonly dialog: DialogService,
+    private readonly AuthService: AuthService,
+    private readonly Notification: NotificationService,
+    @Inject(Router) private readonly router: Router,
+    private readonly UserService: UserService) {
     this.user = data.user;
   }
 
-  ngOnInit(): void {
-  }
-
   doUpdateProfile() {
     this.errors = null;
 

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -1,6 +1,6 @@
 import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CommonModule } from '@angular/common';
 import { HttpClient, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, withXsrfConfiguration } from '@angular/common/http';
 import { TranslateModule, TranslateLoader, TranslateCompiler, MissingTranslationHandler, TranslateService, TranslateParser } from '@ngx-translate/core';
@@ -15,9 +15,7 @@ import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { HelpComponent } from './core/components/help/help.component';
 import { NavComponent } from './core/components/nav/nav.component';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { HomeComponent } from './core/components/home/home.component';
-import { } from '@ngx-translate/core';
 import { JSONPointerCompiler, CosMissingTranslationHandler, createTranslateLoader } from './TranslateHandlers';
 import { NgxTranslateDebugParser } from 'ngx-translate-debug';
 import { LanguageSelectComponent } from './core/components/language-select/language-select.component';

diff --git a/src/app/topic/components/topic-member-invite/topic-member-invite.component.scss b/src/app/topic/components/topic-member-invite/topic-member-invite.component.scss
@@ -13,7 +13,7 @@
 
 .dropdown {
   .options {
-    position: fixed;
+    position: absolute;
     margin-top: 30px;
     width: max-content;
     max-width: max-content;

diff --git a/src/app/topic/components/topic-vote-create/topic-vote-create.component.scss b/src/app/topic/components/topic-vote-create/topic-vote-create.component.scss
@@ -43,7 +43,7 @@
   .actions_wrap {
     display: flex;
     align-items: center;
-    gap: 8p;
+    gap: 8px;
   }
 
   .icon_drag {

diff --git a/src/app/topic/topic.component.html b/src/app/topic/topic.component.html
@@ -59,7 +59,6 @@
           </button>
           <div id="activities_button_wrap">
             <activities-button *ngIf="auth.loggedIn$ | async" [topicId]="topic.id"></activities-button>
-            <!-- add [topicId]="topic.id"-->
           </div>
           <div id="tablet_actions" class="dropdown button_dropdown mobile_hidden" [cosDropdown]>
             <button class="btn_medium_close icon">
@@ -356,8 +355,8 @@
                 </div>
                 <div class="notification_title" translate="COMPONENTS.TOPICBOX.NOTIFICATION_TITLE"></div>
                 <div class="notification_links">
-                  <a translate="COMPONENTS.TOPICBOX.NOTIFICATION_LNK_WHY" (click)="reportReasonDialog(topic)"></a>
-                  <a translate="COMPONENTS.TOPICBOX.NOTIFICATION_LNK_VIEW" (click)="hideTopicContent=false"></a>
+                  <a (click)="reportReasonDialog(topic)">{{'COMPONENTS.TOPICBOX.NOTIFICATION_LNK_WHY' | translate}}</a>
+                  <a (click)="hideTopicContent=false">{{'COMPONENTS.TOPICBOX.NOTIFICATION_LNK_VIEW' | translate}}</a>
                 </div>
               </div>
             </div>