Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge pull request #1302 from wger-project/dependabot/pip/icalendar-5.0.5
Roland Geider234161d22a0e
diff --cc wger/core/templates/react/react-page.htmlindex be5fc412b,be5fc412b..bf829ef48--- a/wger/core/templates/react/react-page.html+++ b/wger/core/templates/react/react-page.html@@@ -37,7 -37,7 +37,7 @@@{# Content #}{# #}{% block content %}-- <div id="react-exercise-detail"></div>++ <div id="react-routine-overview"></div>{% endblock %}diff --cc wger/core/views/react.pyindex 000000000,000000000..e69de29bbnew file mode 100644--- /dev/null+++ b/wger/core/views/react.pydiff --cc wger/exercises/static/js/exercises.jsindex 7982d560a,7982d560a..000000000deleted file mode 100644,100644--- a/wger/exercises/static/js/exercises.js+++ /dev/null@@@ -1,63 -1,63 +1,0 @@@--/*-- 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-- */----/*-- wger exercise functions-- */----'use strict';----/*-- D3js functions-- */----function wgerDrawWeightLogChart(data, divId) {-- var chartData;-- var legend;-- var minValues;-- var i;-- if (data.length) {-- legend = [];-- minValues = [];-- chartData = [];-- for (i = 0; i < data.length; i++) {-- chartData[i] = MG.convert.date(data[i], 'date');---- // Read the possible repetitions for the chart legend-- legend[i] = data[i][0].reps;---- // Read the minimum values for each repetition-- minValues[i] = d3.min(data[i], function (repetitionData) {-- return repetitionData.weight;-- });-- }---- MG.data_graphic({-- data: chartData,-- y_accessor: 'weight',-- min_y: d3.min(minValues),-- aggregate_rollover: true,-- full_width: true,-- top: 10,-- left: 30,-- right: 10,-- height: 200,-- legend: legend,-- target: '#svg-' + divId,-- colors: ['#204a87', '#4e9a06', '#ce5c00', '#5c3566', '#2e3436', '8f5902', '#a40000']-- });-- }--}diff --cc wger/exercises/templates/exercise/contribute.htmlindex c6daf0360,c6daf0360..000000000deleted file mode 100644,100644--- a/wger/exercises/templates/exercise/contribute.html+++ /dev/null@@@ -1,38 -1,38 +1,0 @@@--{% extends "base_wide.html" %}--{% load i18n static wger_extras thumbnail cache django_bootstrap_breadcrumbs %}------{# #}--{# Opengraph #}--{# #}--{% block opengraph %}--{% endblock %}------{# #}--{# Title #}--{# #}--{% block title %}{% endblock %}------{# #}--{# Header #}--{# #}--{% block header %}-- {% react_static %}--{% endblock %}------{# #}--{# Content #}--{# #}--{% block content %}-- <div id="react-exercise-contribute"></div>--{% endblock %}------{# #}--{# Options #}--{# #}--{% block options %}--{% endblock %}diff --cc wger/exercises/templates/exercise/overview.htmlindex 012c77045,012c77045..000000000deleted file mode 100644,100644--- a/wger/exercises/templates/exercise/overview.html+++ /dev/null@@@ -1,20 -1,20 +1,0 @@@--{% extends "base_wide.html" %}--{% load wger_extras %}------{% block header %}-- {% react_static %}--{% endblock %}------<!---- Main Content---->--{% block content %}-- <div id="react-exercise-overview"></div>--{% endblock %}--------{% block options %}--{% endblock %}