diff --git a/core/forms.py b/core/forms.py index b3397dd..043467f 100644 --- a/core/forms.py +++ b/core/forms.py @@ -7,7 +7,7 @@ class TeamMakeForm(forms.ModelForm): class Meta: widgets = dict( - name=forms.TextInput(attrs={"placeholder": "Json's Team"}), + name=forms.TextInput(attrs={"placeholder": "team name"}), ) model = Team fields = ("name",) @@ -15,7 +15,7 @@ class Meta: class TeamJoinForm(forms.Form): code = forms.CharField( - label=_l("join code"), + label=_l(""), max_length=8, strip=True, required=True, diff --git a/core/migrations/0021_alter_hint_options.py b/core/migrations/0021_alter_hint_options.py new file mode 100644 index 0000000..3ebf662 --- /dev/null +++ b/core/migrations/0021_alter_hint_options.py @@ -0,0 +1,17 @@ +# Generated by Django 4.1.13 on 2023-12-08 01:15 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0020_alter_logicpuzzlehint_qr_index_and_more'), + ] + + operations = [ + migrations.AlterModelOptions( + name='hint', + options={}, + ), + ] diff --git a/core/static/core/team.css b/core/static/core/team.css new file mode 100644 index 0000000..9be42fa --- /dev/null +++ b/core/static/core/team.css @@ -0,0 +1,59 @@ +:root { + --team-bg: #ededed; +} + +.team-content { + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); +} + +.team-heading { + padding: 5px; +} + +input { + outline: none; + background: var(--team-bg); + border: 0px solid var(--team-bg); + color: #767b82; +} + +input[type=submit] { + border: 0px solid var(--team-bg); + /*box-shadow: 0px 0px 0px 4px #fff;*/ + background: #fff; + color: white; + font: inherit; + font-family: inherit; + margin-left: 0; + border-radius: 0 0.3rem 0.3rem 0; + + color: #a4a4a4; + font-weight: bold; +} + +input[type=submit]:hover { + background: rgba(255, 255, 255, 0.95); + transition-duration: .3s; + color: #848a91; +} +input[type=submit]:active { + background: rgba(255, 255, 255, 0.90); + color: #000; +} + +.input-padding { + margin: 0; + padding: 0; + /* + border: 0px solid #d5d5d5; + border-radius: 0 0.3rem 0.3rem 0; + background: #d5d5d5; + height: 80%;*/ +} + +input::placeholder { + color: #bdb9b9; +} \ No newline at end of file diff --git a/core/templates/core/base.html b/core/templates/core/base.html index a3013d2..bbc51f2 100644 --- a/core/templates/core/base.html +++ b/core/templates/core/base.html @@ -7,6 +7,7 @@ {% block title %}{% endblock %} + {% block extracss %}{% endblock %} diff --git a/core/templates/core/index.html b/core/templates/core/index.html index a696480..44b8336 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -18,21 +18,21 @@ {% block body %} - {% if IN_HUNT or FUTURE_HUNT_EXISTS %} -{% if request.user.in_team and IN_HUNT %} - {% url 'qr_first' as first_url %} {% comment %}todo: add logic to swich text to /current{% endcomment %} - {% url 'qr_current' as current_url %} - {% blocktranslate %} - {{ hunt_name }} has started! go decrypt your first hint! - {% endblocktranslate %} -
- {% if not request.user.current_team.solo %} - {% url 'team_invite' as invite_url %} +{% if IN_HUNT or FUTURE_HUNT_EXISTS %} + {% if request.user.in_team and IN_HUNT %} + {% url 'qr_first' as first_url %} {% comment %}todo: add logic to swich text to /current{% endcomment %} + {% url 'qr_current' as current_url %} {% blocktranslate %} - or, would you like to invite more team members? + {{ hunt_name }} has started! go decrypt your first hint! {% endblocktranslate %} - {% endif %} -{% else %} +
+ {% if not request.user.current_team.solo %} + {% url 'team_invite' as invite_url %} + {% blocktranslate %} + or, would you like to invite more team members? + {% endblocktranslate %} + {% endif %} + {% else %}

{% if request.user.in_team %} {% if request.user.current_team.solo %} @@ -64,7 +64,7 @@

{% endif %} -{% endif %} + {% endif %} {% else %}

{% blocktranslate %} diff --git a/core/templates/core/team_join.html b/core/templates/core/team_join.html index 15edd99..dc48b30 100644 --- a/core/templates/core/team_join.html +++ b/core/templates/core/team_join.html @@ -6,16 +6,30 @@ {% translate "Join a Team" %} {% endblock %} +{% block extracss %} + +{% endblock %} + + {% block body %} -

{% translate "either enter your team's join code" %}

-
- {% csrf_token %} - {{ form }} - -
-

{% translate "or, scan your team's QR code" %}

+ +
+
+ {% translate "join a team" %} +
+ +
+ + {% csrf_token %} + {{ form }} +
+ +
+
+
+ {% endblock %} diff --git a/core/templates/core/team_new.html b/core/templates/core/team_new.html index ac28531..80392ad 100644 --- a/core/templates/core/team_new.html +++ b/core/templates/core/team_new.html @@ -6,22 +6,26 @@ {% translate "Make a Team" %} {% endblock %} -{% block header %} -{% translate "make a team" %} +{% block extracss %} + {% endblock %} -{% block head_end %} - + {% block body %} -
+
+
+ {% translate "make a team" %} +
{% csrf_token %} {{ form }} - +
+ +
-
+
{% endblock %} diff --git a/core/urls.py b/core/urls.py index f637792..944655b 100644 --- a/core/urls.py +++ b/core/urls.py @@ -13,7 +13,7 @@ path("catalog", qr.qr_catalog, name="qr_catalog"), path("signal", qr.qr_signal, name="qr_signal"), path("team/join/", team.join, name="join"), - path("team/new", team.make, name="team_new"), + path("team/make/", team.make, name="team_new"), path("team/solo", team.solo, name="team_solo"), path("team/invite", team.invite, name="team_invite"), path("clues", puzzle.logic_clues, name="logic_clues"), diff --git a/core/views/team.py b/core/views/team.py index 62d94b6..61d914e 100644 --- a/core/views/team.py +++ b/core/views/team.py @@ -53,8 +53,8 @@ def join(request): @login_required @require_http_methods(["GET", "POST"]) -@block_if_current_hunt -@upcoming_hunt_required +# @block_if_current_hunt +# @upcoming_hunt_required def make(request): if request.method == "POST": form = TeamMakeForm(request.POST)