Skip to content

Commit

Permalink
Merge pull request #37 from WebMo21/develop
Browse files Browse the repository at this point in the history
Finished up project
  • Loading branch information
SaschaWebDev authored Sep 14, 2021
2 parents eaeecdc + d280f16 commit 7d6eded
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,22 @@ A modern web application enabling users scheduling and organization of fitness a
- GDPR compliant cookie consent banner achieved with [js-cookie](https://www.npmjs.com/package/js-cookie)
- SEO & compatibility for OpenGraph through [Next SEO](https://www.npmjs.com/package/next-seo)
- Sending emails from the frontend for magic url login was achieved with the help of [Mailjet](https://www.mailjet.com)
- The domain [https://www.fitness-time.app/](https://www.fitness-time.app) was purchased and registered with the help of [https://www.namecheap.com/](https://www.namecheap.com) with a free SSL-certificate of [Let's Encrypt](https://letsencrypt.org/de)

## 🎨 UI

- Modern landing page with [Animate on Scroll](https://www.npmjs.com/package/aos) animations
- Responsiveness optimized for desktop, tablet and mobile devices
- **Color Palette**

![Color Palette](color-palette.png)

- accent color lightseagreen (#10b981)
- font color white (#ffffff)
- primary background color darkslategray (#374151)
- secondary background color black (#111827)
- input background color darkslategray (#4b5563)

- **Used Images**
- All used images are either CC0 free to use or their license has been purchased at [Adobe Stock](https://stock.adobe.com) or [flaticon](https://www.flaticon.com)
- Custom [Error](https://www.fitness-time.app/error), [404](https://www.fitness-time.app/404) and [Email sent](https://www.fitness-time.app/auth/mailsent) page
Expand Down
8 changes: 8 additions & 0 deletions components/dashboard/plans/PlanWorkoutCard.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ const PlanWorkoutCard = ({
!/^\d{2}:\d{2}$/.test(updateTimeStart) ||
!/^\d{2}:\d{2}$/.test(updateTimeEnd) ||
!/^[0-9]*$/.test(updateTrackedTime) ||
parseInt(updateTimeStart.split(":")[0]) > 23 ||
parseInt(updateTimeStart.split(":")[0]) < 0 ||
parseInt(updateTimeStart.split(":")[1]) > 59 ||
parseInt(updateTimeStart.split(":")[1]) < 0 ||
parseInt(updateTimeEnd.split(":")[0]) > 23 ||
parseInt(updateTimeEnd.split(":")[0]) < 0 ||
parseInt(updateTimeEnd.split(":")[1]) > 59 ||
parseInt(updateTimeEnd.split(":")[1]) < 0 ||
parseInt(updateTimeEnd.replace(":", "")) -
parseInt(updateTimeStart.replace(":", "")) <
1 ||
Expand Down
Binary file added team-onur-menekse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7d6eded

Please sign in to comment.