Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Activity (History) Page #171

Merged
merged 9 commits into from
Nov 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/app/pages/storage/activity/activity-routing.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { ActivityPage } from './activity.page';

const routes: Routes = [{
path: '',
component: ActivityPage
}];

@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule],
})
export class ActivityPageRoutingModule { }
29 changes: 29 additions & 0 deletions src/app/pages/storage/activity/activity.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatToolbarModule } from '@angular/material/toolbar';
import { IonicModule } from '@ionic/angular';
import { TranslocoModule } from '@ngneat/transloco';
import { ActivityPageRoutingModule } from './activity-routing.module';
import { ActivityPage } from './activity.page';

@NgModule({
imports: [
CommonModule,
FormsModule,
ActivityPageRoutingModule,
IonicModule,
TranslocoModule,
MatToolbarModule,
MatButtonModule,
MatIconModule,
MatListModule,
MatDividerModule
],
declarations: [ActivityPage]
})
export class ActivityPageModule { }
38 changes: 38 additions & 0 deletions src/app/pages/storage/activity/activity.page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<mat-toolbar *transloco="let t">
<button routerLink=".." routerDirection="back" mat-icon-button>
<mat-icon>arrow_back</mat-icon>
</button>
<span>{{ t('activity') }}</span>
</mat-toolbar>

<div *transloco="let t" class="page-content">
<mat-list>
<mat-list-item>
<img matListAvatar src="https://picsum.photos/200/300">
<div mat-line>abcdef1234567890</div>
<div mat-line>2020-10-05 22:32:42</div>
<button class="accepted" mat-stroked-button disableRipple>{{ t('accepted') }}</button>
</mat-list-item>
<mat-divider></mat-divider>
<mat-list-item>
<img matListAvatar src="https://picsum.photos/200/300">
<div mat-line>abcdef1234567890</div>
<div mat-line>2020-10-05 22:32:42</div>
<button class="accepted" mat-stroked-button disableRipple>{{ t('accepted') }}</button>
</mat-list-item>
<mat-divider></mat-divider>
<mat-list-item>
<img matListAvatar src="https://picsum.photos/200/300">
<div mat-line>abcdef1234567890</div>
<div mat-line>2020-10-05 22:32:42</div>
<button class="accepted" mat-stroked-button disableRipple>{{ t('accepted') }}</button>
</mat-list-item>
<mat-divider></mat-divider>
<mat-list-item>
<img matListAvatar src="https://picsum.photos/200/300">
<div mat-line>abcdef1234567890</div>
<div mat-line>2020-10-05 22:32:42</div>
<button class="accepted" mat-stroked-button disableRipple>{{ t('accepted') }}</button>
</mat-list-item>
</mat-list>
</div>
32 changes: 32 additions & 0 deletions src/app/pages/storage/activity/activity.page.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
mat-toolbar {
background: white;
}

.page-content {
mat-list-item {
height: initial;
padding-top: 16px;
padding-bottom: 16px;

div[mat-line] {
margin: 4px 0;
}

img[matListAvatar] {
border-radius: 4px;
width: calc(100vw / 3);
height: calc(100vw / 5);
max-width: 150px;
max-height: 80px;
}

button {
flex-shrink: 0;
}

button.accepted {
color: mediumseagreen;
border-color: mediumseagreen;
}
}
}
39 changes: 39 additions & 0 deletions src/app/pages/storage/activity/activity.page.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MatButtonModule } from '@angular/material/button';
import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon';
import { MatListModule } from '@angular/material/list';
import { MatToolbarModule } from '@angular/material/toolbar';
import { RouterTestingModule } from '@angular/router/testing';
import { IonicModule } from '@ionic/angular';
import { getTranslocoModule } from 'src/app/transloco/transloco-root.module.spec';
import { ActivityPage } from './activity.page';

describe('ActivityPage', () => {
let component: ActivityPage;
let fixture: ComponentFixture<ActivityPage>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ActivityPage],
imports: [
IonicModule.forRoot(),
getTranslocoModule(),
RouterTestingModule,
MatButtonModule,
MatIconModule,
MatListModule,
MatToolbarModule,
MatDividerModule
]
}).compileComponents();

fixture = TestBed.createComponent(ActivityPage);
component = fixture.componentInstance;
fixture.detectChanges();
}));

it('should create', () => {
expect(component).toBeTruthy();
});
});
9 changes: 9 additions & 0 deletions src/app/pages/storage/activity/activity.page.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { Component } from '@angular/core';

@Component({
selector: 'app-activity',
templateUrl: './activity.page.html',
styleUrls: ['./activity.page.scss'],
})

export class ActivityPage { }
3 changes: 3 additions & 0 deletions src/app/pages/storage/storage-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ const routes: Routes = [{
}, {
path: 'proof',
loadChildren: () => import('./proof/proof.module').then(m => m.ProofPageModule)
}, {
path: 'activity',
loadChildren: () => import('./activity/activity.module').then(m => m.ActivityPageModule)
}];

@NgModule({
Expand Down
2 changes: 1 addition & 1 deletion src/app/pages/storage/storage.page.html
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<mat-icon>menu</mat-icon>
</button>
<span class="toolbar-spacer"></span>
<button mat-icon-button>
<button routerLink="activity" mat-icon-button>
<mat-icon>history</mat-icon>
</button>
<button mat-icon-button>
Expand Down
2 changes: 2 additions & 0 deletions src/assets/i18n/en-us.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
"sendPostCapture": "Send PostCapture",
"previewPostCapture": "Preview PostCapture",
"preview": "Preview",
"activity": "Activity",
"accepted": "Accepted",
"message": {
"areYouSure": "This action cannot be undone.",
"verificationEmailSent": "A verification email has been sent to your email address.",
Expand Down
2 changes: 2 additions & 0 deletions src/assets/i18n/zh-tw.json
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@
"sendPostCapture": "發送 PostCapture",
"previewPostCapture": "預覽 PostCapture",
"preview": "預覽",
"activity": "活動紀錄",
"accepted": "已接收",
"message": {
"areYouSure": "此操作不可撤銷。",
"verificationEmailSent": "驗證電子郵件已發送到您的電子郵件地址。",
Expand Down
1 change: 0 additions & 1 deletion src/global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
.ion-page {
background-color: white;
}

.page-content {
flex: 1 1 auto;
overflow: auto;
Expand Down