aboutsummaryrefslogtreecommitdiff
path: root/shardweb
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2018-10-12 22:11:45 +0200
committerAlex Auvolat <alex@adnab.me>2018-10-12 22:11:45 +0200
commiteab3f9483b3659b1ad3572393d24652cac71c8b6 (patch)
treed8066ff0c173ef74bb9758707d8428a5f922bd8b /shardweb
parent574b572fac144135c4381581351445bf5d0de81c (diff)
downloadshard-eab3f9483b3659b1ad3572393d24652cac71c8b6.tar.gz
shard-eab3f9483b3659b1ad3572393d24652cac71c8b6.zip
fixes to connection logic
Diffstat (limited to 'shardweb')
-rw-r--r--shardweb/assets/package-lock.json16
-rw-r--r--shardweb/lib/templates/layout/app.html.eex8
2 files changed, 12 insertions, 12 deletions
diff --git a/shardweb/assets/package-lock.json b/shardweb/assets/package-lock.json
index 3e06420..78fc2ff 100644
--- a/shardweb/assets/package-lock.json
+++ b/shardweb/assets/package-lock.json
@@ -32,7 +32,8 @@
"ansi-color": {
"version": "0.2.1",
"resolved": "https://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz",
- "integrity": "sha1-PnXAN0dSF1RO12Oo21cJ+prlv5o="
+ "integrity": "sha1-PnXAN0dSF1RO12Oo21cJ+prlv5o=",
+ "dev": true
},
"ansi-regex": {
"version": "2.1.1",
@@ -1982,6 +1983,7 @@
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/copycat-brunch/-/copycat-brunch-1.1.0.tgz",
"integrity": "sha1-EOF7hZCeDhKZgd+5AwuYZkg9Zr0=",
+ "dev": true,
"requires": {
"loggy": "~0.2.2",
"mkdirp": "^0.5.1",
@@ -1992,6 +1994,7 @@
"version": "0.2.2",
"resolved": "http://registry.npmjs.org/loggy/-/loggy-0.2.2.tgz",
"integrity": "sha1-ftyFcGqC12HOnO+Gjxr7rYQWVCc=",
+ "dev": true,
"requires": {
"ansi-color": "~0.2.1",
"date-utils": "~1.2.17",
@@ -2070,7 +2073,8 @@
"date-utils": {
"version": "1.2.21",
"resolved": "https://registry.npmjs.org/date-utils/-/date-utils-1.2.21.tgz",
- "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q="
+ "integrity": "sha1-YfsWzcEnSzyayq/+n8ad+HIKK2Q=",
+ "dev": true
},
"debug": {
"version": "2.6.9",
@@ -3489,7 +3493,8 @@
"growl": {
"version": "1.8.1",
"resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
- "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg="
+ "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg=",
+ "dev": true
},
"has": {
"version": "1.0.3",
@@ -4121,7 +4126,8 @@
"minimist": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "dev": true
},
"mixin-deep": {
"version": "1.3.1",
@@ -4148,6 +4154,7 @@
"version": "0.5.1",
"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4626,6 +4633,7 @@
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/quickly-copy-file/-/quickly-copy-file-0.1.0.tgz",
"integrity": "sha1-0UBj/2WfaGl+fL/ugXoHu2NSN8I=",
+ "dev": true,
"requires": {
"mkdirp": "~0.5.0"
}
diff --git a/shardweb/lib/templates/layout/app.html.eex b/shardweb/lib/templates/layout/app.html.eex
index 6cedcaf..9c5a358 100644
--- a/shardweb/lib/templates/layout/app.html.eex
+++ b/shardweb/lib/templates/layout/app.html.eex
@@ -17,9 +17,6 @@
<!-- Custom CSS -->
<link href="<%= static_path(@conn, "/css/sb-admin.css") %>" rel="stylesheet">
- <!-- Morris Charts CSS -->
- <link href="<%= static_path(@conn, "/css/plugins/morris.css") %>" rel="stylesheet">
-
<!-- Custom Fonts -->
<link href="<%= static_path(@conn, "/css/font-awesome.min.css") %>" rel="stylesheet" type="text/css">
@@ -204,11 +201,6 @@
<!-- Bootstrap Core JavaScript -->
<script src="<%= static_path(@conn, "/js/bootstrap.min.js") %>"></script>
- <!-- Morris Charts JavaScript -->
- <script src="<%= static_path(@conn, "/js/plugins/morris/raphael.min.js") %>"></script>
- <script src="<%= static_path(@conn, "/js/plugins/morris/morris.min.js") %>"></script>
- <script src="<%= static_path(@conn, "/js/plugins/morris/morris-data.js") %>"></script>
-
<%= render_gon_script(@conn) %>
<script src="<%= static_path(@conn, "/js/app.js") %>"></script>