diff options
| author | silverwind <me@silverwind.io> | 2020-11-18 23:00:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-18 16:00:16 -0600 |
| commit | 12c2efb45c112baf6013c304c35cbd404f7be21a (patch) | |
| tree | 2deb1fd0a4c09b048c9e4f262057bfe4cfa774b1 /templates | |
| parent | d02c3508e629d854d0094f4562c4cdebfada5962 (diff) | |
| download | gitea-12c2efb45c112baf6013c304c35cbd404f7be21a.tar.gz gitea-12c2efb45c112baf6013c304c35cbd404f7be21a.zip | |
Remove fetch request from heatmap (#13623)
* Remove fetch request from heatmap
Render heatmap data directly to HTML, eliminating one HTTP request on
frontpage and user profile. Also added min-height to the container so
the page content will no longer move after loading.
* rename and error display
* also log the js error
* add error handler
* remove useless inline style and hide divider on small screens
* Update routers/user/home.go
* Update routers/user/profile.go
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/dashboard.tmpl | 5 | ||||
| -rw-r--r-- | templates/user/heatmap.tmpl (renamed from templates/user/dashboard/heatmap.tmpl) | 9 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 5 |
4 files changed, 7 insertions, 14 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 4738b91463..c8e669387b 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -36,8 +36,6 @@ SimpleMDE: {{if .RequireSimpleMDE}}true{{else}}false{{end}}, Tribute: {{if .RequireTribute}}true{{else}}false{{end}}, U2F: {{if .RequireU2F}}true{{else}}false{{end}}, - Heatmap: {{if .EnableHeatmap}}true{{else}}false{{end}}, - heatmapUser: {{if .HeatmapUser}}'{{.HeatmapUser}}'{{else}}null{{end}}, NotificationSettings: { MinTimeout: {{NotificationSettings.MinTimeout}}, TimeoutStep: {{NotificationSettings.TimeoutStep}}, diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl index 7a4968ebe6..dc04d65651 100644 --- a/templates/user/dashboard/dashboard.tmpl +++ b/templates/user/dashboard/dashboard.tmpl @@ -5,10 +5,7 @@ {{template "base/alert" .}} <div class="ui mobile reversed stackable grid"> <div class="ui container ten wide column"> - {{if .EnableHeatmap}} - {{template "user/dashboard/heatmap" .}} - <div class="ui divider"></div> - {{end}} + {{template "user/heatmap" .}} {{template "user/dashboard/feeds" .}} </div> {{template "user/dashboard/repolist" .}} diff --git a/templates/user/dashboard/heatmap.tmpl b/templates/user/heatmap.tmpl index 626c70dd8d..a569405d16 100644 --- a/templates/user/dashboard/heatmap.tmpl +++ b/templates/user/heatmap.tmpl @@ -1,7 +1,8 @@ -<div id="user-heatmap" style="padding-right: 40px"> - <activity-heatmap :locale="locale" :suburl="suburl" :user="heatmapUser"> +{{if .HeatmapData}} + <div id="user-heatmap" data-heatmap-data="{{Json .HeatmapData}}"> <div slot="loading"> <div class="ui active centered inline indeterminate text loader" id="loading-heatmap">{{.i18n.Tr "user.heatmap.loading"}}</div> </div> - </activity-heatmap> -</div> + </div> + <div class="ui divider"></div> +{{end}} diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl index 3a3192a828..d6b99b3861 100644 --- a/templates/user/profile.tmpl +++ b/templates/user/profile.tmpl @@ -108,10 +108,7 @@ <p>{{.i18n.Tr "user.disabled_public_activity"}}</p> </div> {{end}} - {{if .EnableHeatmap}} - {{template "user/dashboard/heatmap" .}} - <div class="ui divider"></div> - {{end}} + {{template "user/heatmap" .}} <div class="feeds"> {{template "user/dashboard/feeds" .}} </div> |