From f5194cd4b917febb92d5e6b7c0b0ca5aff43add5 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Fri, 8 Feb 2019 17:49:00 +1100 Subject: [PATCH] regular user-add --- src/assets/scripts/ads-add/ads-add.html | 1 - src/assets/scripts/app/index.js | 5 + src/assets/scripts/dashboard/dashboard.html | 19 +- src/assets/scripts/index.js | 1 + src/assets/scripts/nwTopbar/nwTopbar.html | 8 +- src/assets/scripts/profile/profile.html | 20 +- src/assets/scripts/user-add/index.js | 11 + .../scripts/user-add/user-add.controller.js | 14 + src/assets/scripts/user-add/user-add.html | 263 ++++++++++++++++++ .../scripts/user-add/user-add.service.js | 8 + src/assets/styles/nomit.scss | 11 +- src/new-ad.html | 6 +- src/new-user.html | 36 +-- src/profile.html | 82 +++--- 14 files changed, 391 insertions(+), 94 deletions(-) create mode 100644 src/assets/scripts/user-add/index.js create mode 100644 src/assets/scripts/user-add/user-add.controller.js create mode 100644 src/assets/scripts/user-add/user-add.html create mode 100644 src/assets/scripts/user-add/user-add.service.js diff --git a/src/assets/scripts/ads-add/ads-add.html b/src/assets/scripts/ads-add/ads-add.html index c9d59e5..68427d8 100644 --- a/src/assets/scripts/ads-add/ads-add.html +++ b/src/assets/scripts/ads-add/ads-add.html @@ -69,7 +69,6 @@
{{classification}}
{{skill}}
-

Posted 3 days ago

diff --git a/src/assets/scripts/app/index.js b/src/assets/scripts/app/index.js index db45c68..f3c00f5 100644 --- a/src/assets/scripts/app/index.js +++ b/src/assets/scripts/app/index.js @@ -16,6 +16,7 @@ angular.module('NomitWisp', 'nwProfile', 'nwSignup', 'nwHistory', + 'nwUserAdd', ngRoute ]) @@ -51,6 +52,10 @@ angular.module('NomitWisp', controller: 'HistoryController', templateUrl: 'assets/scripts/history/history.html' }) + .when('/user_add', { + controller: 'UserAddController', + templateUrl: 'assets/scripts/user-add/user-add.html' + }) // .when('/users', { // controller: 'UsersController', // templateUrl: '' diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index 7072d84..c3caee2 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -1,15 +1,15 @@
-
- Welcome {{ user.fullname }} +
+ Welcome {{ user.name }}
-
+
@@ -74,7 +74,7 @@
-
+
@@ -97,7 +97,7 @@
-
+
@@ -189,12 +189,12 @@
-
+
Your Ads
-
+
@@ -258,13 +258,10 @@
-
- -
-
+
diff --git a/src/assets/scripts/index.js b/src/assets/scripts/index.js index d0465e3..423a5ce 100755 --- a/src/assets/scripts/index.js +++ b/src/assets/scripts/index.js @@ -29,5 +29,6 @@ import './profile'; import './signup'; import './history'; import './trumbowyg'; +import './user-add'; import './app'; \ No newline at end of file diff --git a/src/assets/scripts/nwTopbar/nwTopbar.html b/src/assets/scripts/nwTopbar/nwTopbar.html index 05b7003..5cd4a7a 100644 --- a/src/assets/scripts/nwTopbar/nwTopbar.html +++ b/src/assets/scripts/nwTopbar/nwTopbar.html @@ -18,16 +18,16 @@
  • - +
  • - +
  • - +
    @@ -535,7 +535,7 @@
    - +
    diff --git a/src/assets/scripts/user-add/index.js b/src/assets/scripts/user-add/index.js new file mode 100644 index 0000000..0749b7a --- /dev/null +++ b/src/assets/scripts/user-add/index.js @@ -0,0 +1,11 @@ +import * as angular from 'angular'; +import UserAddController from './user-add.controller'; +import UserAddService from './user-add.service'; + +angular.module('nwUserAdd', []) + .config(['$httpProvider', function($httpProvider) { + $httpProvider.defaults.withCredentials = true; + }]) + .controller(UserAddController.name, UserAddController) + .factory(UserAddService.name, UserAddService); + \ No newline at end of file diff --git a/src/assets/scripts/user-add/user-add.controller.js b/src/assets/scripts/user-add/user-add.controller.js new file mode 100644 index 0000000..c0175fd --- /dev/null +++ b/src/assets/scripts/user-add/user-add.controller.js @@ -0,0 +1,14 @@ +/** @ngInject */ +const UserAddController = ($scope) => { + $scope.$on('loadUserSuccess', function (event, user) { + $scope.user = user; + + $scope.classifications = ['class1', 'class2']; + $scope.skills = ['s1', 's2']; + + }); + UserService.loadUser(); + } + + export default UserAddController; + \ No newline at end of file diff --git a/src/assets/scripts/user-add/user-add.html b/src/assets/scripts/user-add/user-add.html new file mode 100644 index 0000000..6113a38 --- /dev/null +++ b/src/assets/scripts/user-add/user-add.html @@ -0,0 +1,263 @@ +
    +
    +
    +
    + Add a new User / Company +
    +
    + +
    +
    + +
    + + + + + +
    +
    +
    + +
    +
    + +
    +
    New User
    +
    +
    +
    +
    +
    +
    + First Name + +
    +
    + Middle Name + +
    +
    + Last Name + +
    +
    + +
    +
    + Email Address + +
    +
    + Phone Number + +
    +
    + State + +
    +
    + +
    +
    + Nationality + +
    +
    + Visa Type + +
    +
    + Language (Select one or more) + +
    +
    + +
    +
    + Education + +
    +
    + +
    + +
    +
    Main Classification:
    + +
    +
    +
    Skills:
    + +
    +
    +
    +
    +
    Graphic Design
    +
    Adobe Creaetive CC
    +
    Illustration
    +
    +
    + +
    +
    + + +
    +
    + +
    + Curriculum + + +
    +
    + +
    + + + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + +
    +
    New Referee
    +
    +
    +
    +
    +
    +
    + Name + +
    +
    + Business Type + +
    +
    + ABN + +
    +
    + +
    +
    + Email Address + +
    +
    + Phone Number + +
    +
    + Website + +
    +
    + + +
    +
    + Address + +
    +
    + City + +
    +
    + State + +
    +
    + Zip + +
    +
    + +
    +
    + Description + +
    +
    +
    +
    + Twitter + +
    +
    + Facebook + +
    +
    + Instagram + +
    +
    + Linkedin + +
    +
    + + + + +
    +
    +
    +
    +
    +
    +
    + +
    + + +
    + +
    \ No newline at end of file diff --git a/src/assets/scripts/user-add/user-add.service.js b/src/assets/scripts/user-add/user-add.service.js new file mode 100644 index 0000000..8b255cf --- /dev/null +++ b/src/assets/scripts/user-add/user-add.service.js @@ -0,0 +1,8 @@ +const UserAddService = ($http) => { + let serv = {}; + + + return serv; +} + +export default UserAddService; \ No newline at end of file diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index 5e8af30..9cd20a4 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -5,7 +5,6 @@ box-shadow: 0 0 15px rgba(0,0,0,0.5); } - .bg-img{ background-image: url('/assets/static/images/sidebar-bkg.jpg'); background-size: cover; @@ -92,12 +91,15 @@ h1{ .btn-gradient { box-shadow: 0 4px 15px 0 rgba(187, 187, 187, 0.5); background-image: linear-gradient(to right,#ee38a4, #501db9); - color: #fff; + color: #fff !important; font-weight: bold; letter-spacing: 0.05em; border-radius: 50px; border: none; - height: 40px; + height: 40px !important; + min-height: 40px !important; + line-height: 40px !important; + max-height: 40px; width: 200px; margin-top: calc((#{$header-height} - 40px)/2); outline: none; @@ -727,6 +729,3 @@ body.modal-open .blurra{ border: none; } -.ciao{ - border-color: #fff !important; -} \ No newline at end of file diff --git a/src/new-ad.html b/src/new-ad.html index 3469cc8..45b50b8 100644 --- a/src/new-ad.html +++ b/src/new-ad.html @@ -140,7 +140,7 @@
    Location:
    - +
    @@ -162,10 +162,10 @@
    Main Classification:
    - +
    Skills:
    - +
    Graphic Design
    Adobe Creaetive CC
    diff --git a/src/new-user.html b/src/new-user.html index 72aaee3..11eb918 100644 --- a/src/new-user.html +++ b/src/new-user.html @@ -140,27 +140,27 @@
    First Name -
    Middle Name - +
    Last Name - +
    Email Address - +
    Phone Number - +
    State @@ -202,7 +202,7 @@
    Education - @@ -214,11 +214,11 @@
    Main Classification:
    - +
    Skills:
    - +
    @@ -267,16 +267,16 @@
    Name - +
    Business Type -
    ABN -
    @@ -284,17 +284,17 @@
    Email Address -
    Phone Number -
    Website -
    @@ -330,19 +330,19 @@
    Twitter - +
    Facebook - +
    Instagram - +
    Linkedin - +
    diff --git a/src/profile.html b/src/profile.html index 226e0ae..e058dff 100644 --- a/src/profile.html +++ b/src/profile.html @@ -119,27 +119,27 @@
    First Name -
    Middle Name - +
    Last Name - +
    Email Address - +
    Phone Number - +
    State @@ -181,7 +181,7 @@
    Education - @@ -193,11 +193,11 @@
    Main Classification:
    - +
    Skills:
    - +
    @@ -316,16 +316,16 @@
    Name - +
    Business Type -
    ABN -
    @@ -333,17 +333,17 @@
    Email Address -
    Phone Number -
    Website -
    @@ -379,19 +379,19 @@
    Twitter - +
    Facebook - +
    Instagram - +
    Linkedin - +
    @@ -419,16 +419,16 @@
    Name - +
    Business Type -
    ABN -
    @@ -436,17 +436,17 @@
    Email Address -
    Phone Number -
    Website -
    @@ -482,19 +482,19 @@
    Twitter - +
    Facebook - +
    Instagram - +
    Linkedin - +
    @@ -521,16 +521,16 @@
    Name - +
    Business Type -
    ABN -
    @@ -539,17 +539,17 @@
    Email Address -
    Phone Number -
    Website -
    @@ -585,19 +585,19 @@
    Twitter - +
    Facebook - +
    Instagram - +
    Linkedin - +
    @@ -619,15 +619,15 @@
    Current Password - +
    New Password - +
    Confirm New urrent Password - +