Skip to content

Commit 5959842

Browse files
wilsonmcdadewilsonmcdade
authored
Merge pull request #27 from wilsonmcdade/credits
Added Contributors page
2 parents a35632d + 5f3bdf0 commit 5959842

File tree

6 files changed

+111
-26
lines changed

6 files changed

+111
-26
lines changed

‎src/app.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import requests
66
from io import BytesIO
77
from werkzeug.wsgi import FileWrapper
8+
import contributors
89

910
@app.route('/')
1011
# @login_required
@@ -90,6 +91,10 @@ def deleteGame(id):
9091
def static_from_root():
9192
return flask.send_from_directory(app.static_folder, flask.request.path[1:])
9293

94+
@app.route('/credits')
95+
def credits():
96+
return flask.render_template('credits.html', contributors = contributors.contributors)
97+
9398
@app.errorhandler(Exception)
9499
def page404(e):
95100
eCode = 500

‎src/contributors.py

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
import hashlib
2+
3+
contributors = [
4+
{
5+
"name" : "Andrew Ebersole",
6+
"link" : "",
7+
"email" : hashlib.md5(b"andrewe@csh.rit.edu").hexdigest(),
8+
"desc" : "Game Developer, First Year GDD"
9+
},
10+
{
11+
"name" : "Noah Emke",
12+
"link" : "https://noahemke.com",
13+
"email" : hashlib.md5(b"mtft@csh.rit.edu").hexdigest(),
14+
"desc" : "Devcade Team Lead, Third Year GDD"
15+
},
16+
{
17+
"name" : "Will Lyons",
18+
"link" : "",
19+
"email" : hashlib.md5(b"lyons@csh.rit.edu").hexdigest(),
20+
"desc" : "Game Developer, First Year GDD"
21+
},
22+
{
23+
"name" : "Wilson McDade",
24+
"link" : "https://wmcda.de",
25+
"email" : hashlib.md5(b"mcdade@csh.rit.edu").hexdigest(),
26+
"desc" : "Public Site Developer, Game Developer, Fourth Year CS"
27+
},
28+
{
29+
"name" : "Willard Nilges",
30+
"link" : "https://nilges.me/",
31+
"email" : hashlib.md5(b"wilnil@csh.rit.edu").hexdigest(),
32+
"desc" : "Backend Developer, Game Developer, Fifth Year CE"
33+
},
34+
{
35+
"name" : "Joe O'Neil",
36+
"link" : "",
37+
"email" : hashlib.md5(b"joeneil@csh.rit.edu").hexdigest(),
38+
"desc" : "Backend Developer, Game Developer, First Year CS"
39+
},
40+
{
41+
"name" : "Ben Piro",
42+
"link" : "",
43+
"email" : hashlib.md5(b"bean@csh.rit.edu").hexdigest(),
44+
"desc" : "API Lead Developer, Fourth Year CS"
45+
},
46+
{
47+
"name" : "Dennis Santos-Sanchez",
48+
"link" : "",
49+
"email" : hashlib.md5(b"yozora@csh.rit.edu").hexdigest(),
50+
"desc" : "Hardware Team, Third Year CE"
51+
},
52+
{
53+
"name" : "Andrew Simonson",
54+
"link" : "https://asimonson.com",
55+
"email" : hashlib.md5(b"cinnamon@csh.rit.edu").hexdigest(),
56+
"desc" : "Public Site Developer, Third Year CS"
57+
},
58+
{
59+
"name" : "Ella Soccoli",
60+
"link" : "https://esoccoli.me",
61+
"email" : hashlib.md5(b"ella@csh.rit.edu").hexdigest(),
62+
"desc" : "Game Developer, First Year GDD"
63+
},
64+
{
65+
"name" : "Nathan Teall",
66+
"link" : "",
67+
"email" : hashlib.md5(b"st4r@csh.rit.edu").hexdigest(),
68+
"desc" : "Onboard Team Lead, First Year SE"
69+
},
70+
{
71+
"name" : "Alex Vasilcoiu",
72+
"link" : "",
73+
"email" : hashlib.md5(b"babysatan@csh.rit.edu").hexdigest(),
74+
"desc" : "Art Team, First Year"
75+
},
76+
{
77+
"name" : "Chris Wells",
78+
"link" : "",
79+
"email" : hashlib.md5(b"chrisp@csh.rit.edu").hexdigest(),
80+
"desc" : "Hardware Team, First Year GDD"
81+
}
82+
]

‎src/static/css/devcade.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,14 @@ img.header {
263263
border-radius: 10px;
264264
}
265265

266+
.game-icon {
267+
grid-area: icon;
268+
width: 80%;
269+
border-radius: 10px;
270+
margin: auto;
271+
border-radius: 10px;
272+
}
273+
266274
.game-name {
267275
grid-area: name;
268276
}

‎src/templates/credits.html

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,23 @@ <h2>Contributors</h2>
44
<p>Many people have contributed to the different aspects of the Devcade project. Listed below (alphabetically) are the names of those who contributed to the core of the project</p>
55
<div class="card-wrapper">
66
{% for i in range(0,contributors|length) %}
7-
<div class="game-card" style="background-image: url({{ url_for('static', filename='images/csh_tilted.png') }})">
8-
<img class="game-icon" src="https://www.gravatar.com/avatar/{{ contributors[i].email }}" />
9-
<div class="game-name">
10-
<div>
11-
<h2>{{ contributors[i].name }}</h2>
12-
<h3></h3>
7+
{% if contributors[i].link != "" %}
8+
<a href="{{ contributors[i].link }}">
9+
{% endif %}
10+
<div class="game-card" style="background-image: url({{ url_for('static', filename='images/csh_tilted.png') }})">
11+
<img class="game-icon" src="https://www.gravatar.com/avatar/{{ contributors[i].email }}?d=identicon" />
12+
<div class="game-name">
13+
<div>
14+
<h2>{{ contributors[i].name }}</h2>
15+
<h3></h3>
16+
</div>
1317
</div>
18+
<div class="game-desc"><div>{{ contributors[i].desc }}</div></div>
1419
</div>
15-
<div class="game-desc"><div></div></div>
16-
</div>
20+
{% if contributors[i].link != "" %}
21+
</a>
22+
{% endif %}
1723

1824
{% endfor %}
1925
</div>
20-
<ul>
21-
<li>Andrew Ebersole</li>
22-
<li>Noah Emke</li>
23-
<li>Will Lyons</li>
24-
<li>Wilson McDade</li>
25-
<li>Willard Nilges</li>
26-
<li>Joe O'Neil</li>
27-
<li>Ben Piro</li>
28-
<li>Dennis Santos Sanchez</li>
29-
<li>Andrew Simonson</li>
30-
<li>Ella Soccoli</li>
31-
<li>Nathan Teall</li>
32-
<li>Alex Vasilcoiu</li>
33-
<li>Chris Wells</li>
34-
</ul>
3526
{% endblock %}

‎src/templates/header.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ <h1>Devcade</h1>
5454

5555
<div id="nav" class="dropped hidden">
5656
<div class="item"><a href="/">Home</a></div>
57-
<!-- <div class="item"><a href="/about">About</a></div> -->
58-
<div class="item"><a href="/catalog">Catalog</a></div>
57+
<div class="item"><a href="/catalog">Games</a></div>
5958
{% if current_user.is_authenticated %}
6059
<div class="item"><a href="/upload">Upload</a></div>
6160
<div class="item" id="account">

‎src/templates/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ <h2>Who are we?</h2>
3232
cabinet itself -- there really is something for everyone on this project.
3333
</p>
3434
<p>
35-
35+
<a href="credits">Read more</a>
3636
</p>
3737
</div>
3838
<div id="about-csh-wrapper" class="subcontent">

0 commit comments

Comments
 (0)