Skip to content

S
sucs-site
Commit 88694de7 authored by Imran Hussain's avatar Imran Hussain
Browse files
Options

Merge branch 'beta' into 'sucs-site' 

new join.sucs.org and auto deploy fixes

See merge request !116
parents a7104591 b5cb3dff
Pipeline #595 passed with stages
      in 6 minutes and 54 seconds
      Show whitespace changes
      Inline Side-by-side
      Showing with 85 additions and 2 deletions
      htdocs/3step.html 0 → 100644
      View file @ 88694de7
      <!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 → 100644
      View file @ 88694de7
      .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
      View file @ 88694de7
      ......@@ -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");
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment