From 7ba18be952dbe35f7d3a97e736cc00c388d73bae Mon Sep 17 00:00:00 2001
From: david <david@socialnerds.org>
Date: Tue, 22 Nov 2016 00:40:57 +0100
Subject: [PATCH] draft work

---
 factoriocp.conf.sample |   1 +
 factoriocp.py          |  46 +++++++++++++--
 static/favicon.ico     | Bin 9662 -> 15086 bytes
 views/default.tpl      | 131 ++++++++++++++++++++---------------------
 views/footer.tpl       |  17 ++++++
 views/header.tpl       |  31 ++++++++++
 views/login.tpl        |  15 +----
 views/server.tpl       |  98 ++++++++++++++++++++++++++++++
 8 files changed, 253 insertions(+), 86 deletions(-)
 create mode 100644 views/footer.tpl
 create mode 100644 views/header.tpl
 create mode 100644 views/server.tpl

diff --git a/factoriocp.conf.sample b/factoriocp.conf.sample
index c6fd02b..0ea2366 100644
--- a/factoriocp.conf.sample
+++ b/factoriocp.conf.sample
@@ -12,6 +12,7 @@ static_files=/path/to/static/files
 host=localhost
 port=8000
 debug=True
+fqdn=factorio.socialnerds.org
 
 [factorio]
 path=/path/to/factorio/servers
diff --git a/factoriocp.py b/factoriocp.py
index 28fc7e8..7894c25 100644
--- a/factoriocp.py
+++ b/factoriocp.py
@@ -41,15 +41,16 @@ def log_in(username, password):
 # get a list of server dicts
 def get_servers():
     pass
-    return [{ "name": "Creative fun", "version": "0.14.20", "status": "online" },
-            { "name": "Mad enemies", "version": "0.14.19", "status": "offline" }]
+    return [{ "name": "Creative fun", "version": "0.14.20", "status": "online", "port": "43564" },
+            { "name": "Mad enemies", "version": "0.14.19", "status": "offline", "port": "65432" },
+            { "name": "Mad enemies2", "version": "0.14.19", "status": "offline", "port": "65431" }]
 
 
 # routing
 
 # render main page
 @get('/')
-def home():
+def view_home():
     username = logged_in()
     message = request.get_cookie(config['DEFAULT']['cookie_name'] + "_message",
                                  secret=config['DEFAULT']['cookie_secret'])
@@ -70,7 +71,7 @@ def home():
 
 # get login credentials
 @post('/login')
-def post_login():
+def login():
     username = request.forms.get('username')
     password = request.forms.get('password')
     if log_in(username, password):
@@ -90,7 +91,6 @@ def post_login():
 
 # delete cookie
 @get('/logout')
-@get('/logout/')
 def logout():
     if logged_in():
         response.delete_cookie(config['DEFAULT']['cookie_name'])
@@ -108,6 +108,42 @@ def logout():
 def send_static(filename):
         return static_file(filename, root=config['DEFAULT']['static_files'])
 
+# render server page
+@get('/server/<port:int>')
+def view_server(port):
+    username = logged_in()
+    message = request.get_cookie(config['DEFAULT']['cookie_name'] + "_message",
+                                 secret=config['DEFAULT']['cookie_secret'])
+    if username:
+        servers = get_servers()
+        server = [ server for server in servers if int(server['port']) == int(port) ]
+        if server:
+            return template('server',
+                            app_name=config['DEFAULT']['app_name'],
+                            server=server[0],
+                            username=username,
+                            fqdn=config['server']['fqdn'],
+                            message=message)
+        else:
+            message = { "message": "Server does not exist", "alert": "danger" }
+            response.set_cookie(config['DEFAULT']['cookie_name'] + "_message",
+                                message,
+                                secret=config['DEFAULT']['cookie_secret'],
+                                max_age=5,
+                                path="/")
+            redirect("/")
+    else:
+        redirect("/")
+
+
+# create new server
+@get('/create')
+def create_server():
+    pass
+
+
+
+
 
 # run webserver
 if __name__ == "__main__":
diff --git a/static/favicon.ico b/static/favicon.ico
index d6bb62b6e73a9aa0dc3687f7faf9c5e521d727f8..6fd60a6d9c5ed549a914bd2274dd369357a2fb6e 100644
GIT binary patch
literal 15086
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
VVL7pSx}V;OA9SrJkWk-={~u9Ys@(tp

literal 9662
zcmeHLNoZ4H5dM=i2^cpJL=4)B23kR=AR=Pv)sr{Di&$?Wf`};MLMtluAT9^*9$Kv%
zN-rX6DF`ZV2M>xUVl60E(L+JB#y-DE-;{Yn-q!pnTHb^&Gyg2#KbgF|CB~%iYHc-m
zZ!&!)V-^}?ngO^>2SENrk_jXeNG6a>Aelfifyx9f;N1zpoJ!Wj8`(j*+eGekndbv~
z8bxfjXoPI?`F(~hBG;Ok&*y`<g8CoJX0x+IG4=l&@auoG$n}_+OvbYgSsX?DIH94T
zVRx0>Q*Qhi^l9Lb5B9+?C5y#=z%TzSV#G;%(;gm4r_;Re2?RPkLGMD&=aV;7S;_d0
zD)Fhh`cNpjHIIx9>Y!MU!RFi{_P4dQvB@#gJK1SLUjm2Z)|4`KM+e2aYX2fW$%Etj
zr0~~j_JClLy9$|%O|}1ZYL7=)Uj%4&wV*eZO1)FuSbD@p|7*a=JmbP<U#(hldYV^z
zO?CdV|5|$utDlMe^Y;^V{xqXr;0kaVxC?~M%}N}<hkoFyyEpwlByXJlW!=AG&*c8;
zn)}7YNXYT>L*#yg{VOD2et$nj?bndnGUC(=_4OUN4*1Ce1Q==9a!+j^z;QXB@^P<3
zdLSfU*6*b{w{{-%jey!Wh~+5P#a!s9BKOp`zJIt4Qk~<s-mV(Z_Ybn}mCB8?lswx0
zANqfd5BtQ$3uyTny0Bi|*x0zTP$)FPz6Z#7kbR_7DlLJu6pKat<7sY*+CQ)#1GMi`
z;2K~{xF^1r@S3%spW~$ca-`o@znVw(QBPa%Yiq50=9#h9@t`%=u$H;D`qe!BaL~D;
z2hVgbq2-<fZY;{Z^mAE@^YBNk--45VZ#RMIkaO5X_TL_3(_OL_*N;sxYHg+J{~tES
zAl@VU$FtnB7`0YX@xR7l*+VXuTNITT$BU<b)J3k1x`$8RTKG2r^elN0cmUi7=sZo=
z_eg^OmDVGXo<FJfA!e}^nta5)3aFQif|!qadM1c1_@1iOjKImfbls|#d<HS^L+2S=
z@&QE5OW#SogzlMnADibnx-VwlXZ30xyeoiapaobA*plTSB3{B$Tcin3GJ#|Q$pn%K
z%-jh$6~V=?R$a~vcH#=^C_OynINfKA85)M}7MlFDes4@ZKqHI<WBl}ZW-#B?iHB;f
fQxkp%g?Z}BPnX-v6MegSTxsf)>b0(QUT*zg#<O5j

diff --git a/views/default.tpl b/views/default.tpl
index f5027f5..56305e1 100644
--- a/views/default.tpl
+++ b/views/default.tpl
@@ -1,71 +1,66 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
-    <meta name="description" content="">
-    <meta name="author" content="">
-    <link rel="icon" href="/static/favicon.ico">
+%include('header.tpl', app_name=app_name, message=message)
+<!-- Begin page content -->
+<div class="container">
+  <div class="row">
+    <div class="col-sm-8">
+    <h1>Servers</h1>
+    </div>
+    <div class="col-sm-4 text-xs-right">
+      <div class="btn-group">
+        <button type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          {{ username }}
+        </button>
+        <div class="dropdown-menu">
+          <a class="dropdown-item" href="/">Server overview</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="#">Create server</a>
+          <a class="dropdown-item" href="#">Create server from .zip</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/logout">Logout</a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <p class="lead">Control your <a href="http://factorio.com">Factorio</a> game servers from here.</p>
 
-    <title>{{ app_name }}</title>
-
-    <!-- Bootstrap core CSS -->
-    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
-
-    <!-- Custom styles for this template -->
-    <link href="/static/css/sticky-footer.css" rel="stylesheet">
-  </head>
-
-  <body>
-
-    <div class="container">
-      <p>
-        %if message:
-          <div class="alert alert-{{ message['alert'] }} alert-dismissible" role="alert">
-            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            {{ message['message'] }}.
-          </div>
+  <table class="table table-hover">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Version</th>
+        <th>Port</th>
+        <th>Status</th>
+        <th class="text-xs-right">Actions</th>
+      </tr>
+    </thead>
+    <tbody>
+      %for server in servers:
+        %if server['status'] == "online":
+          <tr>
+          <th>{{ server['name'] }}</th>
+            <td>{{ server['version'] }}</td>
+            <td>{{ server['port'] }}</td>
+            <td><span class="tag tag-success">{{ server['status'] }}</span></td>
+            <td class="text-xs-right">
+              <a href="/stop/{{ server['port' ]}}" type="button" class="btn btn-outline-danger btn-sm">Stop</a>
+              <a href="/server/{{ server['port'] }}" type="button" class="btn btn-outline-primary btn-sm">Edit</a>
+            </td>
+          </tr>
+        %else:
+          <tr>
+            <th>{{ server['name'] }}</th>
+            <td>{{ server['version'] }}</td>
+            <td>{{ server['port'] }}</td>
+            <td><span class="tag tag-danger">{{ server['status'] }}</span></td>
+            <td class="text-xs-right">
+              <a href="/start/{{ server['port'] }}" type="button" class="btn btn-outline-success btn-sm">Start</a>
+              <a href="/delete/{{ server['port'] }}" type="button" class="btn btn-outline-danger btn-sm">Delete</a>
+              <a href="/server/{{ server['port'] }}" type="button" class="btn btn-outline-primary btn-sm">Edit</a>
+            </td>
+          </tr>
         %end
-      </p>
-    </div>
-
-    <!-- Begin page content -->
-    <div class="container">
-      <div class="mt-1">
-        <h1>{{ app_name }}</h1>
-      </div>
-      <p class="lead">{{ username }} (<a href="/logout">logout</a>)</p>
-      <p>This is your Factorio server control panel.</p>
-      <p>It is <a href="https://en.wikipedia.org/wiki/Free_software">free software</a> and its code is hosted <a href="https://socialg.it/david/factoriocp">here</a>.</p>
-
-
-    <h2>Servers</h2>
-    <hr>
-    %for server in servers:
-      %if server['status'] == "online":
-        <h4>{{ server['name'] }} <span class="tag tag-success">{{ server['status'] }}</span></h4>
-      %else:
-        <h4>{{ server['name'] }} <span class="tag tag-danger">{{ server['status'] }}</span></h4>
       %end
-        Version: <b>{{ server['version'] }}</b>
-        <br><br>
-    %end
-    </div>
-
-    <footer class="footer">
-      <div class="container">
-        <span class="text-muted">factoriocp v0.1</span>
-      </div>
-    </footer>
-
-    <!-- Bootstrap core JavaScript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
-    <script>window.jQuery || document.write('<script src="/static/js/vendor/jquery.min.js"><\/script>')</script>
-    <script src="/static/js/bootstrap.min.js"></script>
-
-  </body>
-</html>
+    </tbody>
+  </table>
+</div> <!-- Page content -->
+%include('footer.tpl', username=username)
diff --git a/views/footer.tpl b/views/footer.tpl
new file mode 100644
index 0000000..b9f15f9
--- /dev/null
+++ b/views/footer.tpl
@@ -0,0 +1,17 @@
+  <footer class="footer">
+    <div class="container">
+      <div class="text-muted">
+        factoriocp v0.1
+      </div>
+    </div>
+  </footer>
+
+  <!-- Bootstrap core JavaScript
+  ================================================== -->
+  <!-- Placed at the end of the document so the pages load faster -->
+  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+  <script>window.jQuery || document.write('<script src="/static/js/vendor/jquery.min.js"><\/script>')</script>
+  <script src="/static/js/bootstrap.min.js"></script>
+
+  </body>
+</html>
diff --git a/views/header.tpl b/views/header.tpl
new file mode 100644
index 0000000..75dabb8
--- /dev/null
+++ b/views/header.tpl
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <meta name="description" content="">
+    <meta name="author" content="">
+    <link rel="icon" href="/static/favicon.ico">
+
+    <title>{{ app_name }}</title>
+
+    <!-- Bootstrap core CSS -->
+    <link href="/static/css/bootstrap.min.css" rel="stylesheet">
+
+    <!-- Custom styles for this template -->
+    <link href="/static/css/sticky-footer.css" rel="stylesheet">
+  </head>
+  <body>
+    <!-- Begin alert message -->
+    <div class="container">
+      <p>
+        %if message:
+          <div class="alert alert-{{ message['alert'] }} alert-dismissible" role="alert">
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+            {{ message['message'] }}.
+          </div>
+        %end
+      </p>
+    </div> <!-- alert message -->
diff --git a/views/login.tpl b/views/login.tpl
index 568be9b..3cea904 100644
--- a/views/login.tpl
+++ b/views/login.tpl
@@ -20,15 +20,7 @@
 
   <body>
 
-    <div class="container">
-
-      %if message:
-        <div class="alert alert-{{ message['alert'] }} alert-dismissible" role="alert">
-          <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-          {{ message['message'] }}.
-        </div>
-      %end
-    </div>
+    <!-- Begin page content -->
     <div class="container">
       <form class="form-signin" action="/login" method="post">
         <h2 class="form-signin-heading">{{ app_name }}</h2>
@@ -39,10 +31,7 @@
         <p>For security reasons every session will expire {{ int(cookie_max_age/60) }} minutes after login.</p>
         <button class="btn btn-lg btn-primary btn-block" type="submit">Login</button>
       </form>
-
-
-
-    </div> <!-- /container -->
+    </div> <!-- Page content -->
 
     <!-- Bootstrap core JavaScript
     ================================================== -->
diff --git a/views/server.tpl b/views/server.tpl
new file mode 100644
index 0000000..e9b9b27
--- /dev/null
+++ b/views/server.tpl
@@ -0,0 +1,98 @@
+%include('header.tpl', app_name=app_name, message=message)
+<!-- Begin page content -->
+<div class="container">
+  <div class="row">
+    <div class="col-sm-8">
+      %if server['status'] == "online":
+        <h1>{{ server['name'] }}<sup><span class="tag tag-success tag-sm">Online</span></sup></h1>
+      %else:
+        <h1>{{ server['name'] }}<sup><span class="tag tag-danger tag-sm">Offline</span></sup></h1>
+      %end
+    </div>
+    <div class="col-sm-4 text-xs-right">
+      <div class="btn-group">
+        <button type="button" class="btn btn-outline-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+          {{ username }}
+        </button>
+        <div class="dropdown-menu">
+          <a class="dropdown-item" href="/">Server overview</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="#">Create server</a>
+          <a class="dropdown-item" href="#">Create server from .zip</a>
+          <div class="dropdown-divider"></div>
+          <a class="dropdown-item" href="/logout">Logout</a>
+        </div>
+      </div>
+    </div>
+  </div>
+  <p class="lead">Some fon server description goes here.</p>
+
+  <table class="table">
+      <tr>
+        <th>Address</th>
+        <th>Version</th>
+        <th class="text-xs-right">Actions</th>
+      </tr>
+      %if server['status'] == "online":
+        <tr>
+        <td><code>{{ fqdn }}:{{ server['port'] }}</code></td>
+          <td><code>{{ server['version'] }}</code></td>
+          <td class="text-xs-right">
+            <a href="/stop/{{ server['port'] }}" type="button" class="btn btn-outline-danger btn-sm">Stop</a>
+          </td>
+        </tr>
+      %else:
+        <tr>
+          <td><code>{{ fqdn }}:{{ server['port'] }}</code></td>
+          <td><code>{{ server['version'] }}</code></td>
+          <td class="text-xs-right">
+            <a href="/start" type="button" class="btn btn-outline-success btn-sm">Start</a>
+            <a href="/delete/{{ server['port'] }}" type="button" class="btn btn-outline-danger btn-sm">Delete</a>
+          </td>
+        </tr>
+      %end
+  </table>
+
+  <p>
+    <h4>Settings</h4>
+    <hr>
+    <form class="form-inline">
+      <input>
+    </form>
+  </p>
+
+  <p>
+    <h4>Backups</h4>
+    <hr>
+    <form class="form-inline">
+      <input>
+    </form>
+  </p>
+
+  <p>
+    <h4>Mods</h4>
+    <hr>
+    <form class="form-inline">
+      <input>
+    </form>
+  </p>
+
+  <p>
+    <h4>Screenshots</h4>
+    <hr>
+    <form class="form-inline">
+      <input>
+    </form>
+  </p>
+
+  <p>
+    <h4>Console</h4>
+    <hr>
+    <form class="form-inline">
+      <input>
+    </form>
+  </p>
+
+
+</div> <!-- Page content -->
+%include('footer.tpl', username=username)