Skip to content

Commit

Permalink
Merge pull request #404 from globe-and-citizen/develop
Browse files Browse the repository at this point in the history
Release 2.0
  • Loading branch information
arnonrdp authored Jul 1, 2024
2 parents 22db217 + cfae637 commit 5d48ead
Show file tree
Hide file tree
Showing 93 changed files with 30,071 additions and 4,108 deletions.
Binary file added ..env.swp
Binary file not shown.
34 changes: 33 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,42 @@ VITE_FIREBASE_MESSAGING_SENDER_ID=628749901575
VITE_FIREBASE_APP_ID=1:628749901575:web:14e4ffd327ffd9c1962fa2
VITE_FIREBASE_MEASUREMENTID=G-73RG1E19X2
VITE_FIREBASE_VAPID_KEY=BJztoe1O-9j8cWb2nGi4c8THAGWZ8Yp4bahzrbA9TlJFJV3ZgXbquCtk-nFahqXLn-gUMtYzfaP1u10damvf0SM

WAIT_ON_TIMEOUT=600000
VITE_RELEASE_STAGE=development

VITE_LS_SECRET_KEY=celebritycelebrity

VITE_TEST_USER=test@test.com
VITE_TEST_PASSWORD=12345678

#BLOCKCHAIN
VITE_WALLET_CONNECT_PROJECT_ID='9dcf39cb8034882a971d5086066c7f17'
VITE_CURRENT_NETWORK_NAME="amoy"

#sepolia
VITE_ALCHEMY_SEPOLIA_PROVIDER_URL="https://eth-sepolia.g.alchemy.com/v2/F_3kP4qK3m83Mzp0ZsxoBSNwXn9AWZfy"
VITE_ALCHEMY_SEPOLIA_SCAN_URL="https://sepolia.etherscan.io/tx/"
VITE_SEPOLIA_CURRENCY="ETH"
VITE_SEPOLIA_NETWORK_NAME="sepolia"
VITE_SEPOLIA_NETWORK_ID=11155111

#polygon testnet amoy
VITE_ALCHEMY_POLYGON_AMOY_PROVIDER_URL="https://polygon-amoy.g.alchemy.com/v2/00lwM-S0sm1EDraB9zsyZmQbLjzLtQKZ"
VITE_ALCHEMY_POLYGON_AMOY_SCAN_URL="https://www.oklink.com/amoy/tx/"
VITE_POLYGON_AMOY_NETWORK_NAME="Polygon Amoy (Alchemy)"
VITE_POLYGON_AMOY_CURRENCY="MATIC"
VITE_POLYGON_AMOY_NETWORK_ID=80002
VITE_MATIC_RATE_API_LINK="https://api.coingecko.com/api/v3/simple/price?ids=matic-network&vs_currencies=USD"

#polygon mainet
VITE_INFURA_POLYGON_MAINET_PROVIDER_URL="https://polygon-mainnet.g.alchemy.com/v2/Pwf_zLL-IbGvFhwTSbnreQUHi50dynvZ"
VITE_INFURA_POLYGON_MAINET_SCAN_URL="https://polygonscan.com/tx/"
VITE_INFURA_POLYGON_MAINET_NETWORK_NAME="Polygon Matic"
VITE_POLYGON_MAINET_CHAIN_ID=137
VITE_POLYGON_MAINET_CURRENCY="MATIC"

VITE_ADVERTISEMENT_CAMPAIGN_CONTRACT_ADDRESS="0xBC995101978Fe44922c0b121ad8942b6059406d4"
VITE_ADVERTISEMENT_COMPAIGN_CONTRACT_OWNER= "0xd36Dd7cabF457cE317FDA21c0525ed4561D5C352"

VITE_ADVERTISE_CLICK_RATE='0.001'
VITE_ADVERTISE_IMPRESSION_RATE='0.001'
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
branches: ['develop']
pull_request:
# The branches below must be a subset of the branches above
branches: ['main', 'develop']
branches: ['main']
schedule:
- cron: '27 10 * * 0'

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Cypress End-to-End Tests

on:
pull_request:
branches: [main, develop]
branches: [main]
workflow_dispatch:

jobs:
Expand All @@ -23,6 +23,7 @@ jobs:
with:
start: npm run dev:e2e
wait-on: http://localhost:9200/
wait-on-timeout: 600
browser: chrome
headed: true
record: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Vitest Unit Tests

on:
pull_request:
branches: [main, develop]
branches: [main]
workflow_dispatch:

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ ui-debug.log
firebase-debug.log
.nyc_output
coverage/
conf-example
package-lock.json
2 changes: 1 addition & 1 deletion firebase.rules
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ rules_version = '2';
service cloud.firestore {
match /databases/{database}/documents {
match /{document=**} {
allow read, write: if true;
allow read, create, write: if true;
}
}
}
3 changes: 3 additions & 0 deletions firestore.rules
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ service cloud.firestore {
match /errors/{document=**} {
allow read, create, update, delete, write;
}
match /cryptoTransactions/{document=**} {
allow read, create, write;
}
match /feedbacks/{document=**} {
allow read, create, update, delete, write;
}
Expand Down
Loading

0 comments on commit 5d48ead

Please sign in to comment.