added gulp-webserver for developing; added font-awesome & scuttlebot …

…icons
sudomesh · Nov 26, 2017 · 5a454f7 · 5a454f7
1 parent 4778feb
commit 5a454f7
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,14 @@
 # Disaster Radio Website
 
 Builds the Disaster Radio website using Gulp, Twig, SASS, etc.
+
+# Usage
+```
+npm install # install dependencies
+gulp # build everything
+gulp webserver # launch webserver and view site locally in browser
+```
+
 To rebase the website log into the host server and,
 ```
 cd /var/www/public/disaster.radio/disaster-radio-website

diff --git a/gulpfile.js b/gulpfile.js
@@ -1,3 +1,4 @@
+const webserver = require('gulp-webserver');
 const del = require('del');
 const files = require('./lib/files');
 const fonts = require('./lib/fonts');
@@ -31,3 +32,12 @@ gulp.task('clean:css', () => del(['./web/assets/stylesheets']));
 gulp.task('clean', ['clean:files', 'clean:images', 'clean:js', 'clean:html', 'clean:css']);
 
 gulp.task('default', ['markdown', 'sass', 'js', 'images', 'files', 'fonts']);
+
+gulp.task('webserver', function() {
+  gulp.src('./web')
+    .pipe(webserver({
+      livereload: true,
+      directoryListing: false,
+      open: true
+    }));
+});
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-jsx-a11y": "^6.0.2",
     "eslint-plugin-react": "^7.4.0",
+    "gulp-webserver": "^0.9.1",
     "tape": "^4.8.0"
   },
   "dependencies": {

diff --git a/src/assets/images/scuttlebot-bw-sm.png b/src/assets/images/scuttlebot-bw-sm.png
diff --git a/src/connect/index.md b/src/connect/index.md
@@ -4,14 +4,14 @@ description: 'Get involved in the disaster.radio project.'
 ---
 
 ## Participate
-Join our [mailing list](https://sudoroom.org/lists/listinfo/disasterradio)  
-Improve our [documentation](https://github.com/sudomesh/disaster-radio/wiki)  
-Contribute to our [code](https://github.com/sudomesh/disaster-radio)  
+<i class="fa fa-envelope-o" aria-hidden="true"></i> Join our [mailing list](https://sudoroom.org/lists/listinfo/disasterradio)  
+<i class="fa fa-book" aria-hidden="true"></i> Improve our [documentation](https://github.com/sudomesh/disaster-radio/wiki)  
+<i class="fa fa-code" aria-hidden="true"></i> Contribute to our [code](https://github.com/sudomesh/disaster-radio)  
 
 ## Support
-Chat with us through [IRC](https://webchat.freenode.net/) on the freenode channel **#disaster.radio**  
-Find us on [Secure Scuttlebot (SSB)](https://github.com/ssbc) with for the **#disasterradio** tag  
-Submit [bug reports](https://github.com/sudomesh/disaster-radio/issues) or [pull requests](https://github.com/sudomesh/disaster-radio/pulls)  
+<i class="fa fa-comments-o" aria-hidden="true"></i> Chat with us through [IRC](http://webchat.freenode.net?channels=%23disasterradio&uio=d4) on the freenode channel **#disaster.radio**  
+<img src="../assets/images/scuttlebot-bw-sm.png"> Find us on [Secure Scuttlebot (SSB)](https://github.com/ssbc) with the **#disasterradio** tag  
+<i class="fa fa-bug" aria-hidden="true"></i> Submit [bug reports](https://github.com/sudomesh/disaster-radio/issues) or [pull requests](https://github.com/sudomesh/disaster-radio/pulls)  
 _Coming soon: **support forum**_  
 
 ### We are also big fans of the band [Disasteradio](http://www.disasteradio.org/)!

diff --git a/templates/html.twig b/templates/html.twig
@@ -32,6 +32,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
   <link rel="stylesheet" href="/assets/stylesheets/main.css">
   <script src="/assets/javascript/libs/modernizr-2.6.2.min.js"></script>
+  <script src="https://use.fontawesome.com/1c00147b2f.js"></script>
 </head>
 
 <body>