🏝 The DjangoCon US 2018 conference website
Switch branches/tags
Nothing to show
Clone or download
jefftriplett Merge pull request #198 from nhumrich/patch-1
🀝  Update 2018-10-17-14-20-t0-strategies-for-zero-down-time-frequent.md
Latest commit 13b0349 Sep 26, 2018
Permalink
Failed to load latest commit information.
.github πŸ“ Edit PR and issue templates Mar 15, 2018
_includes πŸ”₯ Delete blank line Sep 21, 2018
_layouts πŸ“ Add links to schedule in relevant places Jul 28, 2018
_organizers 🎨 Updates Josue's image to use a jpg Apr 12, 2018
_pages Change "projector" to "projection screen." Sep 21, 2018
_places πŸ”¨ πŸ”₯ Make Places a collection Mar 14, 2018
_posts add image to orientation blog post for social media Sep 25, 2018
_schedule Update 2018-10-17-14-20-t0-strategies-for-zero-down-time-frequent.md Sep 26, 2018
_scss Potential fix for iPad Pro bug Mar 8, 2018
_sponsors Fixing image path and tabbing Sep 23, 2018
_styleguide Updates styleguide with reference to files in resource repo Mar 19, 2018
static add image to orientation blog post for social media Sep 25, 2018
.all-contributorsrc Adding new contributors Apr 21, 2018
.editorconfig πŸ”¨ Simplifies editorconfig Feb 21, 2018
.gitignore Removing codeowners from .gitignore Mar 12, 2018
.sass-lint.yml Updates schedule styles Mar 21, 2017
.surgeignore πŸ”¨ Simple script to make deploying to surge easier Feb 15, 2018
.travis.yml πŸ’š Updates Travis Mar 12, 2018
CNAME Create CNAME Oct 27, 2017
CODE_OF_CONDUCT.md πŸ”¨ rename to CODE_OF_CONDUCT Mar 11, 2018
CONTRIBUTING.md Fix the target branch in contributing guide Aug 28, 2018
Gemfile πŸ”¨ Fixes update Jul 26, 2018
LICENSE Create LICENSE Dec 14, 2016
Makefile πŸ‘• Adds test make directive Mar 9, 2018
Procfile πŸŽ‰ Adds a Procfile to make local dev easier Oct 17, 2017
README.md Adding contribution guidance Apr 25, 2018
Rakefile ❄️ Updates travis setup Dec 21, 2017
_config.yml πŸ”¨ Updates TZ info Jul 9, 2018
gulpfile.js Updates styleguide to match 2018 work Mar 4, 2018
package-lock.json ⬆️ Updates deps Mar 3, 2018
package.json ⬆️ Updates deps Mar 3, 2018

README.md

2018.djangocon.us Website

Build Status Contributors

The 2018 DjangoCon.us website is a static site compiled with Jekyll. The frontend relies heavily on the Foundation framework. Frontend dependencies are installed and updated with npm, and complied for production using Gulp.

Code of Conduct

As a contributor, you can help us keep the Django community open and inclusive. Please read and follow our Code of Conduct.

Getting Started

Get started contributing by reading our Contributing guidelines.

Contributing via Browser

  1. Navigate to the DjangoCon U.S. website repo on GitHub. In the upper right hand corner of the repo, click the "Fork" button. Alternatively, click on an individual file and click the pencil icon. GitHub will automatically fork the repo for you.

  2. Head over to your GitHub account, where you will find the forked repo. This is a copy of the official code. Your changes to this forked code will not affect the official code, unless you submit a pull request and an admin merges your pull request.

  3. For changes that do not need to be tested locally, the change can be made and submitted in the browser.

  4. Within your forked repo, make sure the "Branch" tab is set to the master branch.

  5. Once you are on the correct branch, navigate to the file you intend to change and click the pencil icon to open it. Make the change and click the "Commit changes" button.

  6. Staying within your forked repo, navigate back to the main page of the branch (note: your pull request should be submitted via your forked repo, not the main repo). Click "New pull request." Click the "Commit changes" button. At the "Comparing changes" page, double check that you are happy with your proposed change. If so, click "Create pull request." Add a descriptive title and comment if applicable, then click "Create pull request" at the bottom to submit. An admin will review your proposed change, merge it, or give you feedback.

Example: Updating Organizer Info

Follow the above instructions to step 5.

Click on the _organizer folder, then your own MY_NAME.md file. Click on the pencil icon to open the file. Make your changes, making sure that your information is placed within quotation marks.

To add a photo: navigate to the static/img/organizers folder. Click "Upload files". Drag or choose your photo file into the window. Click "Commit changes". Your photo should now be in the folder. Ideally, the photo should be 400 x 400px. In your MY_NAME.md file, make sure the path to your photo has the proper name and file ending (.jpg, .png, etc.).

If you need assistance, please ask! Complete step 6.

Contributing via Local Development

For changes that require cloning/running the code locally, follow the above instructions to step 5. Instead of navigating to the file through the browser, open up your computer terminal (you will need to have Git installed locally and a code editor of your choice).

Clone your forked repo locally via the terminal, replacing the username in the URL with your own (note: not all operating systems will use a $ as a terminal prompt).

$ git clone https://github.com/<your-username>/2018.djangocon.us

Change directory into the folder

$ cd 2018.djangocon.us

Verify that you are on the master branch

$ git branch

Follow the instructions below to run the website on a local server. GitHub recommends using Bundler to install and run Jekyll. Ruby is a pre-requisite. One of the project dependencies (nokogiri) requires a Ruby version >= 2.1.0. See the Jekyll Quick-start Guide for more info.

Install Jekyll

You might need to use $ sudo gem install jekyll bundler

$ gem install jekyll bundler
$ bundle install

Install gulp

Jekyll will compile sass out of the box, but we're using gulp so we can add autoprefixer and whatever else we might need later.

$ npm install .
# installs dependencies listed in package.json, including gulp.

Run Jekyll

$ bundle exec jekyll serve
# => Now browse to http://localhost:4000

Run html-proofer to find broken links and accessibility issues

$ bundle exec rake test

Run gulp

For CSS development, open a new terminal in your project directory and run the following. This will run the gulp watch scripts to compile sass.

$ gulp

Pushing to GitHub and Submitting a Pull Request

After you have made your changes, you will need to push the local files with the changes back to GitHub in order to submit a pull request. Assuming you are still on the "master" branch, you will be pushing your changes from the local "master" branch to the "master" branch of the forked repo at your GitHub account.

$ git add .
$ git commit -m "Your note"
$ git push origin master

You will then resume the process at step 6 to submit a pull request.

If you plan to continue working locally and submitting pull requests, you may want to add an upstream remote locally that points to the DjangoCon US repo, in order to fetch changes. You may also want to consider creating a feature branch (also known as a "topic" branch), making your changes there (instead of in the master branch), pushing to GitHub and submitting the update via pull request. You can then keep your master branch up-to-date while working on multiple features.

Adding Contributors

If you have gone through the previous installation steps, the all-contributors-cli package should already be installed locally by npm. The developer dependency and scripts can be found in package.json and the init config and JSON entries in the .all-contributorsrc file.

To add a contributor by GitHub username (this will add a JSON entry to .all-contributorsrc and add the contributor to the README list), run the following command, hitting enter twice to avoid choosing any contribution type

$ npm run add -- <username>
hit enter twice

To generate a README list from the .all-contributorsrc file

$ npm run generate

Contributors

Thanks goes to these wonderful people:

This project uses the all-contributors-cli. Contributions of any kind welcome!

License

MIT License