Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 6.0.0 v13 #3430

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
81142ed
Issue #SB-000 merge: Merge pull request #3339 from swayangjit/master
swayangjit Feb 18, 2023
24d87f0
Issue #SB-000 merge: Merge pull request #3346 from swayangjit/master
swayangjit Feb 25, 2023
700226e
Issue #SB-000 merge: Merge branch 'release-5.1.0.9' into master
swayangjit Mar 28, 2023
7cf1f1c
Issue #SB-000 chore: Updated ReadMe.md.
swayangjit Mar 28, 2023
5e25c38
Issue #SB-000 merge: Merge pull request #3383 from swayangjit/master
swayangjit Mar 28, 2023
5b1c0fd
Merge pull request #381 from shikshalokam/ED-519-v12
vishwanath1004 May 8, 2023
9c52829
ISSUE #ED-1514 feat : Deleting evidence attached while creating new task
May 11, 2023
1b91cb8
ISSUE datepickerIssue fix: Date picker issue fix in angular 13
May 12, 2023
0a03b55
Merge pull request #382 from shikshalokam/datePickerIssue
vishwanath1004 May 12, 2023
9a5286b
ISSUE #ED-431 feat : Added program details page UI
Vinod-V3 May 12, 2023
730858f
Merge remote-tracking branch 'origin/release-6.0.0_v13' into ED-431-v13
Vinod-V3 May 12, 2023
9f0e132
ISSUE #ED-430 feat : New Programs Listing page
Vinod-V3 May 16, 2023
3af4010
Issue #ED-430 merge : Merge branch 'release-6.0.0_v13_1' into ED-430
Vinod-V3 May 16, 2023
9200c62
ISSUE #ED-431 feat : Added Join program popup in program details page
Vinod-V3 May 17, 2023
92d1a10
Merge branch 'release-6.0.0_v13' into ED-430
Vinod-V3 May 18, 2023
054bca6
Merge branch 'release-6.0.0_v13' into ED-430
Vinod-V3 May 18, 2023
d454d30
Merge pull request #10 from Vinod-V3/ED-430
Vinod-V3 May 18, 2023
fe87a61
issue #ED-1514 merge : Merging from release-6.0.0_v13
May 18, 2023
fc556ee
Merge pull request #390 from shikshalokam/ED-1514
vishwanath1004 May 18, 2023
7a8d934
Merge branch 'shikshalokam:release-6.0.0_v13' into release-6.0.0_v13
Vinod-V3 May 18, 2023
0f931f0
Merge branch 'release-6.0.0_v13' into ED-431-v13
Vinod-V3 May 18, 2023
b43c06e
ISSUE #ED-431 feat : Api integration done for program details page
Vinod-V3 May 20, 2023
f8bfd7f
Merge pull request #11 from Vinod-V3/ED-431-v13
Vinod-V3 May 20, 2023
53deb55
Merge pull request #391 from Vinod-V3/release-6.0.0_v13
vishwanath1004 May 21, 2023
434f13f
Issue #ED-1682 fix : Ionic migration 5 to 6
May 25, 2023
fde8630
Issue #ED-98 feat : User consent for PII data for improvement projects
May 25, 2023
384606e
Issue #ED-432 fix : QA issue fix
May 25, 2023
b085ac4
Issue #ED-432 fix : QA issue fix
May 25, 2023
a1082fc
ISSUE #ED-431 fix : Changes done for PII consent and QA fixes
Vinod-V3 May 29, 2023
d935cfb
ISSUE #ED-430 fix : QA issue fix
Vinod-V3 May 29, 2023
2fa7bd9
ISSUE #ED-98 fix : Fix done related to PII consent flow for projects
Vinod-V3 May 29, 2023
b972290
Issue #ED-1682 fix : Ionic migration 5 to 6
May 30, 2023
183b931
Merge pull request #392 from Vinod-V3/sprint-6.0_5
vishwanath1004 May 30, 2023
981b690
Issue #ED-542 feat : Program tile for teachers
May 30, 2023
a6b915f
ISSUE #ED-99 feat : User consent for PII data for Observations
Vinod-V3 May 30, 2023
070e99a
ISSUE #ED-22 feat : Modification done for the Start improvement popup
Vinod-V3 May 30, 2023
f9ab1bb
ISSUE #ED-540 feat : Added PII popup for survey and observation, Star…
Vinod-V3 May 30, 2023
45e5dbc
ISSUE #ED-540 feat : Added PII popup for survey and observation, Star…
Vinod-V3 May 30, 2023
56dc755
Merge pull request #393 from Vinod-V3/sprint-6.0_5
vishwanath1004 May 31, 2023
1141958
Issue #SB-000 merge: Merge branch 'release-5.2.0' into master
swayangjit Jun 2, 2023
5107611
Issue #SB-000 chore: Update README.md
swayangjit Jun 2, 2023
d5dc3e4
Issue #SB-000 merge: Merge pull request #3421 from swayangjit/master
swayangjit Jun 2, 2023
d7a374f
Merge branch 'sprint-6.0_5' of https://github.com/Vinod-V3/SunbirdEd-…
Vinod-V3 Jun 2, 2023
8b3804d
ISSUE #ED-99 fix : QA issue fix
Vinod-V3 Jun 2, 2023
eb72ce4
ISSUE #ED-431 fix : QA issue fix
Vinod-V3 Jun 2, 2023
7f0259e
ISSUE #ED-98 fix : QA issue fix
Vinod-V3 Jun 2, 2023
7c91b90
ISSUE #ED-99 fix : QA issue fix
Vinod-V3 Jun 5, 2023
f0dfe0c
ISSUE #ED-431 fix : QA issue fix
Vinod-V3 Jun 5, 2023
f71c1cc
Merge pull request #394 from Vinod-V3/sprint-6.0_5
vishwanath1004 Jun 7, 2023
05af020
Issue #ED-430 fix : QA issue fix
Jun 9, 2023
7c09769
Issue #ED-98,#ED-522 fix : QA issue fixes.
Jun 12, 2023
b37f1c6
ISSUE #ED-540 feat : Pii consent flow changes done for Survey
Vinod-V3 Jun 12, 2023
55575f7
Merge pull request #12 from Vinod-V3/ED-540
Vinod-V3 Jun 12, 2023
d6cba0c
Merge pull request #395 from Vinod-V3/sprint-6.0_5
vishwanath1004 Jun 13, 2023
1536601
Merge branch 'Sunbird-Ed:master' into sprint-6.0_5
vishwanath1004 Jun 13, 2023
c58b346
Merge branch 'Sunbird-Ed:release-6.0.0_v13' into release-6.0.0_v13
vishwanath1004 Jun 13, 2023
de0352d
Issue #000 merge : merging code from release-6.0.0_v13
Jun 13, 2023
b4ef7ef
Merge pull request #396 from shikshalokam/sprint-6.0_5
vishwanath1004 Jun 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 33 additions & 30 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,30 @@
Recommended Branch - release-4.9.0

Kindly mail back to sunbird to get the starter kit Which consists of two files:
a) google-services.json - To be Copied at the root of the project
b) sunbird.properties. - To be Copied into buildConfig/ folder
[![Circle CI - master branch](https://circleci.com/gh/Sunbird-Ed/SunbirdEd-portal/tree/master.svg?style=svg)](https://circleci.com/gh/Sunbird-Ed/SunbirdEd-mobile-app/tree/master.svg?style=svg)
[![Circle CI Badge](https://circleci.com/gh/Sunbird-Ed/SunbirdEd-mobile-app.svg?style=shield)]((https://circleci.com/gh/Sunbird-Ed/SunbirdEd-mobile-app.svg?style=shield))
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-mobile-app&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Sunbird-Ed_SunbirdEd-portal)
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-mobile-app&metric=coverage)](https://sonarcloud.io/summary/new_code?id=Sunbird-Ed_SunbirdEd-mobile-app)
[![Lines of Code](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-mobile-app&metric=ncloc)](https://sonarcloud.io/summary/new_code?id=Sunbird-Ed_SunbirdEd-mobile-app)
[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Sunbird-Ed_SunbirdEd-portal&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=Sunbird-Ed_SunbirdEd-mobile-app)

## What is the Sunbird Mobile app?
The Sunbird Mobile app is the app-based interface for the Sunbird application stack. It provides a app(android/ios) through which all functionality of Sunbird can be accessed.

**Dependencies:**
NPM Version - above 6
Node Version - 14 (Recommended)
Cordova Version - 9 (Recommended)
Latest release- [release-5.2.0](https://github.com/Sunbird-Ed/SunbirdEd-mobile-app/releases/tag/release-5.2.0_RC13)

Ongoing release- [release-6.0.0](https://github.com/Sunbird-Ed/SunbirdEd-mobile-app/tree/release-6.0.0_v13)

**Prerequisites:**
|Package| Version | Recommended Version |
|--|--|--|
[Node](https://nodejs.org/en/) | 12+ | 12.22.10
[NPM](https://nodejs.org/en/) | 6+ | 6.14.16
[Cordova](https://cordova.apache.org/) | 10+ | 10.1.2
[Ionic](https://ionicframework.com/docs/intro/cli) | 5 | 5.7.0
[Java(For Android)](https://www.oracle.com/in/java/technologies/downloads/) | 11+ | 11.0.15.1
[Gradle(For Android)](https://gradle.org/install/) | 7+ | 7.0.2
[CocoaPods(For Ios)](https://cocoapods.org/) | 1.11.3 |

**Project Setup**

**1. Ionic-Android build Setup**
- [Install java](https://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html)
Expand All @@ -26,23 +42,19 @@ Cordova Version - 9 (Recommended)
CLI Setup
- `npm install -g ionic`
- `npm install -g cordova`

**2. Project Setup**
- git clone the repo(https://github.com/Sunbird-Ed/SunbirdEd-mobile-app).
- Rename `sunbird.properties.example` file to `sunbird.properties` and put all the valid credentials and api endpoint.
- Run `./build.sh`

**3. Onboarding/Tabs Configuration**
Onboarding steps and Tabs can be configured via this configuration settings.

**Onboarding Configurations**
|Name|Description|Options|
|----|-----|-----|
|Language Selection|User should select their prefered language|To skip language selection, set skip as false and provide default values|
|User Role Selection|User should select their role|If want to skip User Type selection, set skip as false and provide default user type|
|Profile Settings|User should set their profile by choosing their framework fields|Provide deafult profile values to skip profile settings page|
|District Maping|Here user need to provide details related to their location|To skip this page deafult location values are required|

#### Language Selection
```
{
Expand All @@ -58,7 +70,6 @@ Cordova Version - 9 (Recommended)
]
}
```

#### User Role Selection
```
{
Expand All @@ -71,7 +82,6 @@ Cordova Version - 9 (Recommended)
]
}
```

#### Profile Settings
```
{
Expand Down Expand Up @@ -115,11 +125,8 @@ Cordova Version - 9 (Recommended)
]
}
```

**Tabs Page COnfigurations**

Configure the tabs page according to the requirement. Fllowing are the configurable settings for tabs.

```
{
"tabs": [
Expand All @@ -143,7 +150,6 @@ Configure the tabs page according to the requirement. Fllowing are the configura
]
}
```

|Property|Description|Value|
|----|----|----|
|`root`|On which page the tab should be shown.|`home`|
Expand All @@ -159,19 +165,18 @@ Configure the tabs page according to the requirement. Fllowing are the configura
|`status`|To display to a spefic user criteria|ex: 'logIn' will show to logged in users only|
|`userTypeAdmin`|Wheather to show for only Admin users|Boolean value|


**4. How to build apk**
- To check attached devices do `adb devices`
- `npm run ionic-build` (Make sure you have attached device)
- `ionic cordova run android --prod`
- Apk location `project_folder/platforms/android/app/build/outputs/apk/staging/debug/apk_name.apk`

- To check attached devices do `adb devices`
- `npm run ionic-build` (Make sure you have attached device)
- `ionic cordova run android --prod`
- Apk location `project_folder/platforms/android/app/build/outputs/apk/staging/debug/apk_name.apk`
**5. How to debug apk**
- Open chrome and enter `chrome://inspect`
- Select app

- Open chrome and enter `chrome://inspect`
- Select app
---------------------------------------
# IOS Development setup
## IOS Development setup
## Prerequisites
1. Node js version 14.20.1
2. Ionic 5.4.16 using `npm i [email protected] -g`
Expand All @@ -180,7 +185,6 @@ Configure the tabs page according to the requirement. Fllowing are the configura
5. ios-deploy 1.11.4 - using `brew install ios-deploy`
all of the above should be installed globally
Xcode 12.4 Build version 12D4e or above

NOTE: For M1 chipset users please go through FAQ section for ROSETA 2 compatibility and usage.

## Steps
Expand Down Expand Up @@ -208,5 +212,4 @@ Configure the tabs page according to the requirement. Fllowing are the configura
Check is JAVA_HOME is set by runnig `echo $JAVA_HOME`, if you get the installation path as output then JAVA_HOME is set
For Further details follow the link - https://stackoverflow.com/a/50683158/4259981
4. (iOS Setup only) POD installation - https://cocoapods.org/
5. (Android Setup only) Gradle installation - https://gradle.org/install/

5. (Android Setup only) Gradle installation - https://gradle.org/install/
Loading