Use Gulp, Jade, and SCSS

pandringa commented 8 years ago

This refactors the site to use gulp as a build tool, allowing us to use Jade and SCSS which will compile into HTML and CSS. See the readme for more documentation about how this will work.

This pull request is created mostly as a formality – there are so many merge conflicts here that it would be best to just delete the dev branch and rename this one to replace it.

While we're at it, how do you feel about changing the default branch from dev to either master or production? If we're working in feature branches, the main branch isn't really under development – it's the source code of what is in production – so master feels more fitting.

Finally, these changes would mean that deploying is no longer as simple as a merge – you have to first merge, then check out the default branch, then run gulp deploy which will push to gh-pages for you. However, I'm looking into setting up Travis to do this automatically whenever a PR is merged, so we might be able to go back to the simple merge workflow.

subdavis commented 8 years ago

When you're done with the refactor,

Create a branch from gulp called dev-gulp or something.
Force the code into master

Then I guess we can merge our feature branches into dev-gulp. I'd like for dev-gulp to be the default branch so that pull requests are automatically opened against it. I'll set that when you're ready.

Thanks so much for your work on this. Let me know if you need anything else.

pandringa commented 8 years ago

Just out of curiosity, why would we want to open pull requests against dev-gulp rather than master? Don't you want to compare a feature's code against what's currently in production?

subdavis commented 8 years ago

Nah, I want features to go into a development branch. Then, I want to know what's in the entire merge when I merge to production. That way I can see how features play together before putting them in prod.

pandringa commented 8 years ago

Oh ok - in that case we don't even need Travis. Here's how the workflow might work:

Feature Branch PR
PR merged into development
Test features together in development to confirm that they work
When ready, run gulp deploy which will push changes to gh-pages

pandringa commented 8 years ago

Finished changes and pushed to a new "development" branch – closing this PR now.

HackNC / fall2016

Use Gulp, Jade, and SCSS #34