diff --git a/package.json b/package.json index 3b51bc8..08239f2 100755 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "angular": "^1.6.4", "angular-cookies": "^1.6.4", + "angular-filter": "^0.5.17", "angular-route": "^1.6.4", "babel-core": "^6.26.0", "babel-eslint": "^8.0.1", diff --git a/src/assets/scripts/ads-details/ads-details.controller.js b/src/assets/scripts/ads-details/ads-details.controller.js index 02364fd..33fb76e 100644 --- a/src/assets/scripts/ads-details/ads-details.controller.js +++ b/src/assets/scripts/ads-details/ads-details.controller.js @@ -1,21 +1,15 @@ import moment from 'moment'; -import UserService from '../app/shared.service'; const AdsDetailsController = ($scope, AdsDetailsService, $routeParams, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; AdsDetailsService.fetchAdDetails($routeParams) - .then(function(result){ + .then((result) => { $scope.ad = result; window.msnry.layout(); - console.log(result); }) - .catch(function(error){ - console.log(error); - }); - $scope.daysAgo = (timestamp) => { - return moment(timestamp).fromNow(); - } + .catch((error) => { console.log(error); }); + $scope.daysAgo = (timestamp) => { return moment(timestamp).fromNow(); } }); UserService.loadUser(); } diff --git a/src/assets/scripts/ads-details/ads-details.service.js b/src/assets/scripts/ads-details/ads-details.service.js index e92afd9..9c367ff 100644 --- a/src/assets/scripts/ads-details/ads-details.service.js +++ b/src/assets/scripts/ads-details/ads-details.service.js @@ -3,13 +3,8 @@ const AdsDetailsService = ($http) => { serv.fetchAdDetails = (route) =>{ return $http.get('https://nomitwisp-restapi.herokuapp.com/api/ads/'+route.id) - .then( (result) => { - console.log(route.id); - return result.data; - }, (error) => { - console.log(error); - return error; - }); + .then( (result) => { return result.data; }) + .catch( (error) => { return error; }) } return serv; } diff --git a/src/assets/scripts/ads/ads.controller.js b/src/assets/scripts/ads/ads.controller.js index 3aa7f57..7acf3bf 100644 --- a/src/assets/scripts/ads/ads.controller.js +++ b/src/assets/scripts/ads/ads.controller.js @@ -3,14 +3,8 @@ const AdsController = ($scope, AdsService, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; AdsService.fetchAdsService() - .then(function (result) { - $scope.ads = result; - console.log(result); - }) - .catch(function (error) { - console.log(error); - }) - + .then( (result) => { $scope.ads = result; }) + .catch( (error) => { console.log(error); }) }); UserService.loadUser(); } diff --git a/src/assets/scripts/ads/ads.service.js b/src/assets/scripts/ads/ads.service.js index 612006a..910ef8e 100644 --- a/src/assets/scripts/ads/ads.service.js +++ b/src/assets/scripts/ads/ads.service.js @@ -1,17 +1,11 @@ /** @ngInject */ const AdsService = ($http) => { let serv = {}; - + serv.fetchAdsService = () =>{ return $http.get('https://nomitwisp-restapi.herokuapp.com/api/ads', { withCredentials: true }) - .then( (result) => { - console.log(result.data); - return result.data; - }) - .catch( (error) => { - console.log(error); - return []; - }); + .then( (result) => { return result.data; }) + .catch( (error) => { return error; }); } return serv; } diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index 0384799..797426b 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -13,6 +13,7 @@ angular.module('NomitWisp', 'nwAds', 'nwAdsDetails', 'nwProfile', + 'nwSignup', ngRoute ]) @@ -36,6 +37,10 @@ angular.module('NomitWisp', controller: 'ProfileController', templateUrl: 'assets/scripts/profile/profile.html' }) + .when('/signup', { + controller: 'SignupController', + templateUrl: 'assets/scripts/signup/signup.html' + }) // .when('/users', { // controller: 'UsersController', // templateUrl: '' diff --git a/src/assets/scripts/app/shared.service.js b/src/assets/scripts/app/shared.service.js index 610f384..4dc5016 100644 --- a/src/assets/scripts/app/shared.service.js +++ b/src/assets/scripts/app/shared.service.js @@ -6,7 +6,7 @@ function parseJwt(token) { return JSON.parse(window.atob(base64)); }; -const UserService = ($cookies, $rootScope) => { +const UserService = ($cookies, $rootScope, $location) => { let serv = {}; @@ -16,7 +16,8 @@ const UserService = ($cookies, $rootScope) => { $rootScope.$broadcast('loadUserSuccess', parseJwt( $cookies.get('access_token') )); $('#modalLoginForm').modal('hide'); } else { - $('#modalLoginForm').modal({backdrop: 'static', keyboard: false}); + if($location.path() === '/signup') { $('#modalLoginForm').modal('hide'); } + else { $('#modalLoginForm').modal({backdrop: 'static', keyboard: false}); } } } diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index d9d3541..edb9c39 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -26,5 +26,6 @@ import './dashboard' import './ads'; import './ads-details'; import './profile'; +import './signup'; import './app'; \ No newline at end of file diff --git a/src/assets/scripts/logout/controller.js b/src/assets/scripts/logout/controller.js index 6197e1a..28f9960 100644 --- a/src/assets/scripts/logout/controller.js +++ b/src/assets/scripts/logout/controller.js @@ -2,10 +2,8 @@ const LogoutController = ($scope, LogoutService, $cookies, UserService) => { $scope.userLogged = false; $scope.userLogout = async () => { - console.log("Logout"); - const result = await LogoutService.logoutUserService($scope.user); + await LogoutService.logoutUserService($scope.user); $cookies.remove('access_token'); - console.log(result); UserService.loadUser(); } }; diff --git a/src/assets/scripts/nwLogin/controller.js b/src/assets/scripts/nwLogin/controller.js index ce1e3a2..ff09677 100644 --- a/src/assets/scripts/nwLogin/controller.js +++ b/src/assets/scripts/nwLogin/controller.js @@ -3,17 +3,18 @@ const LoginController = ($scope, $cookies, LoginService, UserService) => { // load the user if already logged in, for all controllers UserService.loadUser(); - $scope.userLogin = async () => { - - let result = await LoginService.loginUserService($scope.user); - if( typeof result.token !== "undefined"){ + $scope.userLogin = async (isValid) => { + if(isValid){ + let result = await LoginService.loginUserService($scope.user); + if( typeof result.token !== "undefined"){ - // save the cookie and reload the user for all controllers - $cookies.put('access_token', result.token); - UserService.loadUser(); + // save the cookie and reload the user for all controllers + $cookies.put('access_token', result.token); + UserService.loadUser(); - } else { - alert(result); + } else { + alert(result); + } } } diff --git a/src/assets/scripts/nwLogin/nwLogin.html b/src/assets/scripts/nwLogin/nwLogin.html index 94a6da8..12ff136 100644 --- a/src/assets/scripts/nwLogin/nwLogin.html +++ b/src/assets/scripts/nwLogin/nwLogin.html @@ -7,7 +7,7 @@

Let's start with getting connected.

Sign up and join the WISP.
- + SIGNUP
@@ -135,19 +135,15 @@

Sign In -
- - - -
-
-

Welcome {{user.fullname}}!

-

This text is only visible to Users

-

This text is only visible to Companies

-

This text is visible to both Nomit and Admin

-

This text is only visible to Nomit

-

This text is only visible to Admin

-
+
+ +

This field is required.

+

Invalid email.

+ + +

Min 5 characters.

+ +

diff --git a/src/assets/scripts/profile/index.js b/src/assets/scripts/profile/index.js index bd00d99..016bb53 100644 --- a/src/assets/scripts/profile/index.js +++ b/src/assets/scripts/profile/index.js @@ -1,8 +1,9 @@ import angular from 'angular'; +import angularFilter from 'angular-filter'; import ProfileController from './profile.controller'; import ProfileService from './profile.service'; -angular.module('nwProfile', []) +angular.module('nwProfile', [angularFilter]) .config(['$httpProvider', function($httpProvider) { $httpProvider.defaults.withCredentials = true; }]) diff --git a/src/assets/scripts/profile/profile.controller.js b/src/assets/scripts/profile/profile.controller.js index 0f37e75..fc4c701 100644 --- a/src/assets/scripts/profile/profile.controller.js +++ b/src/assets/scripts/profile/profile.controller.js @@ -1,3 +1,4 @@ +import visas from './visa.type'; /** @ngInject */ const ProfileController = ($scope, ProfileService, UserService) => { $scope.$on('loadUserSuccess', function (event, user) { @@ -5,16 +6,11 @@ const ProfileController = ($scope, ProfileService, UserService) => { }); UserService.loadUser(); - // Call service to fetch user data ProfileService.fetchProfileService($scope.user.id) - .then(function (result) { - $scope.profile = result; - - }) - .catch(function (error) { - console.log(error); - }) - + .then((result) => { $scope.profile = result; }) + .catch((error) => { console.log(error); }) + + $scope.visas = visas; UserService.loadUser(); } diff --git a/src/assets/scripts/profile/profile.html b/src/assets/scripts/profile/profile.html index 239a94f..64061ec 100644 --- a/src/assets/scripts/profile/profile.html +++ b/src/assets/scripts/profile/profile.html @@ -78,9 +78,8 @@
Visa Type - +
diff --git a/src/assets/scripts/profile/profile.service.js b/src/assets/scripts/profile/profile.service.js index aa54597..a12057d 100644 --- a/src/assets/scripts/profile/profile.service.js +++ b/src/assets/scripts/profile/profile.service.js @@ -4,13 +4,8 @@ const ProfileService = ($http) => { serv.fetchProfileService = (id) =>{ return $http.get('https://nomitwisp-restapi.herokuapp.com/api/user/'+id, { withCredentials: true }) - .then( (result) => { - return result.data; - }) - .catch( (error) => { - console.log(error); - return []; - }); + .then( (result) => { return result.data; }) + .catch( (error) => { return error; }); } return serv; } diff --git a/src/assets/scripts/profile/visa.type.js b/src/assets/scripts/profile/visa.type.js new file mode 100644 index 0000000..d8225ea --- /dev/null +++ b/src/assets/scripts/profile/visa.type.js @@ -0,0 +1,317 @@ +const visas = [ + { + id: 0, + type: "Visitor visa", + subclass: "601", + name: "Electronic Travel Authority (subclass 601)" + }, + { + id: 1, + type: "Visitor visa", + subclass: "651", + name: "eVisitor (subclass 651)" + }, + { + id: 2, + type: "Visitor visa", + subclass: "771", + name: "Transit visa (subclass 771)" + }, + { + id: 3, + type: "Visitor visa", + subclass: "600", + name: "Visitor (subclass 600)" + }, + { + id: 4, + type: "Visitor visa", + subclass: "417-462", + name: "Work and Holiday visa (subclass 417 462)" + }, + { + id: 5, + type: "Studying and training visas", + subclass: "500", + name: "Student visa (subclass 500)" + }, + { + id: 6, + type: "Studying and training visas", + subclass: "590", + name: "Student Guardian visa (subclass 590)" + }, + { + id: 7, + type: "Studying and training visas", + subclass: "407", + name: "Training visa (subclass 407)" + }, + { + id: 8, + type: "Family and partner visas", + subclass: "102", + name: "Adoption visa (subclass 102)" + }, + { + id: 9, + type: "Family and partner visas", + subclass: "114-838", + name: "Aged Dependent Relative visa (subclass 114 838)" + }, + { + id: 10, + type: "Family and partner visas", + subclass: "804", + name: "Aged Parent visa (subclass 804)" + }, + { + id: 11, + type: "Family and partner visas", + subclass: "116-836", + name: "Carer visa (subclass 116 836)" + }, + { + id: 12, + type: "Family and partner visas", + subclass: "101-802", + name: "Child visa (subclass 101 802)" + }, + { + id: 12, + type: "Family and partner visas", + subclass: "864-884", + name: "Contributory Aged Parent visa (subclass 864 884)" + }, + { + id: 13, + type: "Family and partner visas", + subclass: "143-173", + name: "Contributory Parent visa (subclass 143 173)" + }, + { + id: 14, + type: "Family and partner visas", + subclass: "445", + name: "Dependent Child visa (subclass 445)" + }, + { + id: 15, + type: "Family and partner visas", + subclass: "461", + name: "New Zealand Citizen Family Relationship (temporary) visa (subclass 461)" + }, + { + id: 16, + type: "Family and partner visas", + subclass: "117-837", + name: "Orphan Relative (subclass 117 837)" + }, + { + id: 17, + type: "Family and partner visas", + subclass: "103", + name: "Parent visa (subclass 103)" + }, + { + id: 18, + type: "Family and partner visas", + subclass: "100-309", + name: "Partner (Provisional and Migrant) visa (subclass 309 100)" + }, + { + id: 19, + type: "Family and partner visas", + subclass: "801-820", + name: "Partner visa (subclass 820 801)" + }, + { + id: 20, + type: "Family and partner visas", + subclass: "300", + name: "Prospective Marriage visa (subclass 300)" + }, + { + id: 21, + type: "Family and partner visas", + subclass: "115-835", + name: "Remaining Relative visa (subclass 115 835)" + }, + { + id: 22, + type: "Working and skilled visas", + subclass: "188-888", + name: "Business Innovation and Investment visa (subclass 188 888)" + }, + { + id: 23, + type: "Working and skilled visas", + subclass: "890", + name: "Business Owner (subclass 890)" + }, + { + id: 24, + type: "Working and skilled visas", + subclass: "132", + name: "Business Talent visa (subclass 132)" + }, + { + id: 25, + type: "Working and skilled visas", + subclass: "124-858", + name: "Distinguished Talent visa (subclass 124 858)" + }, + { + id: 26, + type: "Working and skilled visas", + subclass: "186", + name: "Employer Nomination Scheme (subclass 186)" + }, + { + id: 27, + type: "Working and skilled visas", + subclass: "891", + name: "Investor visa (subclass 891)" + }, + { + id: 28, + type: "Working and skilled visas", + subclass: "187", + name: "Regional Sponsor Migration Scheme (subclass 187)" + }, + { + id: 29, + type: "Working and skilled visas", + subclass: "189", + name: "Skilled Independent visa (subclass 189)" + }, + { + id: 30, + type: "Working and skilled visas", + subclass: "190", + name: "Skilled Nominated visa (subclass 190)" + }, + { + id: 30, + type: "Working and skilled visas", + subclass: "476", + name: "Skilled-Recognised Graduate visa (subclass 476)" + }, + { + id: 31, + type: "Working and skilled visas", + subclass: "489-887", + name: "Skilled Regional visa (subclass 489 887)" + }, + { + id: 32, + type: "Working and skilled visas", + subclass: "892", + name: "State or Territory Sponsored Business Owner visa (subclass 892)" + }, + { + id: 33, + type: "Working and skilled visas", + subclass: "893", + name: "State or Territory Sponsored Investor visa (subclass 893)" + }, + { + id: 34, + type: "Working and skilled visas", + subclass: "408", + name: "Temporary Activity visa (subclass 408)" + }, + { + id: 35, + type: "Working and skilled visas", + subclass: "485", + name: "Temporary Graduate visa (subclass 485)" + }, + { + id: 36, + type: "Working and skilled visas", + subclass: "400-403", + name: "Temporary Work visa (subclass 400 403)" + }, + { + id: 37, + type: "Working and skilled visas", + subclass: "482", + name: "Temporary Skill Shortage visa (subclass 482)" + }, +] + +export default visas; + /** + + Refugee and humanitarian visas + Global Special Humanitarian (subclass 202) + Protection visa (subclass 866) + Refugee visas (subclass 200, 201, 203 and 204) + Temporary Protection visa (subclass 785) + Safe Haven Enterprise visa (subclass 790) + + Other visas + Bridging visa A – BVA - (subclass 010) + Bridging visa B – BVB – (subclass 020) + Bridging visa C – BVC – (subclass 030) + Bridging visa E – BVE – (subclass 050 and 051) + Crew Travel Authority visa (subclass 942) + Former Resident visa (subclass 151) + Maritime Crew visa (subclass 988) + Medical Treatment visa (subclass 602) + Resident Return visa (subclass 155 157) + Special Category visa (subclass 444) + + Special Purpose visa + Retirement visa (subclass 410) + Investor Retirement visa (subclass 405) + Confirmatory (Residence) visa (subclass 808) + + Repealed visas + Business (Short Stay) visa (subclass 456) + Business Skills (Provisional) visa (subclass 160 and 165) + Domestic Worker (Temporary) Diplomatic and Consular visa (subclass 426) + Domestic Worker (Temporary) Executive visa (subclass 427) + Electronic Travel Authority (Business Entrant) visa (subclass 956 and 977) + Electronic Travel Authority (Visitor) visa (subclass 976) + Employer Nomination Scheme (subclass 121 and 856) + Established Business in Australia visa (subclass 845) + Exchange visa (subclass 411) + Foreign Government Agency (subclass 415) + Government Agreement visa (subclass 406) + Labour Agreement visa (subclass 120) + Labour Agreement visa (subclass 855) + Media and Film Staff visa (subclass 423) + Medical Practitioner visa (subclass 422) + Medical Treatment (Short Stay) visa (subclass 675) + Medical Treatment Long Stay visa (subclass 685) + Regional Sponsor Migration Scheme (subclass 119 and 857) + Religious Worker visa (subclass 428) + Skilled Designated Area Sponsored visa (subclass 496) + Skilled Independent Regional (Provisional) visa (subclass 495) + Skilled Independent visa (subclass 175) + Skilled Independent visa (subclass 885) + Skilled Regional Sponsored visa (subclass 475) + Skilled Regional Sponsored (subclass 487) + Skilled Sponsored visa (subclass 176) + Special Program visa (subclass 416) + Sponsored visa (subclass 886) + Sport visa (subclass 421) + Superyacht Crew visa (subclass 488) + State or Territory Sponsored Regional Established Business in Australia visa (subclass 846) + Temporary Work (Entertainment) visa (subclass 420) + Temporary Work (Skilled) visa (subclass 457) + Tourist visa (subclass 676) + Temporary Work (long Stay Activity) visa (subclass 401) + Training and Research visa (subclass 402) + Visiting Academic visa (subclass 419) + Foreign Affairs or Defence sector visa (subclass 576) + Higher Education Sector visa (subclass 573) + Independent ELICOS Sector visa (subclass 570) + Non Award Sector visa (subclass 575) + Postgraduate Research Sector visa (subclass 574) + School Sector visa (subclass 571) + Student Guardian visa (subclass 580) + Vocational Education and Training Sector visa (Subclass 572) +] */ \ No newline at end of file diff --git a/src/assets/scripts/signup/SignupController.js b/src/assets/scripts/signup/SignupController.js deleted file mode 100644 index 90207a2..0000000 --- a/src/assets/scripts/signup/SignupController.js +++ /dev/null @@ -1,10 +0,0 @@ -'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/index.js b/src/assets/scripts/signup/index.js new file mode 100644 index 0000000..10e3bea --- /dev/null +++ b/src/assets/scripts/signup/index.js @@ -0,0 +1,10 @@ +'use strict'; + +import * as angular from 'angular'; +import ngCookies from 'angular-cookies'; +import SignupController from './signup.controller'; +import SignupService from './signup.service'; + +angular.module('nwSignup', [ngCookies]) + .controller(SignupController.name, SignupController) + .factory(SignupService.name, SignupService); \ No newline at end of file diff --git a/src/assets/scripts/signup/signup.controller.js b/src/assets/scripts/signup/signup.controller.js new file mode 100644 index 0000000..652f8d6 --- /dev/null +++ b/src/assets/scripts/signup/signup.controller.js @@ -0,0 +1,16 @@ +'use strict'; + +/** @ngInject */ +const SignupController = ($scope, $cookies, $location, SignupService, UserService) => { + $scope.userSignup = async() => { + await SignupService.signupUserService($scope.user) + .then((result) => { + $cookies.put('access_token', result); + UserService.loadUser(); + $location.path('/'); + }) + .catch((error) => { console.log(error); }) + } +} + +export default SignupController; \ No newline at end of file diff --git a/src/assets/scripts/signup/signup.html b/src/assets/scripts/signup/signup.html new file mode 100644 index 0000000..47f90fb --- /dev/null +++ b/src/assets/scripts/signup/signup.html @@ -0,0 +1,41 @@ +
+
+
+
+ +
+
+
+
+

Register

+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ +
+
+
+
diff --git a/src/assets/scripts/signup/signup.js b/src/assets/scripts/signup/signup.js deleted file mode 100644 index 22229b4..0000000 --- a/src/assets/scripts/signup/signup.js +++ /dev/null @@ -1,3 +0,0 @@ -'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 index 46363d8..fe83bae 100644 --- a/src/assets/scripts/signup/signup.service.js +++ b/src/assets/scripts/signup/signup.service.js @@ -1,22 +1,26 @@ '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; - }); +const SignupService = ($http)=> { + let serv = {}; + + serv.signupUserService = (user) => { + 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; + }); + } + return serv; } +export default SignupService; +