diff --git a/views/alerts.tpl.html b/views/alerts.tpl.html index 7b85db20..d166ef98 100644 --- a/views/alerts.tpl.html +++ b/views/alerts.tpl.html @@ -1,13 +1,17 @@ {{ if .Error }}
-
- Error: {{ .Messages.Error | capitalize }} -
+
+ Error: {{ .Messages.Error | capitalize }} +
{{ else if .Success }} -
-
- {{ .Messages.Success | capitalize }} -
-
-{{ end }} \ No newline at end of file +
+
+ {{ .Messages.Success | capitalize }} +
+
+{{ end }} diff --git a/views/entity-filter.tpl.html b/views/entity-filter.tpl.html index 014852c2..c06c6b78 100644 --- a/views/entity-filter.tpl.html +++ b/views/entity-filter.tpl.html @@ -1,9 +1,18 @@ \ No newline at end of file +
+ + +
+ diff --git a/views/footer.tpl.html b/views/footer.tpl.html index 9177fd95..b49295b1 100644 --- a/views/footer.tpl.html +++ b/views/footer.tpl.html @@ -1,13 +1,26 @@ - \ No newline at end of file + diff --git a/views/head.tpl.html b/views/head.tpl.html index 62ff733c..37392524 100644 --- a/views/head.tpl.html +++ b/views/head.tpl.html @@ -1,16 +1,36 @@ - Wakapi – Coding Statistics - - - - - - - - - - - - - - \ No newline at end of file + Wakapi – Coding Statistics + + + + + + + + + + + + + + diff --git a/views/header.tpl.html b/views/header.tpl.html index 6fb81a54..3d9e006b 100644 --- a/views/header.tpl.html +++ b/views/header.tpl.html @@ -1,3 +1,3 @@
- {{ template "logo.tpl.html" . }} -
\ No newline at end of file + {{ template "logo.tpl.html" . }} + diff --git a/views/imprint.tpl.html b/views/imprint.tpl.html index 0c2a1ab1..54864a41 100644 --- a/views/imprint.tpl.html +++ b/views/imprint.tpl.html @@ -1,24 +1,19 @@ - + + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} + + {{ template "header.tpl.html" . }} - - -{{ template "header.tpl.html" . }} - -
-
+
+

Imprint & Data Privacy

-

- {{ htmlSafe .HtmlText }} -

-
-
- -{{ template "footer.tpl.html" . }} - -{{ template "foot.tpl.html" . }} - +

{{ htmlSafe .HtmlText }}

+
+
- \ No newline at end of file + {{ template "footer.tpl.html" . }} {{ template "foot.tpl.html" . }} + + diff --git a/views/index.tpl.html b/views/index.tpl.html index 8e119db4..0ab5389d 100644 --- a/views/index.tpl.html +++ b/views/index.tpl.html @@ -1,101 +1,238 @@ - + + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} + + {{ template "header.tpl.html" . }} {{ template "alerts.tpl.html" . }} {{ + template "login-btn.tpl.html" . }} - - -{{ template "header.tpl.html" . }} - -{{ template "alerts.tpl.html" . }} - -{{ template "login-btn.tpl.html" . }} - -
-
+
+
{{ if and .Newsbox .Newsbox.Text }}
- {{ .Newsbox.Text | htmlSafe }} + {{ .Newsbox.Text | htmlSafe }}
{{ end }} -

Keep Track of
Your Coding Time

-

Wakapi is an open-source tool that helps you keep track of the - time you have spent coding on different projects in different programming languages and more.
Ideal for - statistics freaks and anyone else.

+

+ Keep Track of
Your Coding + Time +

+

+ Wakapi is an open-source tool that helps you keep track of the time + you have spent coding on different projects in different programming + languages and more.
Ideal for statistics freaks and anyone else. +

- - - - - - - - - - - - + + + + + + + + + + + +
-

- This system has tracked a total of - {{ range $d := .TotalHours | printf "%d" | toRunes }} - {{ $d }} - {{ end }} - hours of coding from - {{ range $d := .TotalUsers | printf "%d" | toRunes }} - {{ $d }} - {{ end }} - users. +

+ This system has tracked a total of {{ range $d := .TotalHours | printf + "%d" | toRunes }} + {{ $d }} + {{ end }} + hours of coding from + {{ range $d := .TotalUsers | printf "%d" | toRunes }} + {{ $d }} + {{ end }} + users.

- App screenshot + App screenshot
-

Features

-
-
    -
  •   100 % free and open-source
    • -
  •   Built by developers for developers
    • -
  •   Fancy statistics and plots
    • -
  •   Public leaderboards
    • -
  •   Cool badges for readmes
    • -
  •   Weekly e-mail reports
    • -
  •   Intuitive REST API
    • -
  •   Compatible with Wakatime
    • -
  •   Prometheus metrics
    • -
  •   Lightning fast
    • -
  •   GDPR-compliant
    • -
  •   Self-hosted
    • -
-
+

Features

+
+
    +
  • + +   100 % free and open-source +
    • +
  • + +   Built by developers for developers +
    • +
  • + +   Fancy statistics and plots +
    • +
  • + +   Public leaderboards +
    • +
  • + +   Cool badges for readmes +
    • +
  • + +   Weekly e-mail reports +
    • +
  • + +   Intuitive REST API +
    • +
  • + +   Compatible with + Wakatime +
    • +
  • + +   + Prometheus + metrics +
    • +
  • + +   Lightning fast +
    • +
  • + +   GDPR-compliant +
    • +
  • + +   Self-hosted +
    • +
+
-
- License badge - Go version badge - Wakapi coding time badge +
+ License badge + Go version badge + Wakapi coding time badge
-
-
- -{{ template "footer.tpl.html" . }} - -{{ template "foot.tpl.html" . }} - +
+
- \ No newline at end of file + {{ template "footer.tpl.html" . }} {{ template "foot.tpl.html" . }} + + diff --git a/views/leaderboard.tpl.html b/views/leaderboard.tpl.html index cb6f37f1..bfc52a47 100644 --- a/views/leaderboard.tpl.html +++ b/views/leaderboard.tpl.html @@ -1,107 +1,156 @@ - + + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} + - + + {{ template "alerts.tpl.html" . }} {{ if .User }} {{ template + "menu-main.tpl.html" . }} {{ else }} {{ template "header.tpl.html" . }} {{ + template "login-btn.tpl.html" . }} {{ end }} - - -{{ template "alerts.tpl.html" . }} - -{{ if .User }} -{{ template "menu-main.tpl.html" . }} -{{ else }} -{{ template "header.tpl.html" . }} -{{ template "login-btn.tpl.html" . }} -{{ end }} - -
-
-
-

Leaderboard

- {{ if .IntervalLabel }} -  ({{ .IntervalLabel }}) - {{ end }} +
+
+
+

Leaderboard

+ {{ if .IntervalLabel }} +  ({{ .IntervalLabel }}) + {{ end }}
-

- Wakapi's leaderboard shows a ranking of the most active users on this server, given they opted in to get listed on the public leaderboard. Statistics are updated at least every 12 hours and are based on the users' total coding time in a pre-defined interval. - To participate, log in, go to Settings 🠒 Permissions and enable leaderboards. +

+ Wakapi's leaderboard shows a ranking of the most active users on this + server, given they opted in to get listed on the public leaderboard. + Statistics are updated at least every 12 hours and are based on the + users' total coding time in a pre-defined interval. To participate, + log in, go to + Settings → Permissions + and enable leaderboards.

-
    -
  • - Total -
    • -
  • - By Language -
    • + {{ if ne .By "" }} -
    - {{ range $i, $key := (strslice .TopKeys 0 10) }} -
    - - {{ if and (eq (lower $.By) "language") ($.LangIcon $key) }} -   - {{ end }} - {{ $key }} - -
    - {{ end }} +
    + {{ range $i, $key := (strslice .TopKeys 0 10) }} +
    + + {{ if and (eq (lower $.By) "language") ($.LangIcon $key) }} +   + {{ end }} + {{ $key }} + +
    + {{ end }}
    {{ end }} -
    - {{ if len .Items }} -
      - {{ range $i, $item := .Items }} -
    1. -
      # {{ $item.Rank }}
      -
      - {{ if avatarUrlTemplate }} - User Profile Avatar - {{ else }} - - {{ end }} -
      - @{{ $item.UserID }} - {{ if $item.User.HasActiveSubscription }} - - {{ end }} -
      -
      - -
      {{ $item.Total | duration }}
      -
      2. +
      + {{ if len .Items }} +
        + {{ range $i, $item := .Items }} +
      1. +
        # {{ $item.Rank }}
        +
        + {{ if avatarUrlTemplate }} + User Profile Avatar + {{ else }} + {{ end }} -
      -

      Last Updated: {{ .LastUpdate | datetime }}

      - {{ else }} -

      -   - The leaderboard is currently empty ... -

      +
      + @{{ $item.UserID }} + {{ if $item.User.HasActiveSubscription }} + + {{ end }} +
      +
      + +
      + {{ $item.Total | duration }} +
      + {{ end }} - +
    +

    Last Updated: {{ .LastUpdate | datetime }}

    + {{ else }} +

    +   The leaderboard is currently empty ... +

    + {{ end }}
    -
    -
- -{{ template "footer.tpl.html" . }} - -{{ template "foot.tpl.html" . }} - +
+
+ {{ template "footer.tpl.html" . }} {{ template "foot.tpl.html" . }} + diff --git a/views/login-btn.tpl.html b/views/login-btn.tpl.html index b013b5e3..62de6e96 100644 --- a/views/login-btn.tpl.html +++ b/views/login-btn.tpl.html @@ -2,11 +2,18 @@ {{ if .LeaderboardEnabled }}
-  Leaderboard + +  Leaderboard
{{ end }}
-  Login + +  Login
- \ No newline at end of file + diff --git a/views/login.tpl.html b/views/login.tpl.html index 0f0e229f..3fc18007 100644 --- a/views/login.tpl.html +++ b/views/login.tpl.html @@ -1,55 +1,69 @@ - + + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} + + {{ template "header.tpl.html" . }} {{ template "alerts.tpl.html" . }} - - -{{ template "header.tpl.html" . }} - -{{ template "alerts.tpl.html" . }} - -
-
+
+
-

Welcome!

- Log in to continue using Wakapi +

Welcome!

+ Log in to continue using Wakapi
-
- -
-
- -
-
- - Forgot password? - -
- {{ if .AllowSignup }} - - - - {{ else }} - - - - {{ end }} - -
+
+ +
+
+ +
+
+ + Forgot password? + +
+ {{ if .AllowSignup }} + + + + {{ else }} + + + + {{ end }} +
+
-
-
- -{{ template "footer.tpl.html" . }} - -{{ template "foot.tpl.html" . }} - +
+
+ {{ template "footer.tpl.html" . }} {{ template "foot.tpl.html" . }} + diff --git a/views/logo.tpl.html b/views/logo.tpl.html index 702768de..fe5e7f4c 100644 --- a/views/logo.tpl.html +++ b/views/logo.tpl.html @@ -1,3 +1,7 @@ - - Logo - \ No newline at end of file + + Logo + diff --git a/views/mail/head.tpl.html b/views/mail/head.tpl.html index b76f4533..61ad9cb1 100644 --- a/views/mail/head.tpl.html +++ b/views/mail/head.tpl.html @@ -1,88 +1,88 @@ - - -Wakapi - - \ No newline at end of file + + diff --git a/views/mail/import_finished.tpl.html b/views/mail/import_finished.tpl.html index a8ddda13..c78c253b 100644 --- a/views/mail/import_finished.tpl.html +++ b/views/mail/import_finished.tpl.html @@ -1,51 +1,224 @@ + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} - - - - - - + - - -
  - {{ template "theader.tpl.html" . }} + + + + + + +
+   + + {{ template "theader.tpl.html" . }} -
- +
+
+ +
+ - + -
- - - - -
-

Data import finished

-

You have requested to import data from WakaTime to Wakapi. The import has now finished after {{ .Duration }} ({{ .NumHeartbeats }} new heartbeats imported).

You should be able to see the newly imported coding statistics in Wakapi.

- - - - - - -
- - - - - - -
Go to dashboard
-
-
- 		+

+ Data import finished +

+

+ You have requested to import data from WakaTime to + Wakapi. The import has now finished after {{ .Duration + }} ({{ .NumHeartbeats }} new heartbeats imported).

You + should be able to see the newly imported coding + statistics in Wakapi. +

+ + + + + + +
+ + + + + + +
+ Go to dashboard +
+
+
+
+
- {{ template "tfooter.tpl.html" . }} - + {{ template "tfooter.tpl.html" . }} + + 		+    
- + + + diff --git a/views/mail/report.tpl.html b/views/mail/report.tpl.html index c91c8213..bae8fcb6 100644 --- a/views/mail/report.tpl.html +++ b/views/mail/report.tpl.html @@ -1,112 +1,510 @@ + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} - - - - - - + - - -
  - {{ template "theader.tpl.html" . }} + + + + + + +
+   + + {{ template "theader.tpl.html" . }} -
- +
+
+ +
+ - +

+ If you do not want to receive e-mail reports anymore, + please log in to Wakapi.dev and go to + Settings to disable them. +

+ -
- - - - -
-

Your Stats from {{ .Report.From | date }} to {{ .Report.To | date }}

-

You have coded a total of {{ .Report.Summary.TotalTime | duration }} between {{ .Report.From | date }} and {{ .Report.To | date }}.

+ 		+

+ Your Stats from {{ .Report.From | date }} to {{ + .Report.To | date }} +

+

+ You have coded a total of + {{ .Report.Summary.TotalTime | duration }} + between {{ .Report.From | date }} and {{ .Report.To | + date }}. +

-

Projects

- - - {{ range $i, $item := .Report.Summary.Projects }} - - - - - {{ end }} - -
{{ $item.Key }}:{{ $item.TotalFixed | duration }}
+

+ Projects +

+ + + {{ range $i, $item := .Report.Summary.Projects }} + + + + + {{ end }} + +
+ {{ $item.Key }}: + + {{ $item.TotalFixed | duration }} +
- {{ if len .Report.DailySummaries }} -

Weekdays

- - - {{ range $i, $summary := .Report.DailySummaries }} - - - - - {{ end }} - -
{{ $summary.FromTime.T | date }}:{{ $summary.TotalTime | duration }}
- {{ end }} + {{ if len .Report.DailySummaries }} +

+ Weekdays +

+ + + {{ range $i, $summary := .Report.DailySummaries }} + + + + + {{ end }} + +
+ {{ $summary.FromTime.T | date }}: + + {{ $summary.TotalTime | duration }} +
+ {{ end }} -

Languages

- - - {{ range $i, $item := .Report.Summary.Languages }} - - - - - {{ end }} - -
{{ $item.Key }}:{{ $item.TotalFixed | duration }}
+

+ Languages +

+ + + {{ range $i, $item := .Report.Summary.Languages }} + + + + + {{ end }} + +
+ {{ $item.Key }}: + + {{ $item.TotalFixed | duration }} +
-

Editors

- - - {{ range $i, $item := .Report.Summary.Editors }} - - - - - {{ end }} - -
{{ $item.Key }}:{{ $item.TotalFixed | duration }}
+

+ Editors +

+ + + {{ range $i, $item := .Report.Summary.Editors }} + + + + + {{ end }} + +
+ {{ $item.Key }}: + + {{ $item.TotalFixed | duration }} +
-

Operating Systems

- - - {{ range $i, $item := .Report.Summary.OperatingSystems }} - - - - - {{ end }} - -
{{ $item.Key }}:{{ $item.TotalFixed | duration }}
+

+ Operating Systems +

+ + + {{ range $i, $item := + .Report.Summary.OperatingSystems }} + + + + + {{ end }} + +
+ {{ $item.Key }}: + + {{ $item.TotalFixed | duration }} +
-

Machines

- - - {{ range $i, $item := .Report.Summary.Machines }} - - - - - {{ end }} - -
{{ $item.Key }}:{{ $item.TotalFixed | duration }}
+

+ Machines +

+ + + {{ range $i, $item := .Report.Summary.Machines }} + + + + + {{ end }} + +
+ {{ $item.Key }}: + + {{ $item.TotalFixed | duration }} +
-

If you do not want to receive e-mail reports anymore, please log in to Wakapi.dev and go to Settings to disable them.

-
-
+
+
- {{ template "tfooter.tpl.html" . }} - + {{ template "tfooter.tpl.html" . }} + + 		+    
- + + + diff --git a/views/mail/reset_password.tpl.html b/views/mail/reset_password.tpl.html index 953bb59e..79ba6650 100644 --- a/views/mail/reset_password.tpl.html +++ b/views/mail/reset_password.tpl.html @@ -1,52 +1,233 @@ + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} - - - - - - + - - -
  - {{ template "theader.tpl.html" . }} + + + + + + +
+   + + {{ template "theader.tpl.html" . }} -
- +
+
+ +
+ - + -
- - - - -
-

Password Reset

-

You have requested to reset your Wakapi password. Please click the following link to proceed.

- - - - - - -
- - - - - - -
Reset Password
-
-

If you did not request a password change, please just ignore this mail.

-
- 		+

+ Password Reset +

+

+ You have requested to reset your Wakapi password. + Please click the following link to proceed. +

+ + + + + + +
+ + + + + + +
+ Reset Password +
+
+

+ If you did not request a password change, please just + ignore this mail. +

+
+
+
- {{ template "tfooter.tpl.html" . }} - + {{ template "tfooter.tpl.html" . }} + + 		+    
- + + + diff --git a/views/mail/subscription_expiring.tpl.html b/views/mail/subscription_expiring.tpl.html index 4424f06a..2466448f 100644 --- a/views/mail/subscription_expiring.tpl.html +++ b/views/mail/subscription_expiring.tpl.html @@ -1,62 +1,244 @@ + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} - - - - - - + - - -
  - {{ template "theader.tpl.html" . }} + + + + + + +
+   + + {{ template "theader.tpl.html" . }} -
- +
+
+ +
+ - + -
- - - - -
- {{ if .HasExpired }} -

Subscription expired

- {{ else }} -

Subscription about to expire

- {{ end }} -

- {{ if .HasExpired }} - Your Wakapi subscription has expired. - {{ else }} - Your Wakapi subscription will expire soon. - {{ end }} - All coding activity older than {{ .DataRetentionMonths }} months will be deleted soon. Please refer to this article for further details on subscriptions. -

- - - - - - -
- - - - - - -
Go to settings
-
-
- 		+ {{ if .HasExpired }} +

+ Subscription expired +

+ {{ else }} +

+ Subscription about to expire +

+ {{ end }} +

+ {{ if .HasExpired }} Your Wakapi subscription has + expired. {{ else }} Your Wakapi subscription will + expire soon. {{ end }} All coding activity older than + {{ .DataRetentionMonths }} months will be deleted + soon. Please refer to + this article + for further details on subscriptions. +

+ + + + + + +
+ + + + + + +
+ Go to settings +
+
+
+
+
- {{ template "tfooter.tpl.html" . }} - + {{ template "tfooter.tpl.html" . }} + + 		+    
- + + + diff --git a/views/mail/tfooter.tpl.html b/views/mail/tfooter.tpl.html index d2801e9c..3f2d6870 100644 --- a/views/mail/tfooter.tpl.html +++ b/views/mail/tfooter.tpl.html @@ -1,9 +1,43 @@ -
- - - - -
- Powered by Wakapi.dev. -
-
\ No newline at end of file +
+ + + + +
+ Powered by + Wakapi.dev. +
+
diff --git a/views/mail/theader.tpl.html b/views/mail/theader.tpl.html index 2f6745cd..e1936400 100644 --- a/views/mail/theader.tpl.html +++ b/views/mail/theader.tpl.html @@ -1,9 +1,38 @@ -
- - - - -
- Wakapi Logo -
-
\ No newline at end of file +
+ + + + +
+ Wakapi Logo +
+
diff --git a/views/mail/wakatime_connection_failure.tpl.html b/views/mail/wakatime_connection_failure.tpl.html index e80be3dd..c3d55885 100644 --- a/views/mail/wakatime_connection_failure.tpl.html +++ b/views/mail/wakatime_connection_failure.tpl.html @@ -1,51 +1,226 @@ + {{ template "head.tpl.html" . }} -{{ template "head.tpl.html" . }} - - - - - - + - - -
  - {{ template "theader.tpl.html" . }} + + + + + + +
+   + + {{ template "theader.tpl.html" . }} -
- +
+
+ +
+ - + -
- - - - -
-

WakaTime Connection Failure

-

You have configured Wakapi to relay your heartbeats to WakaTime's API. However, requests for the last {{ .NumFailures }} heartbeats have failed. This is most likely an authentication issue. WakaTime connection is paused for now. To resume it, please re-enter your WakaTime API token under Settings.

- - - - - - -
- - - - - - -
Go to Settings
-
-
- 		+

+ WakaTime Connection Failure +

+

+ You have configured Wakapi to relay your heartbeats to + WakaTime's API. However, requests for the last {{ + .NumFailures }} heartbeats have failed. This is most + likely an authentication issue. WakaTime connection is + paused for now. To resume it, please re-enter your + WakaTime API token under + Settings. +

+ + + + + + +
+ + + + + + +
+ Go to Settings +
+
+
+
+
- {{ template "tfooter.tpl.html" . }} - + {{ template "tfooter.tpl.html" . }} + + 		+    
- + + + diff --git a/views/menu-main.tpl.html b/views/menu-main.tpl.html index fed56bbc..da520bcd 100644 --- a/views/menu-main.tpl.html +++ b/views/menu-main.tpl.html @@ -1,132 +1,257 @@ - +