From c3af36064f3516f345b372be947a20541f2083ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Fri, 26 Jun 2015 17:01:30 +0200
Subject: [PATCH] Renamed some files and moved some around

---
 .htaccess                                                   | 4 ++--
 php/controller.php                                          | 4 ++--
 php/footer.php                                              | 6 +++---
 php/nochan.php                                              | 4 ++--
 server/server.js                                            | 2 +-
 static/{build-js/main-fp.js => dist/frontpage-min.js}       | 0
 static/{js => dist}/lib/color-thief.js                      | 0
 static/{js => dist}/lib/jquery-2.1.3.min.js                 | 0
 static/{js => dist}/lib/jquery-ui-1.10.3.min.js             | 0
 static/{js => dist}/lib/materialize.js                      | 0
 static/{js => dist}/lib/materialize.min.js                  | 0
 static/{build-js/main.js => dist/main-min.js}               | 0
 .../remotecontroller-min.js => dist/remote-min.js}          | 0
 13 files changed, 10 insertions(+), 10 deletions(-)
 rename static/{build-js/main-fp.js => dist/frontpage-min.js} (100%)
 rename static/{js => dist}/lib/color-thief.js (100%)
 rename static/{js => dist}/lib/jquery-2.1.3.min.js (100%)
 rename static/{js => dist}/lib/jquery-ui-1.10.3.min.js (100%)
 rename static/{js => dist}/lib/materialize.js (100%)
 rename static/{js => dist}/lib/materialize.min.js (100%)
 rename static/{build-js/main.js => dist/main-min.js} (100%)
 rename static/{build-js/remotecontroller-min.js => dist/remote-min.js} (100%)

diff --git a/.htaccess b/.htaccess
index 105d8c48..fbb84555 100755
--- a/.htaccess
+++ b/.htaccess
@@ -5,8 +5,8 @@ RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
 RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
 
 #Comment out the two folling lines when running server locally to fix issues with localhost
-RewriteCond %{HTTPS} !=on
-RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
+#RewriteCond %{HTTPS} !=on
+#RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
 
 
 RewriteRule ^remote/(.*) php/controller.php?id=$1 [L]
diff --git a/php/controller.php b/php/controller.php
index 6e59052a..144f0e64 100755
--- a/php/controller.php
+++ b/php/controller.php
@@ -167,7 +167,7 @@
     <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
     <script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
     <script type="text/javascript" src="//cdn.socket.io/socket.io-1.2.0.js"></script>
-    <script type="text/javascript" src="/static/js/lib/materialize.js"></script>
-    <script type="text/javascript" src="/static/build-js/remotecontroller-min.js"></script>
+    <script type="text/javascript" src="/static/dist/lib/materialize.js"></script>
+    <script type="text/javascript" src="/static/dist/remote-min.js"></script>
 	</body>
 </html>
diff --git a/php/footer.php b/php/footer.php
index 9fc3c02c..482b8385 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -59,11 +59,11 @@
 
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
 <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
-<script type="text/javascript" src="/static/js/lib/materialize.js"></script>
-<script type="text/javascript" src="/static/js/lib/color-thief.js"></script>
+<script type="text/javascript" src="/static/dist/lib/materialize.js"></script>
+<script type="text/javascript" src="/static/dist/lib/color-thief.js"></script>
 <!--<script type="text/javascript" src="/static/js/lib/jquery-2.1.3.min.js"></script>
 <script type="text/javascript" src="/static/js/lib/jquery-ui-1.10.3.min.js"></script>-->
 <script type="text/javascript" src="https://cdn.socket.io/socket.io-1.3.5.js"></script>
 <!--<script type="text/javascript" src="/static/js/lib/iscroll-min.js"></script>-->
 <script type="text/javascript" src="https://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/sha256.js"></script>
-<script type="text/javascript" src="/static/build-js/main.js"></script>
+<script type="text/javascript" src="/static/dist/main-min.js"></script>
diff --git a/php/nochan.php b/php/nochan.php
index 29e2d9f4..4dbce3f2 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -174,7 +174,7 @@ if(isset($_GET['chan'])){
 
     <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
     <script type="text/javascript" src="https://cdn.socket.io/socket.io-1.2.0.js"></script>
-    <script type="text/javascript" src="static/js/lib/materialize.min.js"></script>
-    <script type="text/javascript" src="static/build-js/main-fp.js"></script>
+    <script type="text/javascript" src="static/dist/lib/materialize.min.js"></script>
+    <script type="text/javascript" src="static/dist/frontpage-min.js"></script>
 	</body>
 </html>
diff --git a/server/server.js b/server/server.js
index 44b116ad..033269e1 100755
--- a/server/server.js
+++ b/server/server.js
@@ -4,7 +4,7 @@ var server;
 This if for the localhost running
 
 ******/
-localhost = false;
+localhost = true;
 
 //https server
 if(localhost)
diff --git a/static/build-js/main-fp.js b/static/dist/frontpage-min.js
similarity index 100%
rename from static/build-js/main-fp.js
rename to static/dist/frontpage-min.js
diff --git a/static/js/lib/color-thief.js b/static/dist/lib/color-thief.js
similarity index 100%
rename from static/js/lib/color-thief.js
rename to static/dist/lib/color-thief.js
diff --git a/static/js/lib/jquery-2.1.3.min.js b/static/dist/lib/jquery-2.1.3.min.js
similarity index 100%
rename from static/js/lib/jquery-2.1.3.min.js
rename to static/dist/lib/jquery-2.1.3.min.js
diff --git a/static/js/lib/jquery-ui-1.10.3.min.js b/static/dist/lib/jquery-ui-1.10.3.min.js
similarity index 100%
rename from static/js/lib/jquery-ui-1.10.3.min.js
rename to static/dist/lib/jquery-ui-1.10.3.min.js
diff --git a/static/js/lib/materialize.js b/static/dist/lib/materialize.js
similarity index 100%
rename from static/js/lib/materialize.js
rename to static/dist/lib/materialize.js
diff --git a/static/js/lib/materialize.min.js b/static/dist/lib/materialize.min.js
similarity index 100%
rename from static/js/lib/materialize.min.js
rename to static/dist/lib/materialize.min.js
diff --git a/static/build-js/main.js b/static/dist/main-min.js
similarity index 100%
rename from static/build-js/main.js
rename to static/dist/main-min.js
diff --git a/static/build-js/remotecontroller-min.js b/static/dist/remote-min.js
similarity index 100%
rename from static/build-js/remotecontroller-min.js
rename to static/dist/remote-min.js