From 411dedf00d4ba269c95b987564aba83a8ff70600 Mon Sep 17 00:00:00 2001
From: Oly <oliver.marks@influentialsoftware.com>
Date: Wed, 1 Feb 2017 14:01:50 +0000
Subject: [PATCH] clean up refresg commands and start on docker-compose files
 for stage

---
 compose/django/gunicorn.sh                    |  2 +-
 compose/nginx/Dockerfile                      |  2 +-
 docker-compose.yml                            | 33 ++++++++++---------
 .../commands/refresh_subscriptions.py         | 12 +++----
 mhackspace/templates/users/user_detail.html   |  7 ++--
 mhackspace/users/models.py                    |  4 +--
 6 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/compose/django/gunicorn.sh b/compose/django/gunicorn.sh
index 014f173..21f8633 100644
--- a/compose/django/gunicorn.sh
+++ b/compose/django/gunicorn.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 python /app/manage.py collectstatic --noinput
-/usr/local/bin/gunicorn config.wsgi -w 4 -b 0.0.0.0:5000 --chdir=/app
\ No newline at end of file
+/usr/local/bin/gunicorn config.wsgi -w 4 -b unix:/data/sockets/gunicorn.sock --chdir=/app
diff --git a/compose/nginx/Dockerfile b/compose/nginx/Dockerfile
index 5984825..136fd5d 100644
--- a/compose/nginx/Dockerfile
+++ b/compose/nginx/Dockerfile
@@ -4,6 +4,6 @@ ADD nginx.conf /etc/nginx/nginx.conf
 
 ADD start.sh /start.sh
 ADD nginx-secure.conf /etc/nginx/nginx-secure.conf
-ADD dhparams.pem /etc/ssl/private/dhparams.pem
+#ADD dhparams.pem /etc/ssl/private/dhparams.pem
 CMD /start.sh
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 3646dd9..3e77fa4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,7 @@
 version: '2'
 
 volumes:
+  gunicorn_socket: {}
   postgres_data: {}
   postgres_backup: {}
 
@@ -22,24 +23,24 @@ services:
       - redis
     command: /gunicorn.sh
     env_file: .env
+    volumes:
+      - .:/app
+      - gunicorn_socket:/data/sockets/
 
-#  nginx:
-#    build: ./compose/nginx
-#    depends_on:
-#      - django
-#      - certbot
+  nginx:
+    build: ./compose/nginx
+    depends_on:
+      - django
+#     - certbot
 
-#    ports:
-#      - "0.0.0.0:80:80"
-
-#    environment:
-#      - MY_DOMAIN_NAME=maidstone-hackspace.org.uk
-#    ports:
-#      - "0.0.0.0:80:80"
-#      - "0.0.0.0:443:443"
-#    volumes:
-#      - /etc/letsencrypt:/etc/letsencrypt
-#      - /var/lib/letsencrypt:/var/lib/letsencrypt
+    environment:
+      - MY_DOMAIN_NAME=maidstone-hackspace.org.uk
+    ports:
+      - "0.0.0.0:80:80"
+#     - "0.0.0.0:443:443"
+#   volumes:
+#     - /etc/letsencrypt:/etc/letsencrypt
+#     - /var/lib/letsencrypt:/var/lib/letsencrypt
 
 #  certbot:
 #    image: quay.io/letsencrypt/letsencrypt
diff --git a/mhackspace/subscriptions/management/commands/refresh_subscriptions.py b/mhackspace/subscriptions/management/commands/refresh_subscriptions.py
index ebcfddc..aeecff9 100644
--- a/mhackspace/subscriptions/management/commands/refresh_subscriptions.py
+++ b/mhackspace/subscriptions/management/commands/refresh_subscriptions.py
@@ -33,12 +33,12 @@ class Command(BaseCommand):
             self.stdout.write(sub.get('status'))
             subscriptions.append(
                 Membership(
-                    user= user_model,
-                    email= sub.get('email'),
-                    reference= sub.get('reference'),
-                    payment= 10.00,
-                    # 'date'= sub.get('start_date'),
-                    date=timezone.now(),
+                    user=user_model,
+                    email=sub.get('email'),
+                    reference=sub.get('reference'),
+                    payment=10.00,
+                    date= sub.get('start_date'),
+                    # date=timezone.now(),
                     status=Membership.lookup_status(name=sub.get('status'))
                 )
             )
diff --git a/mhackspace/templates/users/user_detail.html b/mhackspace/templates/users/user_detail.html
index f5954f2..e731a00 100644
--- a/mhackspace/templates/users/user_detail.html
+++ b/mhackspace/templates/users/user_detail.html
@@ -24,7 +24,6 @@
 <div class="row">
   <div class="col-md-6">
     <img src="{{ user.image.profile.url }}" alt="Profile image"/>
-
     <p>{{ user.username }}</p>
     <p>{{ user.name }}</p>
     <p>{{ user.email }}</p>
@@ -32,11 +31,15 @@
     <p>Member since</p>
     <p>Description: {{ blurb.description }}</p>
     <p>Skills: {{ blurb.description }}</p>
+
+    <h3>Membership status</h3>
     <p>Membership Status: {{ membership.get_status }}</p>
+    <p>Last Payment: {{membership.date}}</p>
+    <p>Amount: &pound;{{membership.payment}}</p>
   </div>
   <div class="col-md-6">
     <div id="membercard" class="registered">
-      <div class="date">Joined {{membership.start_date}}</div>
+      <div class="date">Joined {{membership.date}}</div>
       <div class="container">
         <div class="middle">
           <p>MHS{{ user.id|stringformat:"05d" }}</p><p>{{user.name}}{{user.last_name}}</p>
diff --git a/mhackspace/users/models.py b/mhackspace/users/models.py
index b056cac..a021f33 100644
--- a/mhackspace/users/models.py
+++ b/mhackspace/users/models.py
@@ -36,8 +36,8 @@ class Blurb(models.Model):
 
 
 MEMBERSHIP_STRING = {
-    0: 'Non Member',
-    1: 'Member',
+    0: 'Guest user',
+    1: 'Active membership',
     3: 'Membership Expired'
 }