Skip to content

Commit 5aa48ca

Browse files
devinmattedevinmatte
committed
UI Cleanup and co-op support
1 parent b055d11 commit 5aa48ca

File tree

6 files changed

+29
-25
lines changed

6 files changed

+29
-25
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "CSH Packet",
33
"name": "csh-packet",
4-
"version": "3.1.1",
4+
"version": "3.2",
55
"description": "A web app implementation of the CSH introductory packet.",
66
"bugs": {
77
"url": "https://github.com/ComputerScienceHouse/packet/issues",

‎packet/commands.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def ldap_sync():
190190
db.session.add(sig)
191191

192192
# Migrate MiscSignatures that are from accounts that are now active members
193-
for sig in filter(lambda sig: sig.member in all_upper, packet.misc_signatures):
193+
for sig in filter(lambda sig: sig.member in all_upper and not on_coop, packet.misc_signatures):
194194
MiscSignature.query.filter_by(packet_id=packet.id, member=sig.member).delete()
195195
sig = UpperSignature(packet=packet, member=sig.member, signed=True)
196196
sig.eboard = ldap_get_eboard_role(all_upper[sig.member])

‎packet/templates/include/head.html‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,41 +2,38 @@
22

33
<meta charset="utf-8">
44
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
5-
<meta name="description" content="">
5+
<meta name="description" content="CSH Web Packet">
66
<meta name="author" content="Computer Science House">
77

88
<title>CSH Packet</title>
99

10-
<link rel="manifest" href="/static/manifest.json">
10+
<link rel="manifest" href="{{ url_for('static', filename='manifest.json') }}">
1111
<meta name="theme-color" content="#b0197e">
1212
<meta name="theme-color" href="https://themeswitcher.csh.rit.edu/api/colour">
1313

1414
<!-- Icons -->
1515
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
16-
1716
<link rel="apple-touch-icon" sizes="180x180" href="{{ url_for('static', filename='apple-touch-icon.png') }}">
1817
<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='favicon-32x32.png') }}">
1918
<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='favicon-16x16.png') }}">
19+
<link rel="mask-icon" href="{{ url_for('static', filename='assets/logo.svg') }}" color="#b0197e">
2020

2121
<meta name="msapplication-TileColor" content="#b0197e">
2222
<meta name="msapplication-TileImage" content="{{ url_for('static', filename='mstile-144x144.png') }}">
2323
<meta name="msapplication-config" content="{{ url_for('static', filename='browserconfig.xml') }}">
2424

25-
<link rel="mask-icon" href="{{ url_for('static', filename='assets/logo.svg') }}" color="#b0197e">
26-
25+
<!-- Bootstrap CSS -->
2726
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/1.10.19/css/dataTables.bootstrap4.min.css">
28-
29-
<!-- Bootstrap core CSS -->
3027
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"
3128
integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
3229
<link rel="stylesheet" href="https://themeswitcher.csh.rit.edu/api/get" media="screen">
3330

31+
<!-- Additional dependencies -->
3432
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/sweetalert2.all.min.js"></script>
3533
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/sweetalert2.min.css">
34+
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.10.1/css/all.css">
3635

37-
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.10.1/css/all.css" integrity="sha384-mzrmE5qonljUremFsqc01SB46JvROS7bZs3IO2EmfFsd15uHvIt+Y8vEf7N7fWAU" crossorigin="anonymous">
38-
39-
<link rel="stylesheet" href="/static/css/packet.min.css">
36+
<link rel="stylesheet" href="{{ url_for('static', filename='css/packet.min.css') }}">
4037

4138
<script async src="https://www.googletagmanager.com/gtag/js?id={{ config['ANALYTICS_ID'] }}"></script>
4239
<script>

‎packet/templates/include/scripts.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<!-- Bootstrap core JavaScript -->
22
<script src="https://code.jquery.com/jquery-3.4.1.min.js" integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
3-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
4-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
3+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
4+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
55

66
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js"></script>
77
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/1.10.19/js/dataTables.bootstrap4.min.js"></script>
88
<script type="text/javascript" charset="utf8" src="//cdn.datatables.net/rowgroup/1.0.2/js/dataTables.rowGroup.min.js"></script>
99

10-
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.6-rc.0/js/select2.min.js"></script>
10+
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.8/js/select2.min.js"></script>
1111

1212
<script src="/static/js/signing.js"></script>

‎packet/templates/packet.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
{% block body %}
66
<div class="container main">
7-
<div class="mb-2">
7+
<div class="mb-2 m-1">
88
<div class="row justify-content-between w-100">
9-
<div class="col">
9+
<div class="col m-1">
1010
<h3>{{ get_rit_name(packet.freshman_username) }}</h3>
1111
</div>
1212
<div class="col">
@@ -22,12 +22,12 @@ <h3>{{ get_rit_name(packet.freshman_username) }}</h3>
2222
{% endif %}
2323
</div>
2424
</div>
25-
<div class="row justify-content-between">
26-
<div class="col">
27-
<h5>Signatures: {{ received.total }}/{{ required.total }}</h5>
25+
<div class="row">
26+
<div class="col ml-1 mb-1">
27+
<h6>Signatures: <span class="badge badge-secondary">{{ received.total }}/{{ required.total }}</span></h6>
2828
</div>
29-
<div class="col">
30-
<h5 class="right-align">Packet Ends: {{ packet_end }}</h5>
29+
<div class="col mr-1 mb-1">
30+
<h6 class="right-align">Ends: <span class="badge badge-secondary">{{ packet_end }}</span></h6>
3131
</div>
3232
</div>
3333
<div class="card card-body">

‎packet/templates/upperclassman.html‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,16 @@
22

33
{% block body %}
44
<div class="container main">
5-
<div class="row mobile-hide">
6-
<div class="col-sm-10">
7-
<h3 class="page-title">{{ get_csh_name(member) }}</h3>
5+
<div class="ml-1">
6+
<div class="row">
7+
<div class="col">
8+
<h3 class="page-title">
9+
<img class="eval-user-img" alt="{{ member }}"
10+
src="https://profiles.csh.rit.edu/image/{{ member }}"
11+
width="35" height="35"/>
12+
{{ get_csh_name(member) }}
13+
</h3>
14+
</div>
815
</div>
916
</div>
1017
<div id="eval-blocks">

0 commit comments

Comments
 (0)