From c2840326423a0f6ba6c25b9dd935da745de7755d Mon Sep 17 00:00:00 2001
From: wgaylord <chibill110@gmail.com>
Date: Thu, 10 Jan 2019 17:34:51 -0600
Subject: [PATCH] Restructure the system.

---
 README.md                                         |   6 +++++-
 server/README.md                                  |   3 +++
 requirments.txt => server/requirments.txt         |   0
 satnogs.py => server/satnogs.py                   |   5 -----
 .../satnogs_api_client.py                         |   0
 {static => views/map}/Worker.js                   |   0
 {static => views/map}/active-station-marker.png   | Bin
 templates/map.html => views/map/index.html.html   |  14 +++++++-------
 {static => views/map}/satellite-marker-dark.png   | Bin
 {static => views/map}/satellite-marker-light.png  | Bin
 {static => views/map}/satellite.js                |   0
 {static => views/map}/satnogs-net-logo.png        | Bin
 {static => views/map}/station-marker.png          | Bin
 13 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 server/README.md
 rename requirments.txt => server/requirments.txt (100%)
 rename satnogs.py => server/satnogs.py (98%)
 rename satnogs_api_client.py => server/satnogs_api_client.py (100%)
 rename {static => views/map}/Worker.js (100%)
 rename {static => views/map}/active-station-marker.png (100%)
 rename templates/map.html => views/map/index.html.html (94%)
 rename {static => views/map}/satellite-marker-dark.png (100%)
 rename {static => views/map}/satellite-marker-light.png (100%)
 rename {static => views/map}/satellite.js (100%)
 rename {static => views/map}/satnogs-net-logo.png (100%)
 rename {static => views/map}/station-marker.png (100%)

diff --git a/README.md b/README.md
index 49200bd..d966412 100644
--- a/README.md
+++ b/README.md
@@ -3,4 +3,8 @@
 Uses Satnogs data to generate a map of all stations on Production and all sats currently observed.
 
 
-Currently hosted at satnogs.minecraft16.ml
\ No newline at end of file
+
+Currently hosted at satnogs.minecraft16.ml
+
+
+The server itself is in the server folder and the views are in the view folder.
\ No newline at end of file
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..871af34
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,3 @@
+Basic server that gives all data used by all the existing views that exist.
+
+Place any folder from views into static and launch the server to be able to access that view of the satnogs network.
\ No newline at end of file
diff --git a/requirments.txt b/server/requirments.txt
similarity index 100%
rename from requirments.txt
rename to server/requirments.txt
diff --git a/satnogs.py b/server/satnogs.py
similarity index 98%
rename from satnogs.py
rename to server/satnogs.py
index 97c8adc..71cbc7a 100644
--- a/satnogs.py
+++ b/server/satnogs.py
@@ -153,11 +153,6 @@ def updateTLE():
 
 
 
-
-@app.route("/")
-def map_view():
-    return render_template("map.html")
- 
 @app.route('/active_stations')
 def api_active_stations():
     sations = []
diff --git a/satnogs_api_client.py b/server/satnogs_api_client.py
similarity index 100%
rename from satnogs_api_client.py
rename to server/satnogs_api_client.py
diff --git a/static/Worker.js b/views/map/Worker.js
similarity index 100%
rename from static/Worker.js
rename to views/map/Worker.js
diff --git a/static/active-station-marker.png b/views/map/active-station-marker.png
similarity index 100%
rename from static/active-station-marker.png
rename to views/map/active-station-marker.png
diff --git a/templates/map.html b/views/map/index.html.html
similarity index 94%
rename from templates/map.html
rename to views/map/index.html.html
index 87deac0..47950d7 100644
--- a/templates/map.html
+++ b/views/map/index.html.html
@@ -21,7 +21,7 @@
     <div class="row"> .
         <div class="col-md-12">
             <center>
-                <img src="/static/satnogs-net-logo.png">        
+                <img src="staic/map/satnogs-net-logo.png">        
                 <br>
                 <br>
                 <div id="mapid" ></div>
@@ -35,7 +35,7 @@
 <script>
 test = null
 var light_sat = L.icon({
-    iconUrl: 'static/satellite-marker-light.png',
+    iconUrl: 'staic/map/satellite-marker-light.png',
     iconSize: [40, 40],
     iconAnchor: [20, 20],
     popupAnchor: [0, 0],
@@ -43,7 +43,7 @@ var light_sat = L.icon({
 });
 
 var dark_sat = L.icon({
-    iconUrl: 'static/satellite-marker-dark.png',
+    iconUrl: 'staic/map/satellite-marker-dark.png',
     iconSize: [40, 40],
     iconAnchor: [20, 20],
     popupAnchor: [0, 0],
@@ -51,7 +51,7 @@ var dark_sat = L.icon({
 });
 
 var station = L.icon({
-    iconUrl: 'static/station-marker.png',
+    iconUrl: 'staic/map/station-marker.png',
     iconSize: [10, 10],
     iconAnchor: [5, 5],
     popupAnchor: [0, 0],
@@ -59,7 +59,7 @@ var station = L.icon({
 });
 
 var active_station = L.icon({
-    iconUrl: 'static/active-station-marker.png',
+    iconUrl: 'staic/map/active-station-marker.png',
     iconSize: [20, 20],
     iconAnchor: [10, 10],
     popupAnchor: [0, 0],
@@ -156,7 +156,7 @@ function UpdateMap(e) {
     $.get("/occuring_sats", function(data, status){
         data = JSON.parse(data)
         Object.keys(data).forEach(function(x){
-            worker = new Worker('/static/Worker.js');
+            worker = new Worker('static/map/Worker.js');
             worker.onmessage = UpdateMap
             worker.postMessage([x,data[x]]);
             Workers[x] =worker
@@ -171,7 +171,7 @@ $.get("/occuring_sats", function(data, status){
         Object.keys(data).forEach(function(x){
             if (x in Workers){
             }else{
-            worker = new Worker('/static/Worker.js');
+            worker = new Worker('static/map/Worker.js');
             worker.onmessage = UpdateMap
             worker.postMessage([x,data[x]]);
             Workers[x] =worker
diff --git a/static/satellite-marker-dark.png b/views/map/satellite-marker-dark.png
similarity index 100%
rename from static/satellite-marker-dark.png
rename to views/map/satellite-marker-dark.png
diff --git a/static/satellite-marker-light.png b/views/map/satellite-marker-light.png
similarity index 100%
rename from static/satellite-marker-light.png
rename to views/map/satellite-marker-light.png
diff --git a/static/satellite.js b/views/map/satellite.js
similarity index 100%
rename from static/satellite.js
rename to views/map/satellite.js
diff --git a/static/satnogs-net-logo.png b/views/map/satnogs-net-logo.png
similarity index 100%
rename from static/satnogs-net-logo.png
rename to views/map/satnogs-net-logo.png
diff --git a/static/station-marker.png b/views/map/station-marker.png
similarity index 100%
rename from static/station-marker.png
rename to views/map/station-marker.png