Skip to content

Commit

Permalink
Refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
jedrichards committed Jan 7, 2015
1 parent 2c69f03 commit c4c2456
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 12 deletions.
1 change: 1 addition & 0 deletions .gitignore
@@ -1,3 +1,4 @@
npm-debug.log
node_modules/
.env
public/js/*
1 change: 0 additions & 1 deletion Procfile

This file was deleted.

9 changes: 5 additions & 4 deletions README.md
Expand Up @@ -9,11 +9,12 @@ My personal portfolio site.

## Development

To start the server in development mode and start watching local files for changes run:
The following npm scripts are available:

```
npm run start-dev
```
Name | Description
--- | ---
`npm start` | Starts the server in production mode. Dokku runs this script automatically during deployment to start the app.
`npm run start:dev` | Starts the server in development mode, restarting the server and rebuilding when local files change.

## Deployment

Expand Down
2 changes: 1 addition & 1 deletion client-js/dep.js
@@ -1 +1 @@
module.exports = 'Foo!';
module.exports = 'Foo! Aw yeah boom time!';
11 changes: 8 additions & 3 deletions package.json
Expand Up @@ -5,16 +5,21 @@
"main": "index.js",
"scripts": {
"start": "forever -m --minUptime 5000 --spinSleepTime 5000 index.js",
"start-dev": "export $(cat .env|xargs) && nodemon -e js,hbs index.js",
"build": "browserify client-js/index.js > public/js/index.js",
"start:dev": "parallelshell 'npm run devserver' 'npm run build:js:watch'",
"devserver": "export $(cat .env|xargs) && nodemon -e js,hbs index.js",
"build:js": "browserify client-js/index.js > public/js/index.js",
"build:js:watch": "watch 'npm run build:js' client-js",
"build": "npm run build:js",
"postinstall": "npm run build"
},
"dependencies": {
"browserify": "^8.0.3",
"forever": "^0.13.0",
"handlebars": "^2.0.0",
"hapi": "^8.0.0",
"nodemon": "^1.2.1"
"nodemon": "^1.2.1",
"parallelshell": "^1.0.3",
"watch": "^0.13.0"
},
"engines": {
"node": "0.10.x"
Expand Down
2 changes: 1 addition & 1 deletion public/js/index.js
@@ -1,5 +1,5 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
module.exports = 'Foo!';
module.exports = 'Foo! Aw yeah boom time!';

},{}],2:[function(require,module,exports){
var dep = require('./dep');
Expand Down
5 changes: 3 additions & 2 deletions views/index.hbs
Expand Up @@ -10,8 +10,9 @@
<p><span class="u-mHide">I play well with others </span><a class="RollingLink" href="http://www.madebycomrades.com"><span data-hover="www.madebycomrades.com">www.madebycomrades.com</span></a></p>
</li>
</ul>
<p>I have experience with contemporary frontend technologies such as AngularJS, Backbone + Marionette, Browserify and NPM/Gulp/Grunt for project automation. Also experienced with Node.js-based web apps and REST API development.</p>
<p>I'm comfortable working in teams of all sizes at all stages of the project lifecycle from planning through to delivery. I've worked on Agile teams and have experience writing unit tests and e2e / integration tests.</p>
<p>I specialise in JavaScript application architecture and testing, project automation, HTML, CSS and creative coding tasks.</p>
<p>I have experience with contemporary frontend technologies such as AngularJS, Backbone + Marionette, Browserify and Bash/NPM/Gulp/Grunt for project automation. Also experienced with Node.js-based web apps and REST API development.</p>
<p>I have Agile experience and I'm comfortable working in teams of all sizes at all stages of the project lifecycle from planning through to delivery.</p>
<div class="u-row">
<div class="u-col u-col2">
<h2>Recent Highlights</h2>
Expand Down

0 comments on commit c4c2456

Please sign in to comment.