Fixed HTML5 mode refresh on Apache server

clhorn · clhorn · commit 651b05831d17 · 2017-03-02T11:32:46.000-05:00
run `bower-install`
diff --git a/bower.json b/bower.json
@@ -31,6 +31,7 @@
   "dependencies": {
     "foundation-apps": "~1.2.0",
     "angular-slick": "^0.2.1",
-    "what-input": "^3.0.0"
+    "what-input": "^3.0.0",
+    "angular-route": "^1.6.2"
   }
 }
diff --git a/client/assets/js/app.js b/client/assets/js/app.js
@@ -4,6 +4,7 @@
   angular.module('application', [
     'ui.router',
     'ngAnimate',
+    'ngRoute',
 
     //foundation
     'foundation',
@@ -17,11 +18,37 @@
     .run(run)
   ;
 
-  config.$inject = ['$urlRouterProvider', '$locationProvider'];
+  config.$inject = ['$urlRouterProvider', '$locationProvider', '$routeProvider'];
 
-  function config($urlProvider, $locationProvider) {
+  function config($urlProvider, $locationProvider, $routeProvider) {
     $urlProvider.otherwise('/');
 
+    $routeProvider
+      .when('/spheric', {
+        templateUrl: 'projects/spheric.html',
+      })
+      .when('/cinario', {
+        templateUrl: 'projects/cinario.html',
+      })
+      .when('/the-road', {
+        templateUrl: 'projects/road.html',
+      })
+      .when('/misadventures', {
+        templateUrl: 'projects/misadventures.html',
+      })
+      .when('/reinventing-michael-banks', {
+        templateUrl: 'projects/tmb.html',
+      })
+      .when('/will', {
+        templateUrl: 'projects/will.html',
+      })
+      .when('/weddings', {
+        templateUrl: 'projects/weddings.html',
+      })
+      .when('/about', {
+        templateUrl: 'about.html',
+      });
+
     $locationProvider.html5Mode({
       enabled: true,
       requireBase: false
diff --git a/client/index.html b/client/index.html
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <base href="/">
     <title>Caroline L. Horn</title>
     <meta name="description" content="I am a multidisciplinary designer and developer with over eight years experience. I am passionate about design, both aesthetically and functionally. I create digital experiences that are based on the needs of its users and are tailored to the goals of the client.">
     <link rel="icon" href="./assets/img/favicon.ico" type="image/x-icon">
diff --git a/gulpfile.js b/gulpfile.js
@@ -39,6 +39,7 @@ var paths = {
     'bower_components/hammerjs/hammer.js',
     'bower_components/angular/angular.js',
     'bower_components/angular-animate/angular-animate.js',
+    'bower_components/angular-route/angular-route.js',
     'bower_components/angular-ui-router/release/angular-ui-router.js',
     '!bower_components/foundation-apps/js/vendor/**/*.js',
     'bower_components/foundation-apps/js/angular/**/*.js',

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`"dependencies": {`
`32`	`32`	`"foundation-apps": "~1.2.0",`
`33`	`33`	`"angular-slick": "^0.2.1",`
`34`		`- "what-input": "^3.0.0"`
	`34`	`+ "what-input": "^3.0.0",`
	`35`	`+ "angular-route": "^1.6.2"`
`35`	`36`	`}`
`36`	`37`	`}`