Skip to content

Commit 822a75d

Browse files
devinmattedevinmatte
authored
Merge pull request #139 from ComputerScienceHouse/develop
Version 3.2
2 parents 3c92f55 + 353d8fb commit 822a75d

29 files changed

+1103
-422
lines changed

‎.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ ENV/
106106
# Configurations
107107
config.py
108108

109+
# Setup
110+
node_modules
111+
109112
# Generated Assets
110113
packet/static/css/packet.css
111114
*.min.css
@@ -124,3 +127,4 @@ packet/static/mstile-70x70.png
124127
packet/static/safari-pinned-tab.svg
125128
packet/static/site.webmanifest
126129
faviconData.json
130+

‎.nvmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6

‎.pylintrc‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ disable =
1515
cyclic-import,
1616
locally-disabled,
1717
file-ignored,
18-
no-else-return
18+
no-else-return,
19+
unnecessary-lambda
1920

2021
[REPORTS]
2122
output-format = text

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ python:
55
install:
66
- "pip install -r requirements.txt"
77
script:
8-
- "pylint packet"
8+
- "pylint packet/routes packet"

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# CSH Web Packet
22

33
[![Python 3.6](https://img.shields.io/badge/python-3.6-blue.svg)](https://www.python.org/downloads/release/python-360/)
4-
[![Build Status](https://travis-ci.org/ComputerScienceHouse/packet.svg?branch=develop)](https://travis-ci.org/ComputerScienceHouse/packet)
4+
[![Build Status](https://travis-ci.com/ComputerScienceHouse/packet.svg?branch=develop)](https://travis-ci.com/ComputerScienceHouse/packet)
55

66
Packet is used by CSH to facilitate the freshmen packet portion of our introductory member evaluation process. This is
77
the second major iteration of packet on the web. The first version was

‎config.env.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
# Logging config
1616
LOG_LEVEL = environ.get("PACKET_LOG_LEVEL", "INFO")
17+
ANALYTICS_ID = environ.get("ANALYTICS_ID", "UA-420696-9")
1718

1819
# OpenID Connect SSO config
1920
REALM = environ.get("PACKET_REALM", "csh")

‎frontend/scss/components/badges.scss‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
span {
2+
&.badge {
3+
font-size: 80%;
4+
}
5+
&.badge-eboard {
6+
color: #fff;
7+
background-color: #4CAF50;
8+
}
9+
10+
&.badge-rtp {
11+
color: #fff;
12+
background-color: #ff9800;
13+
}
14+
15+
&.badge-three_da {
16+
color: #fff;
17+
background-color: #e83e8c;
18+
}
19+
20+
&.badge-webmaster {
21+
color: #fff;
22+
background-color: #2196F3;
23+
}
24+
25+
&.badge-cm {
26+
color: #fff;
27+
background-color: #e51c23;
28+
}
29+
30+
&.badge-drink {
31+
color: #fff;
32+
background-color: #b0197e;
33+
}
34+
}

‎frontend/scss/packet.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ $csh-pink: #b0197e;
66
@import "components/datatables";
77
@import "components/buttons";
88
@import "components/signatures";
9+
@import "components/badges";

‎frontend/scss/partials/_base.scss‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
body {
2-
padding-top: 50px;
2+
padding-top: 40px;
33
}
44

55
.main {
6-
margin-top: 50px;
6+
margin-top: 40px;
77
}
88

99
@import "global";

‎migrations/versions/eecf30892d0e_demote_eboard_deluxe.py‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
"""Demote Eboard Deluxe
2+
3+
Revision ID: eecf30892d0e
4+
Revises: fe83600ef3fa
5+
Create Date: 2019-02-14 17:41:18.469840
6+
7+
"""
8+
from alembic import op
9+
import sqlalchemy as sa
10+
11+
12+
# revision identifiers, used by Alembic.
13+
revision = 'eecf30892d0e'
14+
down_revision = 'fe83600ef3fa'
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade():
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.add_column('signature_upper', sa.Column('active_rtp', sa.Boolean(), nullable=False, server_default='f'))
22+
op.add_column('signature_upper', sa.Column('c_m', sa.Boolean(), nullable=False, server_default='f'))
23+
op.add_column('signature_upper', sa.Column('drink_admin', sa.Boolean(), nullable=False, server_default='f'))
24+
op.add_column('signature_upper', sa.Column('three_da', sa.Boolean(), nullable=False, server_default='f'))
25+
op.add_column('signature_upper', sa.Column('webmaster', sa.Boolean(), nullable=False, server_default='f'))
26+
op.alter_column('signature_upper', 'eboard',
27+
existing_type=sa.BOOLEAN(),
28+
type_=sa.String(length=12),
29+
nullable=True)
30+
# ### end Alembic commands ###
31+
32+
33+
def downgrade():
34+
# ### commands auto generated by Alembic - please adjust! ###
35+
op.alter_column('signature_upper', 'eboard',
36+
existing_type=sa.String(length=12),
37+
type_=sa.BOOLEAN(),
38+
nullable=False)
39+
op.drop_column('signature_upper', 'webmaster')
40+
op.drop_column('signature_upper', 'three_da')
41+
op.drop_column('signature_upper', 'drink_admin')
42+
op.drop_column('signature_upper', 'c_m')
43+
op.drop_column('signature_upper', 'active_rtp')
44+
# ### end Alembic commands ###

0 commit comments

Comments
 (0)