SJSU CS 160 Spring 2021 Project - Team Paladins
users who often spend long periods of time on digital devices
are concerned about eye strain and potential long-term vision issues from computer usage,
iCare app is a native application
motivates users to develop good habits to avoid eye strain without being too intrusive to their schedule.
Pomodoro timers and other native applications,
integrates with the user’s calendar, has a modern UI, syncs usage data and preferences, provides usage data, provides insights into usage habits, and reminds the user to take breaks in a customizable and unobtrusive way
This directory holds the source code for our frontend application.
This directory holds the source code for our backend.
This directory holds the source code for our backend.
- Clone this repository to create a local instance that you can work on.
git clone https://github.com/jalenng/2021-spring-cs160-team-paladins.git
- Navigate into the backend or frontend directory
cd backend
orcd frontend
- Follow the directions in
README.md
to run the project.
Copies changes from the remote repository to the local repository. Think of this as "downloading."
Copies changes from the local repository to the remote repository. Think of this as "uploading."
Whenever you are starting work on a new feature or issue, create a branch from one of these development branches:
frontend-dev
backend-dev
Creates a new branch from the specified development branch.
Test the changes you made before creating your PR.
Frontend Automation Testing (Electron)
- Navigate to the frontend directory.
cd frontend
- Run the Spectron tests
npm run test
Backend Automation Testing (Postman)
- Navigate to the backend directory
cd backend
- Run the Postman tests.
npm test
If all the tests pass, you're ready to make a PR.
When your branch/feature is complete and ready for merging:
- Make a pull request (PR) on GitHub.
- https://github.com/jalenng/2021-spring-cs160-team-paladins/pulls
- Set the base to either
backend-dev
orfrontend-dev
. - Describe your changes in the title and description.
- Resolve the file conflicts, if any.
- Wait for us to perform code reviews and request changes if needed.
In addition to reading the changed code in a PR, we can also run it to verify that it works.
git pull
git checkout <branch-name>
- Navigate into the backend or frontend directory.
cd backend
orcd frontend
- Follow the directions in
README.md
to run the project. - Check for bugs and potential issues.
- Comment on the GitHub PR with your findings.
When the issues are resolved, the branch is ready to be merged. Once the branch is merged and no longer needed, go ahead and delete it.
2+ people will work on the same feature. One shares their screen and codes, while the others watch and review the code. All members should be actively engaged for best results, and roles should be switched frequently.