From express.js to hapi.js

danactive · Feb 16, 2015 · 593c57f · 593c57f
1 parent 2cac897
commit 593c57f
Show file tree

Hide file tree

Showing 354 changed files with 19,000 additions and 19,671 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,21 @@
+# EditorConfig helps developers define and maintain consistent
+# coding styles between different editors and IDEs
+# editorconfig.org
+
+root = true
+
+
+[*]
+
+# Change these settings to your own preference
+indent_style = tab
+indent_size = 4
+
+# We recommend you to keep these unchanged
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
diff --git a/.gitignore b/.gitignore
@@ -7,3 +7,4 @@ npm-debug.log
 resizeImages
 *.sublime-project
 *.sublime-workspace
+public/js/
diff --git a/.jshintrc b/.jshintrc
@@ -0,0 +1,26 @@
+{
+  "browser": true,
+  "boss": true,
+  "curly": true,
+  "debug": false,
+  "eqeqeq": true,
+  "eqnull": true,
+  "expr": true,
+  "globalstrict": true,
+  "immed": true,
+  "latedef": true,
+  "laxbreak": true,
+  "loopfunc": true,
+  "newcap": true,
+  "noarg": true,
+  "node": true,
+  "noempty": true,
+  "nonew": true,
+  "trailing": true,
+  "sub": true,
+  "undef": true,
+  "unused": true,
+  "globals": {
+     "browser": true
+  }
+}
diff --git a/README.md b/README.md
@@ -7,6 +7,9 @@ Your personal **history** storyboarded with photo and video albums.  Associate p
 * Includes administration tools for XML generation
 * Free & open source (dependant on other open source projects see indiviual licenses)
 
+[![npm version](https://badge.fury.io/js/history.svg)](http://badge.fury.io/js/history)
+[![MIT Licensed](http://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](http://opensource.org/licenses/MIT)
+
 
 [Demo site 0.15.0](http://danactive.github.io/history/)
 
@@ -43,13 +46,9 @@ Included in this project
 * [Fluid 960 Grid System (admin)](http://www.designinfluences.com/fluid960gs/)
 
 To use the administration tools
-* [Node.js](http://nodejs.org/) v0.6.18
-* [Express](http://expressjs.com/) v3.4.7
-* [GraphicsMagick](https://github.com/aheckmann/gm) v1.14.1
-* [Grunt.js](http://gruntjs.com/) via npm
-    * npm install -g grunt-cli
-* [mocha](http://visionmedia.github.io/mocha/) via npm
-    * npm install -g mocha
+* [node.js](http://nodejs.org/)
+* [hapi.js](http://hapijs.org/)
+* [GraphicsMagick](https://www.npmjs.com/package/gm) Install GraphicsMagick before npm
 * [bower](http://bower.io/) via npm
     * npm install -g bower
 

diff --git a/admin/albumXml.htm b/admin/albumXml.htm
@@ -3,19 +3,19 @@
 	<head>
 		<meta charset="utf-8">
 		<title>Album XML</title>
-		<link rel="stylesheet" href="../css/xml.css">
+		<link rel="stylesheet" href="../static/css/xml.css">
 	</head>
 	<body>
 		<column id="xml"></column>
 		<column id="json"></column>
 		<!-- Attach jQuery library -->
-		<script src="../lib/jquery/dist/jquery.min.js"></script>
+		<script src="../static/lib/jquery/dist/jquery.min.js"></script>
 		<!-- Attach XML and JSON converter library -->
-		<script src="../lib/json_to_xml.js"></script>
+		<script src="../static/lib/json_to_xml.js"></script>
 		<!-- Attach global utilities -->
-		<script src="../js/global.js"></script>
+		<script src="../static/js/global.js"></script>
 		<!-- Attach XML utilities -->
-		<script src="../js/xml.js"></script>
+		<script src="../static/js/xml.js"></script>
 		<!-- Implementation -->
 		<script>
 			function displayAlbum(response) {

diff --git a/admin/edit_album_xml.html b/admin/edit_album_xml.html
@@ -1,14 +1,14 @@
 <!doctype html>
 <head>
 	<meta charset="utf-8">
-	<link rel="stylesheet" href="../css/fluid960gs-reset.css"><!-- 960 CSS framework -->
-	<link rel="stylesheet" href="../css/fluid960gs-text.css"/><!-- 960 CSS framework -->
-	<link rel="stylesheet" href="../css/fluid960gs-grid.css"/><!-- 960 CSS framework -->
-	<script src="../lib/jquery/dist/jquery.js"></script><!-- jQuery framework -->
-	<script src="../lib/json_to_xml.js"></script><!-- jQuery XML to JSON Plugin (also used in Generate Journal) -->
-	<script src="../js/global.js"></script><!-- global JS -->
-	<script src="../js/admin-edit-xml-tested.js"></script><!-- custom JS -->
-	<script src="../js/edit_admin_xml.js"></script><!-- custom JS -->
+	<link rel="stylesheet" href="../static/css/fluid960gs-reset.css"><!-- 960 CSS framework -->
+	<link rel="stylesheet" href="../static/css/fluid960gs-text.css"/><!-- 960 CSS framework -->
+	<link rel="stylesheet" href="../static/css/fluid960gs-grid.css"/><!-- 960 CSS framework -->
+	<script src="../static/lib/jquery/dist/jquery.js"></script><!-- jQuery framework -->
+	<script src="../static/lib/json_to_xml.js"></script><!-- jQuery XML to JSON Plugin (also used in Generate Journal) -->
+	<script src="../static/js/global.js"></script><!-- global JS -->
+	<script src="../static/js/admin-edit-xml-tested.js"></script><!-- custom JS -->
+	<script src="../static/js/edit_admin_xml.js"></script><!-- custom JS -->
 	<style>
 		.a { border-bottom: 1px dashed #595959; cursor: pointer; }
 		#listPhotos > div { float: left; width: 25%; cursor: pointer; }

diff --git a/admin/get_gallery_directories.js b/admin/get_gallery_directories.js
diff --git a/admin/get_geocode_via_map.html b/admin/get_geocode_via_map.html
@@ -15,10 +15,10 @@
 	<script src="https://maps.googleapis.com/maps/api/js?sensor=false"></script>
 
     <!-- Attach Mapstraction with the Google translate support -->    
-    <script src="../lib/mxn-3.0.0-RC5/mxn.js?(googlev3)"></script>
+    <script src="../static/lib/mxn-3.0.0-RC5/mxn.js?(googlev3)"></script>
 
 	<!-- Attach Leaflet mapping API -->
-	<script src="../lib/jquery-1.7.2.min.js"></script>
+	<script src="../static/lib/jquery-1.7.2.min.js"></script>
 
 	<script>
 		/*jslint browser: true, sloppy: true, white: true, maxerr: 50, indent: 4 */

diff --git a/admin/index.htm b/admin/index.htm
diff --git a/admin/map.htm b/admin/map.htm
@@ -4,26 +4,26 @@
 		<meta charset="utf-8">
 		<title>Slippy map</title>
 		<link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.css" />
-		<link rel="stylesheet" href="../css/map.css">
+		<link rel="stylesheet" href="../static/css/map.css">
 	</head>
 	<body>
 		<div id="controls"><button id="next">Next pin</button><button id="prev">Prev pin</button><button id="three">Third pin</button></div>
 		<div id="mapBox"></div>
 		<!-- Attach Leaflet & Mapstraction -->
 		<script src="http://cdn.leafletjs.com/leaflet-0.6.4/leaflet.js"></script>
-		<script src="../lib/mxn-3.0.0-RC5/mxn.js"></script>
-		<script src="../lib/mxn-3.0.0-RC5/mxn.core.js"></script>
-		<script src="../lib/mxn-3.0.0-RC5/mxn.leaflet.core.js"></script>
+		<script src="../static/lib/mxn-3.0.0-RC5/mxn.js"></script>
+		<script src="../static/lib/mxn-3.0.0-RC5/mxn.core.js"></script>
+		<script src="../static/lib/mxn-3.0.0-RC5/mxn.leaflet.core.js"></script>
 		<!-- Attach jQuery library -->
-		<script src="../lib/jquery/dist/jquery.min.js"></script>
+		<script src="../static/lib/jquery/dist/jquery.min.js"></script>
 		<!-- Attach XML and JSON converter library -->
-		<script src="../lib/json_to_xml.js"></script>
+		<script src="../static/lib/json_to_xml.js"></script>
 		<!-- Attach global utilities -->
-		<script src="../js/global.js"></script>
+		<script src="../static/js/global.js"></script>
 		<!-- Attach slippy map -->
-		<script src="../js/map.js"></script>
+		<script src="../static/js/map.js"></script>
 		<!-- Attach XML utilities -->
-		<script src="../js/xml.js"></script>
+		<script src="../static/js/xml.js"></script>
 		<!-- Implementation -->
 		<script>
 			function displayAlbum(response) {

diff --git a/app.js b/app.js
diff --git a/changelog.md b/changelog.md
@@ -1,9 +1,25 @@
-Changelog
-------
+# Changelog
+
+### 1.0.0 - Replace express.js for hapi.js
+#### 2015-Feb-15
+* Replace grunt.js with gulp.js 
+* Mostly async using callbacks and promises
+* Restructure folders to public and src
+
+### 0.20.0 - Rename and move meta files like RAW and movies
+#### 2014-Dec-21
+
+### 0.19.0 - Isolate XML for future JSON
+#### 2014-Dec-20
+
+### 0.18.0 - Add Flickr full justified gallery
+#### 2014-Sep-14
 
 ### 0.17.0 - Generate thumbs
+#### 2014-Jan-10
 
 ### 0.16.0 - Add unit test
+#### 2014-Jan-05
 
 ### 0.15.0 - Grunt.js workflow
 #### 2014-Jan-04