From 78bfa9fbcb3781fef1ab1c06b0c4846f7cc38e71 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 24 Sep 2017 15:28:22 +0300 Subject: [PATCH 1/3] Add ALLOWED_HOSTS to sample settings --- sikweb/settings-sample.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sikweb/settings-sample.py b/sikweb/settings-sample.py index a2cca87..2d239bd 100644 --- a/sikweb/settings-sample.py +++ b/sikweb/settings-sample.py @@ -16,6 +16,8 @@ from sikweb.base import * # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True +# ALLOWED_HOSTS = ["*"] + # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '7p$85^4ibb^p4-=vs44b7!y0e-zemugze18@a#30&71=a8)dp(' From dd69a0c395a1cb5df6dcc474c1e9084a3049408d Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 24 Sep 2017 15:46:43 +0300 Subject: [PATCH 2/3] Split coffee.html to multiple files --- coffee_scale/static/css/coffee.css | 121 ++++++++++++ coffee_scale/static/js/coffee.js | 137 ++++++++++++++ coffee_scale/templates/coffee.html | 293 ++--------------------------- 3 files changed, 273 insertions(+), 278 deletions(-) create mode 100644 coffee_scale/static/css/coffee.css create mode 100644 coffee_scale/static/js/coffee.js diff --git a/coffee_scale/static/css/coffee.css b/coffee_scale/static/css/coffee.css new file mode 100644 index 0000000..2594006 --- /dev/null +++ b/coffee_scale/static/css/coffee.css @@ -0,0 +1,121 @@ +body { + background-color: white; + font-family: monospace; + color: black; +} +#container{ + position:relative; + width:95%; + margin-left:auto; + margin-right:auto; + height:100%; + overflow:hidden; + +} +#upper{ + background-size: contain; + background-repeat: no-repeat; + background-position: bottom center; + background-image: url("/static/img/smokes.png"); + transform-origin: bottom; + animation: smokes 8s ease-in-out 0s infinite; + opacity:0; + height:40%; +} +#lower{ + position:relative; + background-size: contain; + background-repeat: no-repeat; + background-position: top center; + background-image: url("/static/img/coffeecup3.png"); + height:60%; +} +#scale{ + position:absolute; + top:80%; + width:90%; + height:10%; + margin: 0% 5% 0% 5%; + background: lightgrey; + border-radius: 10px; + overflow:hidden; +} +#scale2{ + width: 0%; + transition: width 2s; + height:100%; + background: green; + border-radius: 10px; +} +#brewtime{ + text-align:right; + position:absolute; + right:0px; + z-index:5; + font-size:10vw; +} +#address{ + text-align:left; + position:absolute; + left:0px; + z-index:5; + font-size:4vw; + color: #333; +} +noscript{ + color:red; +} +#text{ + color:green; + position:absolute; + top:50%; + left:50%; +} +.brewing{ + animation: brewing 5s ease-in-out 0s infinite; +} +.hurry{ + color:red !important; +} +.unknown{ + color:orange !important; + animation: unknown 5s ease-in-out 0s infinite; +} +.friday{ + animation: friday 20s ease-in-out 0s infinite; +} +.normal{ + animation: normal 1000s ease-in-out 0s infinite; +} +.coffeeready{ + animation: coffeeready 10s ease-in-out 0s; +} +@keyframes smokes { + 0% {transform: skewX(-10deg);} + 50% {transform: skewX(10deg);} + 100% {transform: skewX(-10deg);} +} +@keyframes brewing { + 0% {color:green;} + 50% {color: transparent;} + 100% {color:green;} +} +@keyframes coffeeready { + 0% {background-color:white;} + 25% {background-color:green;} + 50% {background-color:white;} + 75% {background-color:green;} + 100% {background-color:white;} +} +@keyframes unknown { + 0%,40% {transform: rotate(0deg);} + 60%,100% {transform: rotate(360deg);} +} +@keyframes friday { + 0% {transform: rotate(0deg);} + 100% {transform: rotate(360deg);} +} +@keyframes normal { + 0%,49% {transform: rotate(0deg);} + 50%,100% {transform: rotate(360deg);} +} diff --git a/coffee_scale/static/js/coffee.js b/coffee_scale/static/js/coffee.js new file mode 100644 index 0000000..ca97335 --- /dev/null +++ b/coffee_scale/static/js/coffee.js @@ -0,0 +1,137 @@ +var len = 0; +var lastBrew = "∞"; +var brewtext = ""; + +$(document).ready(function(){ + $('#text').bind("DOMSubtreeModified", resize); + updateTime(); + setInterval(updateTime,1000); + formatBrewTime(); + setInterval(formatBrewTime,10000); +}); + +$(window).resize(resize); + +var defaultBackoffTime = 1000; +var modified = 0; + +function fetchdata(data, status){ + var backoffTime = defaultBackoffTime; + modified = 1; + if (typeof status !== 'undefined'){ + if (status == "success"){ + backoffTime = defaultBackoffTime; + parseData(data); + } + else if (status == "error"){ + backoffTime *= 2; + modified = 0 + handleError(); + return; + } + } +} + +$.getJSON("/coffee/cups", fetchdata); +setInterval(function() { + $.getJSON("/coffee/cups", fetchdata); +}, 2000); + +function formatBrewTime(){ + if(!brewtext && lastBrew instanceof Date){ + var now = new Date(); + var timeDiff = Math.max(now.getTime()-lastBrew.getTime(),0); + if(timeDiff < 3600000) + tmp = Math.round(timeDiff/60000) + ' min'; + else + tmp = '~' + Math.round(timeDiff/3600000*2)/2 + ' h'; + $("#brewtime").html(tmp); + }else + $("#brewtime").html(brewtext); +} + +function handleError(){ + setData("?",0,0,Number.MAX_VALUE,Number.MAX_VALUE); +} + +function parseData(data) { + if (data) { + var date = new Date(data.date); + lastBrew = new Date(data.last_brew); + var now = new Date(); + var cups = data.cups; + var brewing = data.brewing; + var timeDiff = Math.max(now.getTime() - lastBrew.getTime(),0); + var opa = Math.max(100-timeDiff/90000,0); + setData(cups, data.temp, opa,now.getTime()-date.getTime(), timeDiff, brewing); + } + else{ + handleError(); + } +} + +function setData(cups, temp, opa, timeFromUpdate, timeFromBrew, brewing){ + var now = new Date(); + if(cups == 0) + opa = 0; + brewtext = ""; + $("#upper").css({opacity: opa/100}); + $("#scale2").css({width: Math.min(cups/9*100,100) + '%'}); + $("#text,body").removeClass(); + + if(timeFromUpdate > 600000){ + cups = "?"; + brewtext = "∞"; + $("#text").addClass("unknown"); + } + else if(brewing){ + cups = "+"; + brewtext = ":)"; + $("#text").addClass("brewing"); + } + else if(cups <= 2){ + $("#text").addClass("hurry"); + } + formatBrewTime(); + if($("#text").html() == "+" && !brewing) + $("body").addClass("coffeeready"); + + cups = Number(cups).toFixed(1); + var cupsString = cups.toString(); + len = cupsString.length; + $("#text").html(cups); +} + +function updateTime(){ + var now = new Date(); + $("#time").html(formatTime(now.getHours(),now.getMinutes(),now.getSeconds())); +} + +function formatTime(hours, minutes, seconds){ + var str = ""; + + if(hours < 10) + str += "0"; + str += hours; + + str += ":"; + + if(minutes < 10) + str += "0"; + str += minutes; + + str += ":"; + + if(seconds < 10) + str += "0"; + str += seconds; + + return str; +} +function resize(){ + var w = $("#container").width(); + var h = $("#container").height(); + var s = w > h ? h : w; + var font = s*0.8*0.38/Math.sqrt(len); + $("#text").css({ top: s*0.16-font/2 + 'px', fontSize: font + 'px', marginLeft: -font*len*3/10 + 'px'}); +} diff --git a/coffee_scale/templates/coffee.html b/coffee_scale/templates/coffee.html index 2d5ee2b..1c2fec9 100644 --- a/coffee_scale/templates/coffee.html +++ b/coffee_scale/templates/coffee.html @@ -1,287 +1,24 @@ -Coffee Cups @Guild Room - AYY SIK RY - - - - - - - - - - - + Coffee Cups @Guild Room - AYY SIK ry + + + + + + + + + + + - -
+
- Kahvivaaka + ka.dy.fi
@@ -292,6 +29,6 @@ function resize(){
-
+ From 010fab5be170035c7d430bbc4cdc49d6bca1fcc6 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Sun, 24 Sep 2017 16:21:45 +0300 Subject: [PATCH 3/3] Move static dir and fix eslint issues --- .eslintignore | 3 +- .eslintrc.json | 3 +- .gitignore | 2 +- coffee_scale/static/js/coffee.js | 34 +++++++----------- global_static/img/favicon.ico | Bin 1150 -> 0 bytes sikweb/base.py | 4 +-- {global_static => static}/css/about.css | 0 {global_static => static}/css/base.css | 0 {global_static => static}/css/footer.css | 0 .../css/lib/bootstrap.min.css | 0 .../css/lib/simple-sidebar.css | 0 {global_static => static}/img/en.png | Bin {global_static => static}/img/fi.png | Bin .../js/lib/angular-animate.js | 0 .../js/lib/angular-qrcode.js | 0 .../js/lib/angular-route.js | 0 {global_static => static}/js/lib/angular.js | 0 .../js/lib/bootstrap.min.js | 0 .../js/lib/jquery-3.1.0.min.js | 0 .../js/lib/jquery.noty.packaged.js | 0 {global_static => static}/js/lib/moment.js | 0 .../ng-file-upload-bower-12.2.11/.versions | 0 .../FileAPI.flash.swf | Bin .../ng-file-upload-bower-12.2.11/FileAPI.js | 0 .../FileAPI.min.js | 0 .../lib/ng-file-upload-bower-12.2.11/LICENSE | 0 .../ng-file-upload-bower-12.2.11/README.md | 0 .../ng-file-upload-bower-12.2.11/bower.json | 0 .../ng-file-upload-all.js | 0 .../ng-file-upload-all.min.js | 0 .../ng-file-upload-shim.js | 0 .../ng-file-upload-shim.min.js | 0 .../ng-file-upload.js | 0 .../ng-file-upload.min.js | 0 .../ng-file-upload-bower-12.2.11/package.js | 0 {global_static => static}/js/lib/qrcode.js | 0 .../js/lib/qrcode_UTF8.js | 0 .../js/lib/underscore-min.js | 0 38 files changed, 20 insertions(+), 26 deletions(-) delete mode 100644 global_static/img/favicon.ico rename {global_static => static}/css/about.css (100%) rename {global_static => static}/css/base.css (100%) rename {global_static => static}/css/footer.css (100%) rename {global_static => static}/css/lib/bootstrap.min.css (100%) rename {global_static => static}/css/lib/simple-sidebar.css (100%) rename {global_static => static}/img/en.png (100%) rename {global_static => static}/img/fi.png (100%) rename {global_static => static}/js/lib/angular-animate.js (100%) rename {global_static => static}/js/lib/angular-qrcode.js (100%) rename {global_static => static}/js/lib/angular-route.js (100%) rename {global_static => static}/js/lib/angular.js (100%) rename {global_static => static}/js/lib/bootstrap.min.js (100%) rename {global_static => static}/js/lib/jquery-3.1.0.min.js (100%) rename {global_static => static}/js/lib/jquery.noty.packaged.js (100%) rename {global_static => static}/js/lib/moment.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/.versions (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/FileAPI.flash.swf (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/FileAPI.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/FileAPI.min.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/LICENSE (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/README.md (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/bower.json (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.min.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.min.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.min.js (100%) rename {global_static => static}/js/lib/ng-file-upload-bower-12.2.11/package.js (100%) rename {global_static => static}/js/lib/qrcode.js (100%) rename {global_static => static}/js/lib/qrcode_UTF8.js (100%) rename {global_static => static}/js/lib/underscore-min.js (100%) diff --git a/.eslintignore b/.eslintignore index 69337b2..fce1844 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,4 +1,5 @@ members/static/js/lib infoscreen/static/js/lib webapp/static/js/lib -global_static/js/lib +static/js/lib +collected_static diff --git a/.eslintrc.json b/.eslintrc.json index 2c290d0..c8aec53 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,6 +1,7 @@ { "env": { - "browser": true + "browser": true, + "jquery": true }, "globals": { "angular": 1, diff --git a/.gitignore b/.gitignore index b606e14..4d5ace6 100644 --- a/.gitignore +++ b/.gitignore @@ -9,9 +9,9 @@ infoscreen/static/js/hsl.json members/logs/* .idea/ logs/ -/static/ /media/ node_modules/ /.coverage db.sqlite3 requirements_henu.txt +/collected_static/ diff --git a/coffee_scale/static/js/coffee.js b/coffee_scale/static/js/coffee.js index ca97335..df052f9 100644 --- a/coffee_scale/static/js/coffee.js +++ b/coffee_scale/static/js/coffee.js @@ -12,22 +12,13 @@ $(document).ready(function(){ $(window).resize(resize); -var defaultBackoffTime = 1000; -var modified = 0; - function fetchdata(data, status){ - var backoffTime = defaultBackoffTime; - modified = 1; if (typeof status !== 'undefined'){ if (status == "success"){ - backoffTime = defaultBackoffTime; parseData(data); } else if (status == "error"){ - backoffTime *= 2; - modified = 0 handleError(); - return; } } } @@ -38,20 +29,21 @@ setInterval(function() { }, 2000); function formatBrewTime(){ - if(!brewtext && lastBrew instanceof Date){ + if (!brewtext && lastBrew instanceof Date){ var now = new Date(); - var timeDiff = Math.max(now.getTime()-lastBrew.getTime(),0); - if(timeDiff < 3600000) - tmp = Math.round(timeDiff/60000) + ' min'; - else - tmp = '~' + Math.round(timeDiff/3600000*2)/2 + ' h'; + var timeDiff = Math.max(now.getTime() - lastBrew.getTime(), 0); + var tmp = (timeDiff < 3600000) + ? Math.round(timeDiff / 60000) + ' min' + : '~' + Math.round(timeDiff / 3600000 * 2) / 2 + ' h'; + $("#brewtime").html(tmp); - }else + } else { $("#brewtime").html(brewtext); + } } -function handleError(){ - setData("?",0,0,Number.MAX_VALUE,Number.MAX_VALUE); +function handleError() { + setData("?", 0, 0, Number.MAX_VALUE, Number.MAX_VALUE); } function parseData(data) { @@ -62,7 +54,7 @@ function parseData(data) { var cups = data.cups; var brewing = data.brewing; var timeDiff = Math.max(now.getTime() - lastBrew.getTime(),0); - var opa = Math.max(100-timeDiff/90000,0); + var opa = Math.max(100 - timeDiff / 90000,0); setData(cups, data.temp, opa,now.getTime()-date.getTime(), timeDiff, brewing); } else{ @@ -71,9 +63,9 @@ function parseData(data) { } function setData(cups, temp, opa, timeFromUpdate, timeFromBrew, brewing){ - var now = new Date(); - if(cups == 0) + if (cups == 0) { opa = 0; + } brewtext = ""; $("#upper").css({opacity: opa/100}); $("#scale2").css({width: Math.min(cups/9*100,100) + '%'}); diff --git a/global_static/img/favicon.ico b/global_static/img/favicon.ico deleted file mode 100644 index 0799dd35a6bd7f1830ec3a14c8897c0549476ffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1150 zcmZQzU<5(|0R|vYV8~!$U=RbcG=LZ+qyWT>V3L8s0VszK{{R2ah>m+>4A)K!5PvMp z%`7j*!=gMnQ2b?*5yxtDb;x|6(W0!34E(&T46>bGLibn3O8uW5Ch;AF*Ct5+@AeXS zZf&eBzjfm}-t8OLh$8FVv1zSztpn%H8du@NWsXAITRcV2=GzKxj5gxyj{@Qn2chi? zBPD-N3ljZUZO?hN(1hXUrqxSjVP@>wwn@0&k@Noi2+8k7_Cg!`{l)JaNH7P(`Kf^-ZyP;CPDdEY&1vTJ9vgv(BFV_M@Y#GST&e_$He2 z>T^Owes*~9-;LE{T@DIcQ1}$u32kLzVr2E#;i>L%=X!m6@8Wc9`axpZmONY60rkub zmG~;f$D#@J_up^>zHX45iZHABqF~(>-x zvtJMd)W2_WHZJ@9H6i*X`B>C@{lxFDiHEo!q#mf>aej!v@4E+AV1yscyetcz%^*Jm z)7aA~*|@olPt={Vk$l`ara_Acyk2aEb4e z{Dq(Q#TlQ-dX5DhRO}tB9~!P7M-&9dE$C943!UGcf%BPYDJ9!gLil diff --git a/sikweb/base.py b/sikweb/base.py index 1e3c808..6ccab05 100644 --- a/sikweb/base.py +++ b/sikweb/base.py @@ -237,9 +237,9 @@ STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', ) STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, 'static') +STATIC_ROOT = os.path.join(BASE_DIR, 'collected_static') STATICFILES_DIRS = ( - os.path.join(BASE_DIR, 'global_static'), + os.path.join(BASE_DIR, 'static'), ) MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' diff --git a/global_static/css/about.css b/static/css/about.css similarity index 100% rename from global_static/css/about.css rename to static/css/about.css diff --git a/global_static/css/base.css b/static/css/base.css similarity index 100% rename from global_static/css/base.css rename to static/css/base.css diff --git a/global_static/css/footer.css b/static/css/footer.css similarity index 100% rename from global_static/css/footer.css rename to static/css/footer.css diff --git a/global_static/css/lib/bootstrap.min.css b/static/css/lib/bootstrap.min.css similarity index 100% rename from global_static/css/lib/bootstrap.min.css rename to static/css/lib/bootstrap.min.css diff --git a/global_static/css/lib/simple-sidebar.css b/static/css/lib/simple-sidebar.css similarity index 100% rename from global_static/css/lib/simple-sidebar.css rename to static/css/lib/simple-sidebar.css diff --git a/global_static/img/en.png b/static/img/en.png similarity index 100% rename from global_static/img/en.png rename to static/img/en.png diff --git a/global_static/img/fi.png b/static/img/fi.png similarity index 100% rename from global_static/img/fi.png rename to static/img/fi.png diff --git a/global_static/js/lib/angular-animate.js b/static/js/lib/angular-animate.js similarity index 100% rename from global_static/js/lib/angular-animate.js rename to static/js/lib/angular-animate.js diff --git a/global_static/js/lib/angular-qrcode.js b/static/js/lib/angular-qrcode.js similarity index 100% rename from global_static/js/lib/angular-qrcode.js rename to static/js/lib/angular-qrcode.js diff --git a/global_static/js/lib/angular-route.js b/static/js/lib/angular-route.js similarity index 100% rename from global_static/js/lib/angular-route.js rename to static/js/lib/angular-route.js diff --git a/global_static/js/lib/angular.js b/static/js/lib/angular.js similarity index 100% rename from global_static/js/lib/angular.js rename to static/js/lib/angular.js diff --git a/global_static/js/lib/bootstrap.min.js b/static/js/lib/bootstrap.min.js similarity index 100% rename from global_static/js/lib/bootstrap.min.js rename to static/js/lib/bootstrap.min.js diff --git a/global_static/js/lib/jquery-3.1.0.min.js b/static/js/lib/jquery-3.1.0.min.js similarity index 100% rename from global_static/js/lib/jquery-3.1.0.min.js rename to static/js/lib/jquery-3.1.0.min.js diff --git a/global_static/js/lib/jquery.noty.packaged.js b/static/js/lib/jquery.noty.packaged.js similarity index 100% rename from global_static/js/lib/jquery.noty.packaged.js rename to static/js/lib/jquery.noty.packaged.js diff --git a/global_static/js/lib/moment.js b/static/js/lib/moment.js similarity index 100% rename from global_static/js/lib/moment.js rename to static/js/lib/moment.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/.versions b/static/js/lib/ng-file-upload-bower-12.2.11/.versions similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/.versions rename to static/js/lib/ng-file-upload-bower-12.2.11/.versions diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.flash.swf b/static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.flash.swf similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.flash.swf rename to static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.flash.swf diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.js b/static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.js rename to static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.min.js b/static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.min.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.min.js rename to static/js/lib/ng-file-upload-bower-12.2.11/FileAPI.min.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/LICENSE b/static/js/lib/ng-file-upload-bower-12.2.11/LICENSE similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/LICENSE rename to static/js/lib/ng-file-upload-bower-12.2.11/LICENSE diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/README.md b/static/js/lib/ng-file-upload-bower-12.2.11/README.md similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/README.md rename to static/js/lib/ng-file-upload-bower-12.2.11/README.md diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/bower.json b/static/js/lib/ng-file-upload-bower-12.2.11/bower.json similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/bower.json rename to static/js/lib/ng-file-upload-bower-12.2.11/bower.json diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.min.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.min.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.min.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-all.min.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.min.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.min.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.min.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload-shim.min.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.min.js b/static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.min.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.min.js rename to static/js/lib/ng-file-upload-bower-12.2.11/ng-file-upload.min.js diff --git a/global_static/js/lib/ng-file-upload-bower-12.2.11/package.js b/static/js/lib/ng-file-upload-bower-12.2.11/package.js similarity index 100% rename from global_static/js/lib/ng-file-upload-bower-12.2.11/package.js rename to static/js/lib/ng-file-upload-bower-12.2.11/package.js diff --git a/global_static/js/lib/qrcode.js b/static/js/lib/qrcode.js similarity index 100% rename from global_static/js/lib/qrcode.js rename to static/js/lib/qrcode.js diff --git a/global_static/js/lib/qrcode_UTF8.js b/static/js/lib/qrcode_UTF8.js similarity index 100% rename from global_static/js/lib/qrcode_UTF8.js rename to static/js/lib/qrcode_UTF8.js diff --git a/global_static/js/lib/underscore-min.js b/static/js/lib/underscore-min.js similarity index 100% rename from global_static/js/lib/underscore-min.js rename to static/js/lib/underscore-min.js