🚨fix angular error/warning

TarradeMarc · TarradeMarc · commit 42282bb2ead7 · 2025-06-05T11:14:20.000+02:00
diff --git a/controlpanel/cad/src/app/components/alert-action-table/alert-action-table.component.scss b/controlpanel/cad/src/app/components/alert-action-table/alert-action-table.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables';
+@use '../../../styles/variables';
 
 .action-table {
     box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 1px -1px,
@@ -68,7 +68,7 @@
             text-align: center;
             .add-action-btn {
                 width: 90%;
-                background-color: $primaryColor;
+                background-color: variables.$primaryColor;
                 border: none;
                 border-radius: 5px;
                 padding: 0.2rem 0;
diff --git a/controlpanel/cad/src/app/components/injection-when-table/injection-when-table.component.scss b/controlpanel/cad/src/app/components/injection-when-table/injection-when-table.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables';
+@use '../../../styles/variables';
 
 .when-table {
     box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 1px -1px,
@@ -31,7 +31,7 @@
             text-align: center;
             .add-when-btn {
                 width: 90%;
-                background-color: $primaryColor;
+                background-color: variables.$primaryColor;
                 border: none;
                 border-radius: 5px;
                 padding: 0.2rem 0;
diff --git a/controlpanel/cad/src/app/components/menu/menu.component.scss b/controlpanel/cad/src/app/components/menu/menu.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 $menu-icon-size: 2rem;
 
 .menu {
@@ -63,13 +63,13 @@ $menu-icon-size: 2rem;
                 white-space: nowrap;
                 text-overflow: ellipsis;
                 &:hover {
-                    background-color: $backgroundPrimaryColor;
+                    background-color: variables.$backgroundPrimaryColor;
                 }
             }
             .app-separator {
                 margin: 0 0.5rem;
                 border: none;
-                border-bottom: 1px solid $inputBorder;
+                border-bottom: 1px solid variables.$inputBorder;
             }
         }
     }
@@ -78,9 +78,6 @@ $menu-icon-size: 2rem;
         display: flex;
         flex-direction: column;
         .menu-item .menu-link, .dropdown-menu-item {
-            &:hover, &:hover .dropdown {
-                background-color: bisque;
-            }
             position: relative;
             display: flex;
             flex-direction: row;
@@ -90,6 +87,9 @@ $menu-icon-size: 2rem;
             margin: 0.3rem 0;
             text-decoration: none;
             color: #000;
+            &:hover, &:hover .dropdown {
+                background-color: bisque;
+            }
             &:visited {
                 color: initial;
             }
diff --git a/controlpanel/cad/src/app/components/source-select/source-select.component.scss b/controlpanel/cad/src/app/components/source-select/source-select.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 
 .multi-select {
     position: relative;
@@ -24,7 +24,7 @@
         scrollbar-width: none;
         scroll-behavior: smooth;
         .source-item {
-            border: 2px solid $primaryColor;
+            border: 2px solid variables.$primaryColor;
             display: flex;
             align-items: center;
             height: 100%;
diff --git a/controlpanel/cad/src/app/components/when-alert-select/when-alert-select.component.scss b/controlpanel/cad/src/app/components/when-alert-select/when-alert-select.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 
 .multi-select {
     position: relative;
@@ -24,7 +24,7 @@
         scrollbar-width: none;
         scroll-behavior: smooth;
         .when-item {
-            border: 2px solid $primaryColor;
+            border: 2px solid variables.$primaryColor;
             display: flex;
             align-items: center;
             height: 100%;
diff --git a/controlpanel/cad/src/app/pages/add-decoy/add-decoy.component.scss b/controlpanel/cad/src/app/pages/add-decoy/add-decoy.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 
 .top-bar {
     display: flex;
@@ -40,12 +40,12 @@
         }
         .active-step {
             .circle {
-                background-color: $primaryColor;
+                background-color: variables.$primaryColor;
                 color: white;
-                border-color: $primaryColor;
+                border-color: variables.$primaryColor;
             }
             p {
-                color: $primaryColor;
+                color: variables.$primaryColor;
             }
         }
         .disabled-step {
@@ -67,7 +67,7 @@
         }
         .active-separator {
             hr {
-                border-top-color: $primaryColor !important;
+                border-top-color: variables.$primaryColor !important;
             }
         }
         .done {
diff --git a/controlpanel/cad/src/app/pages/add-decoy/injection/injection.component.scss b/controlpanel/cad/src/app/pages/add-decoy/injection/injection.component.scss
@@ -1,4 +1,4 @@
-@import '../../../../styles/variables.scss';
+@use '../../../../styles/variables.scss';
 
 .decoy-form {
     .left-form {
diff --git a/controlpanel/cad/src/app/pages/add-decoy/injection/injection.component.ts b/controlpanel/cad/src/app/pages/add-decoy/injection/injection.component.ts
@@ -20,7 +20,6 @@ import { Observable, Subscription } from 'rxjs';
         TooltipComponent,
         ReactiveFormsModule,
         InjectionWhenTableComponent,
-        RouterLink
     ],
     templateUrl: './injection.component.html',
     styleUrl: './injection.component.scss'
diff --git a/controlpanel/cad/src/app/pages/list-decoy/list-decoy.component.scss b/controlpanel/cad/src/app/pages/list-decoy/list-decoy.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 .wrapper {
     width: 100%;
     padding: 0 4%;
diff --git a/controlpanel/cad/src/app/pages/logs/logs.component.scss b/controlpanel/cad/src/app/pages/logs/logs.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 
 .wrapper {
     width: 100%;
@@ -33,11 +33,11 @@
                     padding: 0.2rem 0.8rem;
                     font-weight: 500;
                     margin-left: 2rem;
-                    color: $primaryColor;
+                    color: variables.$primaryColor;
                     cursor: pointer;
                     transition: all 0.2s ease;
                     &:hover {
-                        background-color: rgba($primaryColor, 0.2);
+                        background-color: rgba(variables.$primaryColor, 0.2);
                         box-shadow: rgba(0, 0, 0, 0.2) 0px 3px 3px -2px,
                                     rgba(0, 0, 0, 0.14) 0px 3px 4px 0px,
                                     rgba(0, 0, 0, 0.12) 0px 1px 8px 0px;
@@ -47,10 +47,10 @@
                         mask: url('../../../../public/filter.svg') no-repeat center; 
                         width: 24px; 
                         height: 24px; 
-                        background-color: $primaryColor;
+                        background-color: variables.$primaryColor;
                     }
                     p {
-                        color: $primaryColor;
+                        color: variables.$primaryColor;
                     }
                     option {
                         background-color: #FFF;
@@ -82,7 +82,7 @@
                                 display: flex;
                                 flex-direction: row;
                                 align-items: center;
-                                border: $inputBorder 1px solid;
+                                border: variables.$inputBorder 1px solid;
                                 border-radius: 20px;
                                 padding: 0.2rem 0.6rem 0.2rem 0.2rem;
                                 height: fit-content;
@@ -101,7 +101,7 @@
                                 flex: 1;
                                 display: flex;
                                 border-radius: 6px;
-                                border: $inputBorder 1px solid;
+                                border: variables.$inputBorder 1px solid;
                                 :first-child {
                                     border-radius: 6px 0 0 6px;
                                 }
@@ -117,14 +117,14 @@
                                 }
                                 .select-operator {
                                     width: 70%;
-                                    border-right: solid $inputBorder 1px;
-                                    border-left: solid $inputBorder 1px;
+                                    border-right: solid variables.$inputBorder 1px;
+                                    border-left: solid variables.$inputBorder 1px;
                                 }
                                 .delete-btn {
                                     padding: 2px 1px;
                                     cursor: pointer;
                                     border: 0;
-                                    border-left: solid $inputBorder 1px;
+                                    border-left: solid variables.$inputBorder 1px;
                                     background-color: #F6F6F6;
                                     .delete-icon {
                                         margin: 0 auto;
@@ -136,7 +136,7 @@
                                 }
                             }
                             .add-search-value {
-                                background-color: $primaryColor;
+                                background-color: variables.$primaryColor;
                                 padding: 0 0.5rem;
                                 border: 0;
                                 color: #FFF;
diff --git a/controlpanel/cad/src/app/pages/system/system.component.scss b/controlpanel/cad/src/app/pages/system/system.component.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/variables.scss';
+@use '../../../styles/variables.scss';
 
 
 .wrapper {
@@ -49,14 +49,14 @@
                     mask: url('../../../../public/upload.svg') no-repeat center; 
                     width: 24px; 
                     height: 24px; 
-                    background-color: $primaryColor;
+                    background-color: variables.$primaryColor;
                 }
                 .download-icon {
                     margin: 0 0.8rem 0 0;
                     mask: url('../../../../public/download.svg') no-repeat center; 
                     width: 24px; 
                     height: 24px; 
-                    background-color: $primaryColor;
+                    background-color: variables.$primaryColor;
                 }
             }
         }
@@ -189,7 +189,7 @@
                         mask: url('../../../../public/loading.svg') no-repeat center; 
                         mask-size: contain;
                         height: 2rem;
-                        background-color: $primaryColor;
+                        background-color: variables.$primaryColor;
                         animation: loading-anim 1.5s linear infinite;
                     }
                 }
diff --git a/controlpanel/cad/src/styles.scss b/controlpanel/cad/src/styles.scss
@@ -136,7 +136,7 @@ app-add-decoy, app-list-decoy, app-config, app-system {
 .outlined-btn {
     display: flex;
     background-color: white;
-    color: $primaryColor;
+    color: variables.$primaryColor;
     font-size: 1rem;
     border: 2px solid #D9D9D9;
     padding: 0.5rem 0.8rem;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import '../../../styles/variables.scss';`
	`1`	`+@use '../../../styles/variables.scss';`
`2`	`2`
`3`	`3`	`.top-bar {`
`4`	`4`	`display: flex;`
`@@ -40,12 +40,12 @@`
`40`	`40`	`}`
`41`	`41`	`.active-step {`
`42`	`42`	`.circle {`
`43`		`- background-color: $primaryColor;`
	`43`	`+ background-color: variables.$primaryColor;`
`44`	`44`	`color: white;`
`45`		`- border-color: $primaryColor;`
	`45`	`+ border-color: variables.$primaryColor;`
`46`	`46`	`}`
`47`	`47`	`p {`
`48`		`- color: $primaryColor;`
	`48`	`+ color: variables.$primaryColor;`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`.disabled-step {`
`@@ -67,7 +67,7 @@`
`67`	`67`	`}`
`68`	`68`	`.active-separator {`
`69`	`69`	`hr {`
`70`		`- border-top-color: $primaryColor !important;`
	`70`	`+ border-top-color: variables.$primaryColor !important;`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`.done {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import '../../../../styles/variables.scss';`
	`1`	`+@use '../../../../styles/variables.scss';`
`2`	`2`
`3`	`3`	`.decoy-form {`
`4`	`4`	`.left-form {`