# HG changeset patch
# User rougeronj
# Date 1426091894 -3600
# Node ID 08f34bbc70ee9327a81e8156a9e82fbbf372a422
# Parent 1ada9d221ba3dfa25b1cb4a998f054184819eff7
set up django rest framework
diff -r 1ada9d221ba3 -r 08f34bbc70ee .pydevproject
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.pydevproject Wed Mar 11 17:38:14 2015 +0100
@@ -0,0 +1,8 @@
+
+
+ammico_python
+python 2.7
+
+/${PROJECT_DIR_NAME}/server
+
+
diff -r 1ada9d221ba3 -r 08f34bbc70ee client/app/app.js
--- a/client/app/app.js Mon Feb 23 12:40:17 2015 +0100
+++ b/client/app/app.js Wed Mar 11 17:38:14 2015 +0100
@@ -1,7 +1,7 @@
(function(){
'use strict';
- angular.module('ammico', [ 'ngRoute','ammicoHome', 'ammicoGallery', 'ammicoSlideshow', 'ammicoSearch', 'templates' ])
+ angular.module('ammico', [ 'ngRoute','ammicoHome', 'ammicoGallery', 'ammicoSlideshow', 'ammicoSearch', 'ammicoLogin', 'templates' ])
.config(function($routeProvider) {
$routeProvider.
when('/', {
@@ -36,6 +36,10 @@
controller: 'searchCtrl',
templateUrl: 'search/search.html'
}).
+ when('/login/', {
+ controller: 'loginCtrl',
+ templateUrl: 'login/login.html'
+ }).
otherwise({
redirectTo: '/'
});
diff -r 1ada9d221ba3 -r 08f34bbc70ee client/app/index.html
--- a/client/app/index.html Mon Feb 23 12:40:17 2015 +0100
+++ b/client/app/index.html Wed Mar 11 17:38:14 2015 +0100
@@ -24,6 +24,9 @@