Create LICENSE resolves se701g2/Doto#4 #14
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cwon880
reviewed
Mar 6, 2020
There was a problem hiding this comment.
Hi @daltonlim, this looks good I had a quick look and I think MIT license also appears to be most adequate license for our purposes. For the full name on the license should that perhaps be the name of our team?
|
Hi @cwon880. That is a good point you bring up and I shall add a name. Does our team have a formal name or should I use se3701g2? |
|
@daltonlim Yea that sounds good, I don't think we have decided on a team name just yet so maybe lets leave this pr open until then |
|
I think we should use se701g2 as our name since we have it as the organisation name. But I think we may be able to change it so I would be open to just seeing what others want to do |
|
@daltonlim looks our team name will be taffy, so maybe change it to that? |
|
@cwon880 maybe we should just choose a Team name at our meeting tomorrow |
|
@daltonlim I think we might have to choose license at the end, depending on any frameworks of dependencies we have used which may require a specific license as Kelly has pointed out in class. |
|
Yeah, that's a good point. I'll leave this open for now. |
KimberleyEvans-Parker
added a commit
that referenced
this pull request
Apr 22, 2020
* create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com>
KimberleyEvans-Parker
added a commit
that referenced
this pull request
Apr 22, 2020
* create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com>
KimberleyEvans-Parker
added a commit
that referenced
this pull request
Apr 22, 2020
* create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix * issue/feature Add productivity mode slider for gamification system * Mode can be linked to points scored * issue/220-delete-task (#251) * Add auth to update task * Add test for updating task * Add delete task * Add test for deleting task * Start implementing delete task for front end * Implement delete task * Ensure taskID is set before passing it on to backend (#253) Bug is fixed and everything works fine. * bug/248 - Fix issue with inconsistent theme change behaviour closes #248 (#255) * Ensure that fetchUserInfo is called only once to reduce load on DotoService and also prevent inconsistent state * Add dependency for callback * fix issue where duration of event didnt match the actual time specified (#258) * Remove redundant code in Points * Add streak image and formatting * Streak updates every second * Remove Redundant Code * Move Avatar into Points * Remove redundant code, Move Avatar into Points Add comments * Add alt to streak image * Added a user stats modal with dummy data. (#14) * create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Remove .shadow * Remove duplicate buttons and order buttons Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> Co-authored-by: Utsav Trivedi <utsavtrivedi16@gmail.com> Co-authored-by: Eric Pedrido <43208889+EricPedrido@users.noreply.github.com> Co-authored-by: Preet Patel <iam@preetpatel.com> Co-authored-by: Bradley Coleman <43105616+bradleycoleman@users.noreply.github.com>
salma-s
pushed a commit
that referenced
this pull request
Apr 26, 2020
* issue/feature Add productivity mode slider for gamification system * Mode can be linked to points scored * issue/220-delete-task (#251) * Add auth to update task * Add test for updating task * Add delete task * Add test for deleting task * Start implementing delete task for front end * Implement delete task * Ensure taskID is set before passing it on to backend (#253) Bug is fixed and everything works fine. * bug/248 - Fix issue with inconsistent theme change behaviour closes #248 (#255) * Ensure that fetchUserInfo is called only once to reduce load on DotoService and also prevent inconsistent state * Add dependency for callback * fix issue where duration of event didnt match the actual time specified (#258) * Added a user stats modal with dummy data. (#14) * create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * issue/feature Add productivity mode slider for gamification system * Mode can be linked to points scored * fix issue where duration of event didnt match the actual time specified (#258) * Added a user stats modal with dummy data. (#14) * create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * issue 11/feature *Basic MarketPlace UI *Themes(buttons) can be clicked *Real points yet to be inserted *Need to add lock/unlock logic *Content-boxes used for easy insertion of components * Prettier formatting * Add LockedThemes class * Fomat Calendar * Create lock.png * Add AvailableTheme to modularise MarketPlace * Add lock image to available themes * handles initially being locked/owned * Add popup when theme is locked * issue/13 Streak (#15) * create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix * issue/feature Add productivity mode slider for gamification system * Mode can be linked to points scored * issue/220-delete-task (#251) * Add auth to update task * Add test for updating task * Add delete task * Add test for deleting task * Start implementing delete task for front end * Implement delete task * Ensure taskID is set before passing it on to backend (#253) Bug is fixed and everything works fine. * bug/248 - Fix issue with inconsistent theme change behaviour closes #248 (#255) * Ensure that fetchUserInfo is called only once to reduce load on DotoService and also prevent inconsistent state * Add dependency for callback * fix issue where duration of event didnt match the actual time specified (#258) * Remove redundant code in Points * Add streak image and formatting * Streak updates every second * Remove Redundant Code * Move Avatar into Points * Remove redundant code, Move Avatar into Points Add comments * Add alt to streak image * Added a user stats modal with dummy data. (#14) * create points variable to work off of * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * issue/2-Logic for Gamification system - Incrementing points (#6) * issue/198 - Duration selection uses time-dial closes #198 (#208) * Duration selection uses time-dial Duration must be positive * Duration selection uses time-dial Duration must be positive * remove hardcoded date * variable consistency * issue/209 - Migrate from npm to yarn for package management (#214) * Migrate front-end from npm -> yarn * Migrate back-end from npm -> yarn * Replace npm with yarn This updates the documentation and changes references from npm to yarn. * Migrate build/deploy/CI with yarn Note that `yarn install --frozen-lockfile` replaces `npm ci` and that `--if-present` is dropped from `npm run build` when moving to `yarn build` as it is only needed when there is no strict control over the package.json. We have such control, so it is unnecessary. * Remove lingering file generated by npm * Update scripts to use yarn * Fix build command * Attempt to fix build commands in deployment config * Ensure no tests are treated as 'pass' * Update CI workflow to resolve issues This splits frontend and backend into separate jobs, whilst also trying to maintain a consistent and meaningful layout for the config. * Revert back to 'yarn build' This reverts commit e415beb. * Fix typo; 'runs' to 'run' * Remove build command from backend * Change order so build is before test The frontend tests rely on files generated by the build process, so it's important to build before running the tests. * issue/114-setup a formal logging system closes #114 (#207) * Add winston logging package * Configure http request logging * Configure logging module * Replace usages of console with logger * Remove package-lock.json * Fixed logger import name (#219) * issue/210 - Extend formatting toolchain to work with both projects (#217) * Remove husky from doto-frontend * Initialise multi package project with lerna * Simplify node modules installation with one command * Configure husky on root package * Configure doto-frontend package for precommit lint-staged * Configure doto-backend package for precommit lint-staged * Configure eslintrc for mocha testing * Format all doto-backend files * Reformat files after rebase * Update readme with lerna and yarn instructions * issue/213 - Add ability to complete a task (#223) * Add task completion on list view and calendar components Allows users to complete from either component and keeps data in sync * Update Appointment coloring when task is complete Provides clear indication to the user which of their tasks are complete and incomplete * Fix issue where tasks did not have keys Fixes task duplication issue * Add strikethrough when completing tasks * Remove unused radio styles * Update property name completed to isComplete * Connect frontend logic to backend This means the isComplete state is persisted in the backend * Add unit tests for updating isComplete * issue/197 - Removed magic numbers in back-end and replaced with constants (#226) * fixing front end merging issues * resolves commit issues * capitalised enums and changed require path to reflect code styling * commit issues resolving * capitalised enum keys * reverted random changes in front end Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> * issue/200 Bug schedule task overlaps when time is not specified closes #200 (#216) * Constant travel time added * Add travel time in form * Removed pacjage-lock files * Points increase/decrease when task is completed/uncompleted * Style Points inside Material-UI Avatar * Points title * Handles non-persisting duration error * Yarn build fix Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Revert "issue/2-Logic for Gamification system - Incrementing points (#6)" (#9) This reverts commit b763c9f. * Made dumb stats page (not based on real values). * Added a dummy stats window - currently values are static. * fixed merging issue. * Made values for stats pass as props instead of setting them in the userstats class. * Deleted package-lock.json which was included by mistake. * Deleted VS file that was automatically generated Co-authored-by: KimberleyEvans-Parker <45865186+KimberleyEvans-Parker@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> * Remove .shadow * Remove duplicate buttons and order buttons Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> Co-authored-by: Utsav Trivedi <utsavtrivedi16@gmail.com> Co-authored-by: Eric Pedrido <43208889+EricPedrido@users.noreply.github.com> Co-authored-by: Preet Patel <iam@preetpatel.com> Co-authored-by: Bradley Coleman <43105616+bradleycoleman@users.noreply.github.com> * issue 11/feature *Basic MarketPlace UI *Themes(buttons) can be clicked *Real points yet to be inserted *Need to add lock/unlock logic *Content-boxes used for easy insertion of components * Remove redundant code * Add Points to settings Points doesn't work or link to calendar points or persist * Decrease points when theme is unlocked * Remove unused code * Add TODO comment Still needs to error if not enough points * Move Points title outside Points.js * Set points to 0 * Add comments and TODOs and remove console.log * Made the pie chart in the stats window responsive (based on actual number of tasks). * Added default case to handleThemeClick() on SettingsPage.js * Pass yarn tests * Connect updating and retrieving points with backend Persists the progress users have made * Connect unlocked items to backend Persists the items users have unlocked * Update Settings Page snapshot * Prevent point balance from dropping below zero in marketplace This could be achieved by purchasing items that the user could not afford * Removed author since Git Blame will be used * Removed comments from marketplace.css * Update calendar.css * Refresh streak every minute * Removed react-minimal-pie-chart from root and added in doto-frontend Co-authored-by: Utsav Trivedi <utsavtrivedi16@gmail.com> Co-authored-by: Eric Pedrido <43208889+EricPedrido@users.noreply.github.com> Co-authored-by: Preet Patel <iam@preetpatel.com> Co-authored-by: Bradley Coleman <43105616+bradleycoleman@users.noreply.github.com> Co-authored-by: Matt Eden <45587386+Matteas-Eden@users.noreply.github.com> Co-authored-by: Jordan Sim-Smith <jordansimsmith@gmail.com> Co-authored-by: Tony Liu <ipwnu777@gmail.com> Co-authored-by: Harrison Leach <44953072+HarrisonLeach1@users.noreply.github.com> Co-authored-by: arangace <48401725+arangace@users.noreply.github.com> Co-authored-by: arangace <ahua291@aucklanduni.ac.nz> Co-authored-by: utri092 <41176826+utri092@users.noreply.github.com> Co-authored-by: Brad <bradcoleman1998@gmail.com> Co-authored-by: Harrison Leach <HarrisonL7190@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #4
Reasoning behind the choice can be found in the wiki