Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IDNZ: UI for Upload form #35

Merged
merged 4 commits into from
Apr 21, 2021
Merged

IDNZ: UI for Upload form #35

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9711602
Fix warning message for upload
rafaelbernard Apr 20, 2021
bb5629d
Style for Upload button
rafaelbernard Apr 20, 2021
3728b8a
Adjustments
rafaelbernard Apr 21, 2021
d71ff8f
Fix font weights and reset
rafaelbernard Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions src/id-card/assets/css/style-id-card.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ form {
color: #000000;
}


.alert-warning {
color: #000000;
background-color: #F5F8FA;
Expand All @@ -76,14 +77,9 @@ form {

.btn-lg {
border-radius: 8px;

color: #FFFFFF;
font-family: Poppins, serif;
/*font-style: normal;*/
/*font-weight: 500;*/
font-size: 20px;

color: #FFFFFF;

margin: 0 16px;
}

Expand All @@ -100,6 +96,11 @@ form {
color: #FFFFFF;
}

.btn-primary.disabled, .btn-primary:disabled {
background-color: #004A5A;
border-color: #004A5A;
}

.btn-primary:hover,
.btn-primary:focus,
.btn-primary.focus,
Expand Down Expand Up @@ -134,9 +135,6 @@ form {
}

.small-text {
/*font-family: Roboto sans-serif;*/
/*font-style: normal;*/
/*font-weight: normal;*/
font-size: 18px;
line-height: 24px;
}
Expand Down Expand Up @@ -165,7 +163,7 @@ form {
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 0px 0px 0px 48px;
padding: 0 0 0 48px;

width: 585px;
height: 479px;
Expand All @@ -174,17 +172,13 @@ form {
}

#step1-first-div-1 {
display: flex;
flex-direction: column;
align-items: flex-start;
padding: 80px 0px 24px;
padding: 80px 0 24px;

width: 537px;
height: 360px;

flex: none;
order: 0;
flex-grow: 0;
margin: 24px 0;
}

Expand All @@ -193,15 +187,14 @@ form {
}

#upload-doc-text {
padding: 72px 0px 24px;
padding: 72px 0 24px;
}

#image-upload .input-group-text {
display: none;
}

#image-upload .form-control::file-selector-button {
/*background-color: #FFF1F2;*/
border: none;
padding: 12px 12px 12px 20px;
}
Expand All @@ -215,5 +208,5 @@ form {
color: #8A8A8A;
padding: 8px 0;
text-align: right;
margin: 0px 0px;
margin: 0 0;
}
150 changes: 74 additions & 76 deletions src/id-card/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@
this.createBase64Image(selectedImage);
},
login() {
this.logged = true;
this.loggedUser = {name: 'Sarah Kelly Delavan', email: 'email'};
return;

this.messageClear();
const toDisclose = new DiscloseQueryGenerator()
.forAttribute(ATTRIBUTE.FAKE_PERSONAL_DATA_PERSON_NAME.FULL_NAME)
Expand Down Expand Up @@ -274,100 +270,102 @@ <h1>Get your IDNZ digital card.</h1>
<p style="margin: 24px 0 48px 0">
Issue a digital version of your IDNZ card into your IRMA wallet or refresh the expiry date of your current digital card.
</p>

<div style="margin-left:-16px">
<button class="btn btn-lg btn-primary" v-on:click="login()">Issue digital card</button>
<button class="btn btn-lg btn-secondary" v-on:click="refreshExpiryDate()">Refresh expiry date</button>
</div>

<div class="status alert mt-4" v-if="statusMessage" v-bind:class="statusMessageClass" role="alert">
<img :src="`assets/images/icon-${statusMessageClass}.png`">
{{ statusMessage }}
<div class="mt-4">
<span class="status alert" v-if="statusMessage" v-bind:class="statusMessageClass" role="alert">
<img :src="`assets/images/icon-${statusMessageClass}.png`">
{{ statusMessage }}
</span>
</div>
</div>
<div class="ms-5">
<img src="assets/images/landing-page.png" height="624" width="602">
</div>
</div>

<div>

<!-- Step 2 -->
<div v-if="logged">
<div class="row" v-if="statusMessage">
<div class="status alert col-12" v-bind:class="statusMessageClass" role="alert">{{ statusMessage }}</div>
</div>
<!-- Step 2 -->
<div v-if="logged">
<div class="row" v-if="statusMessage">
<div class="status alert col-12" v-bind:class="statusMessageClass" role="alert">{{ statusMessage }}</div>
</div>

<div v-if="!idCardToIssue">
<div class="row">
<div class="col-12 col-lg-8 col-xl-6">
<div id="upload-doc-text">
<h3 class="pb-3">Welcome, <span id="logged-name">{{ loggedUser.name.split(' ').shift() }}</span></h3>
<h2>
Please select and upload your document
</h2>
</div>
<form id="upload">
<div class="pt-3 pb-3">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" v-model="formDocumentType" value="passport">
<label class="form-check-label" for="inlineRadio1">Passport</label>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" v-model="formDocumentType" value="driverLicence">
<label class="form-check-label" for="inlineRadio2">License</label>
</div>
<div v-if="!idCardToIssue">
<div class="row">
<div class="col-12 col-lg-8 col-xl-6">
<div id="upload-doc-text">
<h3 class="pb-3">Welcome, <span id="logged-name">{{ loggedUser.name.split(' ').shift() }}</span></h3>
<h2>
Please select and upload your document
</h2>
</div>
<form id="upload">
<div class="pt-3 pb-3">
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio1" v-model="formDocumentType" value="passport">
<label class="form-check-label" for="inlineRadio1">Passport</label>
</div>
<div v-if="formDocumentType">
<div class="input-group" id="image-upload">
<input type="file" class="form-control" id="inputGroupFile02" accept="image/*" @change="handleImage">
<label class="input-group-text" for="inputGroupFile02">Upload</label>
</div>
<div id="image-file-size" class="mb-3">Maximum file size: 10 MB</div>

<div class="col-auto">
<button type="button" class="btn btn-primary mb-3"
v-bind:disabled="!formBase64Image || requestInProgress"
v-on:click="uploadDocument()">Send
</button>
</div>
<div class="form-check form-check-inline">
<input class="form-check-input" type="radio" name="inlineRadioOptions" id="inlineRadio2" v-model="formDocumentType" value="driverLicence">
<label class="form-check-label" for="inlineRadio2">License</label>
</div>
<div class="alert alert-warning" role="alert">
<img src="assets/images/icon-alert-warning.png">
The name on the document should match with
<strong>{{ loggedUser.name }}</strong>
</div>
<div v-if="formDocumentType">
<div class="input-group" id="image-upload">
<input type="file" class="form-control" id="inputGroupFile02" accept="image/*" @change="handleImage">
<label class="input-group-text" for="inputGroupFile02">Upload</label>
</div>
</form>
</div>
</div>
</div>
<div id="image-file-size" class="mb-3">Maximum file size: 10 MB</div>

<!-- Step 3 -->
<div v-if="idCardToIssue">
<h3>Confirmed Information - ID Card</h3>
<ul>
<li>Full name: {{ idCardToIssue.fullName }} </li>
<li>First name: {{ idCardToIssue.firstName }} </li>
<li>Last name: {{ idCardToIssue.lastName }} </li>
<li>Date of birth: {{ idCardToIssue.birthdate }} </li>
<li>Expiry date: {{ idCardToIssue.expiryDate }} </li>
<li>Issue Date: {{ idCardToIssue.issueDate }} </li>
<li>Card number: {{ idCardToIssue.number }} </li>
<li>Over18: {{ idCardToIssue.over18 }} </li>
<li>Over20: {{ idCardToIssue.over20 }} </li>
<li>Over65: {{ idCardToIssue.over65 }} </li>
</ul>

<button type="button" class="btn btn-success mb-3" v-if="!finished" v-on:click="saveIdCard()">Issue your ID-Card!</button>
<div class="col-auto">
<button type="button" class="btn btn-primary btn-lg mb-3"
v-bind:disabled="!formBase64Image || requestInProgress"
v-on:click="uploadDocument()">Upload
</button>
</div>
</div>
<div>
<span class="alert alert-warning" role="alert">
<img src="assets/images/icon-alert-warning.png">
The name on the document should match with
<strong>{{ loggedUser.name }}</strong>
</span>
</div>
</form>
</div>
</div>
</div>

<!-- Step 4 -->
<div v-if="finished">
<h3>Done</h3>
<!-- Step 3 -->
<div v-if="idCardToIssue">
<h3>Confirmed Information - ID Card</h3>
<ul>
<li>Full name: {{ idCardToIssue.fullName }} </li>
<li>First name: {{ idCardToIssue.firstName }} </li>
<li>Last name: {{ idCardToIssue.lastName }} </li>
<li>Date of birth: {{ idCardToIssue.birthdate }} </li>
<li>Expiry date: {{ idCardToIssue.expiryDate }} </li>
<li>Issue Date: {{ idCardToIssue.issueDate }} </li>
<li>Card number: {{ idCardToIssue.number }} </li>
<li>Over18: {{ idCardToIssue.over18 }} </li>
<li>Over20: {{ idCardToIssue.over20 }} </li>
<li>Over65: {{ idCardToIssue.over65 }} </li>
</ul>

<button type="button" class="btn btn-success mb-3" v-if="!finished" v-on:click="saveIdCard()">Issue your ID-Card!</button>
</div>

<p>Click on reset to start over.</p>
</div>
<!-- Step 4 -->
<div v-if="finished">
<h3>Done</h3>

<p>Click on reset to start over.</p>
</div>

</div>

</div>
Expand Down