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

import walletconnect dependencies into app #420

Merged
merged 48 commits into from
Jun 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
592ad40
import walletconnect dependencies into app
kremalicious Dec 1, 2022
c790dd1
revert script import to `main` version
kremalicious Dec 1, 2022
a0f24b3
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Dec 15, 2022
0b7dc99
migrating to WalletConnect v2
KatunaNorbert Dec 16, 2022
c471f48
switch Rollup with Vite
KatunaNorbert Jan 4, 2023
7773c3e
add back dockerignore and env example files
KatunaNorbert Jan 4, 2023
f6de1c7
handle wallet connection and network switch
KatunaNorbert Jan 9, 2023
4b78174
update all contract read functions
KatunaNorbert Jan 9, 2023
81f6c0c
add gas estimate to write contract methods
KatunaNorbert Jan 10, 2023
5252401
update rewards contract calls and cleanup
KatunaNorbert Jan 10, 2023
6969c13
getBlockTimestamp and UI fixes
KatunaNorbert Jan 12, 2023
089f604
fix disabled lock date input
KatunaNorbert Jan 12, 2023
ab68b97
fix date update and lock end date input disabled state
KatunaNorbert Jan 12, 2023
04e355b
show QRcode for mobile wallet connection and remove unused dependencies
KatunaNorbert Jan 25, 2023
3b40f21
fix Vite console warnings
KatunaNorbert Jan 25, 2023
2e3af19
update env variables examples and readme
KatunaNorbert Jan 26, 2023
06708d5
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Feb 22, 2023
7edc2d3
fix conflicts and QR code mobile connect(WIP)
KatunaNorbert Feb 24, 2023
85d88a9
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Mar 2, 2023
ef97214
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Mar 7, 2023
9dde9d3
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Apr 18, 2023
12814cb
fix server not starting
KatunaNorbert Apr 18, 2023
8b9fa5d
add latest version of WalletConnect2
KatunaNorbert Jun 9, 2023
295dd93
Merge branch 'main' into fix/walletconnect-import
KatunaNorbert Jun 9, 2023
13d96e4
update write contract methods
KatunaNorbert Jun 9, 2023
da0344a
fix lock ocean card width
KatunaNorbert Jun 12, 2023
d71e3da
fixes around farm table
KatunaNorbert Jun 12, 2023
f1f3f40
disable type checks since we are not using typescritp
KatunaNorbert Jun 12, 2023
8c6f3ec
fix claim passive rewards tx
KatunaNorbert Jun 12, 2023
d993c0c
fix UI main width
KatunaNorbert Jun 12, 2023
a19626b
fix date picker icon not showing, remove Rollup libraries
KatunaNorbert Jun 12, 2023
7b8dde7
fix build
KatunaNorbert Jun 21, 2023
b60b344
removed build config from vite config
KatunaNorbert Jun 21, 2023
5954c5f
removed rollup libraries
KatunaNorbert Jun 21, 2023
0af10ee
simplify Vite config
KatunaNorbert Jun 21, 2023
47624a7
removed ts file
KatunaNorbert Jun 22, 2023
c654876
added rollup plugins
KatunaNorbert Jun 22, 2023
b975963
use Vite preprocess
KatunaNorbert Jun 22, 2023
6790dcf
specify svelte preprocess
KatunaNorbert Jun 22, 2023
56de384
load env variable
KatunaNorbert Jun 22, 2023
7511e2d
assign env variable before use
KatunaNorbert Jun 22, 2023
57c220e
used assigned value inside NetworksSection
KatunaNorbert Jun 22, 2023
57dd974
use assigned env variable values in other places
KatunaNorbert Jun 22, 2023
3741cd6
used assigned env values inside lock ocean components
KatunaNorbert Jun 22, 2023
54b6b91
remove parse function over env var
KatunaNorbert Jun 22, 2023
08df2fa
use infura provider instead of wc
KatunaNorbert Jun 22, 2023
6a6620d
removed app config file and update env example file
KatunaNorbert Jun 22, 2023
6863eb9
web3 store cleanup
KatunaNorbert Jun 22, 2023
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
42 changes: 10 additions & 32 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,42 +1,20 @@
# Choose one of the following environment configuration: local (development), goerli (staging), mainnet (production)
# This will automatically set other required environment variables to point to choosen configuration.

# Development: point to your local ganache chain. Usit it when running Ocean stack locally with Barge.
# NODE_ENV = "development"

# Staging: point to Goerli network.
NODE_ENV = "staging"

# Production: point to Ethereum Mainnet.
# NODE_ENV = "production"


# your infura key
INFURA_KEY = "01SAMPLE9234KEY"




# You can enable or disable rollup livereload to start a server and reload the page on saving changes.
# This is usualy enabled on local and disable on production.
START_RELOAD_SERVER = true



VITE_INFURA_KEY = "01SAMPLE9234KEY"

# You can also set your custom environment variables by adding a different value for NODE_ENV then the specified ones above, and manually setting the other variables.
# wallet connect projectId key
VITE_WALLET_CONNECT_KEY = ""

# set one of Ocean subgraphs from the available subgrapsh list from https://github.com/oceanprotocol/ocean-subgraph.
# SUBGRAPH_API = "https://v4.subgraph.goerli.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph"
VITE_SUBGRAPH_API = "https://v4.subgraph.goerli.oceanprotocol.com/subgraphs/name/oceanprotocol/ocean-subgraph"

# chain where ve contracts are deployed - 8996 is development
# VE_SUPPORTED_CHAINID = 8996
# chain where ve contracts are deployed
VITE_VE_SUPPORTED_CHAINID = 5

# list of suppported chainIDs (used for filtering asset only)
# SUPPORTED_CHAIN_IDS = [8996]
VITE_SUPPORTED_CHAIN_IDS = [5]

# api endpoint to get the pools list
# BACKEND_API = "https://test-df-sql.oceandao.org"
# api endpoint to get the data from df-sql
VITE_BACKEND_API = "https://test-df-sql.oceandao.org"

# set to "enabled" if you want to enable wallet address debugging inside app
# DEBUGGING = "enabled"
# VITE_DEBUGGING = "enabled"
27 changes: 23 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,26 @@
/node_modules/
/public/build/
.idea/
.DS_Store
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
.env
.coverage
.vscode/

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
3 changes: 3 additions & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["svelte.svelte-vscode"]
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ npm install
npm run dev
```

Navigate to [localhost:4005](http://localhost:4005). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.
Navigate to [localhost:8080](http://localhost:5173). You should see your app running. Edit a component file in `src`, save it, and reload the page to see your changes.

By default, the server will only respond to requests from localhost. To allow connections from other computers, edit the `sirv` commands in package.json to include the option `--host 0.0.0.0`.

Expand Down
5 changes: 0 additions & 5 deletions data/pools/poolinfo-chain3.csv

This file was deleted.

4 changes: 0 additions & 4 deletions data/pools/poolinfo-chain4.csv

This file was deleted.

5 changes: 0 additions & 5 deletions data/rewards/rewards-TST.csv

This file was deleted.

Empty file removed get
Empty file.
2 changes: 2 additions & 0 deletions public/global.css → global.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

html,
body {
display: flex;
flex-direction: column;
position: relative;
width: 100%;
height: 100%;
Expand Down
7 changes: 7 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<meta http-equiv="Pragma" content="no-cache">
<link rel="icon" type="image/svg+xml" href="/logo-ocean-svg.svg" />
<link rel='stylesheet' href='/global.css'>
</head>
<body>
<script type="module" src="/src/main.js"></script>
</body>
32 changes: 32 additions & 0 deletions jsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"compilerOptions": {
"moduleResolution": "Node",
"target": "ESNext",
"module": "ESNext",
/**
* svelte-preprocess cannot figure out whether you have
* a value or a type, so tell TypeScript to enforce using
* `import type` instead of `import` for Types.
*/
"isolatedModules": true,
"resolveJsonModule": true,
/**
* To have warnings / errors of the Svelte compiler at the
* correct position, enable source maps by default.
*/
"sourceMap": true,
"esModuleInterop": true,
"skipLibCheck": true,
"forceConsistentCasingInFileNames": true,
/**
* Typecheck JS in `.svelte` and `.js` files by default.
* Disable this if you'd like to use dynamic types.
*/
"checkJs": false
},
/**
* Use global.d.ts instead of compilerOptions.types
* to avoid limiting type declarations.
*/
"include": ["src/**/*.d.ts", "src/**/*.js", "src/**/*.svelte"]
}
Loading