Skip to content

Commit

Permalink
HeatMap scroll upd
Browse files Browse the repository at this point in the history
  • Loading branch information
aceberg committed Feb 28, 2024
1 parent 0426e25 commit 3a66218
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 30 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
# Change Log
All notable changes to this project will be documented in this file.

## [0.1.6] - 2024-02-
## [0.1.6] - 2024-02-28
### Changed
- Navbar update
- HeatMap scroll starts at right side

### Fixed
- Bug deleting form element on pressing `Enter`
Expand Down
1 change: 1 addition & 0 deletions internal/web/public/css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

@media (max-width: 1399px) {
.horiz-scroll {
direction: rtl;
overflow-x: scroll;
}
}
10 changes: 4 additions & 6 deletions internal/web/templates/config.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{{ define "config.html" }}

<body>
<div class="container-lg">
<br>
<div class="container-lg mt-4">
<div class="row">
<div class="col-md">
<div class="col-md mb-4">
<div class="card border-primary">
<div class="card-header">Config</div>
<div class="card-body table-responsive">
Expand Down Expand Up @@ -55,14 +54,13 @@
</div>
</div>
<div class="col-md">
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">Version</div>
<div class="card-body">
<a href="https://github.com/aceberg/ExerciseDiary/releases/tag/{{ .Version }}" target="_blank">{{ .Version }}</a>
</div>
</div>
<br>
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">About</div>
<div class="card-body">
<p>● After changing <b>Host</b> or <b>Port</b> the app must be restarted</p>
Expand Down
5 changes: 2 additions & 3 deletions internal/web/templates/exercise.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
{{ define "exercise.html" }}

<body>
<div class="container-lg">
<br>
<div class="container-lg mt-4">
<div class="row">
<div class="col-md">
<div class="col-md mb-4">
<div class="card border-primary">
<div class="card-header">Exercise</div>
<div class="card-body table-responsive">
Expand Down
14 changes: 6 additions & 8 deletions internal/web/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<script src="/fs/public/js/weight-chart.js"></script>
<link rel="stylesheet" type="text/css" href="/fs/public/css/index.css" />
<body>
<br>
<!-- Add Weight Modal -->
<div class="modal" id="mWeight">
<div class="modal-dialog" role="document">
Expand Down Expand Up @@ -39,20 +38,20 @@ <h5 class="modal-title">Add weight</h5>
</div>
</div>
<!-- End Modal -->
<div class="container-lg">
<div class="container-lg mt-4">
<div class="row">
<div class="col-md-8">
<div class="col-md-8 mb-4">
<div class="card border-primary">
<div class="card-body">
<div class="horiz-scroll">
<div style="max-height: 100px; width: 1150px;">
<div style="height: 100px; width: 770px;">
<canvas id="matrix-chart" style="height: 100%; width: 100%;"></canvas>
</div>
</div>
</div>
</div>
</div>
<div class="col-md-4">
<div class="col-md-4 mb-4">
<div class="card border-primary">
<div class="card-body" style="overflow-x: scroll;">
<div class="d-flex justify-content-evenly">
Expand All @@ -71,9 +70,8 @@ <h4><i class="bi bi-window-plus"></i></h4>
</div>
</div>
</div>
<br>
<div class="row">
<div class="col-md">
<div class="col-md mb-4">
<div class="accordion">
{{ range $gr, $grID := .GroupMap }}
<div class="accordion-item border-primary">
Expand Down Expand Up @@ -131,7 +129,7 @@ <h5 class="modal-title">{{ .Name }}</h5>
{{ end }}
</div>
</div>
<div class="col-md">
<div class="col-md mb-4">
<div class="card border-primary">
<div class="card-header">
<div class="row">
Expand Down
10 changes: 4 additions & 6 deletions internal/web/templates/stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@
<script src="/fs/public/js/weight-chart.js"></script>
<link rel="stylesheet" type="text/css" href="/fs/public/css/index.css" />
<body>
<div class="container-lg">
<br>
<div class="container-lg mt-4">
<div class="row">
<div class="col-md-4">
<div class="col-md-4 mb-4">
<div class="card border-primary">
<div class="card-header">Exercise</div>
<div class="card-body">
Expand Down Expand Up @@ -39,14 +38,13 @@
</div>
</div>
<div class="col-md-8">
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">Reps</div>
<div class="card-body">
<canvas id="stats-reps" style="max-height: 200px;"></canvas>
</div>
</div>
<br>
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">Weight</div>
<div class="card-body">
<canvas id="stats-weight" style="max-height: 200px;"></canvas>
Expand Down
10 changes: 4 additions & 6 deletions internal/web/templates/weight.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
<script src="/fs/public/js/weight-chart.js"></script>
<link rel="stylesheet" type="text/css" href="/fs/public/css/index.css" />
<body>
<div class="container-lg">
<br>
<div class="container-lg mt-4">
<div class="row">
<div class="col-md-4">
<div class="col-md-4 mb-4">
<div class="card border-primary">
<div class="card-header">Weight</div>
<div class="card-body table-responsive">
Expand All @@ -28,16 +27,15 @@
</div>
</div>
<div class="col-md-8">
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">Chart</div>
<div class="card-body">
<div class="chart-container m-auto">
<canvas id="weight-chart" style="max-height: 200px;"></canvas>
</div>
</div>
</div>
<br>
<div class="card border-primary">
<div class="card border-primary mb-4">
<div class="card-header">Add</div>
<div class="card-body">
<form action="/weight/" method="post" name="sets" class="input-group">
Expand Down

0 comments on commit 3a66218

Please sign in to comment.