From 7b40eb507abab85f124c900fb06f67b67569ed6a Mon Sep 17 00:00:00 2001 From: Charlie Chiu <41720382+charcharliepie@users.noreply.github.com> Date: Tue, 5 Feb 2019 16:30:26 +1100 Subject: [PATCH] updated footer, history, users pages --- package.json | 1 + src/_footer.html | 26 ++- src/assets/styles/nomit.scss | 94 +++++++++-- src/history.html | 175 ++++++++++++++++++++ src/reports.html | 290 ++++++++++++++++++++-------------- src/users.html | 47 +++--- webpack/plugins/htmlPlugin.js | 1 + 7 files changed, 479 insertions(+), 155 deletions(-) create mode 100644 src/history.html diff --git a/package.json b/package.json index bbba4f5..d583e33 100755 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "angular": "^1.6.4", "angular-cookies": "^1.6.4", + "avatar-initials": "^4.1.0", "babel-core": "^6.26.0", "babel-eslint": "^8.0.1", "babel-loader": "^7.1.2", diff --git a/src/_footer.html b/src/_footer.html index 2d425b4..a3b662d 100644 --- a/src/_footer.html +++ b/src/_footer.html @@ -1,3 +1,27 @@ \ No newline at end of file diff --git a/src/assets/styles/nomit.scss b/src/assets/styles/nomit.scss index abfb739..e29d707 100644 --- a/src/assets/styles/nomit.scss +++ b/src/assets/styles/nomit.scss @@ -175,10 +175,6 @@ h1{ } // ***** STAR RATING ***** / -body{ - font-size: 5em; - } - .star-rating-display { unicode-bidi: bidi-override; color: #c5c5c5; @@ -220,7 +216,6 @@ body{ } } - /* Completely remove from the flow but leave available to screen readers. */ .is-vishidden { position: absolute !important; overflow: hidden; @@ -320,22 +315,39 @@ textarea { } .card-body-users { - border-top: 1px solid #9c9fa0; + border-top: 0.03125em solid #DDDDDD; margin: 0; } .users-icons { - margin-left: 150px; - padding: 5px; + margin-left: 160px; + padding: 8px; padding-left: 0; } .users-icons i { - font-size: 20px; - margin-right: 15px; - color: #9c9fa0; + font-size: 17px; + margin-right: 20px; + color: #DDDDDD; } +.users-col { + vertical-align: middle; + margin-top: 30px; +} + +.users-action-btn { + padding-left: 2; + margin-top: 10px; +} + +.users-action-btn i { + font-size: 17px; + margin-right: 5px; + color: #DDDDDD; +} + + //login .modal-dialog { max-width: 800px; @@ -424,7 +436,7 @@ textarea { border-top: 1px solid #9c9fa0; margin: 0; } - +f .companies-icons { margin-left: 150px; padding: 5px; @@ -501,3 +513,61 @@ textarea { background-color: #FFFFFF; } +/* FOOTER */ +.rounded-social-buttons { + text-align: center; +} + +.rounded-social-buttons .social-button { + display: inline-block; + position: relative; + cursor: pointer; + width: 1.875rem; + height: 1.8755rem; + padding: 0; + text-decoration: none; + text-align: center; + font-size: 1rem; + font-weight: normal; + line-height: 2em; + border-radius: 1.6875rem; + transition: all 0.5s ease; + margin-right: 0.25rem; + margin-bottom: 0.25rem; + +} + +.rounded-social-buttons .social-button:hover, .rounded-social-buttons .social-button:focus { + -webkit-transform: rotate(360deg); + -ms-transform: rotate(360deg); + transform: rotate(360deg); +} + +.rounded-social-buttons .fa-twitter, .fa-facebook-f, .fa-linkedin { + font-size: 15px; + color: #FFFFFF; +} + +.rounded-social-buttons .social-button.facebook { + background: #3b5998; +} + +.rounded-social-buttons .social-button.facebook:hover, .rounded-social-buttons .social-button.facebook:focus { + background: #888888; +} + +.rounded-social-buttons .social-button.twitter { + background: #55acee; +} + +.rounded-social-buttons .social-button.twitter:hover, .rounded-social-buttons .social-button.twitter:focus { + background: #888888; +} + +.rounded-social-buttons .social-button.linkedin { + background: #007bb5; +} + +.rounded-social-buttons .social-button.linkedin:hover, .rounded-social-buttons .social-button.linkedin:focus { + background: #888888; +} diff --git a/src/history.html b/src/history.html new file mode 100644 index 0000000..807b66b --- /dev/null +++ b/src/history.html @@ -0,0 +1,175 @@ + + + + + + + History + + + + + + +
+ +
+ + + + + +
+ + + ${require('html-loader!./_sidebar.html')} + + +
+ + ${require('html-loader!./_topbar.html')} + + +
+
+
+

+ History +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#PositionCompanyIndustrySubmission DateApplication Status
1Graphic Design InternSierra Delta CreativeDesign07 Jan 2019 +
+ ON +
+
2Barista InternBrunettiHospitality21 Jan 2019 +
+ OFF +
+
3Web Developer InternAgile TalentIT / Software Engineering23 Jan 2019 +
+ CLOSED +
+
4Kitchen Hand InternYarra River GrillHospitality25 Jan 2019 +
+ CANCELLED +
+
+ +
+
+ + +
+ + + + + + + ${require('html-loader!./_footer.html')} + + + + + + \ No newline at end of file diff --git a/src/reports.html b/src/reports.html index 85145a2..7dbfc43 100644 --- a/src/reports.html +++ b/src/reports.html @@ -1,135 +1,179 @@ - - - - - + + - - - + + + + Reports - Reports + - - - - - - - - - - -
- -
- - - - - -
- - ${require('html-loader!./_sidebar.html')} - - -
- - ${require('html-loader!./_topbar.html')} - - -
-
-

Reports

-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#First NameLast NameUsernameStateLanguageFieldsMember Since
1TonyStarktonystarkVICEnglishHospitalityFeb 2019
2DavidJamesdavidjamesVICEnglish, ItalianDesignFeb 2019
3MiroKirovmirokirovVICEnglish, JapaneseITFeb 2019
-
-
-
-
+ + + + +
+ +
+ + - + + +
+ + ${require('html-loader!./_sidebar.html')} - - + +
+ + ${require('html-loader!./_topbar.html')} + + +
+
+
+

+ Reports +

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#PositionCompanyIndustrySubmitted By (ID)Submission DateApplication Status
1Graphic Design InternSierra Delta CreativeDesigndavidchan07 Jan 2019 +
+ ON +
+
2Barista InternBrunettiHospitalityjenniferbrown21 Jan 2019 +
+ OFF +
+
3Web Developer InternAgile TalentIT / Software Engineeringchristhomson23 Jan 2019 +
+ CLOSED +
+
4Kitchen Hand InternYarra River GrillHospitalityjohndoe25 Jan 2019 +
+ CANCELLED +
+
+
+
- - - - - - +
+ + + + + ${require('html-loader!./_footer.html')} + + + + + \ No newline at end of file diff --git a/src/users.html b/src/users.html index cfe29ec..a8b77c0 100644 --- a/src/users.html +++ b/src/users.html @@ -104,37 +104,46 @@
-
-
- Users -
-
+
+

Users

+
-
-
-
- +
+
+
+
+
David James
Victoria
Mobile: 0414987654
+
+
+
+ + +
-
-
-
- - - - -
+
+ +
+
+
+
+ + + + +
-
-
+
+
+
diff --git a/webpack/plugins/htmlPlugin.js b/webpack/plugins/htmlPlugin.js index f49021c..6144047 100755 --- a/webpack/plugins/htmlPlugin.js +++ b/webpack/plugins/htmlPlugin.js @@ -13,6 +13,7 @@ const titles = { 'ads_1':'ads_1', 'ad-details':'ad-details', 'reports':'reports', + 'history':'history', 'chat': 'Chat', 'compose': 'Compose', 'datatable': 'Datatable',