diff --git a/src/_sidebar.html b/src/_sidebar.html index 330770c..aeaf413 100644 --- a/src/_sidebar.html +++ b/src/_sidebar.html @@ -147,7 +147,7 @@
diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js
new file mode 100644
index 0000000..81ab4e5
--- /dev/null
+++ b/src/assets/scripts/app/index.js
@@ -0,0 +1,4 @@
+import * as angular from 'angular';
+
+angular.module('NomitWisp',
+['NomitWisp-Login']);
\ No newline at end of file
diff --git a/src/_footer.html b/src/assets/scripts/footer/footer.html
similarity index 100%
rename from src/_footer.html
rename to src/assets/scripts/footer/footer.html
diff --git a/src/assets/scripts/footer/index.js b/src/assets/scripts/footer/index.js
new file mode 100644
index 0000000..2efde72
--- /dev/null
+++ b/src/assets/scripts/footer/index.js
@@ -0,0 +1,12 @@
+import * as angular from 'angular';
+// const angular = require('angular');
+
+angular.module('NomitWisp', [])
+ .directive('nwFooter', nwFooter);
+
+function nwFooter(){
+ return {
+ restrict: 'E',
+ templateUrl: 'assets/scripts/footer/footer.html'
+ }
+}
\ No newline at end of file
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js
index 1d1ca0b..ff6c5d3 100755
--- a/src/assets/scripts/index.js
+++ b/src/assets/scripts/index.js
@@ -16,4 +16,6 @@ import './fullcalendar';
import './googleMaps';
import './utils';
import './user-form';
-import './login';
\ No newline at end of file
+import './login';
+import './app';
+import './footer';
\ No newline at end of file
diff --git a/src/assets/scripts/login/controller.js b/src/assets/scripts/login/controller.js
index 653ab3a..69cbcdb 100644
--- a/src/assets/scripts/login/controller.js
+++ b/src/assets/scripts/login/controller.js
@@ -6,7 +6,6 @@ const LoginController = ($scope, LoginService, $cookies) => {
$scope.userLogged = true;
$scope.user = parseJwt( $cookies.get('access_token') );
}
- console.log("BEFORE FUNC ");
$scope.userLogin = async () => {
let result = await LoginService.loginUserService($scope.user);
diff --git a/src/assets/scripts/signup/SignupController.js b/src/assets/scripts/signup/SignupController.js
new file mode 100644
index 0000000..90207a2
--- /dev/null
+++ b/src/assets/scripts/signup/SignupController.js
@@ -0,0 +1,10 @@
+'use strict';
+
+angular.module('NomitWisp-Signup', [])
+ .controller('SignupController', SignupController);
+
+
+/** @ngInject */
+function SignupController($scope) {
+
+}
\ No newline at end of file
diff --git a/src/assets/scripts/signup/signup.js b/src/assets/scripts/signup/signup.js
new file mode 100644
index 0000000..22229b4
--- /dev/null
+++ b/src/assets/scripts/signup/signup.js
@@ -0,0 +1,3 @@
+'use strict';
+
+angular.module('NomitWisp-Signup', []);
\ No newline at end of file
diff --git a/src/assets/scripts/signup/signup.service.js b/src/assets/scripts/signup/signup.service.js
new file mode 100644
index 0000000..46363d8
--- /dev/null
+++ b/src/assets/scripts/signup/signup.service.js
@@ -0,0 +1,22 @@
+'use strict';
+
+angular.module('NomitWisp-Signup', [])
+ .factory(SignupService.name, SignupService);
+
+/** @ngInject */
+function SignupService($http) {
+ return $http({
+ method: 'POST',
+ url: 'https://nomitwisp-restapi.herokuapp.com/signup',
+ data: user,
+ headers: { 'Content-Type': 'application/json' }
+ })
+ .then((result) => {
+ console.log(result.data.token);
+ return result.data.token;
+ }).catch((err) => {
+ console.log(err.data);
+ return err.data;
+ });
+}
+
diff --git a/src/index.html b/src/index.html
index 656c96c..1024b13 100755
--- a/src/index.html
+++ b/src/index.html
@@ -1,5 +1,5 @@
-
+
@@ -278,7 +278,7 @@
- ${require('html-loader!./_footer.html')}
+