Skip to content

Commit 7505abe

Browse files
committed
delete comp
1 parent 38a649d commit 7505abe

File tree

10 files changed

+38
-46
lines changed

10 files changed

+38
-46
lines changed

src/client/components/ControlFlowGraphRuntime/ControlFlowGraphRuntime.js renamed to src/client/components/ControlFlowGraph/ControlFlowGraph.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import React from 'react';
22

33
import Graph from '../Graph/Graph';
44

5-
import styles from './ControlFlowGraphRuntime.scss';
5+
import styles from './ControlFlowGraph.scss';
66

7-
const ControlFlowGraphRuntime = ({ contractName, contractPath, graphResponse }) => {
7+
const ControlFlowGraphRuntime = ({ contractName, contractPath, graphResponse, type }) => {
88
return (
99
<div className={styles['control-flow-graph']}>
1010
<Graph
11-
graphType="cfgruntime"
11+
graphType={type}
1212
graphId={contractName}
1313
contractPath={contractPath}
1414
cfg={graphResponse.cfg}

src/client/components/ControlFlowGraphConstructor/ControlFlowGraphConstructor.js

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/client/components/ControlFlowGraphRuntime/ControlFlowGraphRuntime.scss

Lines changed: 0 additions & 7 deletions
This file was deleted.

src/client/components/Form/Form.scss

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@
1818
border-bottom: 1px dotted $color-light-grey;
1919
transition: border-color 0.2s;
2020

21+
&:-webkit-autofill,
22+
&:-webkit-autofill:hover,
23+
&:-webkit-autofill:focus {
24+
border-bottom: 1px dotted $color-green;
25+
-webkit-text-fill-color: $color-light-grey;
26+
box-shadow: 0 0 0px 1000px $color-dark-grey inset;
27+
transition: background-color 5000s ease-in-out 0s;
28+
}
29+
2130
&:focus {
2231
border-color: $color-green;
2332
outline: 0 none;
@@ -32,7 +41,7 @@
3241
background: transparent;
3342
border: 1px solid $color-light-grey;
3443
cursor: pointer;
35-
transition: opacity 0.7, border-color 0.2s;
44+
transition: border-color 0.2s;
3645

3746
&:last-of-type {
3847
margin-left: 10px;
@@ -48,7 +57,11 @@
4857
}
4958

5059
&:hover {
51-
opacity: 0.7;
60+
border-color: $color-green;
61+
62+
span {
63+
color: $color-green;
64+
}
5265
}
5366

5467
span {

src/client/components/Panel/Panel.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React from 'react';
22

33
import TransactionDebugger from '../TransactionDebugger/TransactionDebugger';
44
import Disassembler from '../Disassembler/Disassembler';
5-
import ControlFlowGraphRuntime from '../ControlFlowGraphRuntime/ControlFlowGraphRuntime';
6-
import ControlFlowGraphConstructor from '../ControlFlowGraphConstructor/ControlFlowGraphConstructor';
5+
//import ControlFlowGraphRuntime from '../ControlFlowGraphRuntime/ControlFlowGraphRuntime';
6+
import ControlFlowGraph from '../ControlFlowGraph/ControlFlowGraph';
77
import StorageViewer from '../StorageViewer/StorageViewer';
88

99
import styles from './Panel.scss';
@@ -29,15 +29,17 @@ const Panel = ({ type, contractName, contractCode, contractPath, debuggerRespons
2929
/>
3030
}
3131
{type === 'Control Flow Graph Runtime' &&
32-
<ControlFlowGraphRuntime
32+
<ControlFlowGraph
33+
type='cfgruntime'
3334
contractPath={contractPath}
3435
contractName={contractName}
3536
contractCode={contractCode}
3637
graphResponse={graphResponse}
3738
/>
3839
}
3940
{type === 'Control Flow Graph Constructor' &&
40-
<ControlFlowGraphConstructor
41+
<ControlFlowGraph
42+
type='cfgconstructor'
4143
contractPath={contractPath}
4244
contractName={contractName}
4345
contractCode={contractCode}

src/client/components/SettingsBar/SettingsBar.scss

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
background: transparent;
1515
border: 1px solid $color-light-grey;
1616
cursor: pointer;
17-
transition: opacity 0.7, border-color 0.2s;
17+
transition: border-color 0.2s;
1818

1919
&:last-of-type {
2020
margin-left: 10px;
@@ -30,7 +30,11 @@
3030
}
3131

3232
&:hover {
33-
opacity: 0.7;
33+
border-color: $color-green;
34+
35+
span {
36+
color: $color-green;
37+
}
3438
}
3539

3640
span {
@@ -43,7 +47,7 @@
4347

4448
&__message {
4549
display: table;
46-
margin: auto;
50+
margin: 20px auto 0 auto;
4751

4852
p {
4953
color: $color-green;

src/client/components/Store/Actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const hideEVMState = () => {
2323
}
2424
}
2525

26-
export const showLoadingMessage = (message) => {
26+
export const showLoadingMessage = message => {
2727
return {
2828
type: ActionTypes.SHOW_LOADING_MESSAGE,
2929
message
@@ -94,6 +94,6 @@ export const postVersion = version => dispatch => {
9494
dispatch(addVersion(response));
9595
})
9696
.catch(error => {
97-
alert('Your version could not be posted\nError: ' + error.message)
97+
dispatch(showErrorMessage(error.message));
9898
});
9999
};

src/client/components/Tab/TabMenuItem/TabMenuItem.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
.tab-menu-item {
22
position: relative;
33
height: 60px;
4-
flex: 1 0 auto;
4+
flex: 1 0 200px;
5+
max-width: 200px;
56
padding: 15px 20px 20px 20px;
67
text-align: center;
78
background: $color-grey;
89
color: $color-green;
910
z-index: 0;
1011
box-shadow: inset 2px 1px 5px (#000 + 30);
12+
overflow: hidden;
13+
text-overflow: ellipsis;
1114
transform: translate(0, 20px);
1215
transition: transform 0.2s ease-in-out, box-shadow 0.2s ease-in-out, color 0.2s ease-in-out, background 0.2s ease-in-out;
1316
cursor: pointer;

src/client/components/TopNavBar/TopNavBar.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
}
2828

2929
&__versions-dropdown {
30-
flex: 0 1 200px;
30+
flex: 0 0 250px;
3131
position: relative;
3232
padding-left: 10px;
3333
padding: 24.5px 20px;

0 commit comments

Comments
 (0)