From elbows at sucs.org  Thu Sep 12 16:05:38 2019
From: elbows at sucs.org (Laurence Sebastian Bowes)
Date: Thu, 12 Sep 2019 16:05:38 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 3 commits: updated
 some out of date stuff
Message-ID: <5d7a5ec23687_2a43fbe386110e48457b@gitlab.mail>



Laurence Sebastian Bowes pushed to branch beta at sucssite / sucs-site


Commits:
d21905a6 by Laurence Sebastian Bowes at 2019-09-12T14:38:54Z
updated some out of date stuff

- - - - -
99bd275b by Laurence Sebastian Bowes at 2019-09-12T14:49:26Z
Hopefully this fixes it
- - - - -
5f4e17eb by Laurence Sebastian Bowes at 2019-09-12T15:05:33Z
Merge branch &#39;master&#39; into &#39;beta&#39;

updated some out of date stuff

See merge request sucssite/sucs-site!112
- - - - -


3 changed files:

- .gitlab-ci.yml
- static/About/Staff.txt
- static/fragments/Front.txt


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -30,6 +30,7 @@ js-syntax-check:
    - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - apt-get install -y nodejs
+   - apt-get install -y npm
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 


=====================================
static/About/Staff.txt
=====================================
@@ -4,9 +4,9 @@
 <p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
 <ul class="boxes">
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/colours.png" width="100" />
 	<br />
-	<strong>President</strong><br />Alexander Moras (~vectre)</div>
+	<strong>President</strong><br />Declan Morbey (~colours)</div>
 </li>
 <li>
 <div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
@@ -14,14 +14,18 @@
 	<strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mr_miyagi_420.png" width="100" />
     <br />
-	<strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
+	<strong>Secretary</strong><br />Rafal Gajewski (~mr_miyagi_420)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mpg.png" width="100" />
+    <br />
+    <strong>Events</strong><br />Maxwell Michael Gisborne (~mpg)</div>
+</li>
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
     <br />
-    <strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
+    <strong>Publicity</strong><br />Alexander Moras (~vectre)</div>      
 </li>
 </ul>
 <div class="clear"></div>
@@ -100,4 +104,4 @@ exceptional help over the years.</p>
 </div>
 </div>
 </div>
--->
\ No newline at end of file
+-->


=====================================
static/fragments/Front.txt
=====================================
@@ -7,5 +7,5 @@ hour access. There are usually members present through the week
 so feel free to stop by.</p>
 <p>Visit the <a href="Community">Community</a> section of the site for more
 ways to get in touch with your fellow members, including <a href="Community/Milliways">Milliways</a>, our chat room.&nbsp;</p>
-<p>SUCS celebrated its twenty-fifth birthday in the summer of 2014. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
-<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
\ No newline at end of file
+<p>SUCS celebrated its thirtieth birthday in the summer of 2019. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
+<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/6cf55875dd6ceb4e3335765898fbed2252a531f8...5f4e17ebe1bcb6dbc05753bbb681ec710fbcb69e

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/6cf55875dd6ceb4e3335765898fbed2252a531f8...5f4e17ebe1bcb6dbc05753bbb681ec710fbcb69e
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190912/65a57752/attachment-0001.html>

From elbows at sucs.org  Thu Sep 12 16:13:23 2019
From: elbows at sucs.org (Laurence Sebastian Bowes)
Date: Thu, 12 Sep 2019 16:13:23 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 4 commits:
 updated some out of date stuff
Message-ID: <5d7a609392fb4_2a43fbe49481768853b1@gitlab.mail>



Laurence Sebastian Bowes pushed to branch sucs-site at sucssite / sucs-site


Commits:
d21905a6 by Laurence Sebastian Bowes at 2019-09-12T14:38:54Z
updated some out of date stuff

- - - - -
99bd275b by Laurence Sebastian Bowes at 2019-09-12T14:49:26Z
Hopefully this fixes it
- - - - -
5f4e17eb by Laurence Sebastian Bowes at 2019-09-12T15:05:33Z
Merge branch &#39;master&#39; into &#39;beta&#39;

updated some out of date stuff

See merge request sucssite/sucs-site!112
- - - - -
a7104591 by Laurence Sebastian Bowes at 2019-09-12T15:13:19Z
Merge branch &#39;beta&#39; into &#39;sucs-site&#39;

Beta

See merge request sucssite/sucs-site!113
- - - - -


3 changed files:

- .gitlab-ci.yml
- static/About/Staff.txt
- static/fragments/Front.txt


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -30,6 +30,7 @@ js-syntax-check:
    - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - apt-get install -y nodejs
+   - apt-get install -y npm
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 


=====================================
static/About/Staff.txt
=====================================
@@ -4,9 +4,9 @@
 <p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
 <ul class="boxes">
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/colours.png" width="100" />
 	<br />
-	<strong>President</strong><br />Alexander Moras (~vectre)</div>
+	<strong>President</strong><br />Declan Morbey (~colours)</div>
 </li>
 <li>
 <div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
@@ -14,14 +14,18 @@
 	<strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mr_miyagi_420.png" width="100" />
     <br />
-	<strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
+	<strong>Secretary</strong><br />Rafal Gajewski (~mr_miyagi_420)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mpg.png" width="100" />
+    <br />
+    <strong>Events</strong><br />Maxwell Michael Gisborne (~mpg)</div>
+</li>
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
     <br />
-    <strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
+    <strong>Publicity</strong><br />Alexander Moras (~vectre)</div>      
 </li>
 </ul>
 <div class="clear"></div>
@@ -100,4 +104,4 @@ exceptional help over the years.</p>
 </div>
 </div>
 </div>
--->
\ No newline at end of file
+-->


=====================================
static/fragments/Front.txt
=====================================
@@ -7,5 +7,5 @@ hour access. There are usually members present through the week
 so feel free to stop by.</p>
 <p>Visit the <a href="Community">Community</a> section of the site for more
 ways to get in touch with your fellow members, including <a href="Community/Milliways">Milliways</a>, our chat room.&nbsp;</p>
-<p>SUCS celebrated its twenty-fifth birthday in the summer of 2014. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
-<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
\ No newline at end of file
+<p>SUCS celebrated its thirtieth birthday in the summer of 2019. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
+<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/37529fc81673abdf7a619b658b5ddde645880aae...a71045912e19c6f97629c6c4d5a1d6e033c0f09b

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/37529fc81673abdf7a619b658b5ddde645880aae...a71045912e19c6f97629c6c4d5a1d6e033c0f09b
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190912/b5b5269b/attachment-0001.html>

From sucs_site_user at sucs.org  Mon Sep 16 11:28:50 2019
From: sucs_site_user at sucs.org (SUCS Site RunAs)
Date: Mon, 16 Sep 2019 11:28:50 +0100
Subject: [SUCS Devel] SUCS Website Feedback
Message-ID: <E1i9oFW-0000bw-6K@silver.sucs.swan.ac.uk>

andy had this to say about the page /Community/Members/frosty:

"Dear Sir/Madam,

I believe that a container should house significantly more than 250 green bananas.

One proposes the introduction of a 'pallet'.

Warmest Regards,
A not very anonymous user"



From imranh at sucs.org  Tue Sep 24 12:10:18 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:10:18 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] new join.sucs.org
 page
Message-ID: <5d89f99af3510_2a43fbe49464d8485932@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
ee16606a by Imran Hussain at 2019-09-24T11:10:02Z
new join.sucs.org page

- - - - -


2 changed files:

- + htdocs/3step.html
- + htdocs/plaster-files/css/3step.css


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>SUCS 3 Step Signup</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+		<link rel="stylesheet" href="plaster-files/css/3step.css">
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
+
+<body>
+
+	<div class="jumbotron jumbotron-fluid text-center">
+		<!--h1>Swansea University Computer Society</h1-->
+		<img src="https://sucs.org/~imranh/img/sucslogo_trans_white.png"/>
+		<!--p>1. Pay, 2. Create, 3. Enjoy</p--> 
+	</div>
+
+	<div class="container text-center">
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h4 class="card-title">💳</h4>
+						<p class="card-text">1. Pay for membership</p>
+						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">👤</h5>
+						<p class="card-text">2. Create your username</p>
+						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">💬</h5>
+						<p class="card-text">3. Jon the conversation</p>
+						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	</body>
+
+</html>
\ No newline at end of file


=====================================
htdocs/plaster-files/css/3step.css
=====================================
@@ -0,0 +1,23 @@
+.jumbotron {
+	background-image: linear-gradient(to bottom left, #FA0, #f60);
+}
+
+.jumbotron img {
+	width: auto;
+	height: auto;
+	max-height: 12em;
+}
+
+h1 {
+	color: #fff;
+	font-weight: bold;
+}
+
+.btn-primary {
+	background-color: #f60;
+	border-color: #f60;
+}
+.btn-primary:hover {
+	background-color: #f80;
+	border-color: #f80;
+}
\ No newline at end of file



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/ee16606acdca49fe0951566fa2cc84c8819f6d8c

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/ee16606acdca49fe0951566fa2cc84c8819f6d8c
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/945cde9f/attachment-0001.html>

From elbows at sucs.org  Thu Sep 12 15:38:30 2019
From: elbows at sucs.org (Laurence Sebastian Bowes)
Date: Thu, 12 Sep 2019 15:38:30 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] updated some out of
 date stuff
Message-ID: <5d7a5866dbc21_2a43fbe4946dd08831ec@gitlab.mail>



Laurence Sebastian Bowes pushed to branch master at sucssite / sucs-site


Commits:
d21905a6 by Laurence Sebastian Bowes at 2019-09-12T14:38:54Z
updated some out of date stuff

- - - - -


2 changed files:

- static/About/Staff.txt
- static/fragments/Front.txt


Changes:

=====================================
static/About/Staff.txt
=====================================
@@ -4,9 +4,9 @@
 <p>The following people were elected to the following posts in accordance with the <a href="../About/Constitution">SUCS constitution</a>.</p>
 <ul class="boxes">
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/colours.png" width="100" />
 	<br />
-	<strong>President</strong><br />Alexander Moras (~vectre)</div>
+	<strong>President</strong><br />Declan Morbey (~colours)</div>
 </li>
 <li>
 <div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/elbows.png" width="100" />
@@ -14,14 +14,18 @@
 	<strong>Treasurer</strong><br />Laurence Sebastian Bowes (~elbows)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/xray_effect.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mr_miyagi_420.png" width="100" />
     <br />
-	<strong>Secretary</strong><br />Ryan Williams (~xray_effect)</div>
+	<strong>Secretary</strong><br />Rafal Gajewski (~mr_miyagi_420)</div>
 </li>
 <li>
-<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/arcryalis.png" width="100" />
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/mpg.png" width="100" />
+    <br />
+    <strong>Events</strong><br />Maxwell Michael Gisborne (~mpg)</div>
+</li>
+<div>&nbsp;<img height="100" src="https://sucs.org/pictures/people/vectre.png" width="100" />
     <br />
-    <strong>Gaming</strong><br />Hywel Williams (~arcryalis)</div>
+    <strong>Publicity</strong><br />Alexander Moras (~vectre)</div>      
 </li>
 </ul>
 <div class="clear"></div>
@@ -100,4 +104,4 @@ exceptional help over the years.</p>
 </div>
 </div>
 </div>
--->
\ No newline at end of file
+-->


=====================================
static/fragments/Front.txt
=====================================
@@ -7,5 +7,5 @@ hour access. There are usually members present through the week
 so feel free to stop by.</p>
 <p>Visit the <a href="Community">Community</a> section of the site for more
 ways to get in touch with your fellow members, including <a href="Community/Milliways">Milliways</a>, our chat room.&nbsp;</p>
-<p>SUCS celebrated its twenty-fifth birthday in the summer of 2014. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
-<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>
\ No newline at end of file
+<p>SUCS celebrated its thirtieth birthday in the summer of 2019. We have compiled a site about the society's history. To read about it and contribute your part of the story, visit <a href="http://history.sucs.org/">http://history.sucs.org/</a>.</p>
+<div style="text-align: center"><a href="http://history.sucs.org/"><img alt="SUCS history" height="50" src="https://sucs.org/images/sucshistory.png" width="231" /></a></div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/d21905a6e07f54ed5f129ccd55d514a811784027

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/d21905a6e07f54ed5f129ccd55d514a811784027
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190912/9448e21d/attachment-0001.html>

From elbows at sucs.org  Thu Sep 12 15:49:30 2019
From: elbows at sucs.org (Laurence Sebastian Bowes)
Date: Thu, 12 Sep 2019 15:49:30 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] Hopefully this fixes
 it
Message-ID: <5d7a5afa5d65a_2a43fbe494817688407f@gitlab.mail>



Laurence Sebastian Bowes pushed to branch master at sucssite / sucs-site


Commits:
99bd275b by Laurence Sebastian Bowes at 2019-09-12T14:49:26Z
Hopefully this fixes it
- - - - -


1 changed file:

- .gitlab-ci.yml


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -30,6 +30,7 @@ js-syntax-check:
    - apt-get install -y curl gnupg
    - curl -sL https://deb.nodesource.com/setup_8.x | bash -
    - apt-get install -y nodejs
+   - apt-get install -y npm
    - npm install -g jshint        
    - find htdocs/js/ -name *.js ! -name jquery* | xargs -n 1 jshint --verbose
 



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/99bd275b3939f80e9314347ddf9c78da0a7fdd3e

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/99bd275b3939f80e9314347ddf9c78da0a7fdd3e
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190912/eea5e780/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 12:16:24 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:16:24 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 2 commits: new
 join.sucs.org page
Message-ID: <5d89fb08c04ca_2a43fbe4946dd08868bd@gitlab.mail>



Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
ee16606a by Imran Hussain at 2019-09-24T11:10:02Z
new join.sucs.org page

- - - - -
245ce50d by Imran Hussain at 2019-09-24T11:16:19Z
Merge branch &#39;master&#39; into &#39;beta&#39;

new join.sucs.org page

See merge request sucssite/sucs-site!114
- - - - -


2 changed files:

- + htdocs/3step.html
- + htdocs/plaster-files/css/3step.css


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>SUCS 3 Step Signup</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+		<link rel="stylesheet" href="plaster-files/css/3step.css">
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
+
+<body>
+
+	<div class="jumbotron jumbotron-fluid text-center">
+		<!--h1>Swansea University Computer Society</h1-->
+		<img src="https://sucs.org/~imranh/img/sucslogo_trans_white.png"/>
+		<!--p>1. Pay, 2. Create, 3. Enjoy</p--> 
+	</div>
+
+	<div class="container text-center">
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h4 class="card-title">💳</h4>
+						<p class="card-text">1. Pay for membership</p>
+						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">👤</h5>
+						<p class="card-text">2. Create your username</p>
+						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">💬</h5>
+						<p class="card-text">3. Jon the conversation</p>
+						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	</body>
+
+</html>
\ No newline at end of file


=====================================
htdocs/plaster-files/css/3step.css
=====================================
@@ -0,0 +1,23 @@
+.jumbotron {
+	background-image: linear-gradient(to bottom left, #FA0, #f60);
+}
+
+.jumbotron img {
+	width: auto;
+	height: auto;
+	max-height: 12em;
+}
+
+h1 {
+	color: #fff;
+	font-weight: bold;
+}
+
+.btn-primary {
+	background-color: #f60;
+	border-color: #f60;
+}
+.btn-primary:hover {
+	background-color: #f80;
+	border-color: #f80;
+}
\ No newline at end of file



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/5f4e17ebe1bcb6dbc05753bbb681ec710fbcb69e...245ce50d6e1a05bac9d822b4b543ac7e9fcdffae

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/5f4e17ebe1bcb6dbc05753bbb681ec710fbcb69e...245ce50d6e1a05bac9d822b4b543ac7e9fcdffae
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/f1d7f122/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 12:31:37 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:31:37 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] Fix sucs site deploy
 script thing
Message-ID: <5d89fe99785cb_2a43fbe49494c00870ce@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
f86ec8d5 by Imran Hussain at 2019-09-24T11:31:33Z
Fix sucs site deploy script thing
- - - - -


1 changed file:

- htdocs/pull.php


Changes:

=====================================
htdocs/pull.php
=====================================
@@ -4,7 +4,7 @@ exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
 	print(ok);
-	exit(0)
+	exit(0);
 }
 
 print("not ok\n");



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/f86ec8d5d0df3a5be6071cd8f35ff8b79af2f32f

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/f86ec8d5d0df3a5be6071cd8f35ff8b79af2f32f
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/88771fbc/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 12:41:18 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:41:18 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] really fix the pull
 script
Message-ID: <5d8a00de44ec_2a43fbe386110e487541@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
683c9187 by Imran Hussain at 2019-09-24T11:39:15Z
really fix the pull script

- - - - -


1 changed file:

- htdocs/pull.php


Changes:

=====================================
htdocs/pull.php
=====================================
@@ -3,7 +3,7 @@
 exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
-	print(ok);
+	print("ok");
 	exit(0);
 }
 



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/683c9187a6aee8cc208eb6df3116901023f532af

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/683c9187a6aee8cc208eb6df3116901023f532af
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/a4b339f6/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 12:51:05 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:51:05 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 3 commits: Fix sucs
 site deploy script thing
Message-ID: <5d8a0329aa407_2a43fbe494817688804@gitlab.mail>



Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
f86ec8d5 by Imran Hussain at 2019-09-24T11:31:33Z
Fix sucs site deploy script thing
- - - - -
683c9187 by Imran Hussain at 2019-09-24T11:39:15Z
really fix the pull script

- - - - -
b5cb3dff by Imran Hussain at 2019-09-24T11:51:01Z
Merge branch &#39;master&#39; into &#39;beta&#39;

Fix sucs site deploy script thing

See merge request sucssite/sucs-site!115
- - - - -


1 changed file:

- htdocs/pull.php


Changes:

=====================================
htdocs/pull.php
=====================================
@@ -3,8 +3,8 @@
 exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
-	print(ok);
-	exit(0)
+	print("ok");
+	exit(0);
 }
 
 print("not ok\n");



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/245ce50d6e1a05bac9d822b4b543ac7e9fcdffae...b5cb3dff45c356f9f8e7ab41a64fb50beba35a3d

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/245ce50d6e1a05bac9d822b4b543ac7e9fcdffae...b5cb3dff45c356f9f8e7ab41a64fb50beba35a3d
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/0b7b3099/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 12:58:07 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 12:58:07 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 6 commits: new
 join.sucs.org page
Message-ID: <5d8a04cf97000_2a43fbe494957f488918@gitlab.mail>



Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
ee16606a by Imran Hussain at 2019-09-24T11:10:02Z
new join.sucs.org page

- - - - -
245ce50d by Imran Hussain at 2019-09-24T11:16:19Z
Merge branch &#39;master&#39; into &#39;beta&#39;

new join.sucs.org page

See merge request sucssite/sucs-site!114
- - - - -
f86ec8d5 by Imran Hussain at 2019-09-24T11:31:33Z
Fix sucs site deploy script thing
- - - - -
683c9187 by Imran Hussain at 2019-09-24T11:39:15Z
really fix the pull script

- - - - -
b5cb3dff by Imran Hussain at 2019-09-24T11:51:01Z
Merge branch &#39;master&#39; into &#39;beta&#39;

Fix sucs site deploy script thing

See merge request sucssite/sucs-site!115
- - - - -
88694de7 by Imran Hussain at 2019-09-24T11:58:02Z
Merge branch &#39;beta&#39; into &#39;sucs-site&#39;

new join.sucs.org and auto deploy fixes

See merge request sucssite/sucs-site!116
- - - - -


3 changed files:

- + htdocs/3step.html
- + htdocs/plaster-files/css/3step.css
- htdocs/pull.php


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>SUCS 3 Step Signup</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+		<link rel="stylesheet" href="plaster-files/css/3step.css">
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
+
+<body>
+
+	<div class="jumbotron jumbotron-fluid text-center">
+		<!--h1>Swansea University Computer Society</h1-->
+		<img src="https://sucs.org/~imranh/img/sucslogo_trans_white.png"/>
+		<!--p>1. Pay, 2. Create, 3. Enjoy</p--> 
+	</div>
+
+	<div class="container text-center">
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h4 class="card-title">💳</h4>
+						<p class="card-text">1. Pay for membership</p>
+						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">👤</h5>
+						<p class="card-text">2. Create your username</p>
+						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+					</div>
+				</div>
+			</div>
+		</div>
+		<div class="row d-flex justify-content-center">
+			<div class="col-8">
+				<div class="card mb-4">
+					<div class="card-body">
+						<h5 class="card-title">💬</h5>
+						<p class="card-text">3. Jon the conversation</p>
+						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+	</body>
+
+</html>
\ No newline at end of file


=====================================
htdocs/plaster-files/css/3step.css
=====================================
@@ -0,0 +1,23 @@
+.jumbotron {
+	background-image: linear-gradient(to bottom left, #FA0, #f60);
+}
+
+.jumbotron img {
+	width: auto;
+	height: auto;
+	max-height: 12em;
+}
+
+h1 {
+	color: #fff;
+	font-weight: bold;
+}
+
+.btn-primary {
+	background-color: #f60;
+	border-color: #f60;
+}
+.btn-primary:hover {
+	background-color: #f80;
+	border-color: #f80;
+}
\ No newline at end of file


=====================================
htdocs/pull.php
=====================================
@@ -3,8 +3,8 @@
 exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
-	print(ok);
-	exit(0)
+	print("ok");
+	exit(0);
 }
 
 print("not ok\n");



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/a71045912e19c6f97629c6c4d5a1d6e033c0f09b...88694de70168d7d7925cefc37b88062fc37d6ab3

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/a71045912e19c6f97629c6c4d5a1d6e033c0f09b...88694de70168d7d7925cefc37b88062fc37d6ab3
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/dd435ca0/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 14:10:41 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 14:10:41 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] 2 commits: Fix sucs
 site deploy script thing
Message-ID: <5d8a15d155f07_2a43fbe4945ed94891d3@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
f86ec8d5 by Imran Hussain at 2019-09-24T11:31:33Z
Fix sucs site deploy script thing
- - - - -
683c9187 by Imran Hussain at 2019-09-24T11:39:15Z
really fix the pull script

- - - - -


1 changed file:

- htdocs/pull.php


Changes:

=====================================
htdocs/pull.php
=====================================
@@ -3,8 +3,8 @@
 exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
-	print(ok);
-	exit(0)
+	print("ok");
+	exit(0);
 }
 
 print("not ok\n");



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/ee16606acdca49fe0951566fa2cc84c8819f6d8c...683c9187a6aee8cc208eb6df3116901023f532af

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/ee16606acdca49fe0951566fa2cc84c8819f6d8c...683c9187a6aee8cc208eb6df3116901023f532af
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/f05a02bb/attachment.html>

From imranh at sucs.org  Tue Sep 24 14:20:50 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 14:20:50 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] 2 commits: Fix sucs
 site deploy script thing
Message-ID: <5d8a18327f81e_2a43fbe2f6f0cc089384@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
f86ec8d5 by Imran Hussain at 2019-09-24T11:31:33Z
Fix sucs site deploy script thing
- - - - -
683c9187 by Imran Hussain at 2019-09-24T11:39:15Z
really fix the pull script

- - - - -


1 changed file:

- htdocs/pull.php


Changes:

=====================================
htdocs/pull.php
=====================================
@@ -3,8 +3,8 @@
 exec("cd ..; git reset --hard HEAD; git pull", $retArr, $retVal);
 
 if ($retVal == 0) {
-	print(ok);
-	exit(0)
+	print("ok");
+	exit(0);
 }
 
 print("not ok\n");



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/ee16606acdca49fe0951566fa2cc84c8819f6d8c...683c9187a6aee8cc208eb6df3116901023f532af

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/ee16606acdca49fe0951566fa2cc84c8819f6d8c...683c9187a6aee8cc208eb6df3116901023f532af
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/82eb37b9/attachment.html>

From andy at sucs.org  Tue Sep 24 17:31:39 2019
From: andy at sucs.org (Andrew Vincent Pover)
Date: Tue, 24 Sep 2019 17:31:39 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] Correct typo
Message-ID: <5d8a44eb867cf_2a43fbe4945ed9492779@gitlab.mail>



Andrew Vincent Pover pushed to branch master at sucssite / sucs-site


Commits:
a30362c1 by Andrew Vincent Pover at 2019-09-24T16:31:36Z
Correct typo
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -47,7 +47,7 @@
 				<div class="card mb-4">
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
-						<p class="card-text">3. Jon the conversation</p>
+						<p class="card-text">3. Join the conversation</p>
 						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/a30362c1776f1b023a6d4d503f9cfc083a9e918c

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/a30362c1776f1b023a6d4d503f9cfc083a9e918c
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/ac136592/attachment-0001.html>

From imranh at sucs.org  Tue Sep 24 17:42:17 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 17:42:17 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 2 commits: Correct typo
Message-ID: <5d8a476911947_2a43fbe4947114c9351a@gitlab.mail>



Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
a30362c1 by Andrew Vincent Pover at 2019-09-24T16:31:36Z
Correct typo
- - - - -
c692f3b7 by Imran Hussain at 2019-09-24T16:42:12Z
Merge branch &#39;master&#39; into &#39;beta&#39;

Correct typo

See merge request sucssite/sucs-site!117
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -47,7 +47,7 @@
 				<div class="card mb-4">
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
-						<p class="card-text">3. Jon the conversation</p>
+						<p class="card-text">3. Join the conversation</p>
 						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/b5cb3dff45c356f9f8e7ab41a64fb50beba35a3d...c692f3b7a7e342ddeca8c90eeaa9d85c174cbcf2

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/b5cb3dff45c356f9f8e7ab41a64fb50beba35a3d...c692f3b7a7e342ddeca8c90eeaa9d85c174cbcf2
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/ec3e4b85/attachment.html>

From imranh at sucs.org  Tue Sep 24 18:12:58 2019
From: imranh at sucs.org (Imran Hussain)
Date: Tue, 24 Sep 2019 18:12:58 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 3 commits:
 Correct typo
Message-ID: <5d8a4e9a8c6e5_2a43fbe4946dd08943f@gitlab.mail>



Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
a30362c1 by Andrew Vincent Pover at 2019-09-24T16:31:36Z
Correct typo
- - - - -
c692f3b7 by Imran Hussain at 2019-09-24T16:42:12Z
Merge branch &#39;master&#39; into &#39;beta&#39;

Correct typo

See merge request sucssite/sucs-site!117
- - - - -
d770a230 by Imran Hussain at 2019-09-24T17:12:54Z
Merge branch &#39;beta&#39; into &#39;sucs-site&#39;

Fix a typo

See merge request sucssite/sucs-site!118
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -47,7 +47,7 @@
 				<div class="card mb-4">
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
-						<p class="card-text">3. Jon the conversation</p>
+						<p class="card-text">3. Join the conversation</p>
 						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/88694de70168d7d7925cefc37b88062fc37d6ab3...d770a23045b285fa72e0fd67db50c959fb1feae5

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/88694de70168d7d7925cefc37b88062fc37d6ab3...d770a23045b285fa72e0fd67db50c959fb1feae5
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190924/bd03959b/attachment-0001.html>

From imranh at sucs.org  Wed Sep 25 18:57:31 2019
From: imranh at sucs.org (Imran Hussain)
Date: Wed, 25 Sep 2019 18:57:31 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][master] join.sucs.org - Open
 links in new tabs
Message-ID: <5d8baa8b48132_2a43fbe494957f4945d0@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / sucs-site


Commits:
c3340846 by Imran Hussain at 2019-09-25T17:57:26Z
join.sucs.org - Open links in new tabs 
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -26,7 +26,7 @@
 					<div class="card-body">
 						<h4 class="card-title">💳</h4>
 						<p class="card-text">1. Pay for membership</p>
-						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+						<a href="https://sucs.org/join" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Pay Online</a>
 					</div>
 				</div>
 			</div>
@@ -37,7 +37,7 @@
 					<div class="card-body">
 						<h5 class="card-title">👤</h5>
 						<p class="card-text">2. Create your username</p>
-						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+						<a href="https://sucs.org/susignup" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Create Username</a>
 					</div>
 				</div>
 			</div>
@@ -48,7 +48,7 @@
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
 						<p class="card-text">3. Join the conversation</p>
-						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+						<a href="https://chat.sucs.org" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>
 			</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/c3340846a9ffabce8bba4bd7e54d03c513ec1bdc

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/commit/c3340846a9ffabce8bba4bd7e54d03c513ec1bdc
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190925/258ab51f/attachment-0001.html>

From imranh at sucs.org  Wed Sep 25 19:03:53 2019
From: imranh at sucs.org (Imran Hussain)
Date: Wed, 25 Sep 2019 19:03:53 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][beta] 2 commits:
 join.sucs.org - Open links in new tabs
Message-ID: <5d8bac09d1f17_2a43fbe3861095095494@gitlab.mail>



Imran Hussain pushed to branch beta at sucssite / sucs-site


Commits:
c3340846 by Imran Hussain at 2019-09-25T17:57:26Z
join.sucs.org - Open links in new tabs 
- - - - -
b5a31cca by Imran Hussain at 2019-09-25T18:03:49Z
Merge branch &#39;master&#39; into &#39;beta&#39;

join.sucs.org - Open links in new tabs

See merge request sucssite/sucs-site!119
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -26,7 +26,7 @@
 					<div class="card-body">
 						<h4 class="card-title">💳</h4>
 						<p class="card-text">1. Pay for membership</p>
-						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+						<a href="https://sucs.org/join" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Pay Online</a>
 					</div>
 				</div>
 			</div>
@@ -37,7 +37,7 @@
 					<div class="card-body">
 						<h5 class="card-title">👤</h5>
 						<p class="card-text">2. Create your username</p>
-						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+						<a href="https://sucs.org/susignup" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Create Username</a>
 					</div>
 				</div>
 			</div>
@@ -48,7 +48,7 @@
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
 						<p class="card-text">3. Join the conversation</p>
-						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+						<a href="https://chat.sucs.org" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>
 			</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/c692f3b7a7e342ddeca8c90eeaa9d85c174cbcf2...b5a31cca4aca00a38d1d8d93c882ad87032abe5b

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/c692f3b7a7e342ddeca8c90eeaa9d85c174cbcf2...b5a31cca4aca00a38d1d8d93c882ad87032abe5b
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190925/b6dee5ed/attachment-0001.html>

From imranh at sucs.org  Wed Sep 25 19:10:53 2019
From: imranh at sucs.org (Imran Hussain)
Date: Wed, 25 Sep 2019 19:10:53 +0100
Subject: [SUCS Devel] [Git][sucssite/sucs-site][sucs-site] 3 commits:
 join.sucs.org - Open links in new tabs
Message-ID: <5d8badadd6c80_2a43fbe386110e49637c@gitlab.mail>



Imran Hussain pushed to branch sucs-site at sucssite / sucs-site


Commits:
c3340846 by Imran Hussain at 2019-09-25T17:57:26Z
join.sucs.org - Open links in new tabs 
- - - - -
b5a31cca by Imran Hussain at 2019-09-25T18:03:49Z
Merge branch &#39;master&#39; into &#39;beta&#39;

join.sucs.org - Open links in new tabs

See merge request sucssite/sucs-site!119
- - - - -
8c4c820e by Imran Hussain at 2019-09-25T18:10:49Z
Merge branch &#39;beta&#39; into &#39;sucs-site&#39;

join.sucs.org - Open links in new tabs

See merge request sucssite/sucs-site!120
- - - - -


1 changed file:

- htdocs/3step.html


Changes:

=====================================
htdocs/3step.html
=====================================
@@ -26,7 +26,7 @@
 					<div class="card-body">
 						<h4 class="card-title">💳</h4>
 						<p class="card-text">1. Pay for membership</p>
-						<a href="https://sucs.org/join" class="btn btn-primary">Pay Online</a>
+						<a href="https://sucs.org/join" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Pay Online</a>
 					</div>
 				</div>
 			</div>
@@ -37,7 +37,7 @@
 					<div class="card-body">
 						<h5 class="card-title">👤</h5>
 						<p class="card-text">2. Create your username</p>
-						<a href="https://sucs.org/susignup" class="btn btn-primary">Create Username</a>
+						<a href="https://sucs.org/susignup" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Create Username</a>
 					</div>
 				</div>
 			</div>
@@ -48,7 +48,7 @@
 					<div class="card-body">
 						<h5 class="card-title">💬</h5>
 						<p class="card-text">3. Join the conversation</p>
-						<a href="https://chat.sucs.org" class="btn btn-primary">Join Discord</a>
+						<a href="https://chat.sucs.org" target="_blank" rel="noopener noreferrer" class="btn btn-primary">Join Discord</a>
 					</div>
 				</div>
 			</div>



View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/d770a23045b285fa72e0fd67db50c959fb1feae5...8c4c820e6045dfdeecf4244da17da9787eacea0c

-- 
View it on GitLab: https://projects.sucs.org/sucssite/sucs-site/compare/d770a23045b285fa72e0fd67db50c959fb1feae5...8c4c820e6045dfdeecf4244da17da9787eacea0c
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190925/61f19cd6/attachment-0001.html>

From imranh at sucs.org  Thu Sep 26 16:25:17 2019
From: imranh at sucs.org (Imran Hussain)
Date: Thu, 26 Sep 2019 16:25:17 +0100
Subject: [SUCS Devel] [Git][sucssite/doorkey][master] make doorkey.sucs.org
 look way nicer
Message-ID: <5d8cd85d8e4c1_2a43fbe38610e0096545@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / doorkey


Commits:
bfa1987e by Imran Hussain at 2019-09-26T15:24:46Z
make doorkey.sucs.org look way nicer

- - - - -


3 changed files:

- + public/css/doorkey.css
- + public/img/sucslogo_trans_white.png
- public/index.php


Changes:

=====================================
public/css/doorkey.css
=====================================
@@ -0,0 +1,28 @@
+html,body {
+	height: 100%;
+}
+
+
+nav {
+	background-image: linear-gradient(to bottom left, #FA0, #f60);
+}
+
+nav img {
+	width: auto;
+	height: auto;
+	max-height: 4em;
+}
+
+h1 {
+	color: #fff;
+	font-weight: bold;
+}
+
+.btn-primary {
+	background-color: #f60;
+	border-color: #f60;
+}
+.btn-primary:hover {
+	background-color: #f80;
+	border-color: #f80;
+}
\ No newline at end of file


=====================================
public/img/sucslogo_trans_white.png
=====================================
Binary files /dev/null and b/public/img/sucslogo_trans_white.png differ


=====================================
public/index.php
=====================================
@@ -20,7 +20,8 @@ $ipAddr = $_SERVER['REMOTE_ADDR'];
 //var_dump($ipAddr);
 
 if (!ip_in_range($ipAddr, "137.44.10.128/25")){
-	exit("nah mate");
+	$outsider = true;
+	//exit("nah mate");
 }
 
 if(isset($_REQUEST['username'])) {
@@ -38,7 +39,7 @@ include_once("../ldap-auth.php");
 
 $isAuthd = ldapAuth($username, $password);
 
-if ($isAuthd == "sucs"){
+if ($isAuthd == "sucs" && !$outsider) {
 	include_once("../doorkey.php");
 	//curl door
 	$curl = curl_init();
@@ -51,8 +52,60 @@ if ($isAuthd == "sucs"){
 
 ?>
 
-<form method="post">
-Username: <input type="text" name="username" size="15" /><br />
-Password: <input type="password" name="password" size="15" /><br />
-<input type="submit" value="Unlock Door!" />
-</form>
+
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<title>SUCS doorkey</title>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1">
+		<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+		<link rel="stylesheet" href="css/doorkey.css">
+		<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+		<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+		<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	</head>
+
+	<body>
+
+		<nav class="navbar navbar-light bg-light">
+			<a class="navbar-brand" href="https://sucs.org"><img src="img/sucslogo_trans_white.png" /></a>
+		</nav>
+
+		<div class="h-100 container justify-content-center text-center">
+			<div class="h-100 row d-flex justify-content-center align-items-center">
+				<div class="col-8">
+					<div class="card mb-4">
+						<?php
+							if ($outsider) {
+								print('
+							<div class="card-body">
+								<h4 class="card-title">❌</h4>
+								<p>You must be connected to GuestNET to use this service.</p>
+							</div>
+
+								');
+							} else {
+								print('
+							<div class="card-body">
+								<h4 class="card-title">🔑</h4>
+								<form method="post">
+									<div class="form-group">
+										<input type="text" name="username" size="15" class="form-control" placeholder="Enter username" /><br />
+										<input type="password" name="password" size="15" class="form-control" placeholder="Enter password" /><br />
+										<input type="submit" class="btn btn-primary" value="Unlock Door!" />
+									</div>
+								</form>
+							</div>
+								');
+							}
+						?>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+
+	</body>
+
+</html>



View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/bfa1987ead04d5c91812df6778b692019b007b7c

-- 
View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/bfa1987ead04d5c91812df6778b692019b007b7c
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190926/2d0fd761/attachment-0001.html>

From imranh at sucs.org  Thu Sep 26 17:15:39 2019
From: imranh at sucs.org (Imran Hussain)
Date: Thu, 26 Sep 2019 17:15:39 +0100
Subject: [SUCS Devel] [Git][sucssite/doorkey][master] don't show ugly
 messages anymore
Message-ID: <5d8ce42b93e1e_2a43fbe38610e0096795@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / doorkey


Commits:
d8af36e3 by Imran Hussain at 2019-09-26T16:14:14Z
don&#39;t show ugly messages anymore

- - - - -


1 changed file:

- public/index.php


Changes:

=====================================
public/index.php
=====================================
@@ -32,14 +32,15 @@ if(isset($_REQUEST['password'])) {
 }
 
 if ( in_array($username,$bannedUsers) ) {
-	die("u r b&");
+	$banned = true;
+	//die("u r b&");
 }
 
 include_once("../ldap-auth.php");
 
 $isAuthd = ldapAuth($username, $password);
 
-if ($isAuthd == "sucs" && !$outsider) {
+if ($isAuthd == "sucs" && !$outsider && !$banned) {
 	include_once("../doorkey.php");
 	//curl door
 	$curl = curl_init();
@@ -47,7 +48,8 @@ if ($isAuthd == "sucs" && !$outsider) {
 	curl_setopt($curl,CURLOPT_RETURNTRANSFER,TRUE);
 	curl_exec($curl);
 	curl_close($curl);
-	exit("door unlocked! (probably)");
+	$success = true;
+	//exit("door unlocked! (probably)");
 }
 
 ?>
@@ -83,9 +85,27 @@ if ($isAuthd == "sucs" && !$outsider) {
 								<h4 class="card-title">❌</h4>
 								<p>You must be connected to GuestNET to use this service.</p>
 							</div>
+								');
+							} elif ($banned) {
+								print('
+							<div class="card-body">
+								<h4 class="card-title">🔨</h4>
+								<p>You are banned from the room.</p>
+							</div>
+								');
 
+							}
+							} elif ($success) {
+								print('
+							<div class="card-body">
+								<h4 class="card-title">✔️</h4>
+								<p>Door unlocked!</p>
+							</div>
 								');
-							} else {
+
+							}
+
+							else {
 								print('
 							<div class="card-body">
 								<h4 class="card-title">🔑</h4>
@@ -100,7 +120,6 @@ if ($isAuthd == "sucs" && !$outsider) {
 								');
 							}
 						?>
-						</div>
 					</div>
 				</div>
 			</div>



View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/d8af36e3d8995db15d89ab1a8e9093bca84eef33

-- 
View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/d8af36e3d8995db15d89ab1a8e9093bca84eef33
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190926/d0421b9f/attachment-0001.html>

From imranh at sucs.org  Thu Sep 26 17:21:05 2019
From: imranh at sucs.org (Imran Hussain)
Date: Thu, 26 Sep 2019 17:21:05 +0100
Subject: [SUCS Devel] [Git][sucssite/doorkey][master] fix syntax errors,
 i'm still thinking in python!
Message-ID: <5d8ce571a6655_2a43fbe494957f496979@gitlab.mail>



Imran Hussain pushed to branch master at sucssite / doorkey


Commits:
cb0e731f by Imran Hussain at 2019-09-26T16:20:37Z
fix syntax errors, i&#39;m still thinking in python!

- - - - -


1 changed file:

- public/index.php


Changes:

=====================================
public/index.php
=====================================
@@ -86,7 +86,7 @@ if ($isAuthd == "sucs" && !$outsider && !$banned) {
 								<p>You must be connected to GuestNET to use this service.</p>
 							</div>
 								');
-							} elif ($banned) {
+							} elseif ($banned) {
 								print('
 							<div class="card-body">
 								<h4 class="card-title">🔨</h4>
@@ -94,8 +94,7 @@ if ($isAuthd == "sucs" && !$outsider && !$banned) {
 							</div>
 								');
 
-							}
-							} elif ($success) {
+							} elseif ($success) {
 								print('
 							<div class="card-body">
 								<h4 class="card-title">✔️</h4>
@@ -103,9 +102,7 @@ if ($isAuthd == "sucs" && !$outsider && !$banned) {
 							</div>
 								');
 
-							}
-
-							else {
+							} else {
 								print('
 							<div class="card-body">
 								<h4 class="card-title">🔑</h4>



View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/cb0e731f1eebb44166354cc4b148a07241cbe313

-- 
View it on GitLab: https://projects.sucs.org/sucssite/doorkey/commit/cb0e731f1eebb44166354cc4b148a07241cbe313
You're receiving this email because of your account on projects.sucs.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.sucs.org/pipermail/devel/attachments/20190926/e08e9da1/attachment-0001.html>