From 36864f4539fee4834ff451c237c3609e1806b5b1 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Mon, 11 Feb 2019 22:23:01 +1100 Subject: [PATCH 1/3] user card detail fix --- src/assets/scripts/ads/ads.html | 4 +- src/assets/scripts/dashboard/dashboard.html | 2 +- src/assets/scripts/profile/profile.html | 2 +- .../scripts/user-details/user-details.html | 88 +++++++++++-------- 4 files changed, 56 insertions(+), 40 deletions(-) diff --git a/src/assets/scripts/ads/ads.html b/src/assets/scripts/ads/ads.html index 065b891..93b746b 100644 --- a/src/assets/scripts/ads/ads.html +++ b/src/assets/scripts/ads/ads.html @@ -20,7 +20,9 @@

{{ ad.title }}

- + + +

{{ ad.description }}

diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index 97974ee..2ff3a2e 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -2,7 +2,7 @@
- Welcome {{ user.name }} +

Welcome {{ user.name }}

diff --git a/src/assets/scripts/profile/profile.html b/src/assets/scripts/profile/profile.html index 9d6c515..13a9426 100644 --- a/src/assets/scripts/profile/profile.html +++ b/src/assets/scripts/profile/profile.html @@ -2,7 +2,7 @@
- Profile +

Profile

diff --git a/src/assets/scripts/user-details/user-details.html b/src/assets/scripts/user-details/user-details.html index 082310a..aa97456 100644 --- a/src/assets/scripts/user-details/user-details.html +++ b/src/assets/scripts/user-details/user-details.html @@ -15,22 +15,40 @@
-
- -
-
{{userDetails.name}}
{{userDetails.personal.bio}} + +
+ +
+ +
+
{{userDetails.name}}
+ {{userDetails.personal.bio}} +
+
+ +
+
+ + + + +
+
+ + +
Your Profile
-
+
First Name

{{userDetails.personal.first_name}}

-
+
Middle Name

{{userDetails.personal.middle_name}}

@@ -41,66 +59,62 @@
-
+
Email Address

{{userDetails.email}}

-
+
Phone Number

{{userDetails.personal.phone}}

State - +

{{userDetails.personal.state}}

-
+
Nationality

{{userDetails.personal.nationality}}

-
+
Visa Type

{{userDetails.personal.visa}}

- Language (Select one or more) -

{{userDetails.personal.language}}

+ Spoken Languages +
+

{{language}}

+
Education +

{{userDetails.personal.education}}

-
- - -
-
-
Main Classification:
-
-
{{industry}}
-
+
-
Skills:
-
-
{{skill}}
+
-
- -
-
- + Main Classification: +
+
{{industry}}
+
+ +
+
+ Skills: +
+
{{skill}}
+
+ +
+
From 002272b6c596001ba2b97842f18098605c2b42a5 Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Mon, 11 Feb 2019 23:21:27 +1100 Subject: [PATCH 2/3] user-add fix --- .../company-details/company-details.html | 3 +- src/assets/scripts/dashboard/dashboard.html | 2 +- .../scripts/user-add/user-add.controller.js | 7 +- src/assets/scripts/user-add/user-add.html | 545 +++++++++++++----- src/assets/styles/nomit.scss | 1 + 5 files changed, 408 insertions(+), 150 deletions(-) diff --git a/src/assets/scripts/company-details/company-details.html b/src/assets/scripts/company-details/company-details.html index cf86cdd..1a23b5c 100644 --- a/src/assets/scripts/company-details/company-details.html +++ b/src/assets/scripts/company-details/company-details.html @@ -2,7 +2,8 @@
- Company's Profile +

Company's Profile

+
diff --git a/src/assets/scripts/dashboard/dashboard.html b/src/assets/scripts/dashboard/dashboard.html index 2ff3a2e..d8d6aae 100644 --- a/src/assets/scripts/dashboard/dashboard.html +++ b/src/assets/scripts/dashboard/dashboard.html @@ -195,7 +195,7 @@
- +
diff --git a/src/assets/scripts/user-add/user-add.controller.js b/src/assets/scripts/user-add/user-add.controller.js index b67e3e3..139ba48 100644 --- a/src/assets/scripts/user-add/user-add.controller.js +++ b/src/assets/scripts/user-add/user-add.controller.js @@ -1,11 +1,10 @@ /** @ngInject */ +import visas from "../profile/visa.type" + const UserAddController = ($scope,UserService) => { $scope.$on('loadUserSuccess', function (event, user) { $scope.user = user; - $scope.classifications = ['class1', 'class2']; - $scope.skills = ['s1', 's2']; - $scope.tab = 1; $scope.setTab = (newTab) => { @@ -18,6 +17,8 @@ const UserAddController = ($scope,UserService) => { }); UserService.loadUser(); + + $scope.visas = visas; } export default UserAddController; diff --git a/src/assets/scripts/user-add/user-add.html b/src/assets/scripts/user-add/user-add.html index 14f50d2..1fde923 100644 --- a/src/assets/scripts/user-add/user-add.html +++ b/src/assets/scripts/user-add/user-add.html @@ -2,7 +2,8 @@
- Add a new User / Referee +

Add a new User / Referee

+
@@ -35,34 +36,34 @@
+
First Name - +
Middle Name - +
Last Name - +
Email Address - +
Phone Number - +
State - @@ -76,35 +77,293 @@
Nationality - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Visa Type - +
Language (Select one or more) - +
Education - +
@@ -112,157 +371,153 @@
Main Classification: - +
Skills: - +
-
-
-
Graphic Design
-
Adobe Creaetive CC
-
Illustration
-
-
Password: - +
Confirm Password - +
- - + +
- - +
-
+
-
- -
-
- -
-
New Referee
-
-
-
-
-
-
- Name - -
-
- Business Type - -
-
- ABN - -
-
- -
-
- Email Address - -
-
- Phone Number - -
-
- Website - -
-
- - -
-
- Address - -
-
- City - -
-
- State - -
-
- Zip - -
-
- -
-
- Description - -
-
-
-
- Twitter - -
-
- Facebook - -
-
- Instagram - -
-
- Linkedin - +
+ +
+
+ +
+
New Referee
+
+
+
+
+
+
+
+ Name + +
+
+ Business Type + +
+
+ ABN + +
+
+ +
+
+ Email Address + +
+
+ Phone Number + +
+
+ Website + +
+
+ + +
+
+ Address + +
+
+ City + +
+
+ State + +
+
+ Zip + +
+
+ +
+
+ Description +
-
+
+
+
+ Twitter + +
+
+ Facebook + +
+
+ Instagram + +
+
+ Linkedin + +
+
-
-
- Password: - -
-
- Confirm Password - -
+
+
+ Password: + +
+
+ Confirm Password +
- - -
+ + + + +
-
-
+
+
+
diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index a5615cc..6f3087d 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -17,6 +17,7 @@ .main-content{ padding-left: 80px; padding-right: 80px; + padding-bottom: 100px; } .mx-auto { From d5e68fb7a0525c3949d815de0702127a521b209d Mon Sep 17 00:00:00 2001 From: Francesca Sperati <6431@ait.nsw.edu.au> Date: Mon, 11 Feb 2019 23:42:07 +1100 Subject: [PATCH 3/3] minor fixes --- src/assets/scripts/ads-details/ads-details.html | 17 +++++++++-------- src/assets/scripts/companies/companies.html | 11 ----------- src/assets/scripts/referees/referees.html | 12 ------------ src/assets/scripts/users/users.html | 11 ----------- src/companies.html | 11 ----------- src/referees.html | 11 ----------- src/users.html | 11 ----------- 7 files changed, 9 insertions(+), 75 deletions(-) diff --git a/src/assets/scripts/ads-details/ads-details.html b/src/assets/scripts/ads-details/ads-details.html index 65f14cd..8b39012 100644 --- a/src/assets/scripts/ads-details/ads-details.html +++ b/src/assets/scripts/ads-details/ads-details.html @@ -3,22 +3,23 @@
+

Ad's Details

-
+
-
+
-
+
company
-
+

{{ ad.title }}

{{ ad.companyname }}
@@ -32,17 +33,17 @@
-
+
Location:

{{ad.location}}

Application close:
-

14th March 2019 (Friday)

+

{{ad.expiration-date}}

Skills:
-
- {{ skill }} +
+ {{ skill }}

{{ daysAgo(ad.timestamp) }}

diff --git a/src/assets/scripts/companies/companies.html b/src/assets/scripts/companies/companies.html index 26e1695..c17bb06 100644 --- a/src/assets/scripts/companies/companies.html +++ b/src/assets/scripts/companies/companies.html @@ -41,17 +41,6 @@
- -
diff --git a/src/assets/scripts/referees/referees.html b/src/assets/scripts/referees/referees.html index 150aed7..2e9a529 100644 --- a/src/assets/scripts/referees/referees.html +++ b/src/assets/scripts/referees/referees.html @@ -40,18 +40,6 @@
- - -
diff --git a/src/assets/scripts/users/users.html b/src/assets/scripts/users/users.html index d78df99..9021c0d 100644 --- a/src/assets/scripts/users/users.html +++ b/src/assets/scripts/users/users.html @@ -39,17 +39,6 @@
- - diff --git a/src/companies.html b/src/companies.html index abac358..dceecec 100644 --- a/src/companies.html +++ b/src/companies.html @@ -225,17 +225,6 @@
- -
diff --git a/src/referees.html b/src/referees.html index 8818544..e385d70 100644 --- a/src/referees.html +++ b/src/referees.html @@ -140,17 +140,6 @@
- -
diff --git a/src/users.html b/src/users.html index 1ea954e..4086927 100644 --- a/src/users.html +++ b/src/users.html @@ -220,17 +220,6 @@
- -