From f5243420d5c921afa18493c730019e6a9d551c2f Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 9 Dec 2023 22:09:25 -0500 Subject: [PATCH] Job format --- REMEMBER.txt | 1 + src/app/app-routing.module.ts | 5 + src/app/pages/detail/detail.module.ts | 8 - src/app/pages/jobmanager/jobmanager.page.html | 2 +- src/app/pages/mytasks/mytasks.page.html | 8 +- .../preferences/preferences-routing.module.ts | 17 + .../pages/preferences/preferences.module.ts | 20 + .../pages/preferences/preferences.page.html | 16 + .../pages/preferences/preferences.page.scss | 385 ++++++++++++++++++ .../preferences/preferences.page.spec.ts | 24 ++ src/app/pages/preferences/preferences.page.ts | 22 + src/app/pages/profile/profile.page.ts | 4 +- 12 files changed, 499 insertions(+), 13 deletions(-) create mode 100644 src/app/pages/preferences/preferences-routing.module.ts create mode 100644 src/app/pages/preferences/preferences.module.ts create mode 100644 src/app/pages/preferences/preferences.page.html create mode 100644 src/app/pages/preferences/preferences.page.scss create mode 100644 src/app/pages/preferences/preferences.page.spec.ts create mode 100644 src/app/pages/preferences/preferences.page.ts diff --git a/REMEMBER.txt b/REMEMBER.txt index 3f49235..ab4534e 100644 --- a/REMEMBER.txt +++ b/REMEMBER.txt @@ -32,6 +32,7 @@ ionic generate component InterestCard ionic generate component PendingSuggested ionic generate page logout +ionic generate page preferences npm install angularx-qrcode@14.0.0 --save diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c050c51..6c431e4 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -262,6 +262,11 @@ const routes: Routes = [ path: 'jobmessage', loadChildren: () => import('./pages/jobmessage/jobmessage.module').then(m => m.JobmessagePageModule) }, + { + path: 'preferences', + loadChildren: () => import('./pages/preferences/preferences.module').then(m => m.PreferencesPageModule) + }, + diff --git a/src/app/pages/detail/detail.module.ts b/src/app/pages/detail/detail.module.ts index dd143b7..4715955 100644 --- a/src/app/pages/detail/detail.module.ts +++ b/src/app/pages/detail/detail.module.ts @@ -1,11 +1,3 @@ -/* - 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 { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; diff --git a/src/app/pages/jobmanager/jobmanager.page.html b/src/app/pages/jobmanager/jobmanager.page.html index 5daf4b8..1fb8b1c 100644 --- a/src/app/pages/jobmanager/jobmanager.page.html +++ b/src/app/pages/jobmanager/jobmanager.page.html @@ -140,7 +140,7 @@ {{item.description}} {{item.contract}} {{item.price*0.01 | number : '1.2-2'}} {{item.currency}} {{item.job_to}} Due Date: {{item.delivery_date | date}} - + Extension Request: {{item.ext_request | date}}
diff --git a/src/app/pages/mytasks/mytasks.page.html b/src/app/pages/mytasks/mytasks.page.html index 6dc7c1d..f2a5169 100644 --- a/src/app/pages/mytasks/mytasks.page.html +++ b/src/app/pages/mytasks/mytasks.page.html @@ -60,7 +60,7 @@
{{item.title}}
- {{item.job_description}} +
{{item.price*0.01}} {{item.currency}} Due : {{item.delivery_date |date}} @@ -97,12 +97,14 @@
{{item.title}}
- {{item.job_description}} +
+
Due : {{item.delivery_date |date}} + Extension Request: {{item.ext_request | date}}
@@ -136,7 +138,7 @@
{{item.title}}
- {{item.job_description}} +
diff --git a/src/app/pages/preferences/preferences-routing.module.ts b/src/app/pages/preferences/preferences-routing.module.ts new file mode 100644 index 0000000..62fbde4 --- /dev/null +++ b/src/app/pages/preferences/preferences-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { PreferencesPage } from './preferences.page'; + +const routes: Routes = [ + { + path: '', + component: PreferencesPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class PreferencesPageRoutingModule {} diff --git a/src/app/pages/preferences/preferences.module.ts b/src/app/pages/preferences/preferences.module.ts new file mode 100644 index 0000000..108f9f8 --- /dev/null +++ b/src/app/pages/preferences/preferences.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 { PreferencesPageRoutingModule } from './preferences-routing.module'; + +import { PreferencesPage } from './preferences.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + PreferencesPageRoutingModule + ], + declarations: [PreferencesPage] +}) +export class PreferencesPageModule {} diff --git a/src/app/pages/preferences/preferences.page.html b/src/app/pages/preferences/preferences.page.html new file mode 100644 index 0000000..dd7d4f7 --- /dev/null +++ b/src/app/pages/preferences/preferences.page.html @@ -0,0 +1,16 @@ + + + preferences + + + + + + + + +
+ Continue +
+ + diff --git a/src/app/pages/preferences/preferences.page.scss b/src/app/pages/preferences/preferences.page.scss new file mode 100644 index 0000000..1c3cf7a --- /dev/null +++ b/src/app/pages/preferences/preferences.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/preferences/preferences.page.spec.ts b/src/app/pages/preferences/preferences.page.spec.ts new file mode 100644 index 0000000..640df47 --- /dev/null +++ b/src/app/pages/preferences/preferences.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { PreferencesPage } from './preferences.page'; + +describe('PreferencesPage', () => { + let component: PreferencesPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PreferencesPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(PreferencesPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/preferences/preferences.page.ts b/src/app/pages/preferences/preferences.page.ts new file mode 100644 index 0000000..4013e59 --- /dev/null +++ b/src/app/pages/preferences/preferences.page.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; +import {NavController} from "@ionic/angular"; +import {Router} from "@angular/router"; + +@Component({ + selector: 'app-preferences', + templateUrl: './preferences.page.html', + styleUrls: ['./preferences.page.scss'], +}) +export class PreferencesPage implements OnInit { + + constructor( + private navctr: NavController, + private router: Router) { } + + ngOnInit() { + } + onBack() { + this.navctr.back(); + } + +} diff --git a/src/app/pages/profile/profile.page.ts b/src/app/pages/profile/profile.page.ts index 0325aad..0a75bc0 100644 --- a/src/app/pages/profile/profile.page.ts +++ b/src/app/pages/profile/profile.page.ts @@ -62,7 +62,9 @@ export class ProfilePage implements OnInit { this.router.navigate(['payment']); } - onPreferences(){} + onPreferences(){ + this.router.navigate(['preferences']); + } onHistory(){} onInvite() {