Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
interface
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
LuckySwap
interface
Commits
3000f70e
Commit
3000f70e
authored
Mar 11, 2018
by
Uciel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redux refactor complete
parent
67f32348
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
369 additions
and
155 deletions
+369
-155
App.js
src/App.js
+166
-153
exchange-actions.js
src/actions/exchange-actions.js
+92
-0
web3-actions.js
src/actions/web3-actions.js
+1
-1
constants.js
src/constants.js
+17
-0
exchange-reducer.js
src/reducers/exchange-reducer.js
+72
-0
index.js
src/reducers/index.js
+3
-1
initial-state.js
src/store/initial-state.js
+18
-0
No files found.
src/App.js
View file @
3000f70e
This diff is collapsed.
Click to expand it.
src/actions/exchange-actions.js
0 → 100644
View file @
3000f70e
import
{
SET_INPUT_BALANCE
,
SET_OUTPUT_BALANCE
,
SET_INPUT_TOKEN
,
SET_OUTPUT_TOKEN
,
SET_INVARIANT_1
,
SET_INVARIANT_2
,
SET_MARKET_ETH_1
,
SET_MARKET_ETH_2
,
SET_MARKET_TOKENS_1
,
SET_MARKET_TOKENS_2
,
SET_ALLOWANCE_APPROVAL_STATE
,
SET_EXCHANGE_INPUT_VALUE
,
SET_EXCHANGE_OUTPUT_VALUE
,
SET_EXCHANGE_RATE
,
SET_EXCHANGE_FEE
}
from
'
../constants
'
;
export
const
setInputBalance
=
(
inputBalance
)
=>
({
type
:
SET_INPUT_BALANCE
,
inputBalance
});
export
const
setOutputBalance
=
(
outputBalance
)
=>
({
type
:
SET_OUTPUT_BALANCE
,
outputBalance
})
export
const
setInputToken
=
(
inputToken
)
=>
({
type
:
SET_INPUT_TOKEN
,
inputToken
});
export
const
setOutputToken
=
(
outputToken
)
=>
({
type
:
SET_OUTPUT_TOKEN
,
outputToken
});
export
const
setInvariant1
=
(
invariant1
)
=>
({
type
:
SET_INVARIANT_1
,
invariant1
});
export
const
setInvariant2
=
(
invariant2
)
=>
({
type
:
SET_INVARIANT_2
,
invariant2
});
export
const
setMarketEth1
=
(
marketEth1
)
=>
({
type
:
SET_MARKET_ETH_1
,
marketEth1
});
export
const
setMarketEth2
=
(
marketEth2
)
=>
({
type
:
SET_MARKET_ETH_2
,
marketEth2
});
export
const
setMarketTokens1
=
(
marketTokens1
)
=>
({
type
:
SET_MARKET_TOKENS_1
,
marketTokens1
});
export
const
setMarketTokens2
=
(
marketTokens2
)
=>
({
type
:
SET_MARKET_TOKENS_2
,
marketTokens2
});
export
const
setAllowanceApprovalState
=
(
allowanceApproved
)
=>
({
type
:
SET_ALLOWANCE_APPROVAL_STATE
,
allowanceApproved
});
export
const
setExchangeInputValue
=
(
inputValue
)
=>
({
type
:
SET_EXCHANGE_INPUT_VALUE
,
inputValue
});
export
const
setExchangeOutputValue
=
(
outputValue
)
=>
({
type
:
SET_EXCHANGE_OUTPUT_VALUE
,
outputValue
});
export
const
setExchangeRate
=
(
rate
)
=>
({
type
:
SET_EXCHANGE_RATE
,
rate
})
export
const
setExchangeFee
=
(
fee
)
=>
({
type
:
SET_EXCHANGE_FEE
,
fee
})
\ No newline at end of file
src/actions/web3-actions.js
View file @
3000f70e
...
...
@@ -62,4 +62,4 @@ export const setBlockTimestamp = (timestamp) => ({
export
const
setExchangeType
=
(
exchangeType
)
=>
({
type
:
SET_EXCHANGE_TYPE
,
exchangeType
});
\ No newline at end of file
});
src/constants.js
View file @
3000f70e
...
...
@@ -25,3 +25,20 @@ export const SWT_EXCHANGE_CONTRACT_READY = 'SWT_EXCHANGE_CONTRACT_READY';
// token CONTRACT actions in actions, action creator, reducer
export
const
UNI_TOKEN_CONTRACT_READY
=
'
UNI_TOKEN_CONTRACT_READY
'
;
export
const
SWT_TOKEN_CONTRACT_READY
=
'
SWT_TOKEN_CONTRACT_READY
'
;
// actions for the exchange, all in one place
export
const
SET_INPUT_BALANCE
=
'
SET_INPUT_BALANCE
'
;
export
const
SET_OUTPUT_BALANCE
=
'
SET_OUTPUT_BALANCE
'
;
export
const
SET_INPUT_TOKEN
=
'
SET_INPUT_TOKEN
'
;
export
const
SET_OUTPUT_TOKEN
=
'
SET_OUTPUT_TOKEN
'
;
export
const
SET_INVARIANT_1
=
'
SET_INVARIANT_1
'
;
export
const
SET_INVARIANT_2
=
'
SET_INVARIANT_2
'
;
export
const
SET_MARKET_ETH_1
=
'
SET_MARKET_ETH_1
'
;
export
const
SET_MARKET_ETH_2
=
'
SET_MARKET_ETH_2
'
;
export
const
SET_MARKET_TOKENS_1
=
'
SET_MARKET_TOKENS_1
'
;
export
const
SET_MARKET_TOKENS_2
=
'
SET_MARKET_TOKENS_2
'
;
export
const
SET_ALLOWANCE_APPROVAL_STATE
=
'
SET_ALLOWANCE_APPROVAL_STATE
'
;
export
const
SET_EXCHANGE_INPUT_VALUE
=
'
SET_EXCHANGE_INPUT_VALUE
'
;
export
const
SET_EXCHANGE_OUTPUT_VALUE
=
'
SET_EXCHANGE_OUTPUT_VALUE
'
;
export
const
SET_EXCHANGE_RATE
=
'
SET_EXCHANGE_RATE
'
;
export
const
SET_EXCHANGE_FEE
=
'
SET_EXCHANGE_FEE
'
;
\ No newline at end of file
src/reducers/exchange-reducer.js
0 → 100644
View file @
3000f70e
import
{
SET_INPUT_BALANCE
,
SET_OUTPUT_BALANCE
,
SET_INPUT_TOKEN
,
SET_OUTPUT_TOKEN
,
SET_INVARIANT_1
,
SET_INVARIANT_2
,
SET_MARKET_ETH_1
,
SET_MARKET_ETH_2
,
SET_MARKET_TOKENS_1
,
SET_MARKET_TOKENS_2
,
SET_ALLOWANCE_APPROVAL_STATE
,
SET_EXCHANGE_INPUT_VALUE
,
SET_EXCHANGE_OUTPUT_VALUE
,
SET_EXCHANGE_RATE
,
SET_EXCHANGE_FEE
}
from
'
../constants
'
;
export
default
(
state
=
{},
action
)
=>
{
const
{
inputBalance
,
outputBalance
,
inputToken
,
outputToken
,
invariant1
,
invariant2
,
marketEth1
,
marketEth2
,
marketTokens1
,
marketTokens2
,
allowanceApproved
,
inputValue
,
outputValue
,
rate
,
fee
}
=
action
;
switch
(
action
.
type
)
{
case
SET_INPUT_BALANCE
:
return
Object
.
assign
({},
state
,
{
inputBalance
:
inputBalance
});
case
SET_OUTPUT_BALANCE
:
return
Object
.
assign
({},
state
,
{
outputBalance
:
outputBalance
});
case
SET_INPUT_TOKEN
:
return
Object
.
assign
({},
state
,
{
inputToken
:
inputToken
});
case
SET_OUTPUT_TOKEN
:
return
Object
.
assign
({},
state
,
{
outputToken
:
outputToken
});
case
SET_INVARIANT_1
:
return
Object
.
assign
({},
state
,
{
invariant1
:
invariant1
});
case
SET_INVARIANT_2
:
return
Object
.
assign
({},
state
,
{
invariant2
:
invariant2
});
case
SET_MARKET_ETH_1
:
return
Object
.
assign
({},
state
,
{
marketEth1
:
marketEth1
});
case
SET_MARKET_ETH_2
:
return
Object
.
assign
({},
state
,
{
marketEth2
:
marketEth2
});
case
SET_MARKET_TOKENS_1
:
return
Object
.
assign
({},
state
,
{
marketTokens1
:
marketTokens1
});
case
SET_MARKET_TOKENS_2
:
return
Object
.
assign
({},
state
,
{
marketTokens2
:
marketTokens2
});
case
SET_ALLOWANCE_APPROVAL_STATE
:
return
Object
.
assign
({},
state
,
{
allowanceApproved
:
allowanceApproved
});
case
SET_EXCHANGE_INPUT_VALUE
:
return
Object
.
assign
({},
state
,
{
inputValue
:
inputValue
});
case
SET_EXCHANGE_OUTPUT_VALUE
:
return
Object
.
assign
({},
state
,
{
outputValue
:
outputValue
});
case
SET_EXCHANGE_RATE
:
return
Object
.
assign
({},
state
,
{
rate
:
rate
});
case
SET_EXCHANGE_FEE
:
return
Object
.
assign
({},
state
,
{
fee
:
fee
});
default
:
return
state
;
}
}
\ No newline at end of file
src/reducers/index.js
View file @
3000f70e
...
...
@@ -2,9 +2,11 @@ import { combineReducers } from 'redux';
import
web3
from
'
./web3-reducer
'
;
import
exchangeContracts
from
'
./exchangeContract-reducer
'
;
import
tokenContracts
from
'
./tokenContract-reducer
'
;
import
exchange
from
'
./exchange-reducer
'
;
export
default
combineReducers
({
web3
,
exchangeContracts
,
tokenContracts
tokenContracts
,
exchange
});
\ No newline at end of file
src/store/initial-state.js
View file @
3000f70e
...
...
@@ -10,6 +10,7 @@
export
default
{
// lets check if metamask is installed
// also, lets assume that we're disconnected initially
// we're going to need to include a seperate nest for exchange actions
web3
:
{
connected
:
false
,
currentMaskAddress
:
''
,
...
...
@@ -36,5 +37,22 @@ export default {
tokenContracts
:
{
UNI
:
''
,
SWT
:
''
},
exchange
:
{
inputBalance
:
0
,
outputBalance
:
0
,
inputToken
:
{
value
:
'
ETH
'
,
label
:
'
ETH
'
,
clearableValue
:
false
},
outputToken
:
{
value
:
'
UNI
'
,
label
:
'
UNI
'
,
clearableValue
:
false
},
invariant1
:
0
,
invariant2
:
0
,
marketEth1
:
0
,
marketEth2
:
0
,
marketTokens1
:
0
,
marketTokens2
:
0
,
allowanceApproved
:
true
,
inputValue
:
0
,
outputValue
:
0
,
rate
:
0
,
fee
:
0
,
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment