aboutsummaryrefslogtreecommitdiffstats
path: root/templates/main
diff options
context:
space:
mode:
Diffstat (limited to 'templates/main')
-rw-r--r--templates/main/jams/index.html3
-rw-r--r--templates/main/jams/team_list.html67
-rw-r--r--templates/main/jams/team_view.html14
-rw-r--r--templates/main/jams/teams_list.html45
-rw-r--r--templates/main/navigation.html6
5 files changed, 85 insertions, 50 deletions
diff --git a/templates/main/jams/index.html b/templates/main/jams/index.html
index e2201398..b2645962 100644
--- a/templates/main/jams/index.html
+++ b/templates/main/jams/index.html
@@ -66,6 +66,9 @@
<i class="uk-icon fa-fw far fa-plus"></i> &nbsp;Join
</a>
{% else %}
+ <a class="uk-button uk-button-primary" href="{{ url_for('main.jams.jam_team_list', jam_id=jam.number) }}">
+ <i class="uk-icon fa-fw far fa-users"></i> &nbsp;Teams
+ </a>
<a class="uk-button uk-button-default" target="_blank" href="{{ jam.repo }}">
<i class="uk-icon fa-fw fab fa-gitlab"></i> &nbsp;Repository
</a>
diff --git a/templates/main/jams/team_list.html b/templates/main/jams/team_list.html
new file mode 100644
index 00000000..51162416
--- /dev/null
+++ b/templates/main/jams/team_list.html
@@ -0,0 +1,67 @@
+{% extends "main/base.html" %}
+{% block title %}Code Jams | My Teams{% endblock %}
+{% block og_title %}Code Jams | My Teams{% endblock %}
+
+{% block page_classes %}jam-team-list{% endblock %}
+
+{% block content %}
+ <div class="uk-section">
+ <div class="uk-container uk-container-small">
+ <h1 class="uk-header uk-article-title uk-heading-divider">
+ {% if user_teams %}
+ Code Jams: My Teams
+ {% else %}
+ Code Jam {{ jam.number }}: Teams
+ {% endif %}
+ </h1>
+ {% if teams %}
+
+ <div class="uk-flex uk-flex-row uk-flex-wrap team-list-cards">
+ {% for team in teams %}
+ <div class="uk-card uk-card-default uk-margin-small-bottom uk-margin-small-right uk-margin-small-top uk-margin-small-left
+ {% if not user_teams and logged_in and user.user_id in member_ids(team.members) %}
+ team-card-own
+ {% endif %}
+ ">
+ <div class="uk-card-body">
+ <div class="uk-card-title">
+ Team <strong>{{ team.name }}</strong>
+ {% if user_teams %}
+ <p class="uk-article-meta team-subtitle">
+ Code Jam {{ team.jam.number }}
+ </p>
+ {% endif %}
+ </div>
+ <div class="team-member-avatars">
+ {% for member in team.members %}
+ <a href="https://discordapp.com/users/{{ member.user_id }}"
+ title="{{ member.username }}#{{ member.discriminator }}"
+ target="_blank"
+ class="team-member-avatar-link">
+ <img src="{{ member.avatar }}" class="team-member-avatar uk-border-circle"/>
+ </a>
+ {% endfor %}
+ </div>
+ <div class="team-links">
+ <a href="{{ url_for('main.jams.team_view', team_id=team.id) }}"
+ class="uk-button uk-button-primary">
+ <i class="uk-icon fa-fw far fa-eye"></i> &nbsp;View
+ </a>
+ <a href="#" target="_blank" class="uk-button uk-button-default">
+ <i class="uk-icon fa-fw fab fa-gitlab"></i>
+ </a>
+ </div>
+ </div>
+ </div>
+ {% endfor %}
+ </div>
+ {% else %}
+ {% if user_teams %}
+ <p>You are not part of any team.</p>
+ {% else %}
+ <p>There are no teams in this jam.</p>
+ {% endif %}
+ {% endif %}
+ </div>
+ </div>
+{% endblock %}
diff --git a/templates/main/jams/team_view.html b/templates/main/jams/team_view.html
index 8d21f309..e6131b0d 100644
--- a/templates/main/jams/team_view.html
+++ b/templates/main/jams/team_view.html
@@ -13,7 +13,18 @@
<p class="uk-article-meta">
Code Jam {{ team.jam.number }}
</p>
- <p></p>
+ <p>
+ <a href="{{ url_for('main.jams.jam_team_list', jam_id=team.jam.number) }}"
+ class="uk-button uk-button-default">
+ <i class="uk-icon fa-fw far fa-users"></i> &nbsp;Competing Teams
+ </a>
+ {% if logged_in %}
+ <a href="{{ url_for('main.jams.user_team_list') }}"
+ class="uk-button uk-button-default">
+ <i class="uk-icon fa-fw far fa-user"></i> &nbsp;My Teams
+ </a>
+ {% endif %}
+ </p>
<div class="uk-grid">
<div class="uk-width-1-2@m">
@@ -129,7 +140,6 @@
+ "</div>"
).appendTo(eventList);
-
$("#gitlab-activity").append(eventList);
}
diff --git a/templates/main/jams/teams_list.html b/templates/main/jams/teams_list.html
deleted file mode 100644
index e23d21b1..00000000
--- a/templates/main/jams/teams_list.html
+++ /dev/null
@@ -1,45 +0,0 @@
-{% extends "main/base.html" %}
-{% block title %}Code Jams | My Teams{% endblock %}
-{% block og_title %}Code Jams | My Teams{% endblock %}
-
-{% block content %}
- <div class="uk-section">
- <div class="uk-container uk-container-small">
- <h1 class="uk-header uk-article-title uk-heading-divider">
- Code Jams: My Teams
- </h1>
- {% if teams %}
- {% for team in teams %}
- <p></p>
- <div>
- <h3>Code Jam {{ team.jam.number }}: Team <strong>{{ team.name }}</strong></h3>
- <p>
- <a href="{{ url_for('main.jams.team_view', team_id=team.id) }}"
- class="uk-button uk-button-primary">
- <i class="uk-icon fa-fw far fa-eye"></i> &nbsp;View
- </a>
- <a href="#" target="_blank" class="uk-button uk-button-default">
- <i class="uk-icon fa-fw fab fa-gitlab"></i>
- </a>
- </p>
- <strong>Team Members</strong>
- <ul>
- {% for member in team.members %}
- <li>
- {{ member.username }}#{{ member.discriminator }}
- <a class="uk-button uk-button-small"
- title="{{ member.gitlab_username }} on GitLab"
- target="_blank" href="https://gitlab.com/{{ member.gitlab_username }}">
- <i class="uk-icon fa-fw fab fa-gitlab"></i>
- </a>
- </li>
- {% endfor %}
- </ul>
- </div>
- {% endfor %}
- {% else %}
- <p>You are not part of any team.</p>
- {% endif %}
- </div>
- </div>
-{% endblock %}
diff --git a/templates/main/navigation.html b/templates/main/navigation.html
index c60fa19d..a32ac1c1 100644
--- a/templates/main/navigation.html
+++ b/templates/main/navigation.html
@@ -143,10 +143,10 @@
<li><a href="{{ url_for('main.jams.profile') }}">My Profile</a></li>
{% endif %}
- {% if current_page == "main.jams.teams_list" %}
- <li class="uk-active"><a href="{{ url_for('main.jams.teams_list') }}">My Teams</a></li>
+ {% if current_page == "main.jams.user_team_list" %}
+ <li class="uk-active"><a href="{{ url_for('main.jams.user_team_list') }}">My Teams</a></li>
{% else %}
- <li><a href="{{ url_for('main.jams.teams_list') }}">My Teams</a></li>
+ <li><a href="{{ url_for('main.jams.user_team_list') }}">My Teams</a></li>
{% endif %}
<li class="uk-nav-divider"></li>
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-04 07:59:27 +0000