From e0a4d1bb1339e80775aa37efaf8cac314278f8e9 Mon Sep 17 00:00:00 2001 From: Mark Powers Date: Mon, 19 Oct 2020 21:55:02 -0500 Subject: Add navigation template and logout --- src/templates/about.html | 14 +-- src/templates/expected.html | 86 ++++++++------- src/templates/goals.html | 75 ++++++------- src/templates/ledger-edit.html | 33 +++--- src/templates/ledger.html | 82 +++++++------- src/templates/navigation.html | 8 ++ src/templates/summary.html | 239 ++++++++++++++++++++--------------------- 7 files changed, 270 insertions(+), 267 deletions(-) create mode 100644 src/templates/navigation.html (limited to 'src/templates') diff --git a/src/templates/about.html b/src/templates/about.html index 3a80b50..d4f215f 100644 --- a/src/templates/about.html +++ b/src/templates/about.html @@ -2,21 +2,14 @@ - Mark's Database - Login + About - + -

- - - - - -

About

Welcome to the alpha budget app! You've been given exclusive access to this secret trial

Here is how I use this site

@@ -30,6 +23,7 @@

Goals can be used to subdivide net savings into categories. It is still W.I.P.

+ {{> navigation}} \ No newline at end of file diff --git a/src/templates/expected.html b/src/templates/expected.html index 64841a5..9554896 100644 --- a/src/templates/expected.html +++ b/src/templates/expected.html @@ -8,44 +8,54 @@ -

{{name}}'s Budget

- - - - - -

{{name}}'s Budget

+ + + + + +

- - - - {{#each expecteds}} - - - - - - - {{/each}} -

	Name	Total	Period
{{this.index}}	{{this.name}}	{{this.total}}	{{this.days}}

- - - - - - - - - - - -

Weekly:	{{week}}
Monthly:	{{month}}
Yearly:	{{year}}

+ + + + + + + + + {{#each expecteds}} + + + + + + + {{/each}} +

	Name	Total	Period
{{this.index}}	{{this.name}}	{{this.total}}	{{this.days}}

+ + + + + + + + + + + + + +

Weekly:	{{week}}
Monthly:	{{month}}
Yearly:	{{year}}

+ {{>navigation}} - + \ No newline at end of file diff --git a/src/templates/goals.html b/src/templates/goals.html index b5dbe42..e30aa62 100644 --- a/src/templates/goals.html +++ b/src/templates/goals.html @@ -8,44 +8,45 @@ -

{{name}}'s Budget

- - - - - -

- - - + + + + + + + + + {{#each goals}} - + + + + + + + {{/each}} - - - - -

	Name	Amount	Total	Remaining
{{this.index}}	{{this.name}}	{{this.amount}}	{{this.total}}	{{this.remaining}}

- - {{#each goals}} - - - - - - - - {{/each}} -

	Name	Amount	Total	Remaining
{{this.index}}	{{this.name}}	{{this.amount}}	{{this.total}}	{{this.remaining}}

+ +

+ {{>navigation}} - + \ No newline at end of file diff --git a/src/templates/ledger-edit.html b/src/templates/ledger-edit.html index 2acc2c2..e939b6d 100644 --- a/src/templates/ledger-edit.html +++ b/src/templates/ledger-edit.html @@ -8,24 +8,21 @@ -

{{name}}'s Budget

- - - - +

{{name}}'s Budget

+ +

- - + {{> navigation}} - + \ No newline at end of file diff --git a/src/templates/ledger.html b/src/templates/ledger.html index 9ffdeea..e2b7625 100644 --- a/src/templates/ledger.html +++ b/src/templates/ledger.html @@ -9,49 +9,45 @@ -

{{name}}'s Budget

- - - - - +

{{name}}'s Budget

+ + + + + + + + + + + + + {{#each ledger}} + + + + + + + + + + + {{/each}} +

	When	Where	Amount	Category	Tags
{{this.index}}	{{this.when}}	{{this.where}}	{{this.amount}}	{{this.category}}	{{this.subcategory}}

- - - - - - - - - - - - - {{#each ledger}} - - - - - - - - - - - {{/each}} -

	When	Where	Amount	Category	Tags
{{this.index}}	{{this.when}}	{{this.where}}	{{this.amount}}	{{this.category}}	{{this.subcategory}}

- + {{> navigation}} - + \ No newline at end of file diff --git a/src/templates/navigation.html b/src/templates/navigation.html new file mode 100644 index 0000000..c20ccbf --- /dev/null +++ b/src/templates/navigation.html @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/src/templates/summary.html b/src/templates/summary.html index a998be9..2759986 100644 --- a/src/templates/summary.html +++ b/src/templates/summary.html @@ -8,128 +8,125 @@ -

{{name}}'s Budget

- - - - - -

- -

Weekly

- - - - - - - - - {{#each week}} - - - - - - - - {{/each}} - Avg: - - - - - - - -

Year	Week	In	Out	Net
{{this.y}}	{{this.w}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:		{{week_avg.in}}	{{week_avg.out}}	{{week_avg.net}}

Monthly

- - - - - - - - - {{#each month}} - - - - - - - - {{/each}} - - - - - - - -

Year	Month	In	Out	Net
{{this.y}}	{{this.m}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:		{{month_avg.in}}	{{month_avg.out}}	{{month_avg.net}}

Yearly

- - - - - - - - {{#each year}} - - - - - - - {{/each}} - Avg: - - - - - - -

Year	In	Out	Net
{{this.y}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:	{{year_avg.in}}	{{year_avg.out}}	{{year_avg.net}}

Category	Total
{{this.category}}	{{this.s}}

Sub-Categories

- - - - - - {{#each subcategories}} - - - - - {{/each}} -

Sub-Category	Total
{{this.subcategory}}	{{this.s}}

{{name}}'s Budget

Weekly

+ + + + + + + + + {{#each week}} + + + + + + + + {{/each}} + Avg: + + + + + + + +

Year	Week	In	Out	Net
{{this.y}}	{{this.w}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:		{{week_avg.in}}	{{week_avg.out}}	{{week_avg.net}}

Monthly

+ + + + + + + + + {{#each month}} + + + + + + + + {{/each}} + + + + + + + +

Year	Month	In	Out	Net
{{this.y}}	{{this.m}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:		{{month_avg.in}}	{{month_avg.out}}	{{month_avg.net}}

Yearly

+ + + + + + + + {{#each year}} + + + + + + + {{/each}} + Avg: + + + + + + +

Year	In	Out	Net
{{this.y}}	{{this.in}}	{{this.out}}	{{this.net}}
Avg:	{{year_avg.in}}	{{year_avg.out}}	{{year_avg.net}}

Category	Total
{{this.category}}	{{this.s}}

Sub-Categories

+ + + + + + {{#each subcategories}} + + + + + {{/each}} +

Sub-Category	Total
{{this.subcategory}}	{{this.s}}

+ {{> navigation}} \ No newline at end of file -- cgit v1.2.3