Skip to content

Commit 4c25345

Browse files
TheLastCicadaTheLastCicada
authored
Merge pull request #1055 from Chia-Network/develop
Release 1.1.0: Change name from Climate Warehouse to CADT
2 parents d24a704 + 5b2b879 commit 4c25345

File tree

7 files changed

+5029
-4806
lines changed

7 files changed

+5029
-4806
lines changed

‎.github/workflows/build-installers.yaml

+31-20
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@ jobs:
5555
npm install -g notarize-cli
5656
notarize-cli \
5757
--file="$DMG_FILE" \
58-
--bundle-id net.chia.climate-warehouse-ui \
58+
--bundle-id net.chia.cadt-ui \
5959
--username "${{ secrets.APPLE_NOTARIZE_USERNAME }}" \
6060
--password "${{ secrets.APPLE_NOTARIZE_PASSWORD }}"
6161
6262
- name: Upload Mac Installer
6363
uses: actions/upload-artifact@v3
6464
with:
65-
name: mac-installer
65+
name: cadt-ui-mac-installer
6666
path: ${{ github.workspace }}/dist/*.dmg
6767

6868
build_windows:
@@ -91,7 +91,7 @@ jobs:
9191
- name: Upload Windows Installer
9292
uses: actions/upload-artifact@v3
9393
with:
94-
name: windows-installer
94+
name: cadt-ui-windows-installer
9595
path: ${{ github.workspace }}/dist/*.exe
9696

9797
build_linux:
@@ -114,14 +114,20 @@ jobs:
114114
- name: Build electron app
115115
run: npm run electron:package:linux
116116

117+
- name: Rename Linux installer to be standard format for apt
118+
run: |
119+
ORIGINAL=$(ls dist/*.deb)
120+
MODIFIED=${ORIGINAL:0:-10}-1${ORIGINAL#${ORIGINAL:0:-10}}
121+
mv $ORIGINAL $MODIFIED
122+
117123
- name: Upload Linux Installer
118124
uses: actions/upload-artifact@v3
119125
with:
120-
name: linux-installer
126+
name: cadt-ui-linux-installer
121127
path: ${{ github.workspace }}/dist/*.deb
122128

123129
build_web:
124-
name: Build Climate Warehouse Web App
130+
name: Build CADT UI Web App
125131
runs-on: ubuntu-latest
126132
steps:
127133
- name: Checkout Code
@@ -139,13 +145,13 @@ jobs:
139145
npm run build
140146
141147
- name: Create .tar.gz of the web build
142-
run: tar -cvzf web-build.tar.gz build
148+
run: tar -cvzf cadt-ui-web-build.tar.gz build
143149

144150
- name: Upload build artifact
145151
uses: actions/upload-artifact@v3
146152
with:
147-
name: web-build
148-
path: web-build.tar.gz
153+
name: cadt-ui-web-build
154+
path: cadt-ui-web-build.tar.gz
149155

150156
release:
151157
runs-on: ubuntu-latest
@@ -159,33 +165,33 @@ jobs:
159165
- name: Download Windows artifacts
160166
uses: actions/download-artifact@v3
161167
with:
162-
name: windows-installer
163-
path: windows-installer
168+
name: cadt-ui-windows-installer
169+
path: cadt-ui-windows-installer
164170

165171
- name: Download MacOS artifacts
166172
uses: actions/download-artifact@v3
167173
with:
168-
name: mac-installer
169-
path: mac-installer
174+
name: cadt-ui-mac-installer
175+
path: cadt-ui-mac-installer
170176

171177
- name: Download Linux artifacts
172178
uses: actions/download-artifact@v3
173179
with:
174-
name: linux-installer
175-
path: linux-installer
180+
name: cadt-ui-linux-installer
181+
path: cadt-ui-linux-installer
176182

177183
- name: Download Web artifact
178184
uses: actions/download-artifact@v3
179185
with:
180-
name: web-build
181-
path: web-build
186+
name: cadt-ui-web-build
187+
path: cadt-ui-web-build
182188

183189
- name: Get Filenames
184190
run: |
185-
DMG_FILE=$(find ${{ github.workspace }}/mac-installer/ -type f -name '*.dmg')
186-
DEB_FILE=$(find ${{ github.workspace }}/linux-installer/ -type f -name '*.deb')
187-
EXE_FILE=$(find ${{ github.workspace }}/windows-installer/ -type f -name '*.exe')
188-
WEB_FILE=$(find ${{ github.workspace }}/web-build/ -type f -name '*.tar.gz')
191+
DMG_FILE=$(find ${{ github.workspace }}/cadt-ui-mac-installer/ -type f -name '*.dmg')
192+
DEB_FILE=$(find ${{ github.workspace }}/cadt-ui-linux-installer/ -type f -name '*.deb')
193+
EXE_FILE=$(find ${{ github.workspace }}/cadt-ui-windows-installer/ -type f -name '*.exe')
194+
WEB_FILE=$(find ${{ github.workspace }}/cadt-ui-web-build/ -type f -name '*.tar.gz')
189195
190196
echo "DMG_FILE=$DMG_FILE" >>$GITHUB_ENV
191197
echo "DEB_FILE=$DEB_FILE" >>$GITHUB_ENV
@@ -200,3 +206,8 @@ jobs:
200206
${{ env.DEB_FILE }}
201207
${{ env.EXE_FILE }}
202208
${{ env.WEB_FILE }}
209+
210+
- name: Trigger apt repo update
211+
run: |
212+
curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"cadt_repo":"cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}"}' ${{ secrets.GLUE_API_URL }}/api/v1/cadt/${{ github.sha }}/start
213+
curl -s -XPOST -H "Authorization: Bearer ${{ secrets.GLUE_ACCESS_TOKEN }}" --data '{"cadt_repo":"cadt-ui","release_version":"${{ steps.tag-name.outputs.TAGNAME }}"}' ${{ secrets.GLUE_API_URL }}/api/v1/cadt/${{ github.sha }}/success/deploy

‎.github/workflows/deploy-s3.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ concurrency:
1616

1717
jobs:
1818
build-and-deploy:
19-
name: Build Climate Warehouse App and Upload to S3
19+
name: Build CADT App and Upload to S3
2020
runs-on: [k8s-public]
2121
container:
2222
image: ubuntu:latest

‎.husky/commit-msg

100644100755
File mode changed.

‎.husky/pre-commit

100644100755
File mode changed.

‎README.md

+40-7
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,60 @@
1-
# Climate Warehouse User Interface
1+
# Climate Action Data Trust User Interface
22

3-
This repository provides a graphical user interface (UI) for the [Climate Warehouse](https://github.com/Chia-Network/climate-warehouse) application. The Climate Warehouse interfaces with the Chia Blockchain software and provides and API for entering and retrieving carbon data. This UI is a javascript application that connects to the Climate Warehouse API for a convenient way to access the data.
3+
This repository provides a graphical user interface (UI) for the [Climate Action Data Trust (CADT)](https://github.com/Chia-Network/cadt) application. CADT interfaces with the Chia Blockchain software and provides and API for entering and retrieving carbon data. This UI is a javascript application that connects to the CADT API for a convenient way to access the data.
4+
5+
*Note that this application was previously called the Climate Warehouse UI and that name may be used interchangeably in documentation and throughout this application.*
46

57

68
## Installation
79

8-
The UI application can be hosted as a web application and accessed via the browser, or as a desktop application packaged with Electron.
10+
The UI application can be hosted as a web application and accessed via the browser, or as a desktop application packaged with Electron. Currently the application is only packaged for x86 platforms, though building from source is expected to work on ARM.
911

1012
### Desktop Applications
1113

12-
The [releases](https://github.com/Chia-Network/climate-warehouse-ui/releases) page provides desktop applications packaged for Windows, Mac, and Debian-based Linux distributions.
14+
The [releases](https://github.com/Chia-Network/cadt-ui/releases) page provides desktop applications packaged for Windows, Mac, and Debian-based Linux distributions.
15+
16+
#### Ubuntu Desktop via Apt
17+
18+
For Ubuntu-based Linux desktops the CADT UI is available for install with `apt`.
19+
20+
1. Start by updating apt and allowing repository download over HTTPS:
21+
22+
```
23+
sudo apt-get update
24+
sudo apt-get install ca-certificates curl gnupg
25+
```
26+
27+
2. Add Chia's official GPG Key (if you have installed Chia or [CADT](https://github.com/Chia-Network/cadt) with `apt`, you'll have this key already and will get a message about overwriting the existing key, which is safe to do):
28+
29+
```
30+
curl -sL https://repo.chia.net/FD39E6D3.pubkey.asc | sudo gpg --dearmor -o /usr/share/keyrings/chia.gpg
31+
```
32+
33+
3. Use the following command to setup the repository.
34+
35+
```
36+
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/chia.gpg] https://repo.chia.net/cadt/debian/ stable main" | sudo tee /etc/apt/sources.list.d/cadt.list > /dev/null
37+
```
38+
39+
4. Install CADT-UI
40+
41+
```
42+
sudo apt-get update
43+
sudo apt-get install cadt-ui
44+
```
45+
1346

1447
### Web Application
1548

16-
The Climate Warehouse UI can be hosted as a web application, either for internal use, or made available to the public. When operating as a web application, the user's browser must be able to connect to the [Climate Warehouse API](https://github.com/Chia-Network/climate-warehouse). This means the API must be available on the public internet if the UI is public. The `READ_ONLY` option on the API should be set when running a public observer node.
49+
The Climate Warehouse UI can be hosted as a web application, either for internal use, or made available to the public. When operating as a web application, the user's browser must be able to connect to the [CADT API](https://github.com/Chia-Network/cadt). This means the API must be available on the public internet if the UI is public. The `READ_ONLY` option on the API should be set when running a public observer node.
1750

18-
To host the UI on the web, use the [web-build.tar.gz file from the releases page](https://github.com/Chia-Network/climate-warehouse-ui/releases). One of the simplest solutions is to uncompress these files into a [public S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteAccessPermissionsReqd.html). These files could also be served by any webserver, such as Nginx or Apache.
51+
To host the UI on the web, use the [web-build.tar.gz file from the releases page](https://github.com/Chia-Network/cadt-ui/releases). One of the simplest solutions is to uncompress these files into a [public S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteAccessPermissionsReqd.html). These files could also be served by any webserver, such as Nginx or Apache.
1952

2053
### From Source
2154

2255
```
2356
npm install -g react-scripts
24-
git clone [email protected]:Chia-Network/climate-warehouse-ui.git
57+
git clone [email protected]:Chia-Network/cadt-ui.git
2558
cd climate-warehouse-ui
2659
nvm install 16.0.0
2760
nvm use 16.0.0

0 commit comments

Comments
 (0)