Skip to content

Commit 4f3e392

Browse files
libhidelibhide
committed
Update orfik styles, remove join app and do some misc. fixes
1 parent 577ed8a commit 4f3e392

File tree

15 files changed

+230
-359
lines changed

15 files changed

+230
-359
lines changed

‎config.codekit

+130-342
Large diffs are not rendered by default.

‎events/orfik/migrations/0001_initial.py

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
import datetime
6+
from django.conf import settings
7+
8+
9+
class Migration(migrations.Migration):
10+
11+
dependencies = [
12+
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
13+
]
14+
15+
operations = [
16+
migrations.CreateModel(
17+
name='Attempt',
18+
fields=[
19+
('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
20+
('value', models.CharField(max_length=100)),
21+
('correct', models.NullBooleanField(default=None)),
22+
],
23+
),
24+
migrations.CreateModel(
25+
name='Player',
26+
fields=[
27+
('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
28+
('nickname', models.CharField(max_length=20)),
29+
('max_level', models.SmallIntegerField(default=0)),
30+
('last_solve', models.DateTimeField(default=datetime.datetime(2017, 1, 9, 15, 24, 43, 245795))),
31+
('user', models.OneToOneField(to=settings.AUTH_USER_MODEL)),
32+
],
33+
),
34+
migrations.CreateModel(
35+
name='Question',
36+
fields=[
37+
('id', models.AutoField(verbose_name='ID', auto_created=True, primary_key=True, serialize=False)),
38+
('number', models.SmallIntegerField()),
39+
('text', models.TextField(blank=True, null=True)),
40+
('image', models.ImageField(blank=True, null=True, upload_to='question')),
41+
('answer', models.CharField(max_length=100)),
42+
],
43+
),
44+
migrations.AddField(
45+
model_name='attempt',
46+
name='player',
47+
field=models.ForeignKey(to='orfik.Player', related_name='player_attempt'),
48+
),
49+
migrations.AddField(
50+
model_name='attempt',
51+
name='question',
52+
field=models.ForeignKey(to='orfik.Question', related_name='attempt'),
53+
),
54+
]

‎events/orfik/migrations/__init__.py

Whitespace-only changes.

‎events/orfik/templates/orfik/home.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<a href="{% url 'events:orfik:home' %}"><li>Play</li></a>
66
<a href="{% url 'events:orfik:leader' %}"><li>Leaderboard</li></a>
77
<a href="{% url 'events:orfik:instructions' %}"><li>Instructions</li></a>
8-
<a target='_blank' href="https://www.facebook.com/TheComputerScienceSocietyStStephensCollege/"><li>Forum</li></a>
8+
<a target='_blank' href="https://www.facebook.com/TheCompSoc/"><li>Help</li></a>
99
</ul>
1010
{% endblock %}
1111

@@ -20,7 +20,7 @@ <h1 class="light-space" style="text-align: center; margin-bottom: 10px;">You won
2020
<h1 class="light-space" style="text-align: center; margin-bottom: 10px;">The Hunt has ended.</h1>
2121
<p style="text-align: center;">Thanks for playing! If you liked orfik, do tell us about your experience on our facebook page. Until next time, stay curious!</p>
2222
{% else %}
23-
<h2 class="light-space" style="text-align: center;">The hunt has begun!</h2>
23+
<h2 class="light-space" style="text-align: center;">Orfik has started!</h2>
2424
<br />
2525
<a href="{% url 'login' %}" class="btn btn--m btn--full">Login</a>
2626
{% endif %}

‎events/orfik/templates/orfik/instructions.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
{% block body %}
1212
<section id="events-container">
1313
<h1 class="light-space">Instructions</h1>
14-
<ol class='instructions'>
14+
<ol class='instructions' style="margin-bottom: 50px;">
1515
<li>The hunt begins <strong>sharp</strong> at 0000 Hours on March 17, 2016 and ends on March 18 at 23:59 Hours.</li>
1616
<li>Each participant can make a single login using a username of their choice.</li>
1717
<li>Once the game begins you will be faced by a series of questions.</li>
@@ -26,7 +26,6 @@ <h1 class="light-space">Instructions</h1>
2626
<li>The use of the internet, searching the source code etc. are all allowed to arrive at the answer.</li>
2727
<li>Any queries regarding the questions will be answered at the orfik forum by CompSoc on our facebook page. However, no foul language or other miscreant behaviour will be tolerated.</li>
2828
</ol>
29-
30-
<h3>Good luck!</h3>
29+
<a class='btn btn--full btn--black' href="{% url 'events:orfik:home' %}">Start playing!</a>
3130
</section>
3231
{% endblock %}

‎join/migrations/0004_auto_20170109_1410.py

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('join', '0003_auto_20160807_0135'),
11+
]
12+
13+
operations = [
14+
migrations.AlterField(
15+
model_name='newmember',
16+
name='email',
17+
field=models.EmailField(unique=True, max_length=254, error_messages={'unique': 'This email has already been registered.'}),
18+
),
19+
]

‎sass/layout/_footer.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
font-size: 1em;
6868
font-weight: 500;
6969
margin-bottom: 0.4em;
70-
}
70+
}
7171

7272
hr {
7373
border: 1px solid transparentize(#fff, 0.85);

‎sass/pages/events/_base.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#events-container {
2-
max-width: 760px;
2+
max-width: 860px;
33
padding: 0 20px;
44
margin: 100px auto 300px;
55
}

‎sass/pages/events/_navigation.scss

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
display: flex;
66
align-items: center;
77
justify-content: space-around;
8-
margin: 30px auto 10px;
8+
margin: 50px auto 10px;
99
max-width: 660px;
1010

1111
@media screen and (max-width: 538px) {
@@ -16,17 +16,17 @@
1616
.events-nav li {
1717
font-size: 1.2em;
1818
margin: 0;
19+
transition: all 200ms linear;
1920

2021
@media screen and (max-width: 538px) {
2122
background-color: $primary-color;
22-
transition: all 200ms ease-in-out;
2323
padding: 15px;
2424
margin: 10px 15px;
2525
text-align: center;
2626
color: white;
27+
}
2728

28-
&:hover {
29-
background-color: $secondary-color;
30-
}
29+
&:hover {
30+
color: $secondary-color;
3131
}
3232
}

‎sass/pages/events/orfik/_all.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1+
@import 'base';
12
@import 'question';
2-
@import "leaderboard";
3+
@import "leaderboard";
4+
@import 'instructions';

‎sass/pages/events/orfik/_instructions.scss

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
.instructions {
2+
li {
3+
margin-bottom: 5px;
4+
}
5+
}

‎sass/pages/events/orfik/_leaderboard.scss

+5
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,9 @@
22
line-height: 1.6;
33
font-weight: 400;
44
letter-spacing: 1px;
5+
6+
th,
7+
td {
8+
text-align: center;
9+
}
510
}

‎static/stylesheets/main.min.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎templates/base.html

+1-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ <h3>St. Stephen's College</h3>
3333
<ul>
3434
<li><a href="{% url 'events:home' %}">Events</a></li>
3535
<li><a href="{% url 'members' %}">Members</a></li>
36-
<li style="font-weight: bold;"><a href="{% url 'join:home' %}">Join!</a></li>
3736
</ul>
3837
</nav>
3938
</header>
@@ -58,7 +57,7 @@ <h3>St. Stephen's College</h3>
5857
</ul>
5958
<ul>
6059
<li><h3>Follow Us</h3></li>
61-
<li><a target="_blank" href="http://on.fb.me/1IApIym">Facebook</a></li>
60+
<li><a target="_blank" href="https://www.facebook.com/TheCompSoc/">Facebook</a></li>
6261
</ul>
6362
<ul>
6463
<li><h3>Other Links</h3></li>

‎website/settings/base.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
# 'events.logo',
4040
# 'events.orfik',
4141
'metrics',
42-
'join',
42+
# 'join',
4343
'import_export',
4444
)
4545

0 commit comments

Comments
 (0)