From 938b26bda88a87c3a55ec5ec3faa72141e90a51f Mon Sep 17 00:00:00 2001 From: kj1352 Date: Mon, 18 Jan 2021 18:06:02 +0530 Subject: [PATCH] Shop page init --- src/app/app-routing.module.ts | 4 ++++ src/app/more/more.page.html | 19 ++++++++++++------- src/app/more/more.page.ts | 12 ++++++------ src/app/shop/shop-routing.module.ts | 17 +++++++++++++++++ src/app/shop/shop.module.ts | 20 ++++++++++++++++++++ src/app/shop/shop.page.html | 3 +++ src/app/shop/shop.page.scss | 0 src/app/shop/shop.page.spec.ts | 24 ++++++++++++++++++++++++ src/app/shop/shop.page.ts | 15 +++++++++++++++ src/app/tabs/tabs-routing.module.ts | 4 ++++ src/app/tabs/tabs.page.html | 6 ++++++ src/global.scss | 15 --------------- 12 files changed, 111 insertions(+), 28 deletions(-) create mode 100644 src/app/shop/shop-routing.module.ts create mode 100644 src/app/shop/shop.module.ts create mode 100644 src/app/shop/shop.page.html create mode 100644 src/app/shop/shop.page.scss create mode 100644 src/app/shop/shop.page.spec.ts create mode 100644 src/app/shop/shop.page.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 406ba64..6dd0a09 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -57,6 +57,10 @@ const routes: Routes = [ { path: 'quiz', loadChildren: () => import('./quiz/quiz.module').then( m => m.QuizPageModule) + }, + { + path: 'shop', + loadChildren: () => import('./shop/shop.module').then( m => m.ShopPageModule) } ]; @NgModule({ diff --git a/src/app/more/more.page.html b/src/app/more/more.page.html index e525c86..fda096f 100644 --- a/src/app/more/more.page.html +++ b/src/app/more/more.page.html @@ -1,9 +1,14 @@ - - - more - - - - + + + + diff --git a/src/app/more/more.page.ts b/src/app/more/more.page.ts index 719bff8..72f66c4 100644 --- a/src/app/more/more.page.ts +++ b/src/app/more/more.page.ts @@ -1,15 +1,15 @@ import { Component, OnInit } from '@angular/core'; @Component({ - selector: 'app-more', - templateUrl: './more.page.html', - styleUrls: ['./more.page.scss'], + selector: 'app-more', + templateUrl: './more.page.html', + styleUrls: ['./more.page.scss'], }) export class MorePage implements OnInit { - constructor() { } + constructor() { } - ngOnInit() { - } + ngOnInit() { + } } diff --git a/src/app/shop/shop-routing.module.ts b/src/app/shop/shop-routing.module.ts new file mode 100644 index 0000000..994166d --- /dev/null +++ b/src/app/shop/shop-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ShopPage } from './shop.page'; + +const routes: Routes = [ + { + path: '', + component: ShopPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ShopPageRoutingModule {} diff --git a/src/app/shop/shop.module.ts b/src/app/shop/shop.module.ts new file mode 100644 index 0000000..6c1c1ef --- /dev/null +++ b/src/app/shop/shop.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { ShopPageRoutingModule } from './shop-routing.module'; + +import { ShopPage } from './shop.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + ShopPageRoutingModule + ], + declarations: [ShopPage] +}) +export class ShopPageModule {} diff --git a/src/app/shop/shop.page.html b/src/app/shop/shop.page.html new file mode 100644 index 0000000..d786ca0 --- /dev/null +++ b/src/app/shop/shop.page.html @@ -0,0 +1,3 @@ + + + diff --git a/src/app/shop/shop.page.scss b/src/app/shop/shop.page.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/shop/shop.page.spec.ts b/src/app/shop/shop.page.spec.ts new file mode 100644 index 0000000..a64d8bd --- /dev/null +++ b/src/app/shop/shop.page.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ShopPage } from './shop.page'; + +describe('ShopPage', () => { + let component: ShopPage; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ShopPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ShopPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shop/shop.page.ts b/src/app/shop/shop.page.ts new file mode 100644 index 0000000..5f795ad --- /dev/null +++ b/src/app/shop/shop.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-shop', + templateUrl: './shop.page.html', + styleUrls: ['./shop.page.scss'], +}) +export class ShopPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/tabs/tabs-routing.module.ts b/src/app/tabs/tabs-routing.module.ts index 3ecfddc..c0b2f34 100644 --- a/src/app/tabs/tabs-routing.module.ts +++ b/src/app/tabs/tabs-routing.module.ts @@ -34,6 +34,10 @@ const routes: Routes = [ { path: 'quiz', loadChildren: () => import('../quiz/quiz.module').then( m => m.QuizPageModule) + }, + { + path: 'shop', + loadChildren: () => import('../shop/shop.module').then( m => m.ShopPageModule) } ] }, diff --git a/src/app/tabs/tabs.page.html b/src/app/tabs/tabs.page.html index d990fce..84e056d 100644 --- a/src/app/tabs/tabs.page.html +++ b/src/app/tabs/tabs.page.html @@ -31,5 +31,11 @@ + + + + + + diff --git a/src/global.scss b/src/global.scss index 5ce40ff..08aee3e 100644 --- a/src/global.scss +++ b/src/global.scss @@ -123,21 +123,6 @@ figure { margin: 0; } -.content-container { - animation: fadeIn 0.4s forwards; - opacity: 0; - - @keyframes fadeIn { - 0% { - opacity: 0; - transform: translateY(3vh); - } - 100% { - opacity: 1; - transform: translateY(0vh); - } - } -} .chat-button { --background: transparent;