Giter Club home page Giter Club logo

finalyaldaymerchant's Introduction

Build Status

FinalYaldayMerchant

This project is the main user service for Yalday

Development

To start the application in the dev profile, simply run:

./mvnw

Staging

To start the application in the staging

export JHIPSTER_REGISTRY_USER=admin
export JHIPSTER_REGISTRY_PASSWORD=admin
export JHIPSTER_REGISTRY_HOST=yalday-jhipsterregistry.herokuapp.com
export PORT=8080

./mvnw -Pdev,heroku clean package
  
  OR
  
mvn clean package; java -jar target/*.war --spring.profiles.active=dev,heroku --server.port=8080

If ran locally, this will connect to the staging jhipster registry.

Building for production

We are not there yet...

Testing

To launch your application's tests, run:

mvn clean test

Other tests

Performance tests are run by [Gatling][] and written in Scala. They're located in src/test/gatling and can be run with:

./mvnw gatling:execute

For more information, refer to the [Running tests page][].

Contributing

To submit a change do the following

 git pull (--rebase)
 git checkout -b "some_sensible_branch_name"
 <make your changes>
 git commit -am "some sensible commit message"
 git push -u origin some_sensible_branch_name

Conflicts

If you need to make changes to an existing branch, you should always make sure it has the latest master already included. This is done by doing

 git checkout master
 git pull
 git checkout "some_sensible_branch_name" 
 git rebase master

Rebasing has some major advantages to merging from master to the branch. Simply put, you don't end up with an extra commit and the history tree is kept sane. Here is a nice article https://www.atlassian.com/git/tutorials/merging-vs-rebasing

When you rebase your branch onto master you may have conflicts. So at this point you will be in the middle of a rebase. This gives you the chance to fix them by selecting the correct code to use (I use intellij for this but you can use whatever feels most confortable). Once all conflicts are resolved run:

git rebase --continue

then

git push -f

IMPORTANT: This is a force push and will OVERWRITE whatever is in the remote repository. NEVER run this command on master

Continuous integration

All branches and pull requests are ran on travis. The current master status is displayed at the top of this file, click this to go to the travis build, the details of which can be seen .travis.yml.

finalyaldaymerchant's People

Contributors

abetterway2feel avatar azkan01 avatar chriskiernan87 avatar martinrae123 avatar

Watchers

 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.