From 5e7f7a6c9c0aa66929d9102d6e99bb77af4ec1d3 Mon Sep 17 00:00:00 2001 From: enadhilal Date: Mon, 31 May 2021 09:44:04 +0300 Subject: [PATCH 1/8] added backend integrations module --- Mohem/src/app/app-routing.module.ts | 75 ++++++++++--------- Mohem/src/app/app.component.html | 21 ++++++ Mohem/src/app/app.component.ts | 5 ++ .../announcement/announcement.component.html | 52 +++++++++++++ .../announcement/announcement.component.scss | 9 +++ .../announcement.component.spec.ts | 27 +++++++ .../announcement/announcement.component.ts | 60 +++++++++++++++ .../backend-integrations.module.ts | 36 +++++++++ .../backend-integrations.page.html | 3 + .../backend-integrations.page.scss | 0 .../backend-integrations.page.spec.ts | 27 +++++++ .../backend-integrations.page.ts | 15 ++++ .../services/common/common.service.ts | 3 + 13 files changed, 296 insertions(+), 37 deletions(-) create mode 100644 Mohem/src/app/backend-integrations/announcement/announcement.component.html create mode 100644 Mohem/src/app/backend-integrations/announcement/announcement.component.scss create mode 100644 Mohem/src/app/backend-integrations/announcement/announcement.component.spec.ts create mode 100644 Mohem/src/app/backend-integrations/announcement/announcement.component.ts create mode 100644 Mohem/src/app/backend-integrations/backend-integrations.module.ts create mode 100644 Mohem/src/app/backend-integrations/backend-integrations.page.html create mode 100644 Mohem/src/app/backend-integrations/backend-integrations.page.scss create mode 100644 Mohem/src/app/backend-integrations/backend-integrations.page.spec.ts create mode 100644 Mohem/src/app/backend-integrations/backend-integrations.page.ts diff --git a/Mohem/src/app/app-routing.module.ts b/Mohem/src/app/app-routing.module.ts index c2bbba01..9fabe5a8 100644 --- a/Mohem/src/app/app-routing.module.ts +++ b/Mohem/src/app/app-routing.module.ts @@ -1,38 +1,39 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; + + +const routes: Routes = [ + { path: '', redirectTo: 'authentication/login', pathMatch: 'full' }, + { + path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule' + }, + { path: 'home', loadChildren: './home/home.module#HomePageModule' }, + { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, + { path: 'vacation-rule', loadChildren: './vacation-rule/vacation-rule.module#VacationRulePageModule' }, + { path: 'accrual-balances', loadChildren: './accrual-balances/accrual-balances.module#AccrualBalancesPageModule' }, + { path: 'my-team', loadChildren: './my-team/my-team.module#MyTeamPageModule' }, + { path: 'attendance', loadChildren: './attendance/attendance.module#AttendancePageModule' }, + { path: 'eit', loadChildren: './eit/eit.module#EITPageModule' }, + { path: 'absence', loadChildren: './absence/absence.module#AbsencePageModule' }, + { path: 'notification', loadChildren: './notification/notification.module#NotificationPageModule' }, + { path: 'my-specialist', loadChildren: './my-specialist/my-specialist.module#MySpecialistPageModule' }, + { path: 'my-subordinate', loadChildren: './my-subordinate/my-subordinate.module#MySubordinatePageModule' }, + { path: 'time-card', loadChildren: './time-card/time-card.module#TimeCardPageModule' }, + { path: 'payslip', loadChildren: './payslip/payslip.module#PayslipPageModule' }, + { path: 'attendance-tracking', loadChildren: './attendance-tracking/attendance-tracking.module#AttendanceTrackingPageModule' }, + { path: 'itemforsale', loadChildren: './itemforsale/itemforsale.module#ItemforsalePageModule' }, + { path: 'offersdiscount', loadChildren: './offersdiscount/offersdiscount.module#OffersdiscountPageModule' }, { path: 'backend-integrations', loadChildren: './backend-integrations/backend-integrations.module#BackendIntegrationsPageModule' } - -const routes: Routes = [ - { path: '', redirectTo: 'authentication/login', pathMatch: 'full' }, - { - path: 'authentication', loadChildren: './authentication/authentication.module#AuthenticationPageModule' - }, - { path: 'home', loadChildren: './home/home.module#HomePageModule' }, - { path: 'profile', loadChildren: './profile/profile.module#ProfilePageModule' }, - { path: 'vacation-rule', loadChildren: './vacation-rule/vacation-rule.module#VacationRulePageModule' }, - { path: 'accrual-balances', loadChildren: './accrual-balances/accrual-balances.module#AccrualBalancesPageModule' }, - { path: 'my-team', loadChildren: './my-team/my-team.module#MyTeamPageModule' }, - { path: 'attendance', loadChildren: './attendance/attendance.module#AttendancePageModule' }, - { path: 'eit', loadChildren: './eit/eit.module#EITPageModule' }, - { path: 'absence', loadChildren: './absence/absence.module#AbsencePageModule' }, - { path: 'notification', loadChildren: './notification/notification.module#NotificationPageModule' }, - { path: 'my-specialist', loadChildren: './my-specialist/my-specialist.module#MySpecialistPageModule' }, - { path: 'my-subordinate', loadChildren: './my-subordinate/my-subordinate.module#MySubordinatePageModule' }, - { path: 'time-card', loadChildren: './time-card/time-card.module#TimeCardPageModule' }, - { path: 'payslip', loadChildren: './payslip/payslip.module#PayslipPageModule' }, - { path: 'attendance-tracking', loadChildren: './attendance-tracking/attendance-tracking.module#AttendanceTrackingPageModule' }, - { path: 'itemforsale', loadChildren: './itemforsale/itemforsale.module#ItemforsalePageModule' }, - { path: 'offersdiscount', loadChildren: './offersdiscount/offersdiscount.module#OffersdiscountPageModule' } - - - -]; - -@NgModule({ - imports: [ - /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ - RouterModule.forRoot(routes), - ], - exports: [RouterModule] -}) -export class AppRoutingModule { } + + + +]; + +@NgModule({ + imports: [ + /*RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules}),*/ + RouterModule.forRoot(routes), + ], + exports: [RouterModule] +}) +export class AppRoutingModule { } diff --git a/Mohem/src/app/app.component.html b/Mohem/src/app/app.component.html index a8aaa491..10dc48fd 100644 --- a/Mohem/src/app/app.component.html +++ b/Mohem/src/app/app.component.html @@ -66,6 +66,17 @@ {{notBadge}} + + + + + + + {{ts.trPK('login','announcement')}} + {{notBadge}} + + + @@ -148,6 +159,16 @@ + + + + + + {{ts.trPK('login','announcement')}} + {{notBadge}} + + + - - + + diff --git a/Mohem/src/app/home/home.page.html b/Mohem/src/app/home/home.page.html index 89568cb9..aada661e 100644 --- a/Mohem/src/app/home/home.page.html +++ b/Mohem/src/app/home/home.page.html @@ -60,20 +60,21 @@ - Other Services - + {{'general,other-services' | translate}} + + - + - + - + diff --git a/Mohem/src/app/itemforsale/home/home.component.html b/Mohem/src/app/itemforsale/home/home.component.html index ef0a3a6c..709ca806 100644 --- a/Mohem/src/app/itemforsale/home/home.component.html +++ b/Mohem/src/app/itemforsale/home/home.component.html @@ -13,14 +13,14 @@
-
Select Category
-
Completed
+
{{ts.trPK('itemforsale','select-category')}}
+
{{ts.trPK('itemforsale','completed')}}
-
Add Details
+
{{ts.trPK('itemforsale','add-details')}}
{{step >2 ? "Completed" : "Locked"}}
@@ -28,7 +28,7 @@
-
Review & Sell
+
{{ts.trPK('itemforsale','review-sell')}}
{{step >3 ? "Completed" : "Locked"}}
diff --git a/Mohem/src/app/itemforsale/itemforsale.module.ts b/Mohem/src/app/itemforsale/itemforsale.module.ts index bde723c4..6a7aea24 100644 --- a/Mohem/src/app/itemforsale/itemforsale.module.ts +++ b/Mohem/src/app/itemforsale/itemforsale.module.ts @@ -10,6 +10,7 @@ import { HomeComponent } from './home/home.component'; import { ItemsComponent } from './items/items.component'; import { ItemDetailsComponent } from './item-details/item-details.component'; import { MyAdsComponent } from './my-ads/my-ads.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ { @@ -41,6 +42,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [ItemforsalePage, HomeComponent, ItemsComponent, ItemDetailsComponent, MyAdsComponent] diff --git a/Mohem/src/app/itemforsale/items/items.component.html b/Mohem/src/app/itemforsale/items/items.component.html index fb5d94c2..65186524 100644 --- a/Mohem/src/app/itemforsale/items/items.component.html +++ b/Mohem/src/app/itemforsale/items/items.component.html @@ -10,10 +10,10 @@
- Item for sale + {{ts.trPK('itemforsale','title')}} - My Posted Ads + {{ts.trPK('itemforsale','my-posted-ad')}}
@@ -29,13 +29,13 @@ - + -

Browse Categories

+

{{ts.trPK('itemforsale','browse-categories')}}

@@ -183,7 +183,7 @@
- Create new ad + {{ts.trPK('itemforsale','create-new-ad')}}
diff --git a/Mohem/src/app/itemforsale/items/items.component.scss b/Mohem/src/app/itemforsale/items/items.component.scss index cbaa3538..96f389c8 100644 --- a/Mohem/src/app/itemforsale/items/items.component.scss +++ b/Mohem/src/app/itemforsale/items/items.component.scss @@ -78,6 +78,7 @@ ion-card-title{ ion-segment-button{ --background-checked: #000; --indicator-color : transparent!important; + border: none; } ion-segment-button ion-label{ padding: 0; @@ -125,5 +126,10 @@ ion-footer{ } ion-footer .footer-button{ --background: #259CB8; - width: 80%; + width: 80%; + background: #259CB8; + border-radius: 10px; +} +ion-segment{ + height:40px } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html index 0f66b227..d34d972a 100644 --- a/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html +++ b/Mohem/src/app/notification/work-list-main-itg/work-list-main-itg.component.html @@ -474,7 +474,7 @@ {{action.name}} - Request Info + {{'worklistMain, worklistMain' | translate}} diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html index 5df1b8b5..7a2f6d89 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.html @@ -58,7 +58,7 @@ - + @@ -108,7 +108,7 @@ -
+
diff --git a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss index a7c50320..bf94ef38 100644 --- a/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-itg/work-list-replacement-itg.component.scss @@ -27,9 +27,13 @@ } .star-fav{ float: right; - margin: 15px; + margin: 10px; + } + .star-fav-left{ + float: right; + margin: 10px 5px; } - .uk-margin{margin: 15px 0px 0px 15px; + .uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -57,4 +61,5 @@ } .square{ clear: both; - } \ No newline at end of file + } + \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html index 7536c23e..a0af5788 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.html @@ -40,7 +40,7 @@ - + @@ -75,7 +75,7 @@ {{employee.NAME}} -
+
@@ -100,7 +100,7 @@ {{employee.EMPLOYEE_DISPLAY_NAME}} -
+
@@ -128,7 +128,7 @@ -
+
@@ -162,7 +162,7 @@ - +

diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss index ac775fbf..b9b5da54 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.scss @@ -81,16 +81,18 @@ button.item-button.button.button-md.button-clear.button-clear-md { border-radius: 21px; padding-left: 10px !important; } + .filterInput-ar{ // border: solid var(--gray) 1px; // border-radius: 21px; // padding-left: 10px !important; border: solid var(--gray) 1px; border-radius: 21px; + // width:250px // padding-left: 145px !important; - margin-left: 123px; + //margin-left: 123px; // padding-right: 129px; - margin-right: -136px; + //margin-right: -136px; } .filterBtn{ @@ -178,9 +180,9 @@ ion-radio{ } .star-fav{ float: right; - margin: 15px; + margin: 15px 0px 0px 0px; } -.uk-margin{margin: 15px 0px 0px 15px; +.uk-margin{margin: 15px 15px 0px 15px; font-weight: bold; clear: both; position: relative; @@ -190,4 +192,8 @@ ion-radio{ bottom: 10px; position: relative;} + .star-fav-left{ + float: left; + margin: 10px 5px; + } \ No newline at end of file diff --git a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts index b6557cc5..71b1570d 100644 --- a/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts +++ b/Mohem/src/app/notification/work-list-replacement-roll/work-list-replacement-roll.component.ts @@ -78,6 +78,7 @@ export class WorkListReplacementRollComponent implements OnInit { if (requestInfoDel != null) { this.userSelected = true; this.inputSearch = requestInfoDel.NAME; + this.selEmp = requestInfoDel; } } diff --git a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss index c40369aa..b625942e 100644 --- a/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss +++ b/Mohem/src/app/notification/work-list-rfc/work-list-rfc.component.scss @@ -87,6 +87,7 @@ border-radius: 21px; padding-left: 10px !important; } + .filterBtn{ background: var(--newgreen); --background: var (--newgreen); diff --git a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss index 409f7446..cf5e4beb 100644 --- a/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss +++ b/Mohem/src/app/notification/worklist-main-ic/worklist-main-ic.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss index 61bff403..ee5a0d37 100644 --- a/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss +++ b/Mohem/src/app/notification/worklist-main-mr/worklist-main-mr.component.scss @@ -34,10 +34,10 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } .name{ color:black !important ;font-weight: bold; diff --git a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss index 409f7446..d5902df1 100644 --- a/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss +++ b/Mohem/src/app/notification/worklist-main-po/worklist-main-po.component.scss @@ -42,9 +42,9 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } \ No newline at end of file diff --git a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss index 76877e22..a8895a39 100644 --- a/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss +++ b/Mohem/src/app/notification/worklist-main-pr/worklist-main-pr.component.scss @@ -44,8 +44,8 @@ font-size: 10px; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin:15px 10px 0px 0px; } diff --git a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss index d9e971bd..e8434bee 100644 --- a/Mohem/src/app/notification/worklist-main/worklist-main.component.scss +++ b/Mohem/src/app/notification/worklist-main/worklist-main.component.scss @@ -97,12 +97,13 @@ .dateActionHistory{ display: inline-block; margin-left: 5px; + text-align: left; } .req_info{ - width: 25px; - height: 25px; + width: 20px; + height: 20px; display: inline-block; - margin: 5px; + margin: 15px 10px 0px 0px; } diff --git a/Mohem/src/app/offersdiscount/home/home.component.html b/Mohem/src/app/offersdiscount/home/home.component.html index c3fe6413..133c86cc 100644 --- a/Mohem/src/app/offersdiscount/home/home.component.html +++ b/Mohem/src/app/offersdiscount/home/home.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
@@ -17,13 +17,13 @@ - + -

Browse Category

+

{{ts.trPK('itemforsale','browse-categories')}}

diff --git a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html index 6e684c6d..df6095d9 100644 --- a/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html +++ b/Mohem/src/app/offersdiscount/offer-details/offer-details.component.html @@ -4,7 +4,7 @@ - {{ts.trPK('itemforsale','title')}} + {{ts.trPK('itemforsale','offersdiscount')}}
diff --git a/Mohem/src/app/offersdiscount/offersdiscount.module.ts b/Mohem/src/app/offersdiscount/offersdiscount.module.ts index 4c53786e..c453cbe2 100644 --- a/Mohem/src/app/offersdiscount/offersdiscount.module.ts +++ b/Mohem/src/app/offersdiscount/offersdiscount.module.ts @@ -8,6 +8,7 @@ import { IonicModule } from '@ionic/angular'; import { OffersdiscountPage } from './offersdiscount.page'; import { HomeComponent } from './home/home.component'; import { OfferDetailsComponent } from './offer-details/offer-details.component'; +import { HmgCommonModule } from '../hmg-common/hmg-common.module'; const routes: Routes = [ @@ -34,6 +35,7 @@ const routes: Routes = [ CommonModule, FormsModule, IonicModule, + HmgCommonModule, RouterModule.forChild(routes) ], declarations: [OffersdiscountPage, HomeComponent, OfferDetailsComponent] diff --git a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss index b8e5d124..d44e960a 100644 --- a/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss +++ b/Mohem/src/app/vacation-rule/replacement-list/replacement-list.component.scss @@ -116,8 +116,8 @@ button.item-button.button.button-md.button-clear.button-clear-md { .filterInput-ar{ border: solid var(--gray) 1px; border-radius: 21px; - margin-left: 115px; - margin-right: -132px; + // margin-left: 115px; + // margin-right: -132px; } .filterBtn{ diff --git a/Mohem/src/assets/icon/home/HR req.png b/Mohem/src/assets/icon/home/HR req.png new file mode 100644 index 0000000000000000000000000000000000000000..77bb9db71fe6e66469cbaa7d2994ad20cae6bb21 GIT binary patch literal 3321 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 literal 0 HcmV?d00001 diff --git a/Mohem/src/assets/icon/home/announcement@2x.png b/Mohem/src/assets/icon/home/announcement@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f80dd0541a2321242ac9eee6ca2b911187a983ea GIT binary patch literal 3840 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 Date: Thu, 3 Jun 2021 15:11:36 +0300 Subject: [PATCH 6/8] fixed live URL --- .../app/hmg-common/services/connector/connector.service.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mohem/src/app/hmg-common/services/connector/connector.service.ts b/Mohem/src/app/hmg-common/services/connector/connector.service.ts index 97a29e98..352d691d 100644 --- a/Mohem/src/app/hmg-common/services/connector/connector.service.ts +++ b/Mohem/src/app/hmg-common/services/connector/connector.service.ts @@ -27,8 +27,8 @@ export class ConnectorService { public static retryTimes = 0; public static timeOut = 120 * 1000; - public static host = 'https://uat.hmgwebservices.com/'; - //public static host = 'https://hmgwebservices.com/'; + // public static host = 'https://uat.hmgwebservices.com/'; + public static host = 'https://hmgwebservices.com/'; constructor(public httpClient: HttpClient, public cs: CommonService, From 1f0c78d5041a46e4b7015e0b4aaabb94b929ece4 Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 3 Jun 2021 15:20:22 +0300 Subject: [PATCH 7/8] pushed package.json --- Mohem/package.json | 224 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 Mohem/package.json diff --git a/Mohem/package.json b/Mohem/package.json new file mode 100644 index 00000000..47068303 --- /dev/null +++ b/Mohem/package.json @@ -0,0 +1,224 @@ +{ + "name": "MOHEM", + "version": "0.0.1", + "author": "Cloud Solutions", + "homepage": "http://www.cloudsolution-sa.com/", + "private": true, + "scripts": { + "ng": "ng", + "start": "ng serve", + "build": "ng build", + "test": "ng test", + "lint": "ng lint", + "e2e": "ng e2e" + }, + "dependencies": { + "@angular/animations": "^7.2.15", + "@angular/common": "^7.2.2", + "@angular/core": "^7.2.2", + "@angular/forms": "^7.2.2", + "@angular/http": "^7.2.2", + "@angular/platform-browser": "^7.2.2", + "@angular/platform-browser-dynamic": "^7.2.2", + "@angular/router": "^7.2.2", + "@ionic-native/android-permissions": "^5.18.0", + "@ionic-native/app-availability": "^5.18.0", + "@ionic-native/app-rate": "^5.18.0", + "@ionic-native/background-geolocation": "^5.30.0", + "@ionic-native/badge": "^5.18.0", + "@ionic-native/barcode-scanner": "^5.18.0", + "@ionic-native/base64": "^5.18.0", + "@ionic-native/ble": "^5.18.0", + "@ionic-native/camera": "^5.18.0", + "@ionic-native/core": "^5.8.0", + "@ionic-native/date-picker": "^5.10.0", + "@ionic-native/device": "^5.18.0", + "@ionic-native/diagnostic": "^5.18.0", + "@ionic-native/file": "^5.18.0", + "@ionic-native/file-path": "^5.18.0", + "@ionic-native/fingerprint-aio": "^5.18.0", + "@ionic-native/firebase-x": "^5.21.5", + "@ionic-native/geolocation": "^5.10.0", + "@ionic-native/globalization": "^5.18.0", + "@ionic-native/health": "^5.4.0", + "@ionic-native/in-app-browser": "^5.17.0", + "@ionic-native/keyboard": "^5.17.0", + "@ionic-native/launch-navigator": "^5.17.0", + "@ionic-native/local-notifications": "^5.17.0", + "@ionic-native/native-storage": "^5.17.0", + "@ionic-native/nfc": "^5.30.0", + "@ionic-native/open-native-settings": "^5.14.0", + "@ionic-native/splash-screen": "^5.0.0", + "@ionic-native/sqlite": "^5.18.0", + "@ionic-native/status-bar": "^5.0.0", + "@ionic-native/themeable-browser": "^5.18.0", + "@ionic-native/wifi-wizard-2": "^5.31.1", + "@ionic-native/zbar": "^5.10.0", + "@ionic/angular": "^4.1.0", + "@ng-bootstrap/ng-bootstrap": "^4.2.2", + "@swimlane/ngx-charts": "^10.1.0", + "angular-calendar": "^0.26.11", + "app": "0.1.0", + "chart.js": "^2.9.3", + "com-badrit-base64": "^0.2.0", + "cordova-android": "^8.1.0", + "cordova-android-support-gradle-release": "^3.0.1", + "cordova-open-native-settings": "^1.5.2", + "cordova-opentok-android-permissions": "^1.0.1", + "cordova-plugin-actionsheet": "^2.3.3", + "cordova-plugin-add-swift-support": "^2.0.2", + "cordova-plugin-android-permissions": "^1.0.2", + "cordova-plugin-androidx": "^1.0.2", + "cordova-plugin-androidx-adapter": "^1.1.0", + "cordova-plugin-appavailability": "^0.4.2", + "cordova-plugin-apprate": "^1.4.0", + "cordova-plugin-badge": "^0.8.8", + "cordova-plugin-ble-central": "^1.2.4", + "cordova-plugin-camera": "^4.1.0", + "cordova-plugin-datepicker": "^0.9.3", + "cordova-plugin-device": "^2.0.3", + "cordova-plugin-dialogs": "^2.0.2", + "cordova-plugin-file": "^6.0.2", + "cordova-plugin-filepath": "^1.5.6", + "cordova-plugin-fingerprint-aio": "^3.0.0", + "cordova-plugin-firebasex": "^7.0.2", + "cordova-plugin-geolocation": "^4.0.2", + "cordova-plugin-globalization": "^1.11.0", + "cordova-plugin-inappbrowser": "^3.1.0", + "cordova-plugin-ionic-keyboard": "^2.2.0", + "cordova-plugin-ionic-webview": "^4.1.0", + "cordova-plugin-local-notification": "^0.9.0-beta.2", + "cordova-plugin-nativestorage": "^2.3.2", + "cordova-plugin-splashscreen": "^5.0.3", + "cordova-plugin-statusbar": "^2.4.3", + "cordova-plugin-themeablebrowser": "^0.2.18", + "cordova-plugin-whitelist": "^1.3.4", + "cordova-plugin-wifiwizard2": "^3.1.1", + "cordova-sqlite-storage": "^3.4.0", + "cordova-support-google-services": "^1.3.2", + "cordova.plugins.diagnostic": "^5.0.1", + "core-js": "^2.5.4", + "date-fns": "^1.30.1", + "es6-promise-plugin": "^4.1.0", + "ionic2-calendar": "^0.5.8", + "ng-circle-progress": "^1.5.1", + "ng2-file-upload": "^1.3.0", + "ng2-pdf-viewer": "^5.3.2", + "ngx-gauge": "^1.0.0-beta.10", + "npm": "^6.14.11", + "phonegap-nfc": "^1.2.0", + "phonegap-plugin-barcodescanner": "^8.1.0", + "phonegap-plugin-multidex": "^1.0.0", + "primeicons": "^1.0.0", + "primeng": "^7.1.3", + "run": "1.4.0", + "rxjs": "~6.3.3", + "tslib": "^1.10.0", + "uk.co.workingedge.phonegap.plugin.launchnavigator": "^3.2.2", + "xlsx": "^0.14.3", + "zone.js": "~0.8.29" + }, + "devDependencies": { + "@angular-devkit/architect": "~0.12.3", + "@angular-devkit/build-angular": "^0.13.9", + "@angular-devkit/core": "~7.2.3", + "@angular-devkit/schematics": "~7.2.3", + "@angular/cli": "^7.3.6", + "@angular/compiler": "~7.2.2", + "@angular/compiler-cli": "~7.2.2", + "@angular/language-service": "~7.2.2", + "@ionic/angular-toolkit": "~1.4.0", + "@ionic/lab": "3.1.2", + "@types/jasmine": "~2.8.8", + "@types/jasminewd2": "~2.0.3", + "@types/node": "~10.12.0", + "codelyzer": "~4.5.0", + "cordova-ios": "^6.2.0", + "cordova-plugin-wifiwizard2": "^3.1.1", + "es6-promise-plugin": "^4.1.0", + "jasmine-core": "~2.99.1", + "jasmine-spec-reporter": "~4.2.1", + "karma": "^4.0.1", + "karma-chrome-launcher": "~2.2.0", + "karma-coverage-istanbul-reporter": "~2.0.1", + "karma-jasmine": "~1.1.2", + "karma-jasmine-html-reporter": "^0.2.2", + "node-sass": "^4.13.1", + "protractor": "^5.4.3", + "ts-node": "~8.0.0", + "tslint": "~5.12.0", + "typescript": "3.1.6" + }, + "description": "An Ionic project", + "cordova": { + "plugins": { + "cordova-plugin-whitelist": {}, + "cordova-plugin-statusbar": {}, + "cordova-plugin-device": {}, + "cordova-plugin-splashscreen": {}, + "cordova-plugin-nativestorage": {}, + "cordova-plugin-globalization": {}, + "cordova-plugin-android-permissions": {}, + "cordova-plugin-badge": {}, + "cordova-plugin-ionic-keyboard": {}, + "cordova-plugin-datepicker": {}, + "cordova-plugin-geolocation": {}, + "phonegap-plugin-barcodescanner": { + "ANDROID_SUPPORT_V4_VERSION": "27.+" + }, + "cordova-plugin-ionic-webview": { + "ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+" + }, + "cordova-android-support-gradle-release": { + "ANDROID_SUPPORT_VERSION": "27.+" + }, + "cordova.plugins.diagnostic": { + "ANDROID_SUPPORT_VERSION": "28.+" + }, + "cordova-open-native-settings": {}, + "cordova-plugin-camera": { + "ANDROID_SUPPORT_V4_VERSION": "27.+" + }, + "cordova-plugin-file": {}, + "cordova-plugin-filepath": {}, + "com-badrit-base64": {}, + "cordova-sqlite-storage": {}, + "cordova-plugin-ble-central": {}, + "uk.co.workingedge.phonegap.plugin.launchnavigator": {}, + "cordova-plugin-themeablebrowser": {}, + "cordova-plugin-inappbrowser": {}, + "cordova-plugin-local-notification": {}, + "cordova-opentok-android-permissions": {}, + "cordova-plugin-appavailability": {}, + "cordova-plugin-apprate": {}, + "cordova-plugin-fingerprint-aio": { + "FACEID_USAGE_DESCRIPTION": "User Authentication" + }, + "cordova-plugin-firebasex": { + "FIREBASE_ANALYTICS_COLLECTION_ENABLED": "true", + "FIREBASE_PERFORMANCE_COLLECTION_ENABLED": "true", + "FIREBASE_CRASHLYTICS_COLLECTION_ENABLED": "true", + "ANDROID_ICON_ACCENT": "#FF00FFFF", + "ANDROID_PLAY_SERVICES_TAGMANAGER_VERSION": "17.0.0", + "ANDROID_FIREBASE_ANALYTICS_VERSION": "17.2.1", + "ANDROID_FIREBASE_MESSAGING_VERSION": "20.0.0", + "ANDROID_FIREBASE_CONFIG_VERSION": "19.0.3", + "ANDROID_FIREBASE_PERF_VERSION": "19.0.1", + "ANDROID_FIREBASE_AUTH_VERSION": "19.1.0", + "ANDROID_CRASHLYTICS_VERSION": "2.10.1", + "ANDROID_CRASHLYTICS_NDK_VERSION": "2.1.1" + }, + "cordova-plugin-androidx": {}, + "cordova-plugin-androidx-adapter": {}, + "cordova-plugin-background-geolocation": { + "GOOGLE_PLAY_SERVICES_VERSION": "+" + }, + "phonegap-nfc": {}, + "wifiwizard2": {} + }, + "platforms": [ + "android", + "ios" + ] + } +} From 1cd876d1735c1d27f1b156788f695084cad833bc Mon Sep 17 00:00:00 2001 From: umasoodch Date: Thu, 3 Jun 2021 15:50:39 +0300 Subject: [PATCH 8/8] added ionic4-rating module in package.json --- Mohem/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Mohem/package.json b/Mohem/package.json index 47068303..3caf1fb0 100644 --- a/Mohem/package.json +++ b/Mohem/package.json @@ -8,7 +8,7 @@ "ng": "ng", "start": "ng serve", "build": "ng build", - "test": "ng test", + "test": "ng test", "lint": "ng lint", "e2e": "ng e2e" }, @@ -101,6 +101,7 @@ "date-fns": "^1.30.1", "es6-promise-plugin": "^4.1.0", "ionic2-calendar": "^0.5.8", + "ionic4-rating": "^1.0.9", "ng-circle-progress": "^1.5.1", "ng2-file-upload": "^1.3.0", "ng2-pdf-viewer": "^5.3.2",