Skip to content

Commit

Permalink
Fix the layout of workout detail/edit
Browse files Browse the repository at this point in the history 
Signed-off-by: Jo Vandeginste <[email protected]>
  • Loading branch information
@jovandeginste
jovandeginste committed Feb 21, 2024
1 parent 7b8d12e commit bcd0245
Show file tree
Hide file tree
Showing 4 changed files with 94 additions and 109 deletions.
66 changes: 34 additions & 32 deletions pkg/templatehelpers/icons.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package templatehelpers

import "html/template"

const iconDefaults = "icon-baseline icon-space-sm icon-before"

func IconFor(what string) template.HTML {
iconFunctions := []func(string) string{
categoryIcon,
Expand All @@ -17,33 +19,33 @@ func IconFor(what string) template.HTML {
}
}

return template.HTML("icon-solid icon-baseline sm:icon-space-sm icon-before icon-question")
return template.HTML(iconDefaults + " icon-solid icon-question")
}

func categoryIcon(what string) string {
switch what {
case "distance":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-road"
return iconDefaults + " icon-solid icon-road"
case "speed":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-gauge"
return iconDefaults + " icon-solid icon-gauge"
case "max-speed":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-gauge-high"
return iconDefaults + " icon-solid icon-gauge-high"
case "tempo":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-stopwatch"
return iconDefaults + " icon-solid icon-stopwatch"
case "duration":
return "icon-regular icon-baseline sm:icon-space-sm icon-before icon-clock"
return iconDefaults + " icon-regular icon-clock"
case "elevation":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-mountain"
return iconDefaults + " icon-solid icon-mountain"
case "location":
return "icon-regular icon-baseline sm:icon-space-sm icon-before icon-map-location-dot"
return iconDefaults + " icon-regular icon-map-location-dot"
case "date":
return "icon-regular icon-baseline sm:icon-space-sm icon-before icon-calendar"
return iconDefaults + " icon-regular icon-calendar"
case "pause":
return "icon-regular icon-baseline sm:icon-space-sm icon-before icon-hourglass"
return iconDefaults + " icon-regular icon-hourglass"
case "up":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-chevron-up"
return iconDefaults + " icon-solid icon-chevron-up"
case "down":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-chevron-down"
return iconDefaults + " icon-solid icon-chevron-down"
default:
return ""
}
Expand All @@ -52,9 +54,9 @@ func categoryIcon(what string) string {
func miscIcon(what string) string {
switch what {
case "best":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-arrow-up-long"
return iconDefaults + " icon-solid icon-arrow-up-long"
case "worst":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-arrow-down-long"
return iconDefaults + " icon-solid icon-arrow-down-long"
default:
return ""
}
Expand All @@ -63,7 +65,7 @@ func miscIcon(what string) string {
func sportIcon(what string) string {
switch what {
case "running":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-person-running"
return iconDefaults + " icon-solid icon-person-running"
default:
return ""
}
Expand All @@ -72,19 +74,19 @@ func sportIcon(what string) string {
func pageIcon(what string) string {
switch what {
case "dashboard":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-chart-line"
return iconDefaults + " icon-solid icon-chart-line"
case "statistics":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-chart-simple"
return iconDefaults + " icon-solid icon-chart-simple"
case "admin":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-gear"
return iconDefaults + " icon-solid icon-gear"
case "user-profile":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-user-circle"
return iconDefaults + " icon-solid icon-user-circle"
case "user-add":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-user-plus"
return iconDefaults + " icon-solid icon-user-plus"
case "workout":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-dumbbell"
return iconDefaults + " icon-solid icon-dumbbell"
case "workout-add":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-circle-plus"
return iconDefaults + " icon-solid icon-circle-plus"
default:
return ""
}
Expand All @@ -93,25 +95,25 @@ func pageIcon(what string) string {
func utilityIcon(what string) string {
switch what {
case "close":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-xmark"
return iconDefaults + " icon-solid icon-xmark"
case "edit":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-pen-to-square"
return iconDefaults + " icon-solid icon-pen-to-square"
case "auto-update", "refresh":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-arrows-rotate"
return iconDefaults + " icon-solid icon-arrows-rotate"
case "delete":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-trash"
return iconDefaults + " icon-solid icon-trash"
case "note":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-quote-left"
return iconDefaults + " icon-solid icon-quote-left"
case "users":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-users"
return iconDefaults + " icon-solid icon-users"
case "user-signin":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-right-to-bracket"
return iconDefaults + " icon-solid icon-right-to-bracket"
case "user-signout":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-right-from-bracket"
return iconDefaults + " icon-solid icon-right-from-bracket"
case "user-register":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-user-plus"
return iconDefaults + " icon-solid icon-user-plus"
case "user":
return "icon-solid icon-baseline sm:icon-space-sm icon-before icon-user"
return iconDefaults + " icon-solid icon-user"
default:
return ""
}
Expand Down
5 changes: 1 addition & 4 deletions views/workouts/workouts_add.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ <h2 class="{{ IconFor `workout-add` }}">Add a workout</h2>
id="file"
name="file"
accept=".gpx"
size="40"
multiple
/>
</td>
Expand All @@ -36,7 +35,6 @@ <h2 class="{{ IconFor `workout-add` }}">Add a workout</h2>
type="type"
id="type"
name="type"
size="40"
value="running"
readonly
/>
Expand All @@ -52,13 +50,12 @@ <h2 class="{{ IconFor `workout-add` }}">Add a workout</h2>
id="notes"
name="notes"
rows="10"
cols="40"
></textarea>
</td>
</tr>
<tr>
<td></td>
<td><button type="submit" size="40">Add workouts</button></td>
<td><button type="submit">Add workouts</button></td>
</tr>
</tbody>
</table>
Expand Down
114 changes: 52 additions & 62 deletions views/workouts/workouts_edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,71 +10,61 @@
<div class="gap-4">
<h2 class="{{ IconFor .Type }}">{{ .Name | html }}</h2>
</div>
<div class="grid grid-cols-2 gap-4">
<div class="inner-form">
<form method="post" action="{{ RouteFor `workout-update` .ID }}">
<table>
<tbody>
<tr>
<td>
<label for="name">Name</label>
</td>
<div class="sm:flex sm:flex-wrap">
<div class="basis-1/2">
<div class="inner-form">
<form method="post" action="{{ RouteFor `workout-update` .ID }}">
<table>
<tbody>
<tr>
<td>
<label for="name">Name</label>
</td>

<td>
<input
id="name"
name="name"
size="40"
value="{{ .Name }}"
/>
</td>
</tr>
<tr>
<td>
<label for="type">Type</label>
</td>
<td>
<input
id="type"
name="type"
size="40"
value="{{ .Type }}"
readonly
/>
</td>
</tr>
<tr>
<td>
<label for="notes">Notes</label>
</td>
<td>
<textarea
type="text"
id="notes"
name="notes"
rows="10"
cols="40"
>
<td>
<input id="name" name="name" value="{{ .Name }}" />
</td>
</tr>
<tr>
<td>
<label for="type">Type</label>
</td>
<td>
<input
id="type"
name="type"
value="{{ .Type }}"
readonly
/>
</td>
</tr>
<tr>
<td>
<label for="notes">Notes</label>
</td>
<td>
<textarea type="text" id="notes" name="notes" rows="10">
{{ .Notes }}</textarea
>
</td>
</tr>
<tr>
<td></td>
<td>
<button type="submit" size="40">Update workout</button>
</td>
</tr>
</tbody>
</table>
</form>
>
</td>
</tr>
<tr>
<td></td>
<td>
<button type="submit">Update workout</button>
</td>
</tr>
</tbody>
</table>
</form>
</div>
</div>
<div class="basis-1/4">
<div class="inner-form">{{ template "workout_details" . }}</div>
</div>
<div class="grid grid-cols-1">
<div class="grid grid-cols-2 gap-4">
<div class="inner-form">{{ template "workout_details" . }}</div>
<div class="inner-form">
{{ template "workout_breakdown" $.workoutStatistics }}
</div>
<div class="basis-1/4">
<div class="inner-form">
{{ template "workout_breakdown" $.workoutStatistics }}
</div>
</div>
</div>
Expand Down
18 changes: 7 additions & 11 deletions views/workouts/workouts_show.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<h2 class="{{ IconFor .Type }}">{{ .Name | html }}</h2>
</div>
<div class="flex flex-wrap">
<div class="sm:flex sm:flex-wrap">
<div class="basis-1/2">
<div class="inner-form">
<div
Expand All @@ -38,16 +38,12 @@ <h2 class="{{ IconFor .Type }}">{{ .Name | html }}</h2>
</div>
</div>
</div>
<div class="basis-1/2">
<div class="flex flex-wrap">
<div class="basis-1/2">
<div class="inner-form">{{ template "workout_details" . }}</div>
</div>
<div class="basis-1/2">
<div class="inner-form">
{{ template "workout_breakdown" $.workoutStatistics }}
</div>
</div>
<div class="basis-1/4">
<div class="inner-form">{{ template "workout_details" . }}</div>
</div>
<div class="basis-1/4">
<div class="inner-form">
{{ template "workout_breakdown" $.workoutStatistics }}
</div>
</div>
</div>
Expand Down

0 comments on commit bcd0245

Please sign in to comment.