fix conflict

Author: sagnolkamdem

angular.json

@@ -1,7 +1,7 @@
 {
   "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
   "cli": {
-    "analytics": false
+    "analytics": "28bf0e25-7262-4cd2-8008-6af8c18cc349"
   },
   "version": 1,
   "newProjectRoot": "projects",

src/app/core/components/app/app.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
 
 @Component({
   selector: 'admin-root',

src/app/core/components/network-status/network-status.component.ts

@@ -16,10 +16,12 @@ import { fromEvent, Observable, Subscription } from 'rxjs';
           <div class="p-4">
             <div class="flex items-start">
               <div class="flex-shrink-0">
-                <!-- Heroicon name: outline/check-circle -->
                 <svg
                   class="h-6 w-6"
-                  [ngClass]="{'text-green-400': networkStatus === 'online', 'text-red-400': networkStatus === 'offline'}"
+                  [ngClass]="{
+                    'text-green-400': networkStatus === 'online',
+                    'text-red-400': networkStatus === 'offline'
+                  }"
                   xmlns="http://www.w3.org/2000/svg"
                   fill="none"
                   viewBox="0 0 24 24"

src/app/modules/dashboard/pages/dashboard/dashboard.component.html

@@ -170,5 +170,5 @@ <h3 class="text-lg font-medium text-slate-900 dark:text-white">
   </section>
 </div>
 
-<!-- <notification-error [isOpen]="isOpen" (toggleShowNotification)="tosggle($event)" message="Connecté avec succes!" description="qwertyuio rtyui wertyui ertyui"></notification-error> -->
-<!-- <notification-success [isOpen]="isOpen" (toggleShowNotification)="toggle($event)" message="Connecté avec succes!" description="qwertyuio rtyui wertyui ertyui"></notification-success> -->
+<!-- <notification-error [isOpen]="isOpen" (toggleShowNotification)="toggle($event)" message="Connecté avec succes!" description="qwertyuio rtyui wertyui ertyui"></notification-error> -->
+<notification-success [isOpen]="isOpen" (toggleShowNotification)="toggle($event)" message="Connecté avec succes!" description="qwertyuio rtyui wertyui ertyui"></notification-success>

src/app/shared/components/notifications/error.component.ts

@@ -22,7 +22,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
                 <p class="mt-1 text-sm text-red-500">{{ description }}</p>
               </div>
               <div class="ml-4 flex flex-shrink-0">
-                <button (click)="toggle()" type="button" class="inline-flex rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2">
+                <button (click)="toggle()" type="button" class="inline-flex rounded-md bg-white text-gray-400 hover:text-gray-500 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2">
                   <span class="sr-only">Close</span>
                   <svg class="h-5 w-5" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                     <path d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z" />