diff --git a/server/home/home.go b/server/home/home.go
index edda422..a0d4390 100644
--- a/server/home/home.go
+++ b/server/home/home.go
@@ -45,21 +45,66 @@ func Home(c *gin.Context) {
currentlyLoggedIn := session.Get(middlewares.Userkey)
var urls []models.Url
db := database.Db()
- result := db.Where(&models.Url{CreatedBy: currentlyLoggedIn.(string), IsActive: true, IsDeleted: false, IsArchived: false}).Order("updated_at desc").Limit(100).Find(&urls)
- log.WithField("result", result.RowsAffected).Info("" + currentlyLoggedIn.(string))
- c.HTML(http.StatusOK, "home.tmpl", gin.H{"HasError": false, "Urls": urls})
+ result := db.Where("created_by =? and is_active = ? and is_deleted = ?", currentlyLoggedIn.(string), true, false).
+ Order("updated_at desc").
+ Limit(100).
+ Find(&urls)
+ if result.RowsAffected > 0 {
+ log.WithField("resultCount", result.RowsAffected).Info("Fetching the result")
+ }
+
+ c.HTML(http.StatusOK, "home.tmpl", gin.H{"HasError": false, "Urls": urls, "Count": result.RowsAffected})
}
func Favourite(c *gin.Context) {
- c.HTML(http.StatusOK, "favourite.tmpl", nil)
+ log := logger.NewLogger()
+ session := sessions.Default(c)
+ currentlyLoggedIn := session.Get(middlewares.Userkey)
+ var urls []models.Url
+ db := database.Db()
+ result := db.Where("created_by =? and is_active = ? and is_deleted = ? and is_fav =? ", currentlyLoggedIn.(string), true, false, true).
+ Order("updated_at desc").
+ Limit(100).
+ Find(&urls)
+ if result.RowsAffected > 0 {
+ log.WithField("resultCount", result.RowsAffected).Info("Fetching the result")
+ }
+
+ c.HTML(http.StatusOK, "favourite.tmpl", gin.H{"HasError": false, "Urls": urls, "Count": result.RowsAffected})
}
func Archived(c *gin.Context) {
- c.HTML(http.StatusOK, "archived.tmpl", nil)
+ log := logger.NewLogger()
+ session := sessions.Default(c)
+ currentlyLoggedIn := session.Get(middlewares.Userkey)
+ var urls []models.Url
+ db := database.Db()
+ result := db.Where("created_by =? and is_active = ? and is_deleted = ? and is_archived =? ", currentlyLoggedIn.(string), true, false, true).
+ Order("updated_at desc").
+ Limit(100).
+ Find(&urls)
+ if result.RowsAffected > 0 {
+ log.WithField("resultCount", result.RowsAffected).Info("Fetching the result")
+ }
+
+ c.HTML(http.StatusOK, "archived.tmpl", gin.H{"HasError": false, "Urls": urls, "Count": result.RowsAffected})
}
func Trash(c *gin.Context) {
- c.HTML(http.StatusOK, "trash.tmpl", nil)
+ log := logger.NewLogger()
+ session := sessions.Default(c)
+ currentlyLoggedIn := session.Get(middlewares.Userkey)
+ var urls []models.Url
+ db := database.Db()
+ result := db.Where("created_by =? and is_active = ? and is_deleted = ?", currentlyLoggedIn.(string), true, true).
+ Order("updated_at desc").
+ Limit(100).
+ Find(&urls)
+ if result.RowsAffected > 0 {
+ log.WithField("resultCount", result.RowsAffected).Info("Fetching the result")
+ }
+
+ c.HTML(http.StatusOK, "trash.tmpl", gin.H{"HasError": false, "Urls": urls, "Count": result.RowsAffected})
}
func Favicon(c *gin.Context) {
diff --git a/templates/home/archived.tmpl b/templates/home/archived.tmpl
index 7fcb50e..0531d8c 100644
--- a/templates/home/archived.tmpl
+++ b/templates/home/archived.tmpl
@@ -5,8 +5,13 @@
{{template "layout/nav_bar_opener" .}}
{{template "widget/search" .}}
+ {{template "widget/add_link" .}}
- {{template "widget/no_data" .}}
+ {{if (gt .Count 0)}}
+ {{template "home/url_container" .}}
+ {{else}}
+ {{template "widget/no_data" .}}
+ {{end}}
{{template "footer" .}}
diff --git a/templates/home/favourite.tmpl b/templates/home/favourite.tmpl
index 0770e26..0531d8c 100644
--- a/templates/home/favourite.tmpl
+++ b/templates/home/favourite.tmpl
@@ -5,9 +5,13 @@
{{template "layout/nav_bar_opener" .}}
{{template "widget/search" .}}
+ {{template "widget/add_link" .}}
- {{template "home/url_container" .}}
- {{template "widget/pagination" .}}
+ {{if (gt .Count 0)}}
+ {{template "home/url_container" .}}
+ {{else}}
+ {{template "widget/no_data" .}}
+ {{end}}
{{template "footer" .}}
diff --git a/templates/home/home.tmpl b/templates/home/home.tmpl
index 74f1a5b..0531d8c 100644
--- a/templates/home/home.tmpl
+++ b/templates/home/home.tmpl
@@ -7,7 +7,11 @@
{{template "widget/search" .}}
{{template "widget/add_link" .}}
- {{template "home/url_container" .}}
+ {{if (gt .Count 0)}}
+ {{template "home/url_container" .}}
+ {{else}}
+ {{template "widget/no_data" .}}
+ {{end}}
{{template "footer" .}}
diff --git a/templates/home/trash.tmpl b/templates/home/trash.tmpl
index 1b61fe5..0531d8c 100644
--- a/templates/home/trash.tmpl
+++ b/templates/home/trash.tmpl
@@ -5,8 +5,13 @@
{{template "layout/nav_bar_opener" .}}
{{template "widget/search" .}}
+ {{template "widget/add_link" .}}
- {{template "widget/no_data" .}}
+ {{if (gt .Count 0)}}
+ {{template "home/url_container" .}}
+ {{else}}
+ {{template "widget/no_data" .}}
+ {{end}}
{{template "footer" .}}
diff --git a/templates/home/url_actions.tmpl b/templates/home/url_actions.tmpl
index b8b12c2..8ae138b 100644
--- a/templates/home/url_actions.tmpl
+++ b/templates/home/url_actions.tmpl
@@ -12,7 +12,7 @@
-
-