Code Monkey home page Code Monkey logo

pet-match's Introduction

pet-match

App to connect people to pets that need adoption

Hello Team

This is our repository. We will fill it with exciting and wonderful things at a feverish pace. Don't forget to npm install!

The server runs on port 8080, and there is a .env file that you will need to provide with your local SQL server info/credentials. A schema is included (/db/schema.sql) that will create the database for sequelize to use. Sequelize is currently initialized with {force: true}. The database will be re-initailized every run so we can freely modify the database structure.

# More or less what your .env file should look like. Feel free to copy/paste.
DB_HOST=localhost
DB_USER=root
DB_PORT=3306

# Add password here if applicable, otherwise leave as-is
DB_PASSWORD=

How the fork do we share code? Git gud.

Fork it

  1. Create your own fork of the central repository (https://github.com/snarfblam/pet-match). The fork button is on the top-right of the page. You'll get a copy of the repository on your own account.
  2. Clone your copy of the repository to your local machine.
  3. Add the upstream remote
    • A remote is a copy of the repository somewhere other than your local machine.

    • By default git only creates one remote: origin. This is where you cloned the repository from (your own github repository).

    • upstream is the central repository. You need to add this manually.

      git remote add upstream [email protected]:snarfblam/pet-match.git

Share your code

  1. Commit your changes and push them to your own GitHub repository.

  2. Open your repository on GitHub and click the "New pull request" button. GitHub will prompt the central repository owner (me) to pull your changes from your repository into the central one.

    FYI: any additional changes you push to origin after submitting a pull request and before the pull request is accepted will be included as part of the pull request.

Pull other people's code into your repository

  1. Make sure you've commited all your changes first.

  2. Get the latest changes from the central repository like so:

    git fetch upstream master

    Git will create a new branch for you with the contents from the central repository named upstream/master

  3. Merge the new branch with your master branch:

    git merge upstream/master

    If it goes without a hitch you're now up to date with the central repository.

Other stuff

  • Feel free to bug me on slack if my directions for git are inadequate.
  • Best way to avoid merge conflicts is communication. Let people know what you're working on via slack so two people don't try to edit the same code at the same time.
  • If you notice files are being committed that you do not intend to share, feel free to update the .gitignore file.

pet-match's People

Contributors

snarfblam avatar rebecca8840 avatar aaronbugden210 avatar rupali8086 avatar

Watchers

James Cloos avatar

Recommend Projects

  • React photo React

    A declarative, efficient, and flexible JavaScript library for building user interfaces.

  • Vue.js photo Vue.js

    ๐Ÿ–– Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.

  • Typescript photo Typescript

    TypeScript is a superset of JavaScript that compiles to clean JavaScript output.

  • TensorFlow photo TensorFlow

    An Open Source Machine Learning Framework for Everyone

  • Django photo Django

    The Web framework for perfectionists with deadlines.

  • D3 photo D3

    Bring data to life with SVG, Canvas and HTML. ๐Ÿ“Š๐Ÿ“ˆ๐ŸŽ‰

Recommend Topics

  • javascript

    JavaScript (JS) is a lightweight interpreted programming language with first-class functions.

  • web

    Some thing interesting about web. New door for the world.

  • server

    A server is a program made to process requests and deliver data to clients.

  • Machine learning

    Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.

  • Game

    Some thing interesting about game, make everyone happy.

Recommend Org

  • Facebook photo Facebook

    We are working to build community through open source technology. NB: members must have two-factor auth.

  • Microsoft photo Microsoft

    Open source projects and samples from Microsoft.

  • Google photo Google

    Google โค๏ธ Open Source for everyone.

  • D3 photo D3

    Data-Driven Documents codes.