Skip to content

Commit fadf33f

Browse files
jfruxjfrux
committed
Stuff
1 parent 788993d commit fadf33f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1920
-277
lines changed

‎app/actions/eon_detail_actions.js‎

Lines changed: 41 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,4 +309,44 @@ export function SHOW_EON_FAILED(e) {
309309
type: types.SHOW_EON_FAILED,
310310
payload: e
311311
}
312-
}
312+
}
313+
314+
export function DOWNLOAD_ROUTE(eonId) {
315+
return {
316+
type: types.DOWNLOAD_ROUTE,
317+
payload: eonId
318+
}
319+
}
320+
321+
export function DOWNLOAD_ROUTE_SUCCESS(eonId) {
322+
return {
323+
type: types.DOWNLOAD_ROUTE_SUCCESS,
324+
payload: eonId
325+
}
326+
}
327+
export function DOWNLOAD_ROUTE_FAILED(e) {
328+
return {
329+
type: types.DOWNLOAD_ROUTE_FAILED,
330+
payload: e
331+
}
332+
}
333+
334+
export function DOWNLOAD_SEGMENT(eonId) {
335+
return {
336+
type: types.DOWNLOAD_SEGMENT,
337+
payload: eonId
338+
}
339+
}
340+
341+
export function DOWNLOAD_SEGMENT_SUCCESS(eonId) {
342+
return {
343+
type: types.DOWNLOAD_SEGMENT_SUCCESS,
344+
payload: eonId
345+
}
346+
}
347+
export function DOWNLOAD_SEGMENT_FAILED(e) {
348+
return {
349+
type: types.DOWNLOAD_SEGMENT_FAILED,
350+
payload: e
351+
}
352+
}

‎app/actions/network_connection_actions.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function getNeighborNetworks(ip) {
112112

113113
export function getIpsForScan(ip) {
114114
const { afterNetwork, beforeNetwork } = getNeighborNetworks(ip);
115-
const baseIpsToScan = [getBaseIp(ip,3).baseIp,beforeNetwork,afterNetwork];
115+
const baseIpsToScan = [getBaseIp(ip,3).baseIp,beforeNetwork,afterNetwork];
116116
return baseIpsToScan;
117117
}
118118

@@ -140,4 +140,4 @@ export function setupNetworkEvents() {
140140

141141
alertOnlineStatus();
142142
};
143-
}
143+
}

‎app/actions/zmq_actions.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ export function DISCONNECT(service) {
1212
};
1313
}
1414
export function MESSAGE(data) {
15+
// console.log("MESSAGE ACTION:", data);
1516
return {
1617
type: types.MESSAGE,
1718
payload: data

‎app/app.global.scss‎

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ $file-name-color: lighten($light-color,40);
2525
$hidden-file-name-color: rgba($file-name-color,0.4);
2626
$state-toolbar-height: 40px;
2727
body {
28+
color:$text-color;
2829
background-color:#212121;
2930
}
3031
#foldout-container {
@@ -62,7 +63,7 @@ body {
6263
@import "styles/state-list";
6364
@import "styles/command-bar";
6465
@import "styles/is-mac";
65-
66+
6667
.container-fluid {
6768
position: relative;
6869
width:100%;
@@ -86,8 +87,8 @@ body {
8687
width:100%;
8788
}
8889
}
89-
.term_fit::-webkit-scrollbar {
90-
display: none;
90+
.term_fit::-webkit-scrollbar {
91+
display: none;
9192
}
9293
.tab-pane {
9394
position:relative;
@@ -101,39 +102,39 @@ body {
101102
padding:15px;
102103
}
103104
}
104-
.tab-pane::-webkit-scrollbar {
105-
display: none;
105+
.tab-pane::-webkit-scrollbar {
106+
display: none;
106107
}
107108
.terminal-container {
108109
padding:10px;
109110
}
110-
.terminal-container::-webkit-scrollbar {
111-
display: none;
111+
.terminal-container::-webkit-scrollbar {
112+
display: none;
112113
}
113-
114+
114115
.console-tab {
115116
position:relative;
116117
height:100%;
117118
}
118-
.console-tab::-webkit-scrollbar {
119-
display: none;
119+
.console-tab::-webkit-scrollbar {
120+
display: none;
120121
}
121122
.smalltalk {
122123
display: flex;
123124
align-items: center;
124125
flex-direction: column;
125126
justify-content: center;
126-
127+
127128
transition: 200ms opacity;
128-
129+
129130
bottom: 0;
130131
left: 0;
131132
overflow: auto;
132133
padding: 20px;
133134
position: fixed;
134135
right: 0;
135136
top: 0;
136-
137+
137138
z-index: 100;
138139
}
139140

@@ -191,7 +192,7 @@ body {
191192
text-align:left;
192193
// width:100%!important;
193194
margin:0;
194-
195+
195196
background:darken($base-color,5)!important;
196197
background:darken($base-color,5)!important;
197198
border-radius:0;
@@ -274,7 +275,7 @@ body {
274275
text-overflow: ellipsis;
275276
white-space: nowrap;
276277
max-width: 500px;
277-
278+
278279
user-select: none;
279280
color: #333;
280281
font-size: 120%;
@@ -287,7 +288,7 @@ body {
287288
.smalltalk .page .content-area {
288289
overflow: hidden;
289290
text-overflow: ellipsis;
290-
291+
291292
padding: 6px 17px;
292293
position: relative;
293294
}
@@ -309,7 +310,7 @@ button {
309310
appearance: none;
310311
user-select: none;
311312
background-image: linear-gradient(#ededed, #ededed 38%, #dedede);
312-
313+
313314
border: 1px solid rgba(0, 0, 0, 0.25);
314315
border-radius: 2px;
315316
box-shadow: 0 1px 0 rgba(0, 0, 0, 0.08), inset 0 1px 2px rgba(255, 255, 255, 0.75);
@@ -331,7 +332,7 @@ button {
331332

332333
.smalltalk .page .button-strip {
333334
display: flex;
334-
335+
335336
flex-direction: row;
336337
justify-content: flex-end;
337338
}
@@ -447,7 +448,7 @@ body {
447448
height:25px;
448449
font-size:11px;
449450
}
450-
451+
451452
.state-list {
452453
display:table;
453454
width:100%;
@@ -527,15 +528,15 @@ body {
527528
}
528529
}
529530
}
530-
531+
531532
&.dashboard {
532533
.state-card-body {
533534
.list-group {
534535
display:flex;
535536
flex-flow: row;
536537
justify-content: flex-start;
537538
background-color:rgba(#000,0.3);
538-
539+
539540
.list-group-item {
540541
border:0;
541542
// border-radius: 0 !important;
@@ -599,10 +600,10 @@ body {
599600
border-color:#28a745;
600601
opacity:1;
601602
.state-value {
602-
603+
603604
}
604605
.state-label {
605-
606+
606607
}
607608
}
608609
}
@@ -617,14 +618,14 @@ body {
617618
width: $bubble-width;
618619
height: $bubble-height;
619620
position:relative;
620-
621+
621622
.state-value {
622623
top: 8px;
623624
position: absolute;
624625
font-size: 24px;
625626
left: 13px;
626627
font-weight: bold;
627-
628+
628629
}
629630
.state-label {
630631
position:absolute;
@@ -681,9 +682,9 @@ body {
681682
&:first-child,&:last-child {
682683
border-radius:0;
683684
}
684-
685+
685686
}
686-
687+
687688
.card-body {
688689
padding:0!important;
689690
background-color:rgba(#000,0);
@@ -825,11 +826,11 @@ body {
825826
}
826827
.progress_overlay {
827828
margin-top:25px;
828-
829+
829830
}
830831

831832
.scanned_no_results {
832-
833+
833834
}
834835
.manual_error {
835836
background-color:transparent!important;
@@ -864,4 +865,4 @@ body {
864865
}
865866

866867

867-
}
868+
}

‎app/components/EonList/index.js‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const propTypes = {
2828
unresolvedEonIds: PropTypes.array
2929
};
3030

31-
function ValidateIPaddress(ipaddress)
31+
function ValidateIPaddress(ipaddress)
3232
{
3333
if (/^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/.test(ipaddress))
3434
{
@@ -53,6 +53,7 @@ class EonList extends Component {
5353
}
5454
handleScanNetwork = () => {
5555
this.setState({showAddForm: false});
56+
5657
this.props.BEGIN_scanNetwork();
5758
}
5859
toggleAddForm = () => {
@@ -115,7 +116,7 @@ class EonList extends Component {
115116
// console.log("eonList:",eonList);
116117
// if (selectedEon !== null) {
117118
// // console.warn("SSH CONNECTION ERROR!",sshConnectionError);
118-
// return (<Redirect to={routes.EON_DETAIL} />);
119+
// return (<Redirect to={routes.EON_DETAIL} />);
119120
// }
120121
if (network === 'disconnected') {
121122
return <NoConnection />;
@@ -166,7 +167,7 @@ class EonList extends Component {
166167
</CardBody>
167168
</Card>
168169
</Collapse>
169-
170+
170171
<Collapse className={"message"} isOpen={error && error.length > 0}>
171172
<Card body inverse color="danger" className={"error_message"}>
172173
<CardBody className={"error_message_body"}>
@@ -197,4 +198,4 @@ class EonList extends Component {
197198

198199
EonList.propTypes = propTypes;
199200

200-
export default EonList;
201+
export default EonList;

app/components/EonDetail/Console/DataParamsTab.js renamed to app/components/Session/Console/DataParamsTab.js

File renamed without changes.

app/components/EonDetail/Console/EndpointsTab.js renamed to app/components/Session/Console/EndpointsTab.js

File renamed without changes.

app/components/EonDetail/Console/EventsTab.js renamed to app/components/Session/Console/EventsTab.js

File renamed without changes.

app/components/EonDetail/Console/ProfileTab.js renamed to app/components/Session/Console/ProfileTab.js

File renamed without changes.

app/components/EonDetail/Console/RouteModal.js renamed to app/components/Session/Console/RouteModal.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const propTypes = {
2020
class RouteModal extends React.Component {
2121
// constructor(props) {
2222
// super(props);
23-
23+
2424
// this.state = {
2525
// modal: false
2626
// };
@@ -76,7 +76,7 @@ class RouteModal extends React.Component {
7676
<div className={"cabana-url"}>
7777
<FormGroup>
7878
<Label for={"cabana-link"}>Sharable Cabana Link</Label>
79-
<Input type={"textarea"} value={route.sharable_cabana_url} />
79+
<Input type={"textarea"} defaultValue={route.sharable_cabana_url} />
8080
</FormGroup>
8181
<FormGroup>
8282
<Label for={"segments"}>Segments</Label>
@@ -119,4 +119,4 @@ const mapStateToProps = ({ eonDetail }) => {
119119
export default connect(
120120
mapStateToProps,
121121
mapDispatchToProps
122-
)(RouteModal);
122+
)(RouteModal);

0 commit comments

Comments
 (0)