Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion tcf_website/templates/about/current_team.html
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,32 @@ <h4><i class="fa fa-github"></i></h4>
</div>
</div>

<div class="design-team jumbotron py-5 bg-light">
<div class="container">
<h3>Design Team</h3>
<hr/>
<div class="row text-left">
{% for member in design_team %}
<div class="col-lg-3 col-sm-6 d-flex">
<div class="member card mb-4 shadow-sm flex-fill">
<div class="pfp">
<img class="card-img-top" src="{% static 'about/team-pfps/'|add:member.img_filename %}" alt="{{ member.name }}">
</div>
<div class="card-body">
<h5 class="card-text">{{ member.name }}</h5>
<p class="card-text small text-muted">Class of {{ member.class }}</p>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</div>


<div class="marketing-team jumbotron py-5 bg-light">
<div class="container">
<h3>Marketing & Design Team</h3>
<h3>Marketing Team</h3>
<hr/>
<div class="row text-left">
{% for member in marketing_team %}
Expand Down
1 change: 1 addition & 0 deletions tcf_website/views/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ def get_context_data(self, **kwargs):
context["executive_team"] = self.team_info["executive_team"]
context["engineering_team"] = self.team_info["engineering_team"]
context["marketing_team"] = self.team_info["marketing_team"]
context["design_team"] = self.team_info["design_team"]
context["founders"] = self.alum_info["founders"]
context["contributors"] = self.alum_info["contributors"]
return context
12 changes: 10 additions & 2 deletions tcf_website/views/team_info.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@
"github": "namaikureishi"
}
],
"marketing_team": [
"design_team": [
{
"name": "Chai Zhang",
"role": "Designer",
Expand All @@ -276,7 +276,9 @@
"role": "Designer",
"class": "2028",
"img_filename": "DM_Tara_Vidyababu.webp"
},
}
],
"marketing_team": [
{
"name": "Carissa Chen",
"role": "Marketing",
Expand All @@ -288,6 +290,12 @@
"role": "Marketing",
"class": "2027",
"img_filename": "DM_Julie_Huang.jpg"
},
{
"name": "Alyssa Zhang",
"role": "Marketing",
"class": "2027",
"img_filename": "DM_Alyssa_Zhang.jpg"
}
]
}
Loading