Skip to content

Commit

Permalink
Merge branch 'main' into v1
Browse files Browse the repository at this point in the history
  • Loading branch information
OlhaD authored Feb 1, 2024
2 parents ee5a217 + 551f615 commit 95563c3
Show file tree
Hide file tree
Showing 38 changed files with 1,426 additions and 1,858 deletions.
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
REACT_APP_WALLET_API_ROOT=https://dev-k8s.treetracker.org/wallet/v2
USER_LOCALE=en-US
USER_LOCALE=en-US
3 changes: 1 addition & 2 deletions .env.test
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
REACT_APP_WALLET_API_ROOT=https://test-k8s.treetracker.org/wallet/v2

REACT_APP_WALLET_API_ROOT=https://test-k8s.treetracker.org/wallet/v2
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ jobs:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_KEY_ID_DEV }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_DEV }}
aws-access-key-id: ${{ secrets.AWS_KEY_ID_PROD }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_PROD }}
aws-region: us-east-1
- name: Copy front end resources to s3 bucket
run: |
Expand Down
285 changes: 72 additions & 213 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ var b = {

If you have any questions, comments, suggestions, of any sort, please join our community!
We collaborate primarily through [Slack](https://greenstand.slack.com).
The corresponding channel `#wallet-admin-client` is a good place to find additional support.
The corresponding channel `#wallet-admin-client` is a good place to find additional support.
18 changes: 7 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Greenstand Treetracker Wallet Admin Client
# Greenstand Treetracker Wallet Admin Client

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

Expand All @@ -23,12 +23,11 @@ configure their appearance.
- A green marketing company is utilizing the treetracker platform to plant/maintain one or more trees by attaching one or many Greenstand Impact Tokens to a product or sale.
- A company is selling hand-made boots and communicates to its clients that with every pair of boots sold the company is going to pay planters to grow trees; they need to manage the creation of wallets, and add tokens into the consumer/client's wallet.

## UX / UI Design
## UX / UI Design

[See the figma file](https://www.figma.com/file/kXhFReuUVcqQonIgl59On3/Wallet-admin-module-UX?node-id=4%3A21&t=rLUiYOgkuHix3Z5B-1)

## User Stories

[See User Story Document](https://docs.google.com/document/d/1IF4fe4_BC319aoBKBW5LV2pypyDTy4K8qe1qqHexQ1Y/)

## Development Environment Setup
Expand All @@ -37,6 +36,7 @@ configure their appearance.

See https://git-scm.com/downloads for instructions.


### Step 2: Install Node.js

You can install Node.js directly from https://nodejs.org/dist/latest-v18.x/ OR
Expand All @@ -54,8 +54,8 @@ by [following John Papa's instructions](http://jpapa.me/nomoresudo)._
### Step 3: Fork and clone this repository

1. Click _Fork_ on this GitHub repo and follow the steps to fork the repo to your account
1. Open terminal
1. Go to a folder where you would like to install the project. Then type the following, replacing `<username>` with your
2. Open terminal
3. Go to a folder where you would like to install the project. Then type the following, replacing `<username>` with your
GitHub username:

```
Expand Down Expand Up @@ -85,17 +85,13 @@ npm start

Visit http://localhost:3000

## Contributing

For details on how to contribute to the project, such as getting an issue assigned, working on an issue, where to get
support and collaborate etc., please see our [Contribution Guidelines](./CONTRIBUTING.md).

## Note

Contributing to this project can sometimes involve a steep learning curve. Please do not give up and come and find us on
slack to get support setting you up. This is a fun project with an amazing potential to disrupt non-transparent
practices
and open reforestation to the digital world.
and open reforestation to the digital world.

Come have fun with a global team and a project that is disrupting opaque practices and creating open reforestation to the digital world.

More on getting started and [Contributing to the Cause](https://github.com/Greenstand/Greenstand-Overview#contributing-to-the-cause).
Loading

0 comments on commit 95563c3

Please sign in to comment.