Merge pull request #52 from devinmatte/ui_and_mobile

Compacting buttons, Fixing links, adding more icon support

Author: devinmatte

frontend/scss/components/buttons.scss

@@ -1,8 +1,14 @@
-.sign-packet {
-  float: right;
-  text-align: right;
-}
+button {
+  &.sign-packet {
+    float: right;
+    text-align: right;
+  }
+
+  &.sign-button {
+    float: right;
+  }
 
-.sign-button {
-  float: right;
+  &.signed-button {
+    float: right;
+  }
 }

gulpfile.js/tasks/favicon.js

@@ -29,7 +29,7 @@ gulp.task('generate-favicon', function(done) {
 			desktopBrowser: {},
 			windows: {
 				pictureAspect: 'whiteSilhouette',
-				backgroundColor: '#9f00a7',
+				backgroundColor: '#b0197e',
 				onConflict: 'override',
 				assets: {
 					windows80Ie10Tile: true,
@@ -43,7 +43,7 @@ gulp.task('generate-favicon', function(done) {
 			},
 			androidChrome: {
 				pictureAspect: 'noChange',
-				themeColor: '#222222',
+				themeColor: '#b0197e',
 				manifest: {
 					display: 'standalone',
 					orientation: 'notSet',
@@ -57,7 +57,7 @@ gulp.task('generate-favicon', function(done) {
 			},
 			safariPinnedTab: {
 				pictureAspect: 'silhouette',
-				themeColor: '#222222'
+				themeColor: '#b0197e'
 			}
 		},
 		settings: {

packet/routes/shared.py

@@ -1,14 +1,20 @@
 from datetime import datetime
 from itertools import chain
 
-from flask import render_template
+from flask import render_template, redirect
 
 from packet import auth, app
 from packet.models import Freshman, Packet
 from packet.packet import get_signatures, get_number_required, get_number_signed, get_upperclassmen_percent
 from packet.utils import before_request, signed_packet
 
 
+@app.route('/logout')
+@auth.oidc_logout
+def logout():
+    return redirect("/")
+
+
 @app.route("/packet/<uid>")
 @auth.oidc_auth
 @before_request

packet/templates/active_packets.html

@@ -46,13 +46,13 @@ <h3 class="page-title">Active Packets</h3>
                                                     {% if (info.onfloor and info.uid != packet.freshman.rit_username) or info.realm == "csh" %}
                                                         <td class="sign-packet" align="right">
                                                             {% if not packet.did_sign %}
-                                                                <button class="btn btn-primary sign-button"
+                                                                <button class="btn btn-sm btn-primary sign-button"
                                                                         data-freshman_uid="{{ packet.freshman.rit_username }}"
                                                                         data-freshman_name="{{ packet.freshman.name }}">
                                                                     Sign
                                                                 </button>
                                                             {% else %}
-                                                                <button class="btn btn-primary" disabled="disabled"><i
+                                                                <button class="btn btn-sm btn-primary signed-button" disabled="disabled"><i
                                                                         class="fa fa-check"></i>&nbsp;Signed
                                                                 </button>
                                                             {% endif %}

packet/templates/include/head.html

@@ -8,9 +8,22 @@
     <title>CSH Packet</title>
 
     <link rel="manifest" href="/static/manifest.json">
+    <meta name="theme-color" content="#b0197e">
     <meta name="theme-color" href="https://themeswitcher.csh.rit.edu/api/colour">
+
+    <!-- Icons -->
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('static', filename='apple-touch-icon.png') }}">
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='favicon-32x32.png') }}">
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='favicon-16x16.png') }}">
+
+    <meta name="msapplication-TileColor" content="#b0197e">
+    <meta name="msapplication-TileImage" content="{{ url_for('static', filename='mstile-144x144.png') }}">
+    <meta name="msapplication-config" content="{{ url_for('static', filename='browserconfig.xml') }}">
+
+    <link rel="mask-icon" href="{{ url_for('static', filename='assets/logo.svg') }}" color="#b0197e">
+
     <link rel="stylesheet" type="text/css"
           href="https://cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css">
     <link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.16/css/dataTables.bootstrap4.min.css">
@@ -20,12 +33,10 @@
           integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
     <link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen">
 
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/css/select2.min.css" rel="stylesheet"/>
-
     <script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
 
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.3.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
 
-    <link rel="stylesheet" href="/static/css/packet.css">
+    <link rel="stylesheet" href="/static/css/packet.min.css">
 
 </head>

packet/templates/include/nav.html

@@ -33,7 +33,7 @@
                     <div class="dropdown-menu" aria-labelledby="user01">
                         <input id="userInfo" hidden value="{{ info.uid }}">
                         {% if info.realm == "csh" %}
-                            <a class="dropdown-item" href="/">Profile</a>
+                            <a class="dropdown-item" href="https://profiles.csh.rit.edu/">Profile</a>
                             <a class="dropdown-item" href="https://themeswitcher.csh.rit.edu/">Theme</a>
                             <div class="dropdown-divider"></div>
                         {% endif %}

packet/templates/packet.html

@@ -15,7 +15,7 @@ <h3>{{ freshman.name }}</h3>
                                     data-freshman_name="{{ freshman.name }}">Sign
                             </button>
                         {% else %}
-                            <button class="btn btn-primary" disabled="disabled"><i
+                            <button class="btn btn-primary signed-button" disabled="disabled"><i
                                     class="fa fa-check"></i>&nbsp;Signed
                             </button>
                         {% endif %}
@@ -52,7 +52,7 @@ <h5>Upperclassmen Score</h5>
         </div>
         <div id="eval-blocks">
             <div id="eval-table">
-                <div class="card mb-3">
+                <div class="card mb-2">
                     <div class="card-header">
                         <b>EBoard Signatures</b>
                         <b class="signature-count">{{ signed_dict.eboard }}/{{ signatures.eboard.count() }}</b>
@@ -178,8 +178,8 @@ <h5>Upperclassmen Score</h5>
                                 <tbody>
                                 {% for m in signatures.misc %}
                                     <tr {% if m.signed %}style="background-color: #4caf505e" {% endif %}>
-                                        <td width="5%">
-                                            {{ loop.index }}.&nbsp;
+                                        <td width="3%">
+                                            {{ loop.index }}.
                                         </td>
                                         <td>
                                             {% if info.realm == "csh" %}