Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ashermorgan committed Jul 11, 2024
2 parents bd0cb27 + bd7a459 commit 870d74e
Show file tree
Hide file tree
Showing 71 changed files with 6,182 additions and 3,318 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@ jobs:
cache: 'npm'

- run: npm ci
- run: npx playwright install --with-deps
- run: npm run build --if-present
- run: npm run test:unit
- run: npm run test:e2e
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,7 @@ pnpm-debug.log*
*.njsproj
*.sln
*.sw?
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
9 changes: 7 additions & 2 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,14 @@
font-size: 2em;
font-weight: bold;
}
main {
margin: 1em;
}
h1 {
font-size: 1.5em;
margin: 10px 10px 0px;
}
p {
margin-top: 0.5em;
}
</style>
</head>
Expand All @@ -37,7 +42,7 @@
<header>Running Tools</header>
<main>
<h1>404 Not Found</h1>
<p><a href="%BASE_URL%">homepage</a></p>
<p><a href="%BASE_URL%">Return home</a></p>
</main>
</body>
</html>
16 changes: 16 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# Changelog

## 1.4.0 - 2024-07-11

### Added
- Batch Calculator
- Workout Calculator

### Changed
- The edit target set dialog is opened automatically after a new target set is
created
- Target sets can only be used by the calculator they were created in (and by
the Batch Calculator for pace, race, and workout target sets)

### Fixed
- Bug that prevented Split Calculator splits from being saved after a new target
set was created

## 1.3.0 - 2024-03-25

### Added
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ A collection of tools for runners and their coaches.
Try it out [here](https://ashermorgan.github.io/running-tools/).

## Features
- [Batch Calculator](https://ashermorgan.github.io/running-tools/#/calculate/batch):
Create tables of the results of the other calculators over a range of inputs
- [Pace Calculator](https://ashermorgan.github.io/running-tools/#/calculate/paces):
Calculate distances and times that are at the same pace
- [Race Calculator](https://ashermorgan.github.io/running-tools/#/calculate/races):
Expand All @@ -11,6 +13,8 @@ Try it out [here](https://ashermorgan.github.io/running-tools/).
Find splits, paces, and cumulative times for the segments of a race
- [Unit Calculator](https://ashermorgan.github.io/running-tools/#/calculate/units):
Convert between different distance, time, speed, and pace units
- [Workout Calculator](https://ashermorgan.github.io/running-tools/#/calculate/workouts):
Estimate target workout splits using previous race results

## Setup
Install dependencies
Expand All @@ -23,10 +27,11 @@ Run development server
npm run dev
```

Run linter and unit tests
Run linter and tests
```
npm run lint
npm run test:unit
npm run test:e2e
```

Build for production
Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,12 @@
font-weight: bold;
}
p {
margin: 10px;
margin: 1em;
font-weight: bold;
}
</style>
<header>Running Tools</header>
<p>We're sorry but Running Tools doesn't work properly without JavaScript enabled. Please enable it to continue.</p>
<p>Running Tools requires JavaScript. Please enable it to continue.</p>
</noscript>

<!-- built files will be auto injected -->
Expand Down
Loading

0 comments on commit 870d74e

Please sign in to comment.