diff --git a/config.toml b/config.toml index 658ff32..260848a 100644 --- a/config.toml +++ b/config.toml @@ -108,11 +108,14 @@ weight = 700 url = "/resume/" [[languages.en.menu.main]] -name = "Feeds" +name = "Exercise" weight = 800 -url = "/feeds/" - +url = "/exercise/" +[[languages.en.menu.main]] +name = "Feeds" +weight = 900 +url = "/feeds/" [languages.jp] weight = 10 languageName = "日本語" diff --git a/content/exercise.md b/content/exercise.md new file mode 100644 index 0000000..f44d4a7 --- /dev/null +++ b/content/exercise.md @@ -0,0 +1,4 @@ +--- +title: "Exercise" +type: exercise +--- diff --git a/data/workouts/230221.yaml b/data/workouts/230221.yaml new file mode 100644 index 0000000..7819df0 --- /dev/null +++ b/data/workouts/230221.yaml @@ -0,0 +1,11 @@ +--- +type: "cycling" +date: 2021-02-23T12:40:19.837Z +comment: "Day 2 - very wet and very windy. I wanted to do a 2nd circuit but thought better of it." +distance: "3.56 km" +duration: "00:15:53" +pace: "4:27 min/km" +calories: "195 kcal" +image: '/images/workouts/fitotrack-workout_1614086080.jpg' +thumb: '/images/workouts/fitotrack-workout_1614086080_thumb.jpg' +--- \ No newline at end of file diff --git a/data/workouts/250221.yaml b/data/workouts/250221.yaml new file mode 100644 index 0000000..0ddcd9d --- /dev/null +++ b/data/workouts/250221.yaml @@ -0,0 +1,11 @@ +--- +type: "cycling" +date: 2021-02-25T12:32:56.442Z +comment: "Day three, tougher on my legs than expected. Very windy." +distance: "3.47 km" +duration: "00:14:47" +pace: "4:15 min/km" +calories: "201 kcal" +image: "/images/workouts/fitotrack-workout_1614259085.jpg" +thumb: "/images/workouts/fitotrack-workout_1614259085_thumb.jpg" +--- \ No newline at end of file diff --git a/layouts/exercise/single.html b/layouts/exercise/single.html new file mode 100644 index 0000000..e6dc3d5 --- /dev/null +++ b/layouts/exercise/single.html @@ -0,0 +1,16 @@ +{{ define "main" }} +
+{{ range sort .Site.Data.workouts "date" "desc"}} +
+Type
{{ .type | humanize }}
+Date
{{ dateFormat "2 Jan 2006" .date }}
+Comment
{{ .comment | humanize }}
+Image
route map of outdoor exercise from fitotrack app
+Distance
{{ .distance }}
+Duration
{{ .duration }}
+Pace
{{ .pace }}
+Calories burned
{{ .calories }}
+
+{{ end }} +
+{{ end }} diff --git a/static/images/workouts/fitotrack-workout_1614086080.jpg b/static/images/workouts/fitotrack-workout_1614086080.jpg new file mode 100644 index 0000000..7a6f423 Binary files /dev/null and b/static/images/workouts/fitotrack-workout_1614086080.jpg differ diff --git a/static/images/workouts/fitotrack-workout_1614086080_thumb.jpg b/static/images/workouts/fitotrack-workout_1614086080_thumb.jpg new file mode 100644 index 0000000..d9ba0fd Binary files /dev/null and b/static/images/workouts/fitotrack-workout_1614086080_thumb.jpg differ diff --git a/static/images/workouts/fitotrack-workout_1614259085.jpg b/static/images/workouts/fitotrack-workout_1614259085.jpg new file mode 100644 index 0000000..32cafa6 Binary files /dev/null and b/static/images/workouts/fitotrack-workout_1614259085.jpg differ diff --git a/static/images/workouts/fitotrack-workout_1614259085_thumb.jpg b/static/images/workouts/fitotrack-workout_1614259085_thumb.jpg new file mode 100644 index 0000000..2efb381 Binary files /dev/null and b/static/images/workouts/fitotrack-workout_1614259085_thumb.jpg differ diff --git a/themes/nipponalba/layouts/index.html b/themes/nipponalba/layouts/index.html index 5adad63..bf1dc83 100644 --- a/themes/nipponalba/layouts/index.html +++ b/themes/nipponalba/layouts/index.html @@ -51,9 +51,25 @@ Planning: Williams Bros 80/- (sort of) for my next brew, will be a variation on a previous recipe with a grain adjustment.

Reading: Handbook of Brewing by Graham G. Stewart, Inge Russel and Anne Anstruther.

Watching: Borgen a Danish political drama.

- Playing: Valheim a Viking inspired survival game.

+ Playing: Valheim a Viking inspired survival game. +

Latest Workout

+
+ {{ range first 1 (sort .Site.Data.workouts "date" "desc")}} +
+ Type
{{ .type | humanize }}
+ Date
{{ dateFormat "2 Jan 2006" .date }}
+ Comment
{{ .comment | humanize }}
+ Image
route map of outdoor exercise from fitotrack app
+ Distance
{{ .distance }}
+ Duration
{{ .duration }}
+ Pace
{{ .pace }}
+ Calories burned
{{ .calories }}
+
+ {{ end }} +


+ {{ end }} diff --git a/themes/nipponalba/static/css/style.css b/themes/nipponalba/static/css/style.css index 6c4e254..11a32f4 100644 --- a/themes/nipponalba/static/css/style.css +++ b/themes/nipponalba/static/css/style.css @@ -308,7 +308,7 @@ nav li i{ margin:0; padding-left:10px; } -nav > li:nth-child(9) { +nav > li:nth-child(10) { margin-left: auto; padding-right:5px; display:none; @@ -334,7 +334,7 @@ main{ grid-template-rows: auto; } -.about .h-feed, .archive, .stream, .post, .bookmarks, #response, .response, .resume{ +.about .h-feed, .archive, .stream, .post, .bookmarks, #response, .response, .resume, .exercise{ grid-column: 1; vertical-align:top; width: 99%; @@ -984,6 +984,50 @@ hr{ font-weight:bolder; } +.index_exercise{ + width: 95%; +} +.exercise_grid{ + max-width: 96%; + display:grid; + grid-template-columns: 15% 20% 25% 20% auto; + grid-template-rows: 100px 90px; + border: 1px solid var(--border-colour); + border-radius:15px; + margin: 0 auto; + padding: 10px; + margin-bottom: 20px; +} +.exercise_grid .type, .exercise_grid .distance{ + grid-column: 1; +} +.exercise_grid .exdate, .exercise_grid .duration{ + grid-column: 2; +} +.exercise_grid .pace{ + grid-column: 3; +} +.exercise_grid .comment{ + grid-column-start: 3; + grid-column-end: span 2; + width: 100%; +} +.exercise_grid .calories{ + grid-column: 4; +} +.exercise_grid .image{ + grid-column: 5; + text-align: center; +} +.exercise_grid .type, .exercise_grid .exdate, .exercise_grid .comment{ + grid-row: 1; +} +.exercise_grid .image{ + grid-row: 1 / 2; +} +.exercise_grid .distance, .exercise_grid .duration, .exercise_grid .pace, .exercise_grid .calories{ + grid-row: 2; +} @media screen and (max-width: 960px) { #page-top { width: 95%; @@ -1011,7 +1055,7 @@ hr{ main{ display:block; } -#Blogs{ +#Blogs, #Exercise{ display:none; } @@ -1026,7 +1070,7 @@ article img{ .post{ margin-top:20px; } -.post_content, .index_content{ +.post_content, .index_content, .index_exercise{ width: 95%; } .photo .index_content{ @@ -1085,7 +1129,7 @@ nav{ padding:10px 6px; height: 30px; } -.index-article, .index-photo, .index-current, .list-article, .list-blog, .list-category, .index_content{ +.index-article, .index-photo, .index-current, .list-article, .list-blog, .list-category, .index_content, .index_exercise{ width:100%; margin-bottom:10px; }