Merging progress bar changes

19lmyers / cse110-w21-group14

1 stars 2 forks source link

Closed j1sun closed 3 years ago

j1sun commented 3 years ago

May have merge conflicts.

Changelog:

Implemented pause/continue functionality for confirmations
Fixed timer progress bar
- Moved progress bar into a separate component
- Updated method names

j1sun commented 3 years ago

Checked merge conflicts and fixed them up:

index.html had a conflict between components (i.e. ) and the original implementation, so I removed the original implementation conflict.
main.js had a small JSDoc commenting conflict