Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hard-wired app root URL #83

Merged
merged 1 commit into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion CNAME

This file was deleted.

25 changes: 25 additions & 0 deletions frontend/.env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
VITE_NETWORK=23293
VITE_WEB3_GATEWAY=http://127.0.0.1:8545
VITE_CONTRACT_XCHAIN_HEADERCACHE=0x5FbDB2315678afecb367f032d93F642f64180aa3
VITE_CONTRACT_XCHAIN_ACCOUNTCACHE=0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512
VITE_CONTRACT_XCHAIN_STORAGEPROOF=0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0
VITE_CONTRACT_ACL_STORAGEPROOF=0x9A676e781A523b5d0C0e43731313A708CB607508
VITE_CONTRACT_ACL_ALLOWALL=0x0B306BF915C4d645ff596e518fAf3F9669b97016
VITE_CONTRACT_ACL_VOTERALLOWLIST=0x959922bE3CAee4b8Cd9a407cc3ac1C251C2007B1
VITE_CONTRACT_ACL_TOKENHOLDER=0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE
VITE_CONTRACT_TESTTOKEN=0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690
VITE_CONTRACT_GASLESSVOTING=0x68B1D87F95878fE05B998F19b66F4baba5De1aed
VITE_CONTRACT_POLLMANAGER=0x3Aa5ebB10DC797CAC828524e59A333d0A371443c
VITE_CONTRACT_POLLMANAGER_ACL=0x0B306BF915C4d645ff596e518fAf3F9669b97016
VITE_CONTRACT_XCHAIN_HEADERCACHE_TX=0x371e1c9dd50e009f8265ba62b51e637c5199bd00f7566703d280056786e08d71
VITE_CONTRACT_XCHAIN_ACCOUNTCACHE_TX=0xd6e9adce9ead594d70ffd2b8e9a3fae3d137163d8b7ed281e118470a9a77060c
VITE_CONTRACT_XCHAIN_STORAGEPROOF_TX=0xdddd3337e73b4b1d9e4f8ad5d03889d5ea58dd77e744078f7969bfb66211f154
VITE_CONTRACT_ACL_STORAGEPROOF_TX=0x45321c7382280b2ad11d2cf342a5ebdfb0f26a36e1178932286704c182f7cad7
VITE_CONTRACT_ACL_ALLOWALL_TX=0xf00eda87e970f781faeb5d8d1d09bc744173fc83d825485dbe41025356123ea2
VITE_CONTRACT_ACL_VOTERALLOWLIST_TX=0x70a079effb886c3cbe2a16c100cc30ad9e8a74672bdeb6aa0f75fc3917f87295
VITE_CONTRACT_ACL_TOKENHOLDER_TX=0xe9c719ec1edce10ee2eea914e72ed68055fe6fa04d481406936bdc4233deb0a2
VITE_VITE_CONTRACT_TESTTOKEN_TX=0xbd2382fd3828a3964875cbc5fa0acd0e7fa256241f57461a51ea4d7d2f6e34a2
VITE_VITE_CONTRACT_TESTTOKEN=0xa513E6E4b8f2a923D98304ec87F64353C4D5C853
VITE_CONTRACT_GASLESSVOTING_TX=0xb65682a7d830bf21733a70bd94cebb6635959f5ac925a773939154323236c50f
VITE_CONTRACT_POLLMANAGER_TX=0xee6dc8418078609e2974083b0c1a26c49fb6b0f36e90cea9a70e5d295c800f64
VITE_APP_ROOT_URL=http://vote.oasis.io
1 change: 1 addition & 0 deletions frontend/.env.pontusxtest
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ VITE_CONTRACT_GASLESSVOTING=0xB86FB5Ac170dE6A596cF9262054bB252E75e7e4A
VITE_CONTRACT_POLLMANAGER_TX=0x680a0d5bd656523e2113c11e451691440382c8ebcecb705bca18e57bcadcad76
VITE_CONTRACT_POLLMANAGER=0x5C12618F341E39e1263f7886cC0B87Cdcf7A0772
VITE_CONTRACT_POLLMANAGER_ACL=0x96b32310Ecc3F102c8DA0519bE087Fa4e2cA31C2
VITE_APP_ROOT_URL=http://pontusx-blockvote.csillag.me/
1 change: 1 addition & 0 deletions frontend/.env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
VITE_NETWORK=23294
VITE_WEB3_GATEWAY=https://sapphire.oasis.io
VITE_APP_ROOT_URL=http://vote.oasis.io
1 change: 0 additions & 1 deletion frontend/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,5 @@ dist-ssr
# vite-bundle-visualizer output
stats.html
.env.*.local
.env.development
stats.html
.netlify
8 changes: 4 additions & 4 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<meta property="og:title" content="Oasis Blockvote, a poll creation tool for your DAO">
<meta name="twitter:description" content="Create polls for everyone or just your group, with public results but cryptographically secure and private votes.">
<meta property="og:description" content="Create polls for everyone or just your group, with public results but cryptographically secure and private votes.">
<meta name="twitter:image" content="http://vote.oasis.io/thumbnail.png">
<meta property="og:image" content="http://vote.oasis.io/thumbnail.png">
<link rel="canonical" href="http://vote.oasis.io">
<meta property="og:url" content="http://vote.oasis.io">
<meta name="twitter:image" content="%VITE_APP_ROOT_URL%/thumbnail.png">
<meta property="og:image" content="%VITE_APP_ROOT_URL%/thumbnail.png">
<link rel="canonical" href="%VITE_APP_ROOT_URL%">
<meta property="og:url" content="%VITE_APP_ROOT_URL%">
<title>Oasis Blockvote</title>
</head>
<body>
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/constants/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const {
VITE_PINATA_JWT,
VITE_IPFS_GATEWAY,
VITE_CONTRACT_GASLESSVOTING,
VITE_APP_ROOT_URL,
} = import.meta.env

const VITE_NETWORK_BIGINT: bigint = BigInt(ENV_VITE_NETWORK) ?? 0n
Expand Down Expand Up @@ -93,7 +94,7 @@ export const appName = 'Oasis Blockvote'
export const appNameAndTagline = 'Oasis Blockvote, a poll creation tool for your DAO'
export const appDescription =
'Create polls for everyone or just your group, with public results but cryptographically secure and private votes.'
export const appRootUrl = 'http://vote.oasis.io'
export const appRootUrl = VITE_APP_ROOT_URL

export const allowedAnimations = [
'dashboardNoPolls', // No poll indicator appearing on the dashboard
Expand Down
1 change: 1 addition & 0 deletions frontend/src/vite-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ interface ImportMetaEnv {
VITE_CONTRACT_POLLMANAGER_ACL: string
VITE_REACT_APP_BUILD_VERSION: string
VITE_REACT_APP_BUILD_DATETIME: string
VOTE_APP_ROOT_URL: string
}

interface ImportMeta {
Expand Down