Skip to content

Commit 21aa417

Browse files
committed
Merge branch 'feature/add_certify_button' into 'master'
enh(wot) Add a button to certify See merge request clients/cesium-grp/cesium2s!16
2 parents ccf3d31 + 926a190 commit 21aa417

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+16641
-13901
lines changed

.gitlab-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ build:env:
160160

161161
build:
162162
extends: .build
163-
needs: ["build:env"]
164163
image: ${CI_BUILD_IMAGE}
165164
only:
166165
- develop
@@ -366,7 +365,7 @@ gitlab-release:
366365
- echo "--- Building 'www'"
367366
- export NODE_OPTIONS=--max-old-space-size=4096
368367
- npm run build:prod
369-
- fileName=${CI_PROJECT_NAME}-${APP_VERSION}.zip
368+
- fileName=${CI_PROJECT_NAME}-${APP_VERSION}-web.zip
370369
- releaseFile=${CI_PROJECT_DIR}/release/${fileName}
371370
- if [[ -f "${releaseFile}" ]]; then rm "${releaseFile}"; fi
372371
- cd ${CI_PROJECT_DIR}/www || exit 1

README.md

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1+
# Cesium²
2+
13
[![Latest Release](https://git.duniter.org/clients/cesium-grp/cesium2s/-/badges/release.svg)](https://git.duniter.org/clients/cesium-grp/cesium2s/-/releases)
24
[![pipeline status](https://git.duniter.org/clients/cesium-grp/cesium2s/badges/develop/pipeline.svg)](https://git.duniter.org/clients/cesium-grp/cesium2s/-/commits/develop)
35

4-
# Cesium²
5-
66
Cesium², running on Duniter v2s (Substrate).
77

88
Cesium² use Angular, Ionic and Capacitor.
99

10-
# Build
10+
## Build
1111

12-
## In a post-it
12+
### In a post-it
1313

1414
```bash
1515

@@ -26,9 +26,10 @@ npm install
2626
npm run start
2727
```
2828

29-
## Build for Android
29+
### Build for Android
3030

3131
- Init the android project:
32+
3233
```bash
3334
npm run android:prepare
3435
npm run android:init
@@ -40,7 +41,12 @@ npm run start
4041
- Run !
4142

4243
- Compile from the command line:
44+
4345
```bash
4446
npm run android:prepare
4547
npm run android:assemble:prod
4648
```
49+
50+
## More documentation
51+
52+
You will find more devloper documentation in [doc/](https://git.duniter.org/clients/cesium-grp/cesium2s/-/tree/master/doc) directory.

angular.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"crypto",
3030
"store",
3131
"bn.js",
32+
"bs58",
3233
"ip-regexp",
3334
"tweetnacl",
3435
"eventemitter3",

doc/build.md

Lines changed: 99 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,141 @@
1-
# Building from source
1+
# Building from Source
22

3-
Cesium² is an Angular App (Angular with Ionic).
3+
Cesium² is an Angular app built with Ionic. This article will guide you through setting up your environment and building the application.
44

5-
This article will explain how to install your environment, then build the application.
6-
7-
## Installation tools, and get sources
5+
## Installation Tools and Getting the Sources
86

97
1. Install [NVM](https://github.com/nvm-sh/nvm)
108

11-
2. Install Node v18 (e.g. v18.19.0)
12-
```bash
13-
nvm install 18.19.0
14-
```
9+
2. Install Node v18 (e.g., v18.19.0):
1510

16-
3. Install global dependency:
17-
```bash
18-
npm install -g @ionic/cli @angular/cli
19-
```
11+
```bash
12+
nvm install 18.19.0
13+
```
14+
15+
3. Install global dependencies:
16+
17+
```bash
18+
npm install -g @ionic/cli @angular/cli
19+
```
20+
21+
4. Get the sources by cloning the repository:
22+
23+
```bash
24+
git clone ...
25+
```
2026

21-
4. Get sources (clone the repo) : `git clone ...`
27+
### Optional: Install Additional Tools
2228

23-
### Install additional tools (optional)
2429
```bash
2530
sudo apt-get install chromium-browser docker.io
2631
```
2732

28-
## Web build
33+
## Web Build
2934

30-
### For development and test
35+
### Development and Testing
3136

32-
1. Install project's dependencies:
33-
```bash
34-
cd cesium
35-
npm install
36-
```
37+
1. Install the project's dependencies:
3738

38-
2. Check environment configuration:
39+
```bash
40+
cd cesium
41+
npm install
42+
```
3943

44+
2. Check the environment configuration:
4045
- Edit the file `src/environment/environment.ts`
41-
42-
3. Start the app
43-
```bash
44-
cd cesium
45-
npm start
46-
```
46+
47+
3. Start the app:
48+
49+
```bash
50+
cd cesium
51+
npm start
52+
```
53+
4754
By default, the app should be accessible at [http://localhost:4200](http://localhost:4200)
48-
55+
4956
To change the default port, use this command instead:
50-
51-
```bash
52-
cd cesium
53-
ng serve --port [port]
54-
```
5557

56-
### Web build for production
58+
```bash
59+
cd cesium
60+
ng serve --port [port]
61+
```
5762

58-
1. Check environment configuration:
63+
### Production Web Build
5964

65+
1. Check the environment configuration:
6066
- Edit the file `src/environment/environment-prod.ts`
6167

6268
2. Create the release:
63-
```bash
64-
npm run build:prod
65-
```
6669

67-
## Android build
70+
```bash
71+
npm run build:prod
72+
```
73+
74+
## Android Build
75+
76+
### Debug APK for Development and Testing
6877

69-
### Build a debug APK, for development and test
78+
1. Install the Android build environment:
7079

71-
1. Install the android build environment:
72-
```bash
73-
cd sumaris-app/scripts
74-
./env-android.sh
75-
```
80+
```bash
81+
cd sumaris-app/scripts
82+
./env-android.sh
83+
```
7684

7785
2. Create a debug APK file:
78-
```bash
79-
cd sumaris-app/scripts
80-
./build-android.sh
81-
```
8286

83-
### Build a release APK, for production
87+
```bash
88+
cd sumaris-app/scripts
89+
./build-android.sh
90+
```
8491

85-
1. Check environment configuration:
92+
### Release APK for Production
8693

94+
1. Check the environment configuration:
8795
- Edit the file `src/environment/environment-prod.ts`
8896

8997
2. Create a release APK file:
90-
```bash
91-
cd sumaris-app/scripts
92-
./release-android.sh
93-
```
9498

95-
## Useful links
99+
```bash
100+
cd sumaris-app/scripts
101+
./release-android.sh
102+
```
96103

97-
- Ionic 4 colors: https://www.joshmorony.com/a-primer-on-css-4-variables-for-ionic-4/
98-
- Migration to Ionic 4 tips: https://www.joshmorony.com/my-method-for-upgrading-from-ionic-3-to-ionic-4/
99-
- Signing Android APK: See doc at
100-
https://www.c-sharpcorner.com/article/create-ionic-4-release-build-for-android/
104+
## Useful Links
105+
106+
- [Ionic 4 Colors](https://www.joshmorony.com/a-primer-on-css-4-variables-for-ionic-4/)
107+
- [Migration to Ionic 4 Tips](https://www.joshmorony.com/my-method-for-upgrading-from-ionic-3-to-ionic-4/)
108+
- [Signing Android APK](https://www.c-sharpcorner.com/article/create-ionic-4-release-build-for-android/)
101109

102110
## Troubleshooting
103111

104-
### Error on datasource, or angular material table
112+
### Error on Datasource or Angular Material Table
105113

106-
- Checkout the project https://github.com/e-is/angular4-material-table
107-
```bash
108-
git clone https://github.com/e-is/angular4-material-table.git
109-
cd angular4-material-table
110-
```
111-
- Build the project:
112-
```bash
113-
npm install
114-
npm run build
115-
cp package*.json ./dist
116-
```
117-
- Link to your local NPM repo:
118-
```bash
119-
cd dist
120-
npm link
121-
```
122-
- Use it from Sumaris project:
123-
```bash
124-
cd <sumaris_app_root>
125-
npm link angular4-material-table
126-
```
114+
1. Check out the project:
115+
116+
```bash
117+
git clone https://github.com/e-is/angular4-material-table.git
118+
cd angular4-material-table
119+
```
120+
121+
2. Build the project:
122+
123+
```bash
124+
npm install
125+
npm run build
126+
cp package*.json ./dist
127+
```
128+
129+
3. Link to your local NPM repo:
130+
131+
```bash
132+
cd dist
133+
npm link
134+
```
135+
136+
4. Use it from the Sumaris project:
137+
138+
```bash
139+
cd <sumaris_app_root>
140+
npm link angular4-material-table
141+
```

0 commit comments

Comments
 (0)