diff --git a/REMEMBER.txt b/REMEMBER.txt index 1aae2cc..a8b027f 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -29,3 +29,5 @@ npx cap sync https://github.com/capacitor-community/barcode-scanner ionic generate page startscan + +ionic generate page suggest diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index a493d42..78f3873 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -218,6 +218,10 @@ const routes: Routes = [ path: 'startscan', loadChildren: () => import('./pages/startscan/startscan.module').then(m => m.StartscanPageModule) }, + { + path: 'suggest', + loadChildren: () => import('./pages/suggest/suggest.module').then(m => m.SuggestPageModule) + }, ]; @NgModule({ diff --git a/src/app/pages/familylogin/familylogin.page.html b/src/app/pages/familylogin/familylogin.page.html index e968cd8..33aef62 100644 --- a/src/app/pages/familylogin/familylogin.page.html +++ b/src/app/pages/familylogin/familylogin.page.html @@ -10,6 +10,8 @@ + +
@@ -25,7 +27,7 @@
-
+ Family Login @@ -55,7 +57,7 @@ Have an account? login
-
+
diff --git a/src/app/pages/register/register.page.html b/src/app/pages/register/register.page.html index b8e48b0..1597733 100644 --- a/src/app/pages/register/register.page.html +++ b/src/app/pages/register/register.page.html @@ -2,118 +2,120 @@ -
-
-
- -
+
+
+
+
+ +
- Create Your Account - - - Nigeria - United States - - - - + Create Your Account + + + Nigeria + United States + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - Register - + + Register + -
+
- Or Continue With + Or Continue With -
- - - - - +
+ + + + + - - - - - + + + + + - - - - - + + + + + +
+
+ + +
-
-
- -
+ Complete Account - Complete Account - - - + + Country {{signup_country}} - - - Username - {{signup_username}} - - - Enter Confirmation Received In Email - - - - + + + Username + {{signup_username}} + + + Enter Confirmation Received In Email + + + + - - - - - - Complete signup - + + + + + + Complete signup + +
+
+ +
+ Already have an account? Login
- - -
- Already have an account? Login
diff --git a/src/app/pages/suggest/suggest-routing.module.ts b/src/app/pages/suggest/suggest-routing.module.ts new file mode 100644 index 0000000..31d1d87 --- /dev/null +++ b/src/app/pages/suggest/suggest-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { SuggestPage } from './suggest.page'; + +const routes: Routes = [ + { + path: '', + component: SuggestPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class SuggestPageRoutingModule {} diff --git a/src/app/pages/suggest/suggest.module.ts b/src/app/pages/suggest/suggest.module.ts new file mode 100644 index 0000000..60babc8 --- /dev/null +++ b/src/app/pages/suggest/suggest.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 { SuggestPageRoutingModule } from './suggest-routing.module'; + +import { SuggestPage } from './suggest.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SuggestPageRoutingModule + ], + declarations: [SuggestPage] +}) +export class SuggestPageModule {} diff --git a/src/app/pages/suggest/suggest.page.html b/src/app/pages/suggest/suggest.page.html new file mode 100644 index 0000000..2b1a08e --- /dev/null +++ b/src/app/pages/suggest/suggest.page.html @@ -0,0 +1,71 @@ + + +
+
+ +
+
+ +
+
+
+ Suggest Task(s) + +
+ +
+ + + + + +
+ + + +
+ + + + + + + + + + + + +
+ + + + Find + + + My List + + + + + + +
+ +
+ +
+ +
+ +
+
+
+ + + + + + + + diff --git a/src/app/pages/suggest/suggest.page.scss b/src/app/pages/suggest/suggest.page.scss new file mode 100644 index 0000000..1c3cf7a --- /dev/null +++ b/src/app/pages/suggest/suggest.page.scss @@ -0,0 +1,385 @@ + +ion-content { + .back_image { + width: 100%; + height: 230px; + + .back { + font-size: 25px; + color: white; + } + } + + .flex { + display: flex; + justify-content: space-between; + align-items: center; + + ion-icon { + font-size: 22px; + } + } + + .row { + display: flex; + align-items: center; + margin-top: 10px; + + .bg_text { + color: var(--ion-color-primary); + background: #dfe1f3; + font-size: 12px; + padding: 2px 5px; + border-radius: 5px; + margin-right: 10px; + } + + .rate { + display: flex; + align-items: center; + + .review { + margin-left: 5px; + } + } + } + + .color_text { + margin-top: 10px; + font-size: 22px; + font-family: 'semi-bold'; + color: var(--ion-color-primary); + } + + .items { + display: flex; + justify-content: space-between; + margin-top: 10px; + margin-bottom: 20px; + border-bottom: 1px solid lightgrey; + padding-bottom: 10px; + + .stud { + display: flex; + align-items: center; + + ion-icon { + margin-right: 5px; + } + + ion-label { + color: grey; + } + } + } + + .about { + margin-top: 10px; + + .head_text { + font-size: 18px; + font-family: 'semi-bold'; + margin-bottom: 10px; + } + + .mentor { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 20px; + + .left { + display: flex; + + .men_image { + height: 50px; + width: 50px; + border-radius: 100%; + } + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + ion-icon { + font-size: 25px; + } + } + + .description { + color: grey; + margin-bottom: 5px; + } + } + + .lesson { + margin-top: 20px; + + .bold { + font-family: 'semi-bold'; + } + + .color { + color: var(--ion-color-primary); + } + + .grey { + color: grey; + } + + .sec { + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; + } + + .video { + display: flex; + justify-content: space-between; + align-items: center; + background-color: white; + padding: 15px; + box-shadow: 0px 0px 20px 1px rgba(0, 0, 0, 0.1); + border-radius: 10px; + margin-top: 20px; + + .left { + display: flex; + } + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + .text { + margin-left: 10px; + } + + .bold_text { + font-size: 16px; + font-family: 'bold'; + } + + .grey_text { + font-size: 14px; + color: grey; + } + } + } + + .review_tab { + margin-top: 20px; + + .total { + display: flex; + align-items: center; + justify-content: space-between; + + .star-rate { + display: flex; + align-items: center; + + .bold { + font-size: 17px; + font-family: 'semi-bold'; + margin-left: 5px; + } + } + + .color { + color: var(--ion-color-primary); + font-size: 14px; + } + } + + + .story-item { + overflow: scroll; + display: flex; + flex-direction: row; + margin-top: 20px; + + .menu { + width: 100%; + display: flex; + flex-direction: row; + + .item { + padding: 5px; + margin: 5px; + display: flex; + flex-direction: column; + align-items: center; + text-align: center; + + ion-thumbnail { + border-radius: 15px; + width: max-content; + height: 60px; + width: 60px; + --border-radius: 50%; + } + + ion-label { + font-size: 14px; + font-family: "medium"; + color: var(--ion-color-medium); + } + } + + .text { + + display: flex; + align-items: center; + text-align: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + .show { + background-color: var(--ion-color-primary); + } + + .white { + color: white !important; + } + + .choice { + display: flex; + } + } + } + } + + .reviw_list { + margin-top: 25px; + + .profile { + display: flex; + align-items: center; + justify-content: space-between; + margin-bottom: 10px; + + .left { + display: flex; + align-items: center; + + .men_image { + height: 40px; + width: 40px; + border-radius: 100%; + } + + + .bold { + font-family: 'semi-bold'; + } + + .grey { + color: grey; + font-size: 14px; + } + } + + .right { + display: flex; + align-items: center; + + .select { + display: flex; + align-items: center; + border: 1px solid var(--ion-color-primary); + border-radius: 20px; + padding: 2px 15px; + margin-right: 10px; + + .rate_num { + margin-left: 5px; + color: var(--ion-color-primary); + } + } + + ion-icon { + font-size: 20px; + } + } + } + + .like { + display: flex; + align-items: center; + margin-top: 10px; + + .heart { + font-size: 25px; + margin-right: 5px; + } + + .count { + margin-right: 10px; + } + + .time { + color: grey; + font-size: 14px; + } + } + } + } + + + + .bold_text { + font-size: 20px; + font-family: 'bold'; + } +} + + +ion-footer { + --background: white; + + ion-toolbar { + --border-width: 0px; + padding: 10px; + align-items: center; + + ion-icon { + color: white; + font-size: 25px; + } + + .button { + background-color: var(--ion-color-primary); + display: flex; + align-items: center; + justify-content: space-around; + border-radius: 30px; + padding: 12px 0; + + .text { + color: white; + } + } + } +} diff --git a/src/app/pages/suggest/suggest.page.spec.ts b/src/app/pages/suggest/suggest.page.spec.ts new file mode 100644 index 0000000..e075fbb --- /dev/null +++ b/src/app/pages/suggest/suggest.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { SuggestPage } from './suggest.page'; + +describe('SuggestPage', () => { + let component: SuggestPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ SuggestPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(SuggestPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/suggest/suggest.page.ts b/src/app/pages/suggest/suggest.page.ts new file mode 100644 index 0000000..580cac1 --- /dev/null +++ b/src/app/pages/suggest/suggest.page.ts @@ -0,0 +1,36 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-suggest', + templateUrl: './suggest.page.html', + styleUrls: ['./suggest.page.scss'], +}) +export class SuggestPage implements OnInit { + + + tabs = 'about'; + + constructor( + private navctr: NavController, + private router: Router + ) { } + + ngOnInit() { + } + + onBack() { + this.navctr.back(); + } + + onMentor() { + this.router.navigate(['mentor']); + } + + onEnroll() { + this.router.navigate(['enroll']); + } + + +} diff --git a/src/app/pages/tabs/tabs-routing.module.ts b/src/app/pages/tabs/tabs-routing.module.ts index e944141..fb56b43 100644 --- a/src/app/pages/tabs/tabs-routing.module.ts +++ b/src/app/pages/tabs/tabs-routing.module.ts @@ -1,15 +1,7 @@ -/* - Authors : initappz (Rahul Jograna) - Website : https://initappz.com/ - App Name : E-Learning App Template - This App Template Source code is licensed as per the - terms found in the Website https://initappz.com/license - Copyright and Good Faith Purchasers © 2021-present initappz. -*/ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { TabsPage } from './tabs.page'; - +//suggest const routes: Routes = [ { path: '', @@ -23,6 +15,10 @@ const routes: Routes = [ path: 'tab2', loadChildren: () => import('../my-course/my-course.module').then(m => m.MyCoursePageModule) }, + { + path: 'suggest', + loadChildren: () => import('../suggest/suggest.module').then(m => m.SuggestPageModule) + }, { path: 'tab3', loadChildren: () => import('../inbox/inbox.module').then(m => m.InboxPageModule) diff --git a/src/app/pages/tabs/tabs.page.html b/src/app/pages/tabs/tabs.page.html index b6382e3..d9bae25 100644 --- a/src/app/pages/tabs/tabs.page.html +++ b/src/app/pages/tabs/tabs.page.html @@ -8,7 +8,7 @@ Home - + Suggest