From fa21aae85ddd6af09b443638374e3b7654b8dcaf Mon Sep 17 00:00:00 2001 From: "jitendra.ashutec" Date: Wed, 16 Sep 2020 14:08:47 +0530 Subject: [PATCH 1/6] fixed phone login issue --- .../src/lib/core/components/login/login.component.tns.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/shared-library/src/lib/core/components/login/login.component.tns.html b/projects/shared-library/src/lib/core/components/login/login.component.tns.html index 1f616f6b8..e08718cab 100644 --- a/projects/shared-library/src/lib/core/components/login/login.component.tns.html +++ b/projects/shared-library/src/lib/core/components/login/login.component.tns.html @@ -29,7 +29,7 @@                            -                             +                                       From 27acbf1b7a9c564506003375fab4f630459d77e6 Mon Sep 17 00:00:00 2001 From: "jitendra.ashutec" Date: Tue, 29 Sep 2020 10:33:43 +0530 Subject: [PATCH 2/6] Changed in infoplist file --- configurations/bitwiser-edu/ios/Info.plist.dev | 10 ++++++---- configurations/bitwiser-edu/ios/Info.plist.prod | 10 ++++++---- configurations/trivia/ios/Info.plist.dev | 10 ++++++---- configurations/trivia/ios/Info.plist.prod | 10 ++++++---- tsconfig.tns.json | 4 ++-- 5 files changed, 26 insertions(+), 18 deletions(-) diff --git a/configurations/bitwiser-edu/ios/Info.plist.dev b/configurations/bitwiser-edu/ios/Info.plist.dev index 90752e6eb..42804224a 100644 --- a/configurations/bitwiser-edu/ios/Info.plist.dev +++ b/configurations/bitwiser-edu/ios/Info.plist.dev @@ -67,11 +67,13 @@ remote-notification - NSPhotoLibraryUsageDescription - Please allow gallery access NSLocationUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location +NSPhotoLibraryUsageDescription + ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + NSCameraUsageDescription + ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture diff --git a/configurations/bitwiser-edu/ios/Info.plist.prod b/configurations/bitwiser-edu/ios/Info.plist.prod index 08f5b5754..01814adc2 100644 --- a/configurations/bitwiser-edu/ios/Info.plist.prod +++ b/configurations/bitwiser-edu/ios/Info.plist.prod @@ -67,11 +67,13 @@ remote-notification - NSPhotoLibraryUsageDescription - Please allow gallery access NSLocationUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location +NSPhotoLibraryUsageDescription + ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + NSCameraUsageDescription + ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture diff --git a/configurations/trivia/ios/Info.plist.dev b/configurations/trivia/ios/Info.plist.dev index 4195986ea..633a3df1a 100644 --- a/configurations/trivia/ios/Info.plist.dev +++ b/configurations/trivia/ios/Info.plist.dev @@ -67,12 +67,14 @@ remote-notification - NSPhotoLibraryUsageDescription - Please allow gallery access NSLocationUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + NSPhotoLibraryUsageDescription + ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + NSCameraUsageDescription + ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture ITSAppUsesNonExemptEncryption diff --git a/configurations/trivia/ios/Info.plist.prod b/configurations/trivia/ios/Info.plist.prod index 25a6b800c..3bca681a1 100644 --- a/configurations/trivia/ios/Info.plist.prod +++ b/configurations/trivia/ios/Info.plist.prod @@ -67,12 +67,14 @@ remote-notification - NSPhotoLibraryUsageDescription - Please allow gallery access NSLocationUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - App would like to access your location to offer you suggestion for current location + ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + NSPhotoLibraryUsageDescription + ${PRODUCT_NAME} would like to access your photo library, This allows you to select your photo as profile picture + NSCameraUsageDescription + ${PRODUCT_NAME} would like to access your camera, This allows you to take photo for profile picture ITSAppUsesNonExemptEncryption diff --git a/tsconfig.tns.json b/tsconfig.tns.json index b27f7c774..04438481b 100644 --- a/tsconfig.tns.json +++ b/tsconfig.tns.json @@ -27,10 +27,10 @@ "**/*.spec.ts", "server.ts", "./projects/shared-library/src/lib/shared/components/*", - "**/quill-module/*" + "**/quill-module/*", + "projects/trivia/src/tests/**/*.ts", ], "include": [ - "projects/trivia/src/tests/**/*.ts", "./projects/shared-library/src/lib/shared", "./projects/trivia/src/app/game-play/game-play.module.ts", "./projects/trivia/src/app/user/user.module.ts", From 44dabfa4507e5836b54ec5b585d63dbcce0657e3 Mon Sep 17 00:00:00 2001 From: "jitendra.ashutec" Date: Tue, 29 Sep 2020 17:14:44 +0530 Subject: [PATCH 3/6] fixed accounts info not displyed on game profile --- .../game-profile/game-profile.component.tns.html | 10 +++++----- .../app/user/components/game-profile/game-profile.ts | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/projects/trivia/src/app/user/components/game-profile/game-profile.component.tns.html b/projects/trivia/src/app/user/components/game-profile/game-profile.component.tns.html index 42bf02da2..b76c9e50b 100644 --- a/projects/trivia/src/app/user/components/game-profile/game-profile.component.tns.html +++ b/projects/trivia/src/app/user/components/game-profile/game-profile.component.tns.html @@ -112,31 +112,31 @@ - + - + - + - + - + diff --git a/projects/trivia/src/app/user/components/game-profile/game-profile.ts b/projects/trivia/src/app/user/components/game-profile/game-profile.ts index 25926b2ba..81ccc717c 100644 --- a/projects/trivia/src/app/user/components/game-profile/game-profile.ts +++ b/projects/trivia/src/app/user/components/game-profile/game-profile.ts @@ -100,6 +100,7 @@ export class GameProfile { this.topics = []; this.user = userDict[this.userId]; this.account = this.user.account; + this.cd.markForCheck(); this.gamePlayedAgainst = this.user.gamePlayed; if (this.gamePlayedAgainst && this.loggedInUser && this.loggedInUser.userId && this.userType === 1) { this.gamePlayedChangeSubject.next(true); From 406eba2f95e7068f465af388825c826449624666 Mon Sep 17 00:00:00 2001 From: "jitendra.ashutec" Date: Wed, 30 Sep 2020 13:01:09 +0530 Subject: [PATCH 4/6] change app in info.plist --- App_Resources/iOS/Info.plist | 10 ++++++---- configurations/bitwiser-edu/ios/Info.plist.dev | 8 ++++---- configurations/bitwiser-edu/ios/Info.plist.prod | 8 ++++---- configurations/trivia/ios/Info.plist.dev | 8 ++++---- configurations/trivia/ios/Info.plist.prod | 8 ++++---- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/App_Resources/iOS/Info.plist b/App_Resources/iOS/Info.plist index 4195986ea..8ba5332f4 100644 --- a/App_Resources/iOS/Info.plist +++ b/App_Resources/iOS/Info.plist @@ -67,12 +67,14 @@ remote-notification - NSPhotoLibraryUsageDescription - Please allow gallery access NSLocationUsageDescription - App would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - App would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location + NSPhotoLibraryUsageDescription + bitWiser would like to access your photo library, This will allow you to select your photo as profile picture + NSCameraUsageDescription + bitWiser would like to access your camera, This will allow you to take photo for profile picture ITSAppUsesNonExemptEncryption diff --git a/configurations/bitwiser-edu/ios/Info.plist.dev b/configurations/bitwiser-edu/ios/Info.plist.dev index 42804224a..1ab3619c5 100644 --- a/configurations/bitwiser-edu/ios/Info.plist.dev +++ b/configurations/bitwiser-edu/ios/Info.plist.dev @@ -68,12 +68,12 @@ remote-notification NSLocationUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser edu would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser edu would like to access your location to offer you suggestion for current location NSPhotoLibraryUsageDescription - ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + bitWiser edu would like to access your photo library, This will allow you to select your photo as profile picture NSCameraUsageDescription - ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture + bitWiser edu would like to access your camera, This will allow you to take photo for profile picture diff --git a/configurations/bitwiser-edu/ios/Info.plist.prod b/configurations/bitwiser-edu/ios/Info.plist.prod index 01814adc2..cc021e878 100644 --- a/configurations/bitwiser-edu/ios/Info.plist.prod +++ b/configurations/bitwiser-edu/ios/Info.plist.prod @@ -68,12 +68,12 @@ remote-notification NSLocationUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser edu would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser edu would like to access your location to offer you suggestion for current location NSPhotoLibraryUsageDescription - ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + bitWiser edu would like to access your photo library, This will allow you to select your photo as profile picture NSCameraUsageDescription - ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture + bitWiser edu would like to access your camera, This will allow you to take photo for profile picture diff --git a/configurations/trivia/ios/Info.plist.dev b/configurations/trivia/ios/Info.plist.dev index 633a3df1a..8ba5332f4 100644 --- a/configurations/trivia/ios/Info.plist.dev +++ b/configurations/trivia/ios/Info.plist.dev @@ -68,13 +68,13 @@ remote-notification NSLocationUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location NSPhotoLibraryUsageDescription - ${PRODUCT_NAME} would like to access your photo library, This will allow you to select your photo as profile picture + bitWiser would like to access your photo library, This will allow you to select your photo as profile picture NSCameraUsageDescription - ${PRODUCT_NAME} would like to access your camera, This will allow you to take photo for profile picture + bitWiser would like to access your camera, This will allow you to take photo for profile picture ITSAppUsesNonExemptEncryption diff --git a/configurations/trivia/ios/Info.plist.prod b/configurations/trivia/ios/Info.plist.prod index 3bca681a1..5fdc020d8 100644 --- a/configurations/trivia/ios/Info.plist.prod +++ b/configurations/trivia/ios/Info.plist.prod @@ -68,13 +68,13 @@ remote-notification NSLocationUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location NSLocationWhenInUseUsageDescription - ${PRODUCT_NAME} would like to access your location to offer you suggestion for current location + bitWiser would like to access your location to offer you suggestion for current location NSPhotoLibraryUsageDescription - ${PRODUCT_NAME} would like to access your photo library, This allows you to select your photo as profile picture + bitWiser would like to access your photo library, This allows you to select your photo as profile picture NSCameraUsageDescription - ${PRODUCT_NAME} would like to access your camera, This allows you to take photo for profile picture + bitWiser would like to access your camera, This allows you to take photo for profile picture ITSAppUsesNonExemptEncryption From 72344b83cdc47fa7b2ee55ddedf5135c47484aff Mon Sep 17 00:00:00 2001 From: "jitendra.ashutec" Date: Wed, 30 Sep 2020 13:17:18 +0530 Subject: [PATCH 5/6] score is not displayed when score is 0 --- .../components/game-continue/game-continue.component.tns.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/trivia/src/app/game-play/components/game-continue/game-continue.component.tns.html b/projects/trivia/src/app/game-play/components/game-continue/game-continue.component.tns.html index 301db9783..563e93815 100644 --- a/projects/trivia/src/app/game-play/components/game-continue/game-continue.component.tns.html +++ b/projects/trivia/src/app/game-play/components/game-continue/game-continue.component.tns.html @@ -104,7 +104,7 @@ class="score-container">