Skip to content

Commit

Permalink
Remove header component. Fix #151.
Browse files Browse the repository at this point in the history
  • Loading branch information
seanwu1105 committed Nov 2, 2020
1 parent 6b5e42e commit 63a1352
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 135 deletions.
73 changes: 0 additions & 73 deletions src/app/components/header/header.component.html

This file was deleted.

Empty file.
24 changes: 0 additions & 24 deletions src/app/components/header/header.component.spec.ts

This file was deleted.

15 changes: 0 additions & 15 deletions src/app/components/header/header.component.ts

This file was deleted.

19 changes: 0 additions & 19 deletions src/app/components/header/header.module.ts

This file was deleted.

4 changes: 1 addition & 3 deletions src/app/pages/storage/storage.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { TranslocoModule } from '@ngneat/transloco';
import { HeaderModule } from 'src/app/components/header/header.module';
import { StoragePageRoutingModule } from './storage-routing.module';
import { StoragePage } from './storage.page';

Expand All @@ -13,8 +12,7 @@ import { StoragePage } from './storage.page';
FormsModule,
IonicModule,
StoragePageRoutingModule,
TranslocoModule,
HeaderModule
TranslocoModule
],
declarations: [StoragePage]
})
Expand Down
74 changes: 73 additions & 1 deletion src/app/pages/storage/storage.page.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,76 @@
<app-header [headerTitle]="capture" (next)="next()" (back)="back()"></app-header>
<ion-header *transloco="let t" id="menu">
<ion-toolbar style="background-color:white !important">
<ion-buttons>
<ion-grid>
<ion-row>
<ion-col style="text-align: left;">
<ion-button>
<ion-menu-button></ion-menu-button>
</ion-button>
</ion-col>
<ion-col style="text-align: center;" (click)="back()">
<ion-button style="color: black;" class="Top-Bar" expand="full" color="Blue" size="large">
{{ t('all') }}
</ion-button>
</ion-col>
<ion-col style="text-align: center;" (click)="next()">
<ion-button style="color: black;" class="Top-Bar" expand="full" color="Blue" size="large">
{{ t('tags') }}
</ion-button>
</ion-col>
<ion-col style="text-align: right;">
<ion-button routerLink="/settings">
<img slot="icon-only" src="../../../assets/appicon/Search.svg" />
</ion-button>
</ion-col>
</ion-row>
</ion-grid>
</ion-buttons>
</ion-toolbar>
</ion-header>


<ion-menu *transloco="let t" side="start" menuId="first" contentId="menu">
<ion-header>
<ion-toolbar color="translucent">
<ion-title>{{ t('settings') }}</ion-title>
</ion-toolbar>
</ion-header>
<ion-content>
<ion-list>
<ion-menu-toggle>
<ion-item routerLink="/general">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<ion-label>{{ t('general') }}</ion-label>
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle>
<ion-item routerLink="/defaultinformationprovider">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<ion-label>{{ t('defaultInformationProvider') }}</ion-label>
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle>
<ion-item routerLink="/defaultsignature">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<ion-label>{{ t('defaultSignature') }}</ion-label>
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle>
<ion-item>
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<ion-label>{{ t('informationProvider') }}</ion-label>
</ion-item>
</ion-menu-toggle>
<ion-menu-toggle>
<ion-item routerLink="/about">
<ion-icon name="chevron-forward-outline" slot="end"></ion-icon>
<ion-label>{{ t('about') }}</ion-label>
</ion-item>
</ion-menu-toggle>
</ion-list>
</ion-content>
</ion-menu>

<ion-content>
<ion-slides #slides [options]="slideOpts" autoplay="false" (ionSlidesDidLoad)="ionSlideLoad(slides)"
Expand Down

0 comments on commit 63a1352

Please sign in to comment.