Skip to content
Open

Main #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
183 commits
Select commit Hold shift + click to select a range
467b1c5
Merge pull request #114 from Greenstand/v1
OlhaD Feb 1, 2024
8e75c05
Merge pull request #116 from Greenstand/v1
OlhaD Feb 1, 2024
aad5da2
fix: deploy
OlhaD Feb 20, 2024
36765f4
Merge pull request #117 from OlhaD/v1_deploy
OlhaD Feb 20, 2024
ec9aaeb
Merge pull request #118 from OlhaD/v1_deploy
OlhaD Feb 20, 2024
0cc2224
chore(release): 1.1.0 [skip ci]
semantic-release-bot Feb 20, 2024
be7d36e
Update SendTokens.js
OlhaD Feb 27, 2024
1019901
Merge pull request #120 from Greenstand/OlhaD-test-2
OlhaD Feb 27, 2024
ca52c34
fix: Update SendTokens.js
OlhaD Feb 27, 2024
34c1154
Merge pull request #121 from Greenstand/OlhaD-test-3
OlhaD Feb 27, 2024
b1c53f2
feat: Update SendTokens.js
OlhaD Feb 27, 2024
b156005
fix: Update Login.js
OlhaD Feb 27, 2024
4c7b1bb
fix: Update SendTokens.js
OlhaD Feb 27, 2024
8dafb59
fix: setup prerelease for v2
emmanue Feb 28, 2024
17a7409
chore(release): 2.0.1-v2.1 [skip ci]
semantic-release-bot Feb 28, 2024
8610394
Update Login.js
OlhaD Feb 28, 2024
87047f5
feat: Add trust relationship route
Mlowegene Mar 1, 2024
a2c6eb7
feat: Add link item of the trust relationship page
Mlowegene Mar 1, 2024
3910516
feat: update number of length
Mlowegene Mar 1, 2024
a4bd1ab
fix: channel error
emmanue Mar 6, 2024
5e4d5f4
chore(release): 2.0.1-v2.2 [skip ci]
semantic-release-bot Mar 6, 2024
5f558f6
Feat: component that retreave data from api send to the Table
Mlowegene Mar 11, 2024
e1736c0
feat: create listing table
Mlowegene Mar 11, 2024
c26c40b
feat: style for trust relationship table
Mlowegene Mar 11, 2024
5e19aad
feat: create context for trust relationships
Mlowegene Mar 11, 2024
8fbe4e0
feat: create apiClient for trust relationships
Mlowegene Mar 11, 2024
3f727c0
feat: Added trust relationships route
Mlowegene Mar 11, 2024
852ae91
fix: delete unwanted character
Mlowegene Mar 11, 2024
27b0835
feat: Add active link on menu item
Mlowegene Mar 12, 2024
9a380d3
ci: set dev and test deploy [skip ci]
emmanue Mar 12, 2024
9eaf2ff
feat:row highlight on click, pending row highlight and sorting
Mlowegene Mar 12, 2024
6928d53
feat:added functionality for red dot notification next to Trust relat…
samwel141 Mar 12, 2024
bfa646f
Merge branch 'v2' of https://github.com/Mlowegene/treetracker-wallet-…
samwel141 Mar 12, 2024
541a3e0
fix:red dot notification placement
samwel141 Mar 12, 2024
1b6715a
feat: when table row clicked right side panel appear
Mlowegene Mar 15, 2024
27f2d94
feat: making filter functionality
samwel141 Mar 17, 2024
689846e
feat: making filter functionality
samwel141 Mar 17, 2024
85d3c6b
feat: making filter functionality
samwel141 Mar 17, 2024
2278320
feat: making filter functionality
samwel141 Mar 17, 2024
55ad0e4
feat:making search and row click side panel functionality
samwel141 Mar 17, 2024
2a2bb47
fix: delete console log
Mlowegene Mar 18, 2024
0ff01b1
Merge branch 'v2' of github.com:Mlowegene/treetracker-wallet-admin-cl…
Mlowegene Mar 19, 2024
d1cace1
fix: enhancement of the row click side pannel
Mlowegene Mar 19, 2024
35bf05f
fix: path of token to the accept and decline
Mlowegene Mar 19, 2024
29f3ead
ci: update artifacts [skip ci]
emmanue Mar 20, 2024
16f26e0
ci: set base directory [skip ci]
emmanue Mar 20, 2024
0ce04d5
feat: Add sorting in trust relationships table
Mlowegene Mar 25, 2024
653497a
feat: Added the created date filter
samwel141 Mar 26, 2024
7d7d9a3
enhancement: added trust relationships tests
samwel141 Mar 26, 2024
e99444d
Merge branch 'v2' of github.com:Mlowegene/treetracker-wallet-admin-cl…
Mlowegene Mar 26, 2024
9e0b97f
fix: fix typos
Mlowegene Mar 26, 2024
65ccddd
enh: moved filter dialog to a separate component
samwel141 Mar 26, 2024
0ee172b
Merge branch 'v2' of https://github.com/Mlowegene/treetracker-wallet-…
samwel141 Mar 26, 2024
7796826
ci: actions version numbers [skip ci]
emmanue Apr 2, 2024
526a42e
ci: ubuntu shell env [skip ci]
emmanue Apr 2, 2024
ccd9bb5
ci: correct flow [skip ci]
emmanue Apr 2, 2024
c04129f
ci: new workflow [skip ci]
emmanue Apr 2, 2024
b08b1fc
ci: workflow [skip ci]
emmanue Apr 2, 2024
17f8fe4
ci: workflow [skip ci]
emmanue Apr 2, 2024
7a7ed49
ci: deploy workflow [skip ci]
emmanue Apr 2, 2024
c0e9b43
ci: workflow [skip ci]
emmanue Apr 2, 2024
d8a3f9f
feat: request trust relationship functionality
pranavkparti Apr 4, 2024
27c349a
ci: release branch [skip ci]
emmanue Apr 6, 2024
16a4eec
ci: workflow [skip ci]
emmanue Apr 6, 2024
627dc00
rectified failed test cases
samwel141 Apr 8, 2024
afd789b
fix: implement sorting from api
samwel141 Apr 8, 2024
d125092
Merge pull request #126 from Mlowegene/v2
Mloweedgar Apr 9, 2024
2c121f0
chore(release): 2.1.0-v2.1 [skip ci]
semantic-release-bot Apr 9, 2024
1534513
Merge remote-tracking branch 'origin/v2' into v2
pranavkparti Apr 16, 2024
94e1c18
add customize wallet page
OlhaD Apr 16, 2024
06f888b
feat: customize wallet (in progress)
OlhaD Apr 23, 2024
47c0627
feat: integrate with trust relationships table,remove unneeded files
pranavkparti Apr 23, 2024
ff8ed12
feat: integrate with trust relationships table,remove unneeded files
pranavkparti Apr 23, 2024
ebf0a16
feat: implement tests
pranavkparti Apr 23, 2024
76bdaf7
Merge remote-tracking branch 'origin/create-trust-relationship' into …
pranavkparti Apr 23, 2024
4977138
fix: broken test, minor refactor
pranavkparti Apr 23, 2024
d873945
Removed unwanted lines of code
samwel141 Apr 23, 2024
a61bbff
fix initiated_by wallet in trust side panel
samwel141 Apr 24, 2024
dbf8626
Merge pull request #128 from samwel141/v2
Mloweedgar Apr 29, 2024
7215b0b
fix: modified filter features for improved functionality.
Mlowegene Apr 30, 2024
00c280d
Merge pull request #129 from Mlowegene/v2
Mloweedgar Apr 30, 2024
7deae32
chore(release): 2.1.0-v2.2 [skip ci]
semantic-release-bot Apr 30, 2024
896ac8d
fix filter in trust relationships
samwel141 Apr 30, 2024
3635c82
Merge remote-tracking branch 'origin/v2' into create-trust-relationship
pranavkparti Apr 30, 2024
17fc933
fixed merge error
pranavkparti Apr 30, 2024
2851c67
fixed merge error
pranavkparti Apr 30, 2024
1645b76
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 May 4, 2024
aa10e8b
fix: filter by request_type
samwel141 May 4, 2024
836f6ba
Merge pull request #127 from pranavkparti/create-trust-relationship
OlhaD May 6, 2024
8a35f06
chore(release): 2.1.0-v2.3 [skip ci]
semantic-release-bot May 6, 2024
16b734b
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 May 6, 2024
ccae3b3
fix: remove unwanted filter by type
samwel141 May 6, 2024
dc1be50
Update about wallet text
OlhaD May 6, 2024
ac446e8
Merge branch 'v2' into customize-wallets
OlhaD May 6, 2024
2c1d0e5
Merge pull request #131 from samwel141/v2
OlhaD May 6, 2024
4958df8
chore(release): 2.1.0-v2.4 [skip ci]
semantic-release-bot May 6, 2024
eb00793
Save name, about the wallet
OlhaD May 7, 2024
beb0189
customize wallet
OlhaD May 7, 2024
c38e0cf
Merge branch 'v2' into customize-wallets
OlhaD May 7, 2024
86d0794
fix
OlhaD May 7, 2024
e8eda2b
Merge pull request #132 from OlhaD/customize-wallets
OlhaD May 7, 2024
767ce15
fix
OlhaD May 7, 2024
3055656
Merge pull request #133 from Greenstand/customize-wallets
OlhaD May 7, 2024
a9e036d
ignore failed tests
OlhaD May 7, 2024
436ad28
Merge pull request #134 from Greenstand/customize-wallets
OlhaD May 7, 2024
cb43d3c
chore(release): 2.1.0-v2.5 [skip ci]
semantic-release-bot May 7, 2024
c11c1d4
feat: implement accept, decline and delete in trusts
samwel141 May 7, 2024
267930e
fix: fix the number of requested trust relationships
samwel141 May 7, 2024
21ffd8b
fix: fix tests
samwel141 May 7, 2024
3a7fc51
Merge pull request #135 from samwel141/v2
Mloweedgar May 7, 2024
c95864a
chore(release): 2.1.0-v2.6 [skip ci]
semantic-release-bot May 7, 2024
5541f6c
fix: fix number in red dot of trusts
samwel141 May 12, 2024
6e06be8
fix: fix tests
samwel141 May 12, 2024
062f27a
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 May 12, 2024
2b21a89
Merge pull request #136 from samwel141/v2
Mloweedgar May 14, 2024
1ea32f0
chore(release): 2.1.0-v2.7 [skip ci]
semantic-release-bot May 14, 2024
0d55646
fix: fix context provider wrap in layout
samwel141 May 14, 2024
42a7813
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 May 14, 2024
c815bde
Merge pull request #137 from samwel141/v2
Mloweedgar May 14, 2024
d89b603
chore(release): 2.1.0-v2.8 [skip ci]
semantic-release-bot May 14, 2024
6102d32
fix: fix appearance of buttons in panel
samwel141 May 21, 2024
9844373
fix: changed the api endpoint
samwel141 May 21, 2024
b37da9d
fix: fix trustrlationship context wrap error
samwel141 May 21, 2024
f6d8e97
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 May 21, 2024
1e51ae0
Merge pull request #138 from samwel141/v2
Mloweedgar May 21, 2024
a707c43
chore(release): 2.1.0-v2.9 [skip ci]
semantic-release-bot May 21, 2024
a7634a4
feat: added trust request types
pranavkparti May 21, 2024
cd93b2e
Merge branch 'create-trust-relationship' of github.com:pranavkparti/t…
pranavkparti May 21, 2024
0dc1c24
fix: fix typos
samwel141 Jun 25, 2024
9cd9c56
Merge pull request #139 from samwel141/v2
Mloweedgar Jun 25, 2024
2f9d185
chore(release): 2.1.0-v2.10 [skip ci]
semantic-release-bot Jun 25, 2024
c1c7430
fix: include get trusts for managed wallets
samwel141 Jul 23, 2024
416c356
Merge branch 'create-trust-relationship' of github.com:pranavkparti/t…
pranavkparti Jul 29, 2024
e8c44fb
feat: updated test
pranavkparti Jul 30, 2024
029de62
Merge pull request #140 from pranavkparti/create-trust-relationship
pranavkparti Jul 30, 2024
b268a05
chore(release): 2.1.0-v2.11 [skip ci]
semantic-release-bot Jul 30, 2024
09ff63b
fix: fix tests to enable trusts for managed wallets
samwel141 Aug 6, 2024
4bbebf9
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 Aug 6, 2024
01b6ea5
Merge pull request #141 from samwel141/v2
pranavkparti Aug 23, 2024
767265f
chore(release): 2.1.0-v2.12 [skip ci]
semantic-release-bot Aug 23, 2024
f9753b2
fix: sidebar closed width
pranavkparti Aug 25, 2024
03be1e3
fix: sidebar width changed
pranavkparti Aug 26, 2024
eaf1b53
fix: sidebar text color
pranavkparti Aug 26, 2024
ea0f717
fix: fix button logic in trusts side panel
samwel141 Aug 27, 2024
dedb31c
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 Aug 27, 2024
0453be9
Merge pull request #142 from samwel141/v2
pranavkparti Sep 8, 2024
80aa88b
Merge branch 'v2' into ui-sidebar-fix
pranavkparti Sep 8, 2024
00c2a9a
chore(release): 2.1.0-v2.13 [skip ci]
semantic-release-bot Sep 8, 2024
269a3ca
Merge pull request #143 from pranavkparti/ui-sidebar-fix
pranavkparti Sep 8, 2024
ae2eaf3
chore(release): 2.1.0-v2.14 [skip ci]
semantic-release-bot Sep 8, 2024
fb2e0e3
fix: fix sorting order and search functionality
samwel141 Oct 8, 2024
c4c8564
fix: upgrade actions/upload-artifact to v4
samwel141 Oct 20, 2024
78043e3
fix: show correct number of trust relationships
pranavkparti Oct 22, 2024
c896239
Merge pull request #145 from samwel141/ci-cd-v2
dadiorchen Oct 22, 2024
e29db7c
chore(release): 2.1.0-v2.15 [skip ci]
semantic-release-bot Oct 22, 2024
84d075a
Merge branch 'Greenstand:v2' into v2
samwel141 Oct 22, 2024
97748da
Merge branch 'Greenstand:v2' into trust-rel-sidebar-count-fix
pranavkparti Oct 29, 2024
bbc2075
Merge pull request #144 from samwel141/v2
pranavkparti Nov 5, 2024
d830372
Merge branch 'Greenstand:v2' into trust-rel-sidebar-count-fix
pranavkparti Nov 5, 2024
a90272d
chore(release): 2.1.0-v2.16 [skip ci]
semantic-release-bot Nov 5, 2024
3e14431
Merge pull request #146 from pranavkparti/trust-rel-sidebar-count-fix
pranavkparti Nov 5, 2024
bbd6c79
chore(release): 2.1.0-v2.17 [skip ci]
semantic-release-bot Nov 5, 2024
20f7085
fix: upgrade actions/download-artifact to v4
samwel141 Nov 19, 2024
dbf510e
Merge pull request #149 from samwel141/v2
samwel141 Nov 19, 2024
4ab1406
chore(release): 2.1.0-v2.18 [skip ci]
semantic-release-bot Nov 19, 2024
89d2d3f
fix: sidebar shows correct count
pranavkparti Nov 23, 2024
a24705d
Merge pull request #150 from pranavkparti/sidebar-pending-count-fix
pranavkparti Nov 23, 2024
94f9009
chore(release): 2.1.0-v2.19 [skip ci]
semantic-release-bot Nov 23, 2024
0fd3250
feat(trustRelationships): add custom tooltip to enable highlighting o…
samwel141 Dec 17, 2024
2774892
fix(trustRelationships): add test for truncate text functionaslity
samwel141 Dec 17, 2024
86d4afa
Merge branch 'v1' of https://github.com/samwel141/treetracker-wallet-…
samwel141 Dec 17, 2024
528f152
Merge pull request #151 from samwel141/v2
samwel141 Dec 17, 2024
33bc781
chore(release): 2.1.0-v2.20 [skip ci]
semantic-release-bot Dec 17, 2024
b0dd90a
feat: customize wallet - logo, hero
OlhaD Jan 7, 2025
58105e7
Merge pull request #152 from Greenstand/customize-wallet-images
OlhaD Jan 7, 2025
a2fda3c
chore(release): 2.1.0-v2.21 [skip ci]
semantic-release-bot Jan 7, 2025
49d6301
fix: fix content spacing in trust relationships side panel
samwel141 Jan 14, 2025
2a69d0a
Merge branch 'v2' of https://github.com/samwel141/treetracker-wallet-…
samwel141 Jan 14, 2025
c70f2e7
Merge pull request #153 from samwel141/v2
samwel141 Jan 14, 2025
1475394
chore(release): 2.1.0-v2.22 [skip ci]
semantic-release-bot Jan 14, 2025
b9503fe
refactor: Add version two [skip ci]
emmanue Feb 18, 2025
4bde42b
Merge v2
emmanue Feb 18, 2025
a96f7f9
chore(release): 2.1.0 [skip ci]
semantic-release-bot Feb 18, 2025
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
6 changes: 4 additions & 2 deletions .github/workflows/build-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,12 @@ jobs:
const s3BucketSecretNames = {
"main": "DEV_CDN_S3_BUCKET",
"beta": "DEV_STAGING_CDN_S3_BUCKET",
"alpha": "DEV_STAGING_CDN_S3_BUCKET",
}
const cdnIdSecretNames = {
"main": "DEV_CDN_DISTRIBUTION_ID",
"beta": "DEV_STAGING_CDN_DISTRIBUTION_ID",
"alpha": "DEV_STAGING_CDN_DISTRIBUTION_ID",
}
const releaseJson = require("./.releaserc.json");
const branches = releaseJson.branches.map(e => e.name? e.name : e);
Expand Down Expand Up @@ -92,7 +94,7 @@ jobs:
if: github.event_name == 'push' && github.repository == ${{ env.repository }}
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: github.event_name == 'push' && github.repository == ${{ env.repository }}
with:
name: client-bundle
Expand Down Expand Up @@ -136,7 +138,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Download bundled client resources
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: client-bundle
path: build-dev
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- uses: actions/checkout@v2
with:
# have to checkout master, to read releaserc, which means we must update the rc file in master with the newest settings
ref: main
ref: v2
- run: |
echo "::debug:: begin preparing...";
echo "::debug:: version to deploy: $VERSION_TO_DEPLOY";
Expand Down Expand Up @@ -94,7 +94,6 @@ jobs:
echo "resolver: ${{ steps.resolver.outputs.S3_BUCKET_SECRET_NAME}}"
echo "resolver: ${{ steps.resolver.outputs.CDN_ID_SECRET_NAME}}"
name: Print resolver

frontend:
name: Build Frontend Project
runs-on: ubuntu-latest
Expand Down Expand Up @@ -125,7 +124,7 @@ jobs:
if: "contains(github.event.inputs.env, 'dev')"
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: frontend-bundle
path: build
Expand All @@ -143,7 +142,7 @@ jobs:
echo "s3: ${{ needs.prepare.outputs.S3_BUCKET_SECRET_NAME }}"
echo "cdn: ${{ needs.prepare.outputs.CDN_ID_SECRET_NAME }}"
- name: Download bundled frontend resources
uses: actions/download-artifact@v2
uses: actions/download-artifact@v4
with:
name: frontend-bundle
path: build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/treetracker-wallet-admin-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
if: github.event_name == 'push' && github.repository == 'Greenstand/treetracker-wallet-admin-client'
run: npm run build:dev
working-directory: ${{ env.project-directory }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
if: github.event_name == 'push' && github.repository == 'Greenstand/treetracker-wallet-admin-client'
with:
name: client-bundle
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
/coverage

# production
/build
# /build

# misc
.DS_Store
Expand Down
5 changes: 5 additions & 0 deletions .releaserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
"name": "v1",
"prerelease": true,
"channel": "beta"
},
{
"name": "v2",
"prerelease": true,
"channel": "beta"
}
],
"plugins": [
Expand Down
318 changes: 318 additions & 0 deletions CHANGELOG.md

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

The admin panel for accessing wallets and executing all known API calls for the wallet API.


## Product Leadership

Product Engineering and Technical Lead: @OlhaD
Expand Down
Loading
Loading