use default ionic back button

2026-03-26 10:21:52 +00:00 · 2021-11-29 14:42:31 -07:00
parent 848c5d4e6f
commit 648fbd09f2
24 changed files with 19 additions and 60 deletions
--- a/ui/src/app/components/backup-drives/backup-drives-header.component.html
+++ b/ui/src/app/components/backup-drives/backup-drives-header.component.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>{{ title }}</ion-title>
    <ion-buttons slot="end">
--- a/ui/src/app/components/pwa-back-button/pwa-back.component.html
+++ b/ui/src/app/components/pwa-back-button/pwa-back.component.html
@@ -1,3 +0,0 @@
-<ion-button (click)="navigateBack()">
-  <ion-icon slot="icon-only" name="arrow-back"></ion-icon>
-</ion-button>
--- a/ui/src/app/components/pwa-back-button/pwa-back.component.module.ts
+++ b/ui/src/app/components/pwa-back-button/pwa-back.component.module.ts
@@ -1,18 +0,0 @@
-import { NgModule } from '@angular/core'
-import { CommonModule } from '@angular/common'
-import { PwaBackComponent } from './pwa-back.component'
-import { IonicModule } from '@ionic/angular'
-import { RouterModule } from '@angular/router'
-
-@NgModule({
-  declarations: [
-    PwaBackComponent,
-  ],
-  imports: [
-    CommonModule,
-    IonicModule,
-    RouterModule.forChild([]),
-  ],
-  exports: [PwaBackComponent],
-})
-export class PwaBackComponentModule { }
--- a/ui/src/app/components/pwa-back-button/pwa-back.component.scss
+++ b/ui/src/app/components/pwa-back-button/pwa-back.component.scss
--- a/ui/src/app/components/pwa-back-button/pwa-back.component.ts
+++ b/ui/src/app/components/pwa-back-button/pwa-back.component.ts
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core'
-import { NavController } from '@ionic/angular'
-
-@Component({
-  selector: 'pwa-back-button',
-  templateUrl: './pwa-back.component.html',
-  styleUrls: ['./pwa-back.component.scss'],
-})
-export class PwaBackComponent {
-  constructor (
-    private readonly nav: NavController,
-  ) {  }
-
-  navigateBack () {
-    return this.nav.back()
-  }
-}
--- a/ui/src/app/modules/sharing.module.ts
+++ b/ui/src/app/modules/sharing.module.ts
@@ -10,7 +10,6 @@ import { EmptyPipe } from '../pipes/empty.pipe'
 import { NotificationColorPipe } from '../pipes/notification-color.pipe'
 import { InstallState } from '../pipes/install-state.pipe'
 import { TextSpinnerComponentModule } from '../components/text-spinner/text-spinner.component.module'
-import { PwaBackComponentModule } from '../components/pwa-back-button/pwa-back.component.module'
 import { ConvertBytesPipe } from '../pipes/convert-bytes.pipe'

@NgModule({
@@ -33,7 +32,6 @@ import { ConvertBytesPipe } from '../pipes/convert-bytes.pipe'
  ],
  imports: [
    TextSpinnerComponentModule,
-    PwaBackComponentModule,
  ],
  exports: [
    EmverComparesPipe,
@@ -53,7 +51,6 @@ import { ConvertBytesPipe } from '../pipes/convert-bytes.pipe'
    ConvertBytesPipe,
    // components
    TextSpinnerComponentModule,
-    PwaBackComponentModule,
  ],
 })
 export class SharingModule { }
--- a/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
+++ b/ui/src/app/pages/apps-routes/app-actions/app-actions.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Actions</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
+++ b/ui/src/app/pages/apps-routes/app-interfaces/app-interfaces.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Interfaces</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
+++ b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Logs</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
+++ b/ui/src/app/pages/apps-routes/app-metrics/app-metrics.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Monitor</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
+++ b/ui/src/app/pages/apps-routes/app-properties/app-properties.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Properties</ion-title>
    <ion-buttons *ngIf="!loading" slot="end">
--- a/ui/src/app/pages/apps-routes/app-show/app-show.page.html
+++ b/ui/src/app/pages/apps-routes/app-show/app-show.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-item lines="none">
      <ion-avatar slot="start">
--- a/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html
+++ b/ui/src/app/pages/marketplace-routes/app-release-notes/app-release-notes.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Release Notes</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
+++ b/ui/src/app/pages/marketplace-routes/marketplace-show/marketplace-show.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Marketplace Listing</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/notifications/notifications.page.html
+++ b/ui/src/app/pages/notifications/notifications.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start" *ngIf="fromToast">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Notifications</ion-title>
    <ion-buttons slot="end">
--- a/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -2,7 +2,7 @@
  <ion-toolbar>
    <ion-title>LAN Settings</ion-title>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
  </ion-toolbar>
 </ion-header>
--- a/ui/src/app/pages/server-routes/preferences/preferences.page.html
+++ b/ui/src/app/pages/server-routes/preferences/preferences.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Preferences</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
+++ b/ui/src/app/pages/server-routes/server-backup/server-backup.page.html
@@ -12,7 +12,7 @@
  <ion-header>
    <ion-toolbar>
      <ion-buttons slot="start">
-        <pwa-back-button></pwa-back-button>
+        <ion-back-button></ion-back-button>
      </ion-buttons>
      <ion-title>Backup Progress</ion-title>
    </ion-toolbar>
--- a/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
+++ b/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Logs</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
+++ b/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Monitor</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
+++ b/ui/src/app/pages/server-routes/server-specs/server-specs.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>About</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/sessions/sessions.page.html
+++ b/ui/src/app/pages/server-routes/sessions/sessions.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>Active Sessions</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
+++ b/ui/src/app/pages/server-routes/ssh-keys/ssh-keys.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>SSH Keys</ion-title>
  </ion-toolbar>
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -1,7 +1,7 @@
 <ion-header>
  <ion-toolbar>
    <ion-buttons slot="start">
-      <pwa-back-button></pwa-back-button>
+      <ion-back-button></ion-back-button>
    </ion-buttons>
    <ion-title>WiFi Settings</ion-title>
  </ion-toolbar>