Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add long URLs to Most Visited table on homepage #127

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+14 −0
Open

Add long URLs to Most Visited table on homepage #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c704ff
add Link column to home.html
shaftoes May 9, 2024
877c565
turn url into full link
shaftoes May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions golink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ var (

type visitData struct {
Short string
Long string
NumClicks int
}

Expand Down Expand Up @@ -404,10 +405,21 @@ func serveHandler() http.Handler {
func serveHome(w http.ResponseWriter, r *http.Request, short string) {
var clicks []visitData

linkMap := map[string]string{}
links, err := db.LoadAll()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

db.LoadAll() here sort of defeats the use of the in memory stats struct to keep the initial page home page load performant if the db has many links in it.

Instead of loading everything and mapping it against the in memory variable, could the stats struct instead be updated to include the long URL also for display?

It would keep the main page snappy and avoids hitting the db/disk if there's many links to load.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry about the delay. my review was mainly going to focus on this. Loading every link on every page load isn't great. The issue with storing the long URL in the stats struct is just needing to make sure to keep it up to date with changes to the link value.

As for rendering, we should use the same style as the http://go/.all page (long URL underneath the short URL) rather than another column to the right.

if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
for _, link := range links {
linkMap[link.Short] = link.Long
}

stats.mu.Lock()
for short, numClicks := range stats.clicks {
clicks = append(clicks, visitData{
Short: short,
Long: linkMap[short],
NumClicks: numClicks,
})
}
Expand Down
2 changes: 2 additions & 0 deletions tmpl/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ <h2 class="text-xl font-bold pt-6 pb-2">Popular Links</h2>
<tr>
<th class="p-2">Link</th>
<th class="p-2">Clicks</th>
<th class="p-2">URL</th>
</tr>
</thead>
<tbody>
Expand All @@ -35,6 +36,7 @@ <h2 class="text-xl font-bold pt-6 pb-2">Popular Links</h2>
</a>
</td>
<td class="p-2">{{.NumClicks}}</td>
<td class="p-2"><a href="{{.Long}}">{{.Long}}</a></td>
</tr>
{{end}}
</tbody>
Expand Down