Remove trial code, restore repository. Should not have committed this. Oh well. Let's continue this in a branch like I'm supposed to.

This commit is contained in:
James Cole
2019-01-06 16:23:37 +01:00
parent 3b4622a9ac
commit 27802c930f
114 changed files with 4165 additions and 56128 deletions

View File

@@ -194,12 +194,11 @@
drawVerticalLine = '{{ today.formatLocalized(monthAndDayFormat) }}';
{% endif %}
</script>
<!--
<script type="text/javascript" src="v1/js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/lib/chartjs-plugin-annotation.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/charts.js?v={{ FF_VERSION }}"></script>
-->
<script type="text/javascript" src="v1/js/ff/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

View File

@@ -1,7 +1,7 @@
// date ranges
var ranges = {};
var ranges = {}
{% for title, range in dateRangeConfig.ranges %}
ranges["{{ title }}"] = ["{{ range[0].format('Y-m-d') }}", "{{ range[1].format('Y-m-d') }}"];
ranges["{{ title }}"] = [moment("{{ range[0].format('Y-m-d') }}"), moment("{{ range[1].format('Y-m-d') }}")];
{% endfor %}
// date range meta configuration
@@ -19,8 +19,8 @@ customRange: "{{ 'customRange'|_ }}"
// date range actual configuration:
var dateRangeConfig = {
startDate: "{{ dateRangeConfig.start }}",
endDate: "{{ dateRangeConfig.end }}",
startDate: moment("{{ dateRangeConfig.start }}"),
endDate: moment("{{ dateRangeConfig.end }}"),
ranges: ranges
};

View File

@@ -169,14 +169,26 @@
</div>
{# Java libraries and stuff: #}
{# Moment JS #}
<script src="v1/js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/js/ff/moment/{{ language }}.js?v={{ FF_VERSION }}" type="text/javascript"></script>
{# All kinds of variables. #}
<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}{% if account %}&amp;account={{ account.id }}{% endif %}" type="text/javascript"></script>
<script type="text/javascript" src="v1/js/ff/manifest.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/vendor.js?v={{ FF_VERSION }}"></script>
{# big fat JS thing courtesy of Vue#}
<script src="v1/js/app.js?v={{ FF_VERSION }}" type="text/javascript"></script>
{# date range picker, current template, etc.#}
<script src="v1/js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="v1/lib/adminlte/js/adminlte.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="v1/js/lib/accounting.min.js?v={{ FF_VERSION }}"></script>
{# Firefly III code#}
<script type="text/javascript" src="v1/js/ff/firefly.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/help.js?v={{ FF_VERSION }}"></script>
{% if not shownDemo %}
<!--
<script type="text/javascript">
var routeForTour = "{{ current_route_name }}";
var routeStepsUri = "{{ route('json.intro', [current_route_name, what|default("")]) }}";
@@ -184,7 +196,6 @@
</script>
<script type="text/javascript" src="v1/lib/intro/intro.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="v1/js/ff/intro/intro.js?v={{ FF_VERSION }}"></script>
-->
{% endif %}
{% block scripts %}{% endblock %}