Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add URLs für measurements

Roland Geiderfbfe844f2004
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 8cc6e6728..830dbf675 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -50,6 +50,16 @@
{% translate "Calendar" %}
</a>
</li>
+
+ <li>
+ <a class="dropdown-item"
+ href="{% url 'measurements:overview' %}" rel="nofollow">
+ {% if not user.is_authenticated %}
+ <span class="{% fa_class 'lock' %}"></span>
+ {% endif %}
+ {% translate "Measurements" %}
+ </a>
+ </li>
{% endif %}
<li>
@@ -61,6 +71,7 @@
</a>
</li>
+
<li class="dropdown-divider"></li>
<li class="dropdown-header">{% translate "Workout templates" %}</li>
<li>
@@ -179,7 +190,8 @@
<a href="{% url 'weight:overview' %}"
class="dropdown-toggle nav-link text-white {% if active_tab == 'weight' %}active{% endif %}"
data-bs-toggle="dropdown"
- rel="nofollow">{% translate "Body weight" %} <b class="caret"></b></a>
+ rel="nofollow">{% translate "Body weight" %} <b
+ class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a class="dropdown-item"
@@ -206,7 +218,8 @@
<li class="nav-item dropdown">
<a href=""
class="dropdown-toggle nav-link text-white {% if active_tab == 'software' %}active{% endif %}"
- data-bs-toggle="dropdown">{% translate "About this software" %} <b class="caret"></b></a>
+ data-bs-toggle="dropdown">{% translate "About this software" %} <b
+ class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<a class="dropdown-item"
@@ -216,7 +229,8 @@
</li>
<li class="dropdown-divider"></li>
<li>
- <a class="dropdown-item" href="{% url 'software:api' %}">{% translate "REST API" %}</a>
+ <a class="dropdown-item"
+ href="{% url 'software:api' %}">{% translate "REST API" %}</a>
</li>
<li>
<a class="dropdown-item"
@@ -232,13 +246,15 @@
</a>
</li>
<li>
- <a class="dropdown-item" href="https://github.com/wger-project/wger">
+ <a class="dropdown-item"
+ href="https://github.com/wger-project/wger">
<span class="{% fa_class 'external-link-alt' %}"></span>
{% translate "Get the code" %} (Github)
</a>
</li>
<li>
- <a class="dropdown-item" href="https://hosted.weblate.org/engage/wger/">
+ <a class="dropdown-item"
+ href="https://hosted.weblate.org/engage/wger/">
<span class="{% fa_class 'external-link-alt' %}"></span>
{% translate "Translate" %}
</a>
@@ -254,7 +270,8 @@
{% if not user.is_authenticated or user.userprofile.is_temporary %}
<ul class="navbar-nav my-2 my-lg-0">
<li class="dropdown nav-item">
- <a href="#" class="dropdown-toggle nav-link text-white" data-bs-toggle="dropdown">
+ <a href="#" class="dropdown-toggle nav-link text-white"
+ data-bs-toggle="dropdown">
{% translate "Login" %} / {% translate "Register" %}
<span class="caret"></span>
</a>
@@ -265,12 +282,14 @@
</a>
</li>
<li>
- <a class="dropdown-item" href="{% url 'core:user:registration' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:user:registration' %}">
{% translate "Register" %}
</a>
</li>
<li>
- <a class="dropdown-item" href="{% url 'core:user:password_reset' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:user:password_reset' %}">
{% translate "Reset password" %}
</a>
</li>
@@ -280,20 +299,23 @@
{% else %}
<ul class="navbar-nav my-2 my-lg-0">
<li class="dropdown nav-item">
- <a href="#" class="dropdown-toggle nav-link text-white" data-bs-toggle="dropdown">
+ <a href="#" class="dropdown-toggle nav-link text-white"
+ data-bs-toggle="dropdown">
{{ user|format_username }}
<span class="caret"></span>
</a>
<ul class="dropdown-menu dropdown-menu-lg-end">
<li>
- <a class="dropdown-item" href="{% url 'core:user:preferences' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:user:preferences' %}">
{% translate "My preferences" %}
</a>
</li>
{% if not trainer_identity %}
<li class="dropdown-divider"></li>
<li>
- <a class="dropdown-item" href="{% url 'core:user:logout' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:user:logout' %}">
<span class="{% fa_class 'sign-out-alt' %}"></span>
{% translate "Logout" %}
</a>
@@ -308,40 +330,46 @@
<li class="dropdown-header">{% translate "Administration" %}</li>
{% if perms.core.change_language %}
<li>
- <a class="dropdown-item" href="{% url 'core:language:overview' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:language:overview' %}">
{% translate "Languages" %}
</a>
</li>
{% endif %}
{% if perms.core.change_license %}
<li>
- <a class="dropdown-item" href="{% url 'core:license:list' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:license:list' %}">
{% translate "Licenses" %}
</a>
</li>
{% endif %}
{% if perms.core.change_repetitionunit %}
<li>
- <a class="dropdown-item" href="{% url 'core:repetition-unit:list' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:repetition-unit:list' %}">
{% translate "Repetition units" %}
</a>
</li>
{% endif %}
{% if perms.core.change_weightunit %}
<li>
- <a class="dropdown-item" href="{% url 'core:weight-unit:list' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:weight-unit:list' %}">
{% translate "Weight units" %}
</a>
</li>
{% endif %}
{% if perms.gym.manage_gyms %}
<li>
- <a class="dropdown-item" href="{% url 'core:user:list' %}">
+ <a class="dropdown-item"
+ href="{% url 'core:user:list' %}">
{% translate "User list" %}
</a>
</li>
<li>
- <a class="dropdown-item" href="{% url 'gym:gym:list' %}">
+ <a class="dropdown-item"
+ href="{% url 'gym:gym:list' %}">
{% translate "Gyms" %}
</a>
</li>
diff --git a/wger/measurements/urls.py b/wger/measurements/urls.py
new file mode 100644
index 000000000..154219309
--- /dev/null
+++ b/wger/measurements/urls.py
@@ -0,0 +1,34 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+# Django
+from django.urls import path
+
+# wger
+from wger.core.views.react import ReactView
+
+
+urlpatterns = [
+ path(
+ '',
+ ReactView.as_view(div_id='react-measurements-overview', login_required=True),
+ name='overview',
+ ),
+ path(
+ 'category/<int:pk>',
+ ReactView.as_view(div_id='react-measurements-detail', login_required=True),
+ name='detail',
+ ),
+]
diff --git a/wger/urls.py b/wger/urls.py
index 155024b12..8833a9d8b 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -230,6 +230,10 @@ urlpatterns = i18n_patterns(
path('config/', include(('wger.config.urls', 'config'), namespace='config')),
path('gym/', include(('wger.gym.urls', 'gym'), namespace='gym')),
path('gallery/', include(('wger.gallery.urls', 'gallery'), namespace='gallery')),
+ path(
+ 'measurement/',
+ include(('wger.measurements.urls', 'measurements'), namespace='measurements')
+ ),
path('email/', include(('wger.mailer.urls', 'email'), namespace='email')),
path('sitemap.xml', index, {'sitemaps': sitemaps}, name='sitemap'),
path(