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

feat: Restyled yivi components #13

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: Restyled yivi components #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ module.exports = function (grunt) {
node_modules: {
cwd: "node_modules",
src: [
"@privacybydesign/irma-frontend/dist/irma.js",
"@privacybydesign/yivi-frontend/dist/yivi.js",
"@privacybydesign/yivi-css/dist/yivi.min.css",
"bootstrap/dist/**",
"jquery/dist/jquery.min.js",
"js-cookie/src/js.cookie.js",
Expand Down
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"author": "Fabian van den Broek, Sietse Ringers, Radboud University, Privacy by Design Foundation",
"license": "BSD-3-Clause",
"devDependencies": {
"@privacybydesign/irma-frontend": "^0.4.3",
"bootstrap": "~3.4.1",
"@privacybydesign/yivi-frontend": "^0.1.3",
"@privacybydesign/yivi-css": "^0.1.3",
"grunt": "^0.4.5",
"grunt-cli": "1.3.2",
"grunt-contrib-copy": "^0.8.2",
Expand All @@ -17,4 +17,4 @@
"js-cookie": "2.1.3",
"jwt-decode": "~1.4.0"
}
}
}
68 changes: 68 additions & 0 deletions src/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
html,
body {
margin: 0;
padding: 0;
height: 100%;
font-size: 16px;
line-height: 24px;
background-color: #f7f5f3;
font-family: 'Open Sans', Verdana, Arial, sans-serif;
}

.logo-img {
height: 5rem;
}

.content {
max-width: 578px;
padding: 0 16px;
display: flex;
align-items: center;
gap: 2rem;
margin: auto;
}

header {
background: #ffffff;
color: #484747;
border-bottom: 1px solid #cfe4ef;
padding: 16px;
margin-bottom: 4rem;
}

header h1 {
margin: 0;
font-size: 18px;
line-height: 22px;
font-weight: bold;
font-family: 'Alexandria', Verdana, Arial, sans-serif;
}

form :is(select, input, button) {
margin: 1rem 0;
width: 100%;
}

select {
display: block;
border: none;
border-bottom-width: medium;
border-bottom-style: none;
border-bottom-color: currentcolor;
border-bottom: 2px solid #484747;
background-color: transparent;
padding: 0.5rem 0;
}

label {
margin-top: 2rem;
margin-bottom: 0.5rem;
display: block;
font-family: 'Alexandria', Verdana, Arial, sans-serif;
color: #484747;
}

button {
font-weight: 700 !important;
cursor: pointer;
}
83 changes: 52 additions & 31 deletions src/done.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,62 @@
<!DOCTYPE html>
<html lang="en">
<head>
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">

<script type="text/javascript" src="node_modules/jwt-decode/build/jwt-decode.js"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="node_modules/@privacybydesign/irma-frontend/dist/irma.js"></script>
<link
href="node_modules/bootstrap/dist/css/bootstrap.min.css"
rel="stylesheet"
/>
<link
href="node_modules/@privacybydesign/yivi-css/dist/yivi.min.css"
rel="stylesheet"
/>
<link href="css/style.css" rel="stylesheet" />

<script
type="text/javascript"
src="node_modules/jwt-decode/build/jwt-decode.js"
></script>
<script
type="text/javascript"
src="node_modules/jquery/dist/jquery.min.js"
></script>
<script
type="text/javascript"
src="node_modules/@privacybydesign/yivi-frontend/dist/yivi.js"
></script>
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/iDIN-verify.js"></script>

<title><%= done_title %></title>
</head>

<body>
<div class="container">
<div class="row">
<div class="col-xs-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
<h2><%= done_header %></h2>

<div id="alert_box"></div>

<p><%= done_text1 %></p>
<p><%= done_text2 %></p>
<p><%= done_text3 %></p>

<button id="verify_idin_bd_btn" class="btn btn-primary"><%= done_show_button %></button>

<h3 id="result_header"></h3>
<h4 id="result_status"></h4>
<p id="token-content"></p>

<a href=".."><%= done_return %></a>
</div>
</div>
</div>
</body>
</head>

<body>
<header>
<div class="content">
<img class="logo-img" src="images/idin-logo.svg" />
<h1><%= done_header %></h1>
</div>
</header>
<main class="content">
<div>
<div id="alert_box"></div>

<p><%= done_text1 %></p>
<p><%= done_text2 %></p>
<p><%= done_text3 %></p>

<button id="verify_idin_bd_btn" class="yivi-web-button">
<%= done_show_button %>
</button>

<h3 id="result_header"></h3>
<h4 id="result_status"></h4>
<p id="token-content"></p>

<a href=".."><%= done_return %></a>
</div>
</main>
</body>
</html>
99 changes: 59 additions & 40 deletions src/enroll.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,72 @@
<!DOCTYPE html>
<html lang="nl">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link
href="node_modules/bootstrap/dist/css/bootstrap.min.css"
rel="stylesheet"
/>
<link
href="node_modules/@privacybydesign/yivi-css/dist/yivi.min.css"
rel="stylesheet"
/>
<link href="css/style.css" rel="stylesheet" />

<script type="text/javascript" src="node_modules/jwt-decode/build/jwt-decode.js"></script>
<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="node_modules/js-cookie/src/js.cookie.js"></script>
<script
type="text/javascript"
src="node_modules/jwt-decode/build/jwt-decode.js"
></script>
<script
type="text/javascript"
src="node_modules/jquery/dist/jquery.min.js"
></script>
<script
type="text/javascript"
src="node_modules/js-cookie/src/js.cookie.js"
></script>

<script type="text/javascript" src="node_modules/@privacybydesign/irma-frontend/dist/irma.js"></script>
<script
type="text/javascript"
src="node_modules/@privacybydesign/yivi-frontend/dist/yivi.js"
></script>
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/iDIN-enroll.js"></script>

<title><%= enroll_title %></title>
</head>
<body>
</head>
<body>
<header>
<div class="content">
<img class="logo-img" src="images/idin-logo.svg" />
<h1><%= enroll_header %></h1>
</div>
</header>
<main class="content">
<div>
<div id="alert_box"></div>

<div class="container">
<div class="row">
<div id="logo" class="col-xs-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
<hr/>
<a href="#">
<img class="logo-img" src="images/iDIN_logo_64.png" />
</a>
</div>
<div class="col-xs-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3" id="enroll-page" style="display: none;">
<h2><%= enroll_header %></h2>
<p><%= enroll_received_attributes %></p>
<table class="table" id="idinTable">
<tbody></tbody>
</table>
<br />
<p><%= enroll_derived_attributes %></p>
<table class="table" id="ageTable">
<tbody></tbody>
</table>

<div id="alert_box"></div>
<p id="twoCredentialsWarning" style="display: none">
<i><%= enroll_two_credentials_warning %></i>
</p>

<p><%= enroll_received_attributes %></p>
<table class="table" id="idinTable">
<tbody></tbody>
</table>
<br/>
<p><%= enroll_derived_attributes %></p>
<table class="table" id="ageTable">
<tbody></tbody>
</table>

<p id="twoCredentialsWarning" style="display: none"><i><%= enroll_two_credentials_warning %></i></p>

<p><%= enroll_clicktoload %></p>
<button id="enroll" class="btn btn-primary"><%= enroll_load_button %></button>
<hr />
</div>
</div>
</div>
</body>
<p><%= enroll_clicktoload %></p>
<button id="enroll" class="yivi-web-button">
<%= enroll_load_button %>
</button>
<hr />
</div>
</main>
</body>
</html>
62 changes: 36 additions & 26 deletions src/error.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,35 +1,45 @@
<!DOCTYPE html>
<html lang="nl">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />

<title><%= error_title %></title>

<link href="node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link
href="node_modules/bootstrap/dist/css/bootstrap.min.css"
rel="stylesheet"
/>
<link
href="node_modules/@privacybydesign/yivi-css/dist/yivi.min.css"
rel="stylesheet"
/>
<link href="css/style.css" rel="stylesheet" />

<script type="text/javascript" src="node_modules/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="node_modules/js-cookie/src/js.cookie.js"></script>
<script
type="text/javascript"
src="node_modules/jquery/dist/jquery.min.js"
></script>
<script
type="text/javascript"
src="node_modules/js-cookie/src/js.cookie.js"
></script>
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/iDIN-error.js"></script>
</head>
<body>

<div class="container">
<div class="row">
<div id="logo" class="col-xs-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
<hr/>
<a href="#">
<img class="logo-img" src="images/iDIN_logo_64.png" />
</a>
</div>
<div class="col-xs-12 col-md-8 col-lg-6 col-md-offset-2 col-lg-offset-3">
<h2><%= error_header %></h2>
<div id="alert_box"></div>
<p><%= error_text1 %><%= error_text2 %></p>
<hr />
</div>
</div>
</div>
</body>
</head>
<body>
<header>
<div class="content">
<img class="logo-img" src="images/idin-logo.svg" />
<h1><%= error_header %></h1>
</div>
</header>
<main class="content">
<div>
<div id="alert_box"></div>
<p><%= error_text1 %><%= error_text2 %></p>
<hr />
</div>
</main>
</body>
</html>
13 changes: 13 additions & 0 deletions src/images/idin-logo.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading