remove references to matomo / opt-out -> opt-in, general element sele…

…ctor style improvements
jmuzina · Jan 22, 2024 · ce6be70 · ce6be70
1 parent 91c4f63
commit ce6be70
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 32 deletions.
diff --git a/src/app/modules/shared/components/color-theme-toggler/color-theme-toggler.component.html b/src/app/modules/shared/components/color-theme-toggler/color-theme-toggler.component.html
@@ -1,12 +1,12 @@
 <button
+  (click)="ths.toggleLightDark()"
   *ngIf="ths.activeTheme; else themeNotLoadedYet"
-  pButton
-  class="p-button p-button-text p-button-outline"
+  [attr.aria-label]="ths.darkMode ? 'Switch to light mode' : 'Switch to dark mode'"
   [icon]="ths.activeTheme.icon"
-  (click)="ths.toggleLightDark()"
   [pTooltip]="ths.darkMode ? 'Switch to light mode' : 'Switch to dark mode'"
-  [attr.aria-label]="ths.darkMode ? 'Switch to light mode' : 'Switch to dark mode'"
+  class="p-button p-button-text p-button-outline"
+  pButton
 ></button>
 <ng-template #themeNotLoadedYet>
-  <jm-loading-spinner [showMessage]="false" [useDots]="false"></jm-loading-spinner>
+  <jm-loading-spinner [showMessage]="false" [useDots]="false"/>
 </ng-template>
diff --git a/src/app/modules/shared/components/footer/footer.component.html b/src/app/modules/shared/components/footer/footer.component.html
@@ -9,25 +9,25 @@
   <div class="dev-disclaimer-nav-content">
     <div
       *ngIf="dev; else prodWIPDisclaimer"
-      id="dev-disclaimer"
       class="disclaimer-content"
+      id="dev-disclaimer"
     >
       <span class="disclaimer-message"
-        >You are currently viewing the development build, which may be
+      >You are currently viewing the development build, which may be
         unfinished or buggy.</span
       >
       <a
-        pButton
-        class="prod-nav-btn p-button p-button-raised p-button-primary"
-        [href]="exss.prodSite.address"
         (click)="exss.prodSite.open()"
+        [href]="exss.prodSite.address"
+        class="prod-nav-btn p-button p-button-raised p-button-primary"
         label="Return to production site"
+        pButton
       ></a>
     </div>
     <ng-template #prodWIPDisclaimer>
-      <div id="prod-disclaimer" class="disclaimer-content">
+      <div class="disclaimer-content" id="prod-disclaimer">
         <span class="disclaimer-message"
-          >This portfolio is a work in progress. Come back later to see what
+        >This portfolio is a work in progress. Come back later to see what
           changes!</span
         >
       </div>
@@ -37,21 +37,19 @@
 
 <div class="footer-container">
   <div class="footer-left">
-    <div class="dev-build-disclaimer-container" *ngIf="shouldShowWIPDisclaimer">
+    <div *ngIf="shouldShowWIPDisclaimer" class="dev-build-disclaimer-container">
       <button
-        pButton
-        class="disclaimer-icon p-button p-button-text"
-        icon="pi pi-exclamation-triangle"
         (click)="devDisclaimerOpen = true"
         [disabled]="devDisclaimerOpen"
+        class="disclaimer-icon p-button p-button-text"
+        icon="pi pi-exclamation-triangle"
         label="WIP"
+        pButton
       ></button>
     </div>
-    <!--  <button pButton class="attribution-button p-button p-button-text" icon="pi pi-info-circle" pTooltip="Attribution"
-      [disabled]="attributionVisible" (click)="attributionVisible = true"></button> -->
-    <jm-matomo-opt-out></jm-matomo-opt-out>
+    <jm-tracking-opt-in/>
   </div>
   <div class="social-icons-wrapper">
-    <jm-social-icons></jm-social-icons>
+    <jm-social-icons/>
   </div>
 </div>
diff --git a/src/app/modules/shared/components/header/header.component.html b/src/app/modules/shared/components/header/header.component.html
@@ -1,5 +1,5 @@
-<p-menubar class="app-header" [model]="items">
+<p-menubar [model]="items" class="app-header">
   <ng-template pTemplate="end">
-    <jm-color-theme-toggler></jm-color-theme-toggler>
+    <jm-color-theme-toggler/>
   </ng-template>
 </p-menubar>
diff --git a/src/app/modules/shared/components/tracking-opt-in/tracking-opt-in.component.html b/src/app/modules/shared/components/tracking-opt-in/tracking-opt-in.component.html
@@ -23,7 +23,7 @@
     <span [innerHTML]="selected.message" class="opt-state-message"></span>
   </div>
   <ng-template #optStateLoading>
-    <jm-loading-spinner></jm-loading-spinner>
+    <jm-loading-spinner/>
   </ng-template>
 </p-dialog>
 

diff --git a/src/app/modules/shared/components/tracking-opt-in/tracking-opt-in.component.ts b/src/app/modules/shared/components/tracking-opt-in/tracking-opt-in.component.ts
@@ -12,11 +12,11 @@ interface IOptInState {
 }
 
 @Component({
-  selector: 'jm-matomo-opt-out',
-  templateUrl: './matomo-opt-out.component.html',
-  styleUrls: ['./matomo-opt-out.component.scss'],
+  selector: 'jm-tracking-opt-in',
+  templateUrl: './tracking-opt-in.component.html',
+  styleUrls: ['./tracking-opt-in.component.scss'],
 })
-export class MatomoOptOutComponent implements OnInit {
+export class TrackingOptInComponent implements OnInit {
   popupOpen = false;
 
   loading = false;

diff --git a/src/app/modules/shared/shared.module.ts b/src/app/modules/shared/shared.module.ts
@@ -15,14 +15,15 @@ import { TooltipModule } from 'primeng/tooltip';
 import { FooterComponent } from './components/footer/footer.component';
 import { SocialIconsComponent } from './components/social-icons/social-icons.component';
 import { PageNotFoundComponent } from './page-not-found/page-not-found.component';
-import { MatomoOptOutComponent } from './components/matomo-opt-out/matomo-opt-out.component';
+import { TrackingOptInComponent } from './components/tracking-opt-in/tracking-opt-in.component';
 import { SelectButtonModule } from 'primeng/selectbutton';
 import { AttributionComponent } from './components/attribution/attribution.component';
 import { TableModule } from 'primeng/table';
 import { MaintenanceMessageComponent } from './components/maintenance-message/maintenance-message.component';
 import { HumanizedDurationPipe } from './pipes/moment/humanized-duration.pipe';
 import { MomentToDatePipe } from './pipes/moment/date-conversion.pipe';
 import { PluralPipe } from './pipes/plural.pipe';
+
 @NgModule({
   declarations: [
     LoadingSpinnerComponent,
@@ -32,7 +33,7 @@ import { PluralPipe } from './pipes/plural.pipe';
     FooterComponent,
     SocialIconsComponent,
     PageNotFoundComponent,
-    MatomoOptOutComponent,
+    TrackingOptInComponent,
     AttributionComponent,
     MaintenanceMessageComponent,
     HumanizedDurationPipe,
@@ -58,7 +59,7 @@ import { PluralPipe } from './pipes/plural.pipe';
     CommonModule,
     FormsModule,
     ReactiveFormsModule,
-    MatomoOptOutComponent,
+    TrackingOptInComponent,
     ToastModule,
     TooltipModule,
     LoadingSpinnerComponent,

diff --git a/src/environments/environment.production.ts b/src/environments/environment.production.ts
@@ -3,7 +3,6 @@ export const environment = {
   development: false,
   local: false,
   appTitle: 'Julie Muzina',
-  matomoSiteID: '1',
   ignoreMaintenance: false,
   appUrl: 'https://jmuzina.io',
   graphQLEndpoint: 'https://api.jmuzina.io/v1/graphql',

diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -3,7 +3,6 @@ export const environment = {
   development: true,
   local: true,
   appTitle: 'Julie Muzina (LOCAL DEV)',
-  matomoSiteID: null,
   ignoreMaintenance: true,
   appUrl: 'http://localhost:4200',
   graphQLEndpoint: 'http://localhost:8080/v1/graphql',