Skip to content
This repository was archived by the owner on Oct 30, 2023. It is now read-only.

Commit cdd24ea

Browse files
authored
Merge pull request #283 from FlowzPlatform/QA
Qa
2 parents 94572f6 + ed1ee1b commit cdd24ea

29 files changed

+3563
-932
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ logs
44
npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
7+
package-lock.json
78

89
# Runtime data
910
pids

client/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ yarn-error.log*
77
test/unit/coverage
88
test/e2e/reports
99
selenium-debug.log
10+
package-lock.json
1011

1112
# Editor directories and files
1213
.idea

client/index.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,18 @@
1616
<link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
1717
<link href="https://unpkg.com/vue-multiselect@2.0.3/dist/vue-multiselect.min.css" rel="stylesheet">
1818
<link href="/static/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">
19+
<!-- <link rel='stylesheet' href='//cdn.jsdelivr.net/foundation/5.0.2/css/foundation.min.css'> -->
20+
<!-- <link rel='stylesheet' href='//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.0.3/css/font-awesome.css'> -->
21+
<!-- <link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/foundation/3.2.5/stylesheets/foundation.min.css'> -->
1922

2023
<!-- jQuery -->
2124
<script src="/static/js/jquery-3.2.1.min.js" crossorigin="anonymous"></script>
2225
<script src="/static/js/jquery-ui.min.js" crossorigin="anonymous"></script>
2326
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js" type="text/javascript"></script>
2427
<script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.js" type="text/javascript"></script>
28+
<!-- <script src="http://jeremydorn.com/json-editor/dist/jsoneditor.min.js" type="text/javascript"></script> -->
29+
<script src="https://rawgit.com/jdorn/json-editor/master/dist/jsoneditor.js" type="text/javascript"></script>
30+
2531

2632

2733
<!-- Grapes JS COmponent -->
@@ -51,6 +57,12 @@
5157
<script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.24.min.js"></script>
5258
<link type="text/css" rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css" rel="stylesheet"/>
5359

60+
<!-- <script>
61+
// Set the default CSS theme and icon library globally
62+
JSONEditor.defaults.theme = 'foundation5';
63+
JSONEditor.defaults.iconlib = 'fontawesome4';
64+
</script> -->
65+
5466

5567
<!-- for amazon s3 -->
5668
<!-- <script src="https://sdk.amazonaws.com/js/aws-sdk-2.1.24.min.js"></script>

0 commit comments

Comments
 (0)