1. Make changes on a new branch, including a broad category and the ticket number if relevant e.g. feature/123-extra-squiggles, fix/newsletter-signup.
2. Push your branch to the remote.
3. Edit details as necessary.

If you need to preview work on staging, this can be merged and deployed manually without making a merge request. You can still make the merge request as above, but add a note to say that this is on staging, and not yet ready to be merged to master.

This repository includes a Vagrantfile for running the project in a Debian VM.

To set up a new build:

git clone git@github.com:OpenTechFund/opentech.fund.git
cd opentech.fund
vagrant up
vagrant ssh

Then within the SSH session:

dj migrate
dj createcachetable
dj createsuperuser
djrun

This will make the site available on the host machine at: http://127.0.0.1:8000/

Any changes to sass and js files need to be made within the opentech/static_src directory. They then need to be compiled with the help of "gulp".

Start a vagrant SSH session and go to the project root directory.

vagrant ssh
cd /vagrant

Here you can run a number of different "gulp" commands. The two most useful are likely:

gulp watch

That will watch all fles for changes and build them with maps etc., perfect for development. (It will also run the "collecstatic" command, useful when running the site with a production server and not the built in dev server.)

gulp build

This will build all the files for production. For more command see the gulpfile.js file.