Skip to content

Latest commit

 

History

History
46 lines (26 loc) · 1.51 KB

README.md

File metadata and controls

46 lines (26 loc) · 1.51 KB
Raw

STEM+C

Scaffolds

Project

Client

The frontend is built on top of React and Blockly. It will be deployed in the cloud and distributed with a CDN.

Server

The backend is built on top of a headless CMS. It will be deployed in the cloud and utilize various services.

Environments

Development

This project's dependencies are managed through yarn The following are the available scripts we can use with the client and server:

Deployment

Coming soon...

Contributing

Git Flow

Git Flow

Ideally, we want our flow to resemble this. Master and develop are locked for direct commits. All commits must be made to a non-protected branch and submitted via a pull request with one approving review.

Branches

  • master - Deployed version of the application
  • develop - Working version of the application
  • feature/<scaffold>-<feature-name> - Based off of develop
    • ex. feature/server-strapi
  • hotfix/<scaffold>-<fix-name> - Based off of master
    • ex. hotfix/client-cors

Pull Requests

Before submitting a pull request, merge the target branch into the working branch to resolve any merge conflicts. Include a description of the changes made.