From ee3feaf2ef76747b7862f59599d8c909861de107 Mon Sep 17 00:00:00 2001
From: Mohammed Tantawy <6102@ait.nsw.edu.au>
Date: Fri, 1 Feb 2019 12:35:00 +1100
Subject: [PATCH] Migrating to AngularJS

---
 src/_sidebar.html                             | 14 ++++++------
 src/_topbar.html                              |  6 ++---
 src/assets/scripts/app/index.js               |  4 ++++
 .../scripts/footer/footer.html}               |  0
 src/assets/scripts/footer/index.js            | 12 ++++++++++
 src/assets/scripts/index.js                   |  4 +++-
 src/assets/scripts/login/controller.js        |  1 -
 src/assets/scripts/signup/SignupController.js | 10 +++++++++
 src/assets/scripts/signup/signup.js           |  3 +++
 src/assets/scripts/signup/signup.service.js   | 22 +++++++++++++++++++
 src/index.html                                |  4 ++--
 11 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 src/assets/scripts/app/index.js
 rename src/{_footer.html => assets/scripts/footer/footer.html} (100%)
 create mode 100644 src/assets/scripts/footer/index.js
 create mode 100644 src/assets/scripts/signup/SignupController.js
 create mode 100644 src/assets/scripts/signup/signup.js
 create mode 100644 src/assets/scripts/signup/signup.service.js

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 @@
 
 <!-- ### $Sidebar Menu ### -->
 <ul class="sidebar-menu scrollable pos-r">
-      <li class="nav-item mT-30 active visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item mT-30 active visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class="sidebar-link" href="index.html">
           <span class="icon-holder">
             <i class="c-white-500 ti-bar-chart"></i>
@@ -155,7 +155,7 @@
           <span class="title">Dashboard</span>
         </a>
       </li>
-      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="ads.html">
           <span class="icon-holder">
             <i class="c-white-500 ti-receipt"></i>
@@ -172,7 +172,7 @@
       <span class="title">Profile</span>
     </a>
   </li>
-      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="users.html">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-users"></i>
@@ -180,7 +180,7 @@
           <span class="title">Users</span>
         </a>
       </li>
-      <li class="nav-item visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="companies.html">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-building"></i>
@@ -188,7 +188,7 @@
           <span class="title">Companies</span>
         </a>
       </li>
-      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="referees.html">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-crosshairs"></i>
@@ -206,7 +206,7 @@
     </a>
   </li>
   -->
-      <li class="nav-item visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == ‘referee’">
+      <li class="nav-item visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == 'referee'">
         <a class='sidebar-link' href="#">
           <span class="icon-holder">
             <i class="c-white-500 ti-calendar"></i>
@@ -215,7 +215,7 @@
         </a>
       </li>
 
-      <li class="nav-item visible-user visible-company" ng-show="user.role==‘user’ || user.role == ‘company’">
+      <li class="nav-item visible-user visible-company" ng-show="user.role=='user' || user.role == 'company'">
         <a class='sidebar-link' href="#">
           <span class="icon-holder">
             <i class="c-white-500 fa fa-history"></i>
diff --git a/src/_topbar.html b/src/_topbar.html
index 49ecc99..c948093 100644
--- a/src/_topbar.html
+++ b/src/_topbar.html
@@ -8,13 +8,13 @@
             <i class="ti-menu"></i>
           </a>
         </li>
-        <li class="search-box visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == ‘referee’">
+        <li class="search-box visible-nomit visible-referee" ng-show="user.role=='nomit' || user.role == 'referee'">
           <a class="search-toggle no-pdd-right" href="javascript:void(0);">
             <i class="search-icon ti-search pdd-right-10"></i>
             <i class="search-icon-close ti-close pdd-right-10"></i>
           </a>
         </li>
-        <li class="search-input visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == ‘referee’">
+        <li class="search-input visible-referee visible-nomit" ng-show="user.role=='nomit' || user.role == 'referee'">
           <input class="form-control" type="text" placeholder="Search users, companies, or anything..">
         </li>
         <li class="visible-nomit" ng-show="user.role=='nomit'">
@@ -34,7 +34,7 @@
             <div class="peer">
               <span class="fsz-sm c-grey-900  visible-nomit" ng-show="user.role=='nomit'">Nomit Admin</span>
               <span class="fsz-sm c-grey-900  visible-referee" ng-show="user.role=='referee'">Referee Admin</span>
-              <span class="fsz-sm c-grey-900  visible-user visible-company" ng-show="user.role=='user' || user.role == ‘company’">Username</span>
+              <span class="fsz-sm c-grey-900  visible-user visible-company" ng-show="user.role=='user' || user.role == 'company'">Username</span>
             </div>
             <div class="peer mR-10 visible-nomit" ng-show="user.role=='nomit'">
               <img class=" w-2r bdrs-50p mL-10 nomit-logo-top" src="assets/static/images/nomit-logo.png" alt="">
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 @@
 <!DOCTYPE html>
-<html>
+<html ng-app="NomitWisp">
 
 <head>
   <meta charset="utf-8">
@@ -278,7 +278,7 @@
 
 
   <!-- ### $App Screen Footer ### -->
-  ${require('html-loader!./_footer.html')}
+  <nw-footer></nw-footer>
   
   </div>
   </div>