Correct Bower components location

+ adding better deploy task

sthlm/.bowerrc

@@ -1,3 +1,3 @@
 {
-    "directory": "www/_assets/_bower_components"
+    "directory": "src/_assets/_bower_components"
 }

sthlm/.gitignore

@@ -1,4 +1,5 @@
 node_modules
+.grunt
 .tmp
 .sass-cache
 src/_assets/_bower_components

sthlm/Gruntfile.js

@@ -20,6 +20,7 @@ module.exports = function (grunt) {
 
     // configurable paths
     var yeomanConfig = {
+<<<<<<< HEAD
 <<<<<<< HEAD
         app: 'www',
         dist: '_site',
@@ -28,6 +29,10 @@ module.exports = function (grunt) {
         app: 'src',
         dist: '_site'
 >>>>>>> 99253b1... Moving www to src
+=======
+        app: 'src',
+        dist: '_site'
+>>>>>>> 544ce1c... Correct Bower components location
     };
 
     grunt.initConfig({
@@ -37,6 +42,7 @@ module.exports = function (grunt) {
                 command: 'mynt gen -f src _site'
             },
             mynt: {                      // Target
+<<<<<<< HEAD
 <<<<<<< HEAD
                 command: 'mynt gen -f www .tmp'
             },
@@ -55,6 +61,9 @@ module.exports = function (grunt) {
 =======
                 command: 'mynt gen -f src .tmp'
 >>>>>>> 99253b1... Moving www to src
+=======
+                command: 'mynt gen -f src .tmp'
+>>>>>>> 544ce1c... Correct Bower components location
             }
         },
         watch: {
@@ -208,11 +217,11 @@ module.exports = function (grunt) {
             },
             dist: {
                 files: {
-                    '<%= yeoman.dist %>/assets/js/head.min.js': [
+                    '<%= yeoman.dist %>/assets/js/head.js': [
                         '<%= yeoman.app %>/_assets/_bower_components/jquery/jquery.js',
                         '<%= yeoman.app %>/_assets/_bower_components/modernizr/modernizr.custom.js'
                     ],
-                    '<%= yeoman.dist %>/assets/js/foot.min.js': [
+                    '<%= yeoman.dist %>/assets/js/foot.js': [
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/affix.js',
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/alert.js',
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/dropdown.js',
@@ -231,11 +240,11 @@ module.exports = function (grunt) {
             },
             server: {
                 files: {
-                    '.tmp/assets/js/head.min.js': [
+                    '.tmp/assets/js/head.js': [
                         '<%= yeoman.app %>/_assets/_bower_components/jquery/jquery.js',
                         '<%= yeoman.app %>/_assets/_bower_components/modernizr/modernizr.custom.js'
                     ],
-                    '.tmp/assets/js/foot.min.js': [
+                    '.tmp/assets/js/foot.js': [
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/affix.js',
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/alert.js',
                         '<%= yeoman.app %>/_assets/_bower_components/sass-bootstrap/js/dropdown.js',
@@ -361,6 +370,15 @@ module.exports = function (grunt) {
                 'imagemin',
                 'svgmin'
             ]
+        },
+        'gh-pages': {
+            options: {
+                base: '<%= yeoman.dist %>',
+                branch: 'master',
+                repo: '[email protected]:PyladiesSthlm/PyladiesSthlm.github.io.git',
+                message: 'Auto-generated commit from Grunt task in source'
+            },
+            src: '**/*'
         }
     });
 
@@ -417,8 +435,7 @@ module.exports = function (grunt) {
 
     grunt.registerTask('deploy', [
         'build',
-        'copy:deploy',
-        'shell:deploy'
+        'gh-pages'
     ]);
 
     grunt.registerTask('default', [

sthlm/README.md

@@ -46,11 +46,11 @@ two divering paths
 
 
 ### Working on site
-`npm install && bower install && bundle install` to draw in all dependencies
+`npm install && bower install && bundle install && pip install -r requirements.txt` to draw in all dependencies
 
 #### Basic commands
 * `grunt server` to run a local development server, opens [http://localhost:9000](http://localhost:9000) and reloads at changes
-* `grunt deploy` copies the files from `src` and the built `_site` over to the `PyladiesSthlm.github.io` repository, assuming it's in the same folder as the `pyladies` repository. If it is, it will automatically add the changes, commit it and push it onto the origin.
+* `grunt deploy` pushes the changes in the site to the live site repository, with a commit message stating its' auto-generated
 
 ## To do:
 

sthlm/package.json

@@ -28,7 +28,8 @@
     "time-grunt": "~0.1.1",
     "grunt-shell": "~0.4.0",
     "grunt-jsvalidate": "~0.2.1",
-    "grunt-newer": "~0.5.4"
+    "grunt-newer": "~0.5.4",
+    "grunt-gh-pages": "~0.8.1"
   },
   "engines": {
     "node": ">=0.8.0"

sthlm/src/_templates/footer.html

@@ -1,2 +1,2 @@
 <!-- Placed at the end of the document so the pages load faster -->
-<script src="{{ get_asset('js/foot.min.js') }}"></script>
+<script src="{{ get_asset('js/foot.js') }}"></script>

sthlm/src/_templates/header.html

@@ -24,7 +24,7 @@
 <link rel="shortcut icon" href="{{ get_asset('images/favicon.ico') }}" type="image/x-icon">
 
 <!-- Scripts required at loading time -->
-<script src="{{ get_asset('js/head.min.js') }}"></script>
+<script src="{{ get_asset('js/head.js') }}"></script>
 
 
 {% if site.analytics %}

sthlm/src/index.html

@@ -5,8 +5,8 @@
 <div class="jumbotron">
   <h1>PyLadies Stockholm</h1>
   <p class="lead">We are the Stockholm chapter of PyLadies, an international mentorship group for women who love Python.
-  Our focus is to help more women to become active participants and leaders in the tech community in Stockholm.  
-  We organize study groups, workshops, mini-conferences or just get together to code in Python. 
+  Our focus is to help more women to become active participants and leaders in the tech community in Stockholm.
+  We organize study groups, workshops, mini-conferences or just get together to code in Python.
   Our mission is to create a diverse, creative and friendly community for developers of all levels. </p>
   <p><a class="btn btn-danger btn-lg" href="{{ get_url('about/') }}">Learn more</a></p>
 </div>