diff --git a/src/browser/main/controllers/AppController.js b/src/browser/main/controllers/AppController.js index ab682812..1f17a16e 100644 --- a/src/browser/main/controllers/AppController.js +++ b/src/browser/main/controllers/AppController.js @@ -1,3 +1,5 @@ /* global angular */ angular.module('codexen') - .controller('AppController', function ($scope) {}) + .controller('AppController', function ($scope) { + + }) diff --git a/src/browser/main/controllers/directives/SideNavController.js b/src/browser/main/controllers/directives/SideNavController.js index 23cf4bd7..9ddeb479 100644 --- a/src/browser/main/controllers/directives/SideNavController.js +++ b/src/browser/main/controllers/directives/SideNavController.js @@ -5,6 +5,9 @@ angular.module('codexen') vm.isAuthenticated = $auth.isAuthenticated() + vm.showPP = Modal.showPP + vm.showRegulation = Modal.showRegulation + var reloadUser = function () { if (vm.isAuthenticated) { User.me().success(function (data) { diff --git a/src/browser/main/controllers/modals/AgreementModalController.js b/src/browser/main/controllers/modals/AgreementModalController.js new file mode 100644 index 00000000..233d51e7 --- /dev/null +++ b/src/browser/main/controllers/modals/AgreementModalController.js @@ -0,0 +1,15 @@ +/* global angular */ +angular.module('codexen') + .controller('AgreementModalController', function ($modalInstance) { + var vm = this + + vm.isAgreement = true + + vm.submit = function () { + $modalInstance.close() + } + + vm.cancel = function () { + $modalInstance.dismiss('cancel') + } + }) diff --git a/src/browser/main/controllers/modals/PPModalController.js b/src/browser/main/controllers/modals/PPModalController.js new file mode 100644 index 00000000..77a89b79 --- /dev/null +++ b/src/browser/main/controllers/modals/PPModalController.js @@ -0,0 +1,11 @@ +/* global angular */ +angular.module('codexen') + .controller('PPModalController', function ($modalInstance) { + var vm = this + + vm.isAgreement = false + + vm.cancel = function () { + $modalInstance.dismiss('cancel') + } + }) diff --git a/src/browser/main/controllers/states/AuthRegisterController.js b/src/browser/main/controllers/states/AuthRegisterController.js index ec2ebed1..72ff7a33 100644 --- a/src/browser/main/controllers/states/AuthRegisterController.js +++ b/src/browser/main/controllers/states/AuthRegisterController.js @@ -1,20 +1,23 @@ /* global angular */ angular.module('codexen') - .controller('AuthRegisterController', function ($auth, $log, $state, $rootScope) { + .controller('AuthRegisterController', function ($auth, $log, $state, $rootScope, Modal) { var vm = this vm.isEmpty = function (obj) { for (var i in obj) if (obj.hasOwnProperty(i)) return false return true } vm.signup = function () { - $auth.signup({ - email: vm.email, - password: vm.password, - name: vm.name, - profileName: vm.profileName - }).then(function (data) { - $rootScope.$broadcast('userSignIn') - $state.go('home') - }) + Modal.showAgreement() + .then(function () { + $auth.signup({ + email: vm.email, + password: vm.password, + name: vm.name, + profileName: vm.profileName + }).then(function (data) { + $rootScope.$broadcast('userSignIn') + $state.go('home') + }) + }) } }) diff --git a/src/browser/main/index.html b/src/browser/main/index.html index 90e036e9..0b595520 100644 --- a/src/browser/main/index.html +++ b/src/browser/main/index.html @@ -69,6 +69,7 @@ + @@ -76,13 +77,14 @@ + + - diff --git a/src/browser/main/services/Modal.js b/src/browser/main/services/Modal.js index 380b5075..5a66736b 100644 --- a/src/browser/main/services/Modal.js +++ b/src/browser/main/services/Modal.js @@ -1,6 +1,27 @@ /* global angular */ angular.module('codexen') .factory('Modal', function ($modal, $rootScope, $auth) { + var showAgreement = function () { + return $modal.open({ + templateUrl: 'tpls/modals/regulation.html', + controller: 'AgreementModalController as vm' + }).result + } + + var showRegulation = function () { + return $modal.open({ + templateUrl: 'tpls/modals/regulation.html', + controller: 'PPModalController as vm' + }) + } + + var showPP = function () { + return $modal.open({ + templateUrl: 'tpls/modals/pp.html', + controller: 'PPModalController as vm' + }) + } + var signOut = function () { return $modal.open({ templateUrl: 'tpls/modals/sign-out-modal.html', @@ -111,6 +132,9 @@ angular.module('codexen') } return { + showAgreement: showAgreement, + showRegulation: showRegulation, + showPP: showPP, signOut: signOut, newRecipe: newRecipe, editRecipe: editRecipe, diff --git a/src/browser/main/styles/app.css b/src/browser/main/styles/app.css index 7288235e..100c7f1a 100644 --- a/src/browser/main/styles/app.css +++ b/src/browser/main/styles/app.css @@ -80,6 +80,11 @@ #side-view ul.nav.nav-pills .nav-pills > li.active > a:focus { background-color: #004b5f; } +.botlink { + position: absolute; + bottom: 0; + text-align: center; +} /* * ui-select * http://github.com/angular-ui/ui-select @@ -541,3 +546,7 @@ body > .ui-select-bootstrap.open { .marked table > tbody >tr:nth-child(even) { background-color: #003644; } +.short { + height: 500px; + overflow-y: auto; +} diff --git a/src/browser/main/styles/app.styl b/src/browser/main/styles/app.styl index 09f953ca..19ec8112 100644 --- a/src/browser/main/styles/app.styl +++ b/src/browser/main/styles/app.styl @@ -99,3 +99,7 @@ background-color $baseBackgroundColor &:nth-child(even) background-color lighten($baseBackgroundColor, 3%) + +.short + height 500px + overflow-y auto diff --git a/src/browser/main/styles/directives/side-nav.styl b/src/browser/main/styles/directives/side-nav.styl index f6624cf7..272cd26c 100644 --- a/src/browser/main/styles/directives/side-nav.styl +++ b/src/browser/main/styles/directives/side-nav.styl @@ -32,3 +32,7 @@ li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus{ background-color: $backgroundColorSelected } +.botlink + position absolute + bottom 0 + text-align center diff --git a/src/browser/main/tpls/directives/side-nav.tpl.html b/src/browser/main/tpls/directives/side-nav.tpl.html index 4d98b1d3..c2e35b49 100644 --- a/src/browser/main/tpls/directives/side-nav.tpl.html +++ b/src/browser/main/tpls/directives/side-nav.tpl.html @@ -43,3 +43,8 @@ Recipes + + diff --git a/src/browser/main/tpls/modals/pp.html b/src/browser/main/tpls/modals/pp.html new file mode 100644 index 00000000..f4942dc8 --- /dev/null +++ b/src/browser/main/tpls/modals/pp.html @@ -0,0 +1,121 @@ +
+ + + + + +
diff --git a/src/browser/main/tpls/modals/regulation.html b/src/browser/main/tpls/modals/regulation.html new file mode 100644 index 00000000..118ec305 --- /dev/null +++ b/src/browser/main/tpls/modals/regulation.html @@ -0,0 +1,264 @@ +
+ + + + + +