Browse Source

Merge pull request #60 from ExtProjNomit/minor-fixes

Minor fixes
pull/146/head
francesca6431 7 years ago
committed by GitHub
parent
commit
77a66fa159
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 473 additions and 265 deletions
  1. +9
    -8
      src/assets/scripts/ads-details/ads-details.html
  2. +3
    -1
      src/assets/scripts/ads/ads.html
  3. +0
    -11
      src/assets/scripts/companies/companies.html
  4. +2
    -1
      src/assets/scripts/company-details/company-details.html
  5. +2
    -2
      src/assets/scripts/dashboard/dashboard.html
  6. +1
    -1
      src/assets/scripts/profile/profile.html
  7. +0
    -12
      src/assets/scripts/referees/referees.html
  8. +4
    -3
      src/assets/scripts/user-add/user-add.controller.js
  9. +400
    -145
      src/assets/scripts/user-add/user-add.html
  10. +51
    -37
      src/assets/scripts/user-details/user-details.html
  11. +0
    -11
      src/assets/scripts/users/users.html
  12. +1
    -0
      src/assets/styles/nomit.scss
  13. +0
    -11
      src/companies.html
  14. +0
    -11
      src/referees.html
  15. +0
    -11
      src/users.html

+ 9
- 8
src/assets/scripts/ads-details/ads-details.html View File

@ -3,22 +3,23 @@
<div class="content-title mT-60"> <div class="content-title mT-60">
<div class="ml-1 mb-3"> <div class="ml-1 mb-3">
<h1>Ad's Details</h1>
</div> </div>
</div> </div>
<div class=" gap-30 masonry pos-r "> <div class=" gap-30 masonry pos-r ">
<!-- #content container ===== --> <!-- #content container ===== -->
<div class="masonry-sizer col-md-6 "></div>
<div class="masonry-sizer col-12 "></div>
<!-- ### Job Details Card ### --> <!-- ### Job Details Card ### -->
<div class="masonry-item w-50">
<div class="masonry-item w-100">
<div class="card"> <div class="card">
<div class="row"> <div class="row">
<div class="col-3 mt-4 ">
<div class="col-2 mt-4 ">
<img class="img-fluid ml-4 mb-4 companies-update-img avatar rounded-circle" id="ad-details-avatar" alt="company" ng-src={{avatar.element.src}} /> <img class="img-fluid ml-4 mb-4 companies-update-img avatar rounded-circle" id="ad-details-avatar" alt="company" ng-src={{avatar.element.src}} />
</div> </div>
<div class="col-9 card-body">
<div class="col-10 card-body">
<h2 class="card-title mt-4 mr-4">{{ ad.title }}</h2> <h2 class="card-title mt-4 mr-4">{{ ad.title }}</h2>
<h6 class="card-title mr-4">{{ ad.companyname }}</h6> <h6 class="card-title mr-4">{{ ad.companyname }}</h6>
</div> </div>
@ -32,17 +33,17 @@
</div> </div>
<!-- ### Other Info Card ### --> <!-- ### Other Info Card ### -->
<div class="masonry-item w-50">
<div class="masonry-item w-100">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<h5 class="card-title mt-4 ml-4 mr-4">Location:</h5> <h5 class="card-title mt-4 ml-4 mr-4">Location:</h5>
<p class="card-text ml-4 mr-4">{{ad.location}}</p> <p class="card-text ml-4 mr-4">{{ad.location}}</p>
<h5 class="card-title mt-4 ml-4 mr-4">Application close:</h5> <h5 class="card-title mt-4 ml-4 mr-4">Application close:</h5>
<p class="card-text ml-4 mr-4">14th March 2019 (Friday)</p>
<p class="card-text ml-4 mr-4">{{ad.expiration-date}}</p>
<h5 class="card-title mt-4 ml-4 mr-4">Skills:</h5> <h5 class="card-title mt-4 ml-4 mr-4">Skills:</h5>
<div class="ml-4 mb-3">
<span ng-repeat="skill in ad.skills" class="mr-2 mb-2 btn btn-skills">{{ skill }}</span>
<div class="ml-4 mb-3" ng-repeat="skill in ad.skills">
<span class="mr-2 mb-2 btn btn-skills">{{ skill }}</span>
</div> </div>
<p class="card-text ml-4 my-4"></p><small class="text-muted">{{ daysAgo(ad.timestamp) }}</small></p> <p class="card-text ml-4 my-4"></p><small class="text-muted">{{ daysAgo(ad.timestamp) }}</small></p>
</div> </div>


+ 3
- 1
src/assets/scripts/ads/ads.html View File

@ -20,7 +20,9 @@
<div class="card-title d-flex mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;"> <div class="card-title d-flex mx-2" style="justify-content:space-between; margin-bottom:0px; text-align: left;">
<h4> {{ ad.title }} </h4> <h4> {{ ad.title }} </h4>
<div> <div>
<a class='' href="" > <span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span></a>
<a class='' href="" ng-show="user.role =='user'">
<span class="icon-holder"><i class="fa fa-heart-o font-weight-bold mt-2" style="color:#EE38A4; font-size: 22px;"></i></span>
</a>
</div> </div>
</div> </div>
<p class="card-text mx-2"><small class="text-muted">{{ ad.description }}</small></p> <p class="card-text mx-2"><small class="text-muted">{{ ad.description }}</small></p>


+ 0
- 11
src/assets/scripts/companies/companies.html View File

@ -41,17 +41,6 @@
</div> </div>
<!-- PAGINATION-->
<div class="pagination">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
</div> </div>


+ 2
- 1
src/assets/scripts/company-details/company-details.html View File

@ -2,7 +2,8 @@
<div id='mainContent row'> <div id='mainContent row'>
<div class="content-title mT-60"> <div class="content-title mT-60">
<div class="ml-1 mb-3"> <div class="ml-1 mb-3">
Company's Profile
<h1>Company's Profile</h1>
</div> </div>
</div> </div>


+ 2
- 2
src/assets/scripts/dashboard/dashboard.html View File

@ -2,7 +2,7 @@
<div id='mainContent row'> <div id='mainContent row'>
<div class="row content-title mT-60"> <div class="row content-title mT-60">
<div class="col-8 ml-1 mb-4"> <div class="col-8 ml-1 mb-4">
Welcome {{ user.name }}
<h1>Welcome {{ user.name }}</h1>
</div> </div>
</div> </div>
<div class=" gap-20 masonry pos-r"> <div class=" gap-20 masonry pos-r">
@ -195,7 +195,7 @@
</div> </div>
</div> </div>
<div class="masonry-item col-12 visible-company visible-nomit visible-referee" ng-show="user.role == 'nomit' || user.role == 'referee' || user.role == 'company' "> <div class="masonry-item col-12 visible-company visible-nomit visible-referee" ng-show="user.role == 'nomit' || user.role == 'referee' || user.role == 'company' ">
<!-- #suggested ads ==================== -->
<!-- #syour ads ==================== -->
<div class="row gap-30"> <div class="row gap-30">
<!-- # ad n 1 ==================== --> <!-- # ad n 1 ==================== -->


+ 1
- 1
src/assets/scripts/profile/profile.html View File

@ -2,7 +2,7 @@
<div id='mainContent row'> <div id='mainContent row'>
<div class="content-title mT-60"> <div class="content-title mT-60">
<div class="ml-1 mb-3"> <div class="ml-1 mb-3">
Profile
<h1>Profile</h1>
</div> </div>
</div> </div>
<div class="ml-1 mb-3 text-black-bold"> <div class="ml-1 mb-3 text-black-bold">


+ 0
- 12
src/assets/scripts/referees/referees.html View File

@ -40,18 +40,6 @@
</div> </div>
<!-- PAGINATION-->
<div class="pagination">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
</div> </div>
<!--content container--> <!--content container-->


+ 4
- 3
src/assets/scripts/user-add/user-add.controller.js View File

@ -1,11 +1,10 @@
/** @ngInject */ /** @ngInject */
import visas from "../profile/visa.type"
const UserAddController = ($scope,UserService) => { const UserAddController = ($scope,UserService) => {
$scope.$on('loadUserSuccess', function (event, user) { $scope.$on('loadUserSuccess', function (event, user) {
$scope.user = user; $scope.user = user;
$scope.classifications = ['class1', 'class2'];
$scope.skills = ['s1', 's2'];
$scope.tab = 1; $scope.tab = 1;
$scope.setTab = (newTab) => { $scope.setTab = (newTab) => {
@ -18,6 +17,8 @@ const UserAddController = ($scope,UserService) => {
}); });
UserService.loadUser(); UserService.loadUser();
$scope.visas = visas;
} }
export default UserAddController; export default UserAddController;

+ 400
- 145
src/assets/scripts/user-add/user-add.html View File

@ -2,7 +2,8 @@
<div id='mainContent row'> <div id='mainContent row'>
<div class="content-title mT-60"> <div class="content-title mT-60">
<div class="ml-1 mb-3"> <div class="ml-1 mb-3">
Add a new User / Referee
<h1>Add a new User / Referee</h1>
</div> </div>
</div> </div>
@ -35,34 +36,34 @@
</div> </div>
<div class="card-body-profile"> <div class="card-body-profile">
<div class="profile-forms"> <div class="profile-forms">
<form>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">First Name</h9> <h9 class="">First Name</h9>
<input type="text" class="form-control" placeholder="First name" value="Francesca"
required>
<input type="text" class="form-control" data-ng-model="user.personal.first_name" placeholder="First name" required>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Middle Name</h9> <h9 class="">Middle Name</h9>
<input type="text" class="form-control" placeholder="Middle name" required>
<input type="text" class="form-control" data-ng-model="user.personal.middle_name" placeholder="Middle name" required>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Last Name</h9> <h9 class="">Last Name</h9>
<input type="text" class="form-control" placeholder="Last name" value="Sperati" required>
<input type="text" class="form-control" data-ng-model="user.personal.last_name" placeholder="Last name" required>
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Email Address</h9> <h9 class="">Email Address</h9>
<input type="text" class="form-control" placeholder="Email" value="test@test.au" required>
<input type="text" class="form-control" data-ng-model="user.email" placeholder="Email" required>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Phone Number</h9> <h9 class="">Phone Number</h9>
<input type="text" class="form-control" placeholder="Phone" value="0414098765" required>
<input type="text" class="form-control" placeholder="Phone" data-ng-model="user.personal.phone" required>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">State</h9> <h9 class="">State</h9>
<select id="inputState" class="form-control">
<select class="form-control" data-ng-model="user.personal.state" required>
<option selected>VIC</option> <option selected>VIC</option>
<option>SA</option> <option>SA</option>
<option>WA</option> <option>WA</option>
@ -76,35 +77,293 @@
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Nationality</h9> <h9 class="">Nationality</h9>
<select id="inputState" class="form-control">
<option selected>Italian</option>
<option>...</option>
<select ng-model="user.personal.nationality" name="nationality" class="form-control" required>
<option value="">-- select one --</option>
<option value="afghan">Afghan</option>
<option value="albanian">Albanian</option>
<option value="algerian">Algerian</option>
<option value="american">American</option>
<option value="andorran">Andorran</option>
<option value="angolan">Angolan</option>
<option value="antiguans">Antiguans</option>
<option value="argentinean">Argentinean</option>
<option value="armenian">Armenian</option>
<option value="australian">Australian</option>
<option value="austrian">Austrian</option>
<option value="azerbaijani">Azerbaijani</option>
<option value="bahamian">Bahamian</option>
<option value="bahraini">Bahraini</option>
<option value="bangladeshi">Bangladeshi</option>
<option value="barbadian">Barbadian</option>
<option value="barbudans">Barbudans</option>
<option value="batswana">Batswana</option>
<option value="belarusian">Belarusian</option>
<option value="belgian">Belgian</option>
<option value="belizean">Belizean</option>
<option value="beninese">Beninese</option>
<option value="bhutanese">Bhutanese</option>
<option value="bolivian">Bolivian</option>
<option value="bosnian">Bosnian</option>
<option value="brazilian">Brazilian</option>
<option value="british">British</option>
<option value="bruneian">Bruneian</option>
<option value="bulgarian">Bulgarian</option>
<option value="burkinabe">Burkinabe</option>
<option value="burmese">Burmese</option>
<option value="burundian">Burundian</option>
<option value="cambodian">Cambodian</option>
<option value="cameroonian">Cameroonian</option>
<option value="canadian">Canadian</option>
<option value="cape verdean">Cape Verdean</option>
<option value="central african">Central African</option>
<option value="chadian">Chadian</option>
<option value="chilean">Chilean</option>
<option value="chinese">Chinese</option>
<option value="colombian">Colombian</option>
<option value="comoran">Comoran</option>
<option value="congolese">Congolese</option>
<option value="costa rican">Costa Rican</option>
<option value="croatian">Croatian</option>
<option value="cuban">Cuban</option>
<option value="cypriot">Cypriot</option>
<option value="czech">Czech</option>
<option value="danish">Danish</option>
<option value="djibouti">Djibouti</option>
<option value="dominican">Dominican</option>
<option value="dutch">Dutch</option>
<option value="east timorese">East Timorese</option>
<option value="ecuadorean">Ecuadorean</option>
<option value="egyptian">Egyptian</option>
<option value="emirian">Emirian</option>
<option value="equatorial guinean">Equatorial Guinean</option>
<option value="eritrean">Eritrean</option>
<option value="estonian">Estonian</option>
<option value="ethiopian">Ethiopian</option>
<option value="fijian">Fijian</option>
<option value="filipino">Filipino</option>
<option value="finnish">Finnish</option>
<option value="french">French</option>
<option value="gabonese">Gabonese</option>
<option value="gambian">Gambian</option>
<option value="georgian">Georgian</option>
<option value="german">German</option>
<option value="ghanaian">Ghanaian</option>
<option value="greek">Greek</option>
<option value="grenadian">Grenadian</option>
<option value="guatemalan">Guatemalan</option>
<option value="guinea-bissauan">Guinea-Bissauan</option>
<option value="guinean">Guinean</option>
<option value="guyanese">Guyanese</option>
<option value="haitian">Haitian</option>
<option value="herzegovinian">Herzegovinian</option>
<option value="honduran">Honduran</option>
<option value="hungarian">Hungarian</option>
<option value="hung-kong">Hong Kong</option>
<option value="icelander">Icelander</option>
<option value="indian">Indian</option>
<option value="indonesian">Indonesian</option>
<option value="iranian">Iranian</option>
<option value="iraqi">Iraqi</option>
<option value="irish">Irish</option>
<option value="israeli">Israeli</option>
<option value="italian">Italian</option>
<option value="ivorian">Ivorian</option>
<option value="jamaican">Jamaican</option>
<option value="japanese">Japanese</option>
<option value="jordanian">Jordanian</option>
<option value="kazakhstani">Kazakhstani</option>
<option value="kenyan">Kenyan</option>
<option value="kittian and nevisian">Kittian and Nevisian</option>
<option value="kuwaiti">Kuwaiti</option>
<option value="kyrgyz">Kyrgyz</option>
<option value="laotian">Laotian</option>
<option value="latvian">Latvian</option>
<option value="lebanese">Lebanese</option>
<option value="liberian">Liberian</option>
<option value="libyan">Libyan</option>
<option value="liechtensteiner">Liechtensteiner</option>
<option value="lithuanian">Lithuanian</option>
<option value="luxembourger">Luxembourger</option>
<option value="macedonian">Macedonian</option>
<option value="malagasy">Malagasy</option>
<option value="malawian">Malawian</option>
<option value="malaysian">Malaysian</option>
<option value="maldivan">Maldivan</option>
<option value="malian">Malian</option>
<option value="maltese">Maltese</option>
<option value="marshallese">Marshallese</option>
<option value="mauritanian">Mauritanian</option>
<option value="mauritian">Mauritian</option>
<option value="mexican">Mexican</option>
<option value="micronesian">Micronesian</option>
<option value="moldovan">Moldovan</option>
<option value="monacan">Monacan</option>
<option value="mongolian">Mongolian</option>
<option value="moroccan">Moroccan</option>
<option value="mosotho">Mosotho</option>
<option value="motswana">Motswana</option>
<option value="mozambican">Mozambican</option>
<option value="namibian">Namibian</option>
<option value="nauruan">Nauruan</option>
<option value="nepalese">Nepalese</option>
<option value="new zealander">New Zealander</option>
<option value="ni-vanuatu">Ni-Vanuatu</option>
<option value="nicaraguan">Nicaraguan</option>
<option value="nigerien">Nigerien</option>
<option value="north korean">North Korean</option>
<option value="northern irish">Northern Irish</option>
<option value="norwegian">Norwegian</option>
<option value="omani">Omani</option>
<option value="pakistani">Pakistani</option>
<option value="palauan">Palauan</option>
<option value="panamanian">Panamanian</option>
<option value="papua new guinean">Papua New Guinean</option>
<option value="paraguayan">Paraguayan</option>
<option value="peruvian">Peruvian</option>
<option value="polish">Polish</option>
<option value="portuguese">Portuguese</option>
<option value="qatari">Qatari</option>
<option value="romanian">Romanian</option>
<option value="russian">Russian</option>
<option value="rwandan">Rwandan</option>
<option value="saint lucian">Saint Lucian</option>
<option value="salvadoran">Salvadoran</option>
<option value="samoan">Samoan</option>
<option value="san marinese">San Marinese</option>
<option value="sao tomean">Sao Tomean</option>
<option value="saudi">Saudi</option>
<option value="scottish">Scottish</option>
<option value="senegalese">Senegalese</option>
<option value="serbian">Serbian</option>
<option value="seychellois">Seychellois</option>
<option value="sierra leonean">Sierra Leonean</option>
<option value="singaporean">Singaporean</option>
<option value="slovakian">Slovakian</option>
<option value="slovenian">Slovenian</option>
<option value="solomon islander">Solomon Islander</option>
<option value="somali">Somali</option>
<option value="south african">South African</option>
<option value="south korean">South Korean</option>
<option value="spanish">Spanish</option>
<option value="sri lankan">Sri Lankan</option>
<option value="sudanese">Sudanese</option>
<option value="surinamer">Surinamer</option>
<option value="swazi">Swazi</option>
<option value="swedish">Swedish</option>
<option value="swiss">Swiss</option>
<option value="syrian">Syrian</option>
<option value="taiwanese">Taiwanese</option>
<option value="tajik">Tajik</option>
<option value="tanzanian">Tanzanian</option>
<option value="thai">Thai</option>
<option value="togolese">Togolese</option>
<option value="tongan">Tongan</option>
<option value="trinidadian or tobagonian">Trinidadian or Tobagonian</option>
<option value="tunisian">Tunisian</option>
<option value="turkish">Turkish</option>
<option value="tuvaluan">Tuvaluan</option>
<option value="ugandan">Ugandan</option>
<option value="ukrainian">Ukrainian</option>
<option value="uruguayan">Uruguayan</option>
<option value="uzbekistani">Uzbekistani</option>
<option value="venezuelan">Venezuelan</option>
<option value="vietnamese">Vietnamese</option>
<option value="welsh">Welsh</option>
<option value="yemenite">Yemenite</option>
<option value="zambian">Zambian</option>
<option value="zimbabwean">Zimbabwean</option>
</select> </select>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Visa Type</h9> <h9 class="">Visa Type</h9>
<select id="inputState" class="form-control">
<option selected>Student</option>
<option>...</option>
</select>
<select id="inputVisa" class="form-control" ng-model="user.personal.visa" ng-options="visa.name group by visa.type for visa in visas" required>
<option value="" >Other visa...</option>
<option value="" selected>Choose visa...</option>
</select>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Language (Select one or more)</h9> <h9 class="">Language (Select one or more)</h9>
<select id="inputState" class="form-control">
<option selected>English</option>
<option>...</option>
</select>
<select id="inputLanguage" class="form-control" ng-model="user.personal.language" data-placeholder="Choose a Language..."required>
<option value="AF">Afrikanns</option>
<option value="SQ">Albanian</option>
<option value="AR">Arabic</option>
<option value="HY">Armenian</option>
<option value="EU">Basque</option>
<option value="BN">Bengali</option>
<option value="BG">Bulgarian</option>
<option value="CA">Catalan</option>
<option value="KM">Cambodian</option>
<option value="ZH">Chinese</option>
<option value="HR">Croation</option>
<option value="CS">Czech</option>
<option value="DA">Danish</option>
<option value="NL">Dutch</option>
<option value="EN" selected>English</option>
<option value="ET">Estonian</option>
<option value="FJ">Fiji</option>
<option value="FI">Finnish</option>
<option value="FR">French</option>
<option value="KA">Georgian</option>
<option value="DE">German</option>
<option value="EL">Greek</option>
<option value="GU">Gujarati</option>
<option value="HE">Hebrew</option>
<option value="HI">Hindi</option>
<option value="HU">Hungarian</option>
<option value="IS">Icelandic</option>
<option value="ID">Indonesian</option>
<option value="GA">Irish</option>
<option value="IT">Italian</option>
<option value="JA">Japanese</option>
<option value="JW">Javanese</option>
<option value="KO">Korean</option>
<option value="LA">Latin</option>
<option value="LV">Latvian</option>
<option value="LT">Lithuanian</option>
<option value="MK">Macedonian</option>
<option value="MS">Malay</option>
<option value="ML">Malayalam</option>
<option value="MT">Maltese</option>
<option value="MI">Maori</option>
<option value="MR">Marathi</option>
<option value="MN">Mongolian</option>
<option value="NE">Nepali</option>
<option value="NO">Norwegian</option>
<option value="FA">Persian</option>
<option value="PL">Polish</option>
<option value="PT">Portuguese</option>
<option value="PA">Punjabi</option>
<option value="QU">Quechua</option>
<option value="RO">Romanian</option>
<option value="RU">Russian</option>
<option value="SM">Samoan</option>
<option value="SR">Serbian</option>
<option value="SK">Slovak</option>
<option value="SL">Slovenian</option>
<option value="ES">Spanish</option>
<option value="SW">Swahili</option>
<option value="SV">Swedish </option>
<option value="TA">Tamil</option>
<option value="TT">Tatar</option>
<option value="TE">Telugu</option>
<option value="TH">Thai</option>
<option value="BO">Tibetan</option>
<option value="TO">Tonga</option>
<option value="TR">Turkish</option>
<option value="UK">Ukranian</option>
<option value="UR">Urdu</option>
<option value="UZ">Uzbek</option>
<option value="VI">Vietnamese</option>
<option value="CY">Welsh</option>
<option value="XH">Xhosa</option>
</select>
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Education</h9> <h9 class="">Education</h9>
<select class="form-control">
<option selected>Diploma</option>
<option>Degree</option>
<option>...</option>
</select>
<input type="text" class="form-control" ng-model="user.personal.education" placeholder="" required>
</div> </div>
</div> </div>
@ -112,157 +371,153 @@
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Main Classification:</h9> <h9 class="card-title mt-6 mr-4">Main Classification:</h9>
<input type="text" class="form-control" placeholder="Industry" required>
<input type="text" class="form-control" placeholder="Industry" data-ng-model="user.personal.main_classification" required>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Skills:</h9> <h9 class="card-title mt-6 mr-4">Skills:</h9>
<input type="text" class="form-control" placeholder="Preofessions" value="" >
<input type="text" class="form-control" placeholder="Preofessions" data-ng-model="user.personal.skills" required >
</div> </div>
</div> </div>
<div class="row profile-form-row mt-0 ">
<div class="mt-3 mb-4">
<div class="ml-4 btn btn-industry mt-4">Graphic Design</div>
<div class="ml-1 btn btn-skills">Adobe Creaetive CC</div>
<div class="ml-1btn btn-skills">Illustration</div>
</div>
</div>
<div class="row mT-6"> <div class="row mT-6">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Password:</h9> <h9 class="card-title mt-6 mr-4">Password:</h9>
<input type="password" class="form-control" placeholder="****" value="" >
<input type="password" class="form-control" placeholder="****" data-ng-model="user.personal.password" required >
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Confirm Password</h9> <h9 class="card-title mt-6 mr-4">Confirm Password</h9>
<input type="password" class="form-control" placeholder="Repete password" value="" >
<input type="password" class="form-control" placeholder="Repete password" required >
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class=" profile-form-row"> <div class=" profile-form-row">
<button type="button" class="btn btn-gradient ">UPDATE</button>
<button type="button" class="btn btn-border ">CANCEL</button>
<button type="submit" class="btn btn-gradient ">UPDATE</button>
<button type="reset" class="btn btn-border ">CANCEL</button>
</div> </div>
</div> </div>
</form>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
</div> </div>
<div class="tab tab-pane container active" ng-show="isSet(2)"> <div class="tab tab-pane container active" ng-show="isSet(2)">
<div class="create-new-user-tab">
<!--Referee-->
<div class="card card-new-user">
<div class="user-data-title">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<div class="testo">
<h5>New Referee</h5>
</div>
</div>
<div class="card-body-profile">
<div class="profile-forms">
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Name</h9>
<input type="text" class="form-control" ng-model="user.name" placeholder="Leonardo" value="" required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Business Type</h9>
<input type="text" class="form-control" placeholder="Technological Innovation" value=""
required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">ABN</h9>
<input type="text" class="form-control" placeholder="Last name" value="66 942 977 659"
required>
</div>
</div>
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Email Address</h9>
<input type="text" class="form-control" placeholder="Email" value="ir@leonardocompany"
required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Phone Number</h9>
<input type="text" class="form-control" placeholder="Phone" value="+39 06.324731"
required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Website</h9>
<input type="text" class="form-control" placeholder="Phone" value="https://www.leonardocompany.com"
required>
</div>
</div>
<div class="row">
<div class="form-group col-md-4 profile-form-row">
<h9 class="">Address</h9>
<input type="text" class="form-control" id="inputAddress" placeholder="Piazza Monte Grappa, 4"
required>
</div>
<div class="form-group col-md-4 profile-form-row">
<h9 class="">City</h9>
<input type="text" class="form-control" id="inputCity" placeholder="Roma" required>
</div>
<div class="form-group col-md-2 profile-form-row">
<h9 class="">State</h9>
<input type="text" class="form-control" id="validationCustom04" placeholder="Italia" required>
</div>
<div class="form-group col-md-2 profile-form-row">
<h9 class="">Zip</h9>
<input type="text" class="form-control" id="inputZip" placeholder="00195" required>
</div>
</div>
<div class="row">
<div class="col-12 profile-form-row">
<h9 class="">Description</h9>
<textarea id="description" class="company-description" name="story" rows="5">We constantly explore new ideas to turn them into new technologies that improve our world and design the future one. We invest in research and development to provide sustainable and competitive solutions. Wherever defence and security are needed: land, sea, sky, Space and cyberspace.
</textarea>
</div>
</div>
<div class="row ">
<div class="col-3 profile-form-row">
<h9 class="">Twitter</h9>
<input type="text" class="form-control" placeholder="Facebook" value="https://twitter.com/leonardo_it">
</div>
<div class="col-3 profile-form-row">
<h9 class="">Facebook</h9>
<input type="text" class="form-control" placeholder="Facebook" value="https://www.facebook.com/Leonardo-Company-473417172849580/">
</div>
<div class="col-3 profile-form-row">
<h9 class="">Instagram</h9>
<input type="text" class="form-control" placeholder="Instagram" value="https://www.instagram.com/leonardo_company/?hl=it">
</div>
<div class="col-3 profile-form-row">
<h9 class="">Linkedin</h9>
<input type="text" class="form-control" placeholder="Linkedin" value="https://www.linkedin.com/company/drs-defense-solutions-llc/life/">
<div class="create-new-user-tab">
<!--Referee-->
<div class="card card-new-user">
<div class="user-data-title">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<div class="testo">
<h5>New Referee</h5>
</div>
</div>
<div class="card-body-profile">
<div class="profile-forms">
<form>
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Name</h9>
<input type="text" class="form-control" placeholder="Name" data-ng-model="user.name" required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Business Type</h9>
<input type="text" class="form-control" placeholder="Type of Business" data-ng-model="user.referee.type" required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">ABN</h9>
<input type="text" class="form-control" placeholder="ABN" data-ng-model="user.referee.abn" required>
</div>
</div>
<div class="row ">
<div class="col-4 profile-form-row">
<h9 class="">Email Address</h9>
<input type="text" class="form-control" placeholder="Email" data-ng-model="user.email" required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Phone Number</h9>
<input type="text" class="form-control" placeholder="Phone Number" data-ng-model="user.referee.phone" required>
</div>
<div class="col-4 profile-form-row">
<h9 class="">Website</h9>
<input type="text" class="form-control" placeholder="Website" data-ng-model="user.referee.website" required>
</div>
</div>
<div class="row">
<div class="form-group col-md-4 profile-form-row">
<h9 class="">Address</h9>
<input type="text" class="form-control" placeholder="Address" data-ng-model="user.referee.address" required>
</div>
<div class="form-group col-md-4 profile-form-row">
<h9 class="">City</h9>
<input type="text" class="form-control" placeholder="City" data-ng-model="user.referee.city" required>
</div>
<div class="form-group col-md-2 profile-form-row">
<h9 class="">State</h9>
<select class="form-control" data-ng-model="user.personal.state" data-ng-model="user.referee.state" required>
<option selected>VIC</option>
<option>SA</option>
<option>WA</option>
<option>NSW</option>
<option>QLD</option>
<option>TAS</option>
</select>
</div>
<div class="form-group col-md-2 profile-form-row">
<h9 class="">Zip</h9>
<input type="text" class="form-control" placeholder="Post Code" data-ng-model="user.referee.postcode" required>
</div>
</div>
<div class="row">
<div class="col-12 profile-form-row">
<h9 class="">Description</h9>
<textarea class="company-description" name="story" rows="5">{{user.referee.bio}}
</textarea>
</div> </div>
</div>
</div>
<div class="row ">
<div class="col-3 profile-form-row">
<h9 class="">Twitter</h9>
<input type="text" class="form-control" placeholder="Twitter" data-ng-model="user.referee.twitter">
</div>
<div class="col-3 profile-form-row">
<h9 class="">Facebook</h9>
<input type="text" class="form-control" placeholder="Facebook" data-ng-model="user.referee.facebook" >
</div>
<div class="col-3 profile-form-row">
<h9 class="">Instagram</h9>
<input type="text" class="form-control" placeholder="Instagram" data-ng-model="user.referee.instagram" >
</div>
<div class="col-3 profile-form-row">
<h9 class="">Linkedin</h9>
<input type="text" class="form-control" placeholder="Linkedin" data-ng-model="user.referee.linkedin" >
</div>
</div>
<div class="row mT-6">
<div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Password:</h9>
<input type="password" class="form-control" placeholder="****" value="" >
</div>
<div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Confirm Password</h9>
<input type="password" class="form-control" placeholder="Repete password" value="" >
</div>
<div class="row mT-6">
<div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Password:</h9>
<input type="password" class="form-control" placeholder="****" data-ng-model="user.referee.password" required >
</div>
<div class="col-4 profile-form-row">
<h9 class="card-title mt-6 mr-4">Confirm Password</h9>
<input type="password" class="form-control" placeholder="Repete password" required >
</div> </div>
<button type="button" class="btn btn-gradient ">CREATE USER</button>
</div> </div>
<button type="submit" class="btn btn-gradient ">CREATE REFEREE</button>
<button type="reset" class="btn btn-border ">CANCEL</button>
</form>
</div> </div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>


+ 51
- 37
src/assets/scripts/user-details/user-details.html View File

@ -15,22 +15,40 @@
<div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="user.role != 'user'"> <div class="masonry-item w-100 visible-admin visible-nomit visible-referee visible-company" ng-show="user.role != 'user'">
<div class="card item-box"> <div class="card item-box">
<div class="user-data-title">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<div class="testo">
<h5>{{userDetails.name}}</h5> {{userDetails.personal.bio}}
<div class="row user-data-title">
<div class="col-9">
<img class="user-update-img" src="assets/static/images/user-update.png" alt="">
<div class="testo">
<h5>{{userDetails.name}}</h5>
{{userDetails.personal.bio}}
</div>
</div>
<div class="col-3 profile-form-row row">
<div class="users-icons ml-0">
<a href="https://www.linkedin.com/{{userDetails.personal.linkedin}}"><i class="fa fa-linkedin"></i></a>
<a href="https://www.facebook.com/{{userDetails.personal.facebook}} "><i class="fa fa-facebook"></i></a>
<a href="https://www.instagram.com/{{userDetails.personal.instagram}}"><i class="fa fa-instagram"></i></a>
<a href="https://github.com/{{userDetails.personal.github}}"><i class="fa fa-github"></i></a>
</div>
</div> </div>
</div> </div>
<div class="card-body-profile"> <div class="card-body-profile">
<div class="profile-forms"> <div class="profile-forms">
<h5 class="card-title d-flex text-black-bold"> Your Profile</h5> <h5 class="card-title d-flex text-black-bold"> Your Profile</h5>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row">
<div class="col-3 profile-form-row">
<h9 class="">First Name</h9> <h9 class="">First Name</h9>
<p class="font-weight-light"> {{userDetails.personal.first_name}} </p> <p class="font-weight-light"> {{userDetails.personal.first_name}} </p>
</div> </div>
<div class="col-4 profile-form-row">
<div class="col-5 profile-form-row">
<h9 class="">Middle Name</h9> <h9 class="">Middle Name</h9>
<p class="font-weight-light">{{userDetails.personal.middle_name}}</p> <p class="font-weight-light">{{userDetails.personal.middle_name}}</p>
</div> </div>
@ -41,66 +59,62 @@
</div> </div>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row">
<div class="col-3 profile-form-row">
<h9 class="">Email Address</h9> <h9 class="">Email Address</h9>
<p class="font-weight-light">{{userDetails.email}} </p> <p class="font-weight-light">{{userDetails.email}} </p>
</div> </div>
<div class="col-4 profile-form-row">
<div class="col-5 profile-form-row">
<h9 class="">Phone Number</h9> <h9 class="">Phone Number</h9>
<p class="font-weight-light">{{userDetails.personal.phone}}</p> <p class="font-weight-light">{{userDetails.personal.phone}}</p>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">State</h9> <h9 class="">State</h9>
<select id="inputState" class="form-control" >
<option selected>VIC</option>
<option>SA</option>
<option>WA</option>
<option>NSW</option>
<option>QLD</option>
<option>TAS</option>
</select>
<p class="font-weight-light">{{userDetails.personal.state}}</p>
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row">
<div class="col-3 profile-form-row">
<h9 class="">Nationality</h9> <h9 class="">Nationality</h9>
<p class="font-weight-light">{{userDetails.personal.nationality}}</p> <p class="font-weight-light">{{userDetails.personal.nationality}}</p>
</div> </div>
<div class="col-4 profile-form-row">
<div class="col-5 profile-form-row">
<h9 class="">Visa Type</h9> <h9 class="">Visa Type</h9>
<p class="font-weight-light">{{userDetails.personal.visa}}</p> <p class="font-weight-light">{{userDetails.personal.visa}}</p>
</div> </div>
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Language (Select one or more)</h9>
<p class="font-weight-light">{{userDetails.personal.language}}</p>
<h9 class="">Spoken Languages</h9>
<div ng-repeat=" language in userDetails.personal.language">
<p class="font-weight-light">{{language}}</p>
</div>
</div> </div>
</div> </div>
<div class="row "> <div class="row ">
<div class="col-4 profile-form-row"> <div class="col-4 profile-form-row">
<h9 class="">Education</h9> <h9 class="">Education</h9>
<!--<div ng-repeat=" education in userDetails.personal.educations">
<p class="font-weight-light">{{education}}</p>-->
<p class="font-weight-light">{{userDetails.personal.education}}</p> <p class="font-weight-light">{{userDetails.personal.education}}</p>
</div> </div>
</div>
<div class="row profile-form-row">
<div class="mt-4">
<h5 class="card-title mt-4 ml-4 mr-4 d-flex">Main Classification:</h5>
<div ng-repeat="industry in userDetails.personal.main_classification">
<div class="ml-1 mb-4 btn btn-industry" >{{industry}}</div>
</div>
</div>
<h5 class="card-title mt-4 ml-4 mr-4 d-flex">Skills:</h5>
<div ng-repeat="skill in userDetails.personal.skills">
<div class="ml-1 mb-4 btn btn-skills" >{{skill}}</div>
<div class="row col-12 profile-form-row">
</div>
</div>
</div>
<h9 class=" ">Main Classification:</h9>
<div ng-repeat="industry in userDetails.personal.main_classification">
<div class="ml-1 mb-4 btn btn-industry" >{{industry}}</div>
</div>
</div>
<div class="row col-12 profile-form-row">
<h9 class=" mt-60">Skills:</h9>
<div ng-repeat="skill in userDetails.personal.skills">
<div class="ml-1 mb-4 btn btn-skills" >{{skill}}</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>


+ 0
- 11
src/assets/scripts/users/users.html View File

@ -39,17 +39,6 @@
</div> </div>
<!-- PAGINATION-->
<div class="pagination masonry-item w-50">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
<!--content container--> <!--content container-->


+ 1
- 0
src/assets/styles/nomit.scss View File

@ -17,6 +17,7 @@
.main-content{ .main-content{
padding-left: 80px; padding-left: 80px;
padding-right: 80px; padding-right: 80px;
padding-bottom: 100px;
} }
.mx-auto { .mx-auto {


+ 0
- 11
src/companies.html View File

@ -225,17 +225,6 @@
</div> </div>
<!-- PAGINATION-->
<div class="pagination">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
</div><!--content container--> </div><!--content container-->


+ 0
- 11
src/referees.html View File

@ -140,17 +140,6 @@
</div> </div>
<!-- PAGINATION-->
<div class="pagination">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
</div><!--content container--> </div><!--content container-->


+ 0
- 11
src/users.html View File

@ -220,17 +220,6 @@
</div> </div>
</div> </div>
<!-- PAGINATION-->
<div class="pagination">
<a href="#">&laquo;</a>
<a href="#">1</a>
<a class="active" href="#">2</a>
<a href="#">3</a>
<a href="#">4</a>
<a href="#">5</a>
<a href="#">6</a>
<a href="#">&raquo;</a>
</div>
</div><!--content container--> </div><!--content container-->


Loading…
Cancel
Save