Skip to content

A workout-tracking app with a support website that does more than just track workouts. Cross platform in IOS and Android

Notifications You must be signed in to change notification settings

UNLV-CS472-672/2024-S-GROUP3-Barbell

Repository files navigation

Barbell Project - Group 3

The repository for the Barbell project, Group 3.

Resolve Merge Conflicts

There will be merge conflicts, so do check out the resources here of how to resolve them:

Whenever you want to sync with the main branch, get the latest main branch and then merge it with your branch. This will help you to avoid merge conflicts. There is some funny tools can help you with this as well.

# in your local branch, even if your changes doens't affect the main
# we would still do this to not stash changes
git add .
git commit -m "messages"
git push

# after clean the status of your local, now check out the main branch
git checkout main
git fetch && git pull

# now go back to your branch and merge the main branch
git checkout your-branch

# at this point you have two options
# 1. merge the main branch with your branch
git merge --no-ff main

# 2. rebase the main branch with your branch
git rebase main

That's it! You are now up to date with the main branch. Now submit and write that sweet PR.

Git Commit Convention

  1. Use present tense in your commit messages. For example, use "✨feature: Add xyz to component qrs" instead of "✨feature: Added xyz to component qrs". (Source)

  2. Use the emojis below to distinguish what type of change you have made in your commit. This will help keep commit messages consistent and easier to read. For example, "📚docs: Update commit conventions in README.md".

  • ✨feature: Introduces completely new code or new features.
  • 🐛fix: Implements changes that fix a bug. Ideally, reference an issue if present.
  • ♻️refactor: Includes any code-related change that is neither a fix nor a feature.
  • ✅build: Encompasses all changes related to the build of the software, including changes to dependencies or the addition of new ones.
  • ⚡️test: Pertains to all changes regarding tests, whether adding new tests or modifying existing ones.
  • 🚰ci: Involves all changes related to the configuration of continuous integration, such as GitHub Actions or other CI systems.
  • 📚docs: Includes all changes to documentation, such as README files, or any other documentation present in the repository.
  • 🗑️chore: Captures all changes to the repository that do not fit into the above categories.

Fields for GitHub Issue Boards

For effective project management and prioritization, our GitHub issue boards utilize the following fields:

Priority

  • High: Urgent tasks that need to be addressed as soon as possible.
  • Medium: Important tasks that should be completed in the near future.
  • Low: Less critical tasks that can be addressed when convenient.
  • No Priority: Tasks that can be completed at any time without immediate urgency.

Size

Indicates the overall scope and effort required for a task, measured in:

  • XS: Extra Small
  • S: Small
  • M: Medium
  • L: Large
  • XL: Extra Large

Assigned To

Tasks are assigned to team members by their first name. For tasks with multiple assignees, names are comma-separated.


Note: This README is a work in progress and will be updated as the project progresses. Not strictly enforced, just a template for you to START with.

Commons Bugs Encountered

In case you encountered, Failed to get localhost. Please point to your production server.

  • Check the entire constants from expo-constants and see if it exist the hostUri
  • If it doens't exist, you can add it manually.

Development Workflows

Adding/changing the database schema

TBA

EAS UPDATE BRANCHES

<!-- sync development build with [yap] -->
eas update --auto

<!-- build android aab (apk successor) -->
eas build --platform android

WebSocket