Skip to content

Web-example hotel changes#417

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

Open
nicktaras wants to merge 22 commits into
base:web-examples
Choose a base branch
from
Open

Web-example hotel changes #417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b98b21a
re-working the hotel example flow
nicktaras Jan 19, 2021
20016dc
added json flow
nicktaras Jan 19, 2021
90842ea
added logic to further new flow.
nicktaras Jan 19, 2021
b1d85d7
end to end demo ui updated
nicktaras Jan 20, 2021
0674340
code tidy with annotations
nicktaras Jan 20, 2021
b9e6cf1
added most upto date third-party-example. along with the v2 vesion.
nicktaras Jan 20, 2021
2336cab
added heroku endpoint in place of the hotel data
nicktaras Jan 21, 2021
bdbceb7
using demo iframe for now
nicktaras Jan 21, 2021
dd5810f
connected application to new tokenscript.js using heroku data
nicktaras Jan 21, 2021
6372100
added annotations
nicktaras Jan 21, 2021
45c9e1d
updated discount calc
nicktaras Jan 21, 2021
330bd1d
removed lib files. Now working from the heroku lib
nicktaras Jan 21, 2021
4edc40e
updated ui to work with filters. Tidied code naming of components
nicktaras Jan 26, 2021
9f28327
added filter logic to discount tickets defined by webster
nicktaras Jan 28, 2021
aa0a0cf
code tidy
nicktaras Jan 28, 2021
4f316e0
ui adjustments
nicktaras Jan 31, 2021
2ff9db3
added logic for date picker to select date
nicktaras Jan 31, 2021
3ffcb28
updated thirdparty-example
nicktaras Feb 5, 2021
a0dac20
merged the react-thrid-party-examples into a single example
nicktaras Feb 6, 2021
0844c45
removed conditional logic for hotel discount
nicktaras Feb 6, 2021
1b8bdc1
text update
nicktaras Feb 6, 2021
448079b
logic to show ticket instruction to user when there are tickets only
nicktaras Feb 7, 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
2 changes: 2 additions & 0 deletions examples/sites/devcon-issuer/react-third-party/README.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
# example

## Hotel Bogota (react=third-party)

## Developer Getting Started

1. From this directory, run `yarn` or `npm install`
Expand Down
8 changes: 4 additions & 4 deletions examples/sites/devcon-issuer/react-third-party/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,24 +3,24 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@date-io/date-fns": "v1",
"@material-ui/core": "^4.11.2",
"@material-ui/lab": "^4.0.0-alpha.57",
"@material-ui/pickers": "latest",
"@testing-library/jest-dom": "^5.11.4",
"@testing-library/react": "^11.1.0",
"@testing-library/user-event": "^12.1.10",
"add": "^2.0.6",
"asn1js": "^2.0.26",
"big-integer": "^1.6.48",
"bigint-polyfill": "^0.1.0",
"@material-ui/pickers": "latest",
"@date-io/date-fns": "v1",
"date-fns": "latest",
"isevn": "^2.0.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
"react-scripts": "4.0.1",
"web-vitals": "^0.2.4",
"web3": "^1.3.1",
"yarn": "^1.22.10"
"web3": "^1.3.1"
},
"scripts": {
"start": "react-scripts start",
Expand Down
3 changes: 0 additions & 3 deletions examples/sites/devcon-issuer/react-third-party/public/Authentication/getChallenge.json
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions examples/sites/devcon-issuer/react-third-party/public/Authentication/validChallenge.json
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions examples/sites/devcon-issuer/react-third-party/public/Negotciator.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions examples/sites/devcon-issuer/react-third-party/public/attestation.js
View file
Open in desktop

Large diffs are not rendered by default.

11 changes: 0 additions & 11 deletions examples/sites/devcon-issuer/react-third-party/public/demo.html
View file
Open in desktop

This file was deleted.

45 changes: 24 additions & 21 deletions examples/sites/devcon-issuer/react-third-party/public/index.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--

<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.
Expand All@@ -24,12 +22,16 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
<title>React App</title>
<!-- <script src="https://bogotahotel.herokuapp.com/negotiator/negotiator.js"></script> -->
<script src="Negotciator.js"></script>
<script src="attestation.js"></script>
</head>

<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

Expand All@@ -39,5 +41,6 @@
To begin the development, run `npm start` or `yarn start`.
To create a production bundle, use `npm run build` or `yarn build`.
-->
</body>
</html>
</body>

</html>
3 changes: 3 additions & 0 deletions examples/sites/devcon-issuer/react-third-party/public/roomTypesTicketClassDataMock0.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"discount": 15
}
3 changes: 3 additions & 0 deletions examples/sites/devcon-issuer/react-third-party/public/roomTypesTicketClassDataMock1.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"discount": 10
}
3 changes: 3 additions & 0 deletions examples/sites/devcon-issuer/react-third-party/public/roomTypesTicketClassDataMock2.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"discount": 5
}
82 changes: 1 addition & 81 deletions examples/sites/devcon-issuer/react-third-party/src/App.css
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
display: flex;
flex-wrap: wrap;
justify-content: center;
margin: 60px;
margin: 20px 60px;
}

.discountOptionContainer, .discountButtonContainer {
Expand All@@ -34,83 +34,3 @@
text-align: center;
}

/* Ethereum logo */

.ethScale {
height: 20px;
width: 100%;
transform: scale(0.1);
margin-bottom: 52px;
}

#space{
margin: auto;
width: 800px;
height: 500px;
transform: perspective 100px;
transform-origin: 110px 110px;
}

.elogo{
margin: auto;
position: reative;
width: 400px;
height: 400px;
transform-style: preserve-3d;
transform-origin: 110px 110px 0;
transform: perspective(400px) rotateY(46deg) rotateX(-5deg) rotateZ(-5deg);
animation: aniether 6s infinite;
transform-style: preserve-3d;
transform-origin: 110px 110px 0;
transform: perspective(400px) rotateY(46deg) rotateX(-5deg) rotateZ(-5deg);
}

.trif {
position: absolute;
width: 0px;
height: 0px;
border-left: 100px solid transparent;
border-right: 100px solid transparent;
}
.elogo .u1 {
transform: translateZ(50px) rotateX(23.5deg);
border-bottom: 250px solid rgba(50,50,51,0.8);
}
.elogo .u2 {
transform: rotateY(90deg) translateZ(50px) rotateX(23.5deg);
border-bottom: 250px solid rgba(50,50,51,0.6);
}
.elogo .u3 {
transform: rotateY(180deg) translateZ(50px) rotateX(23.5deg);
border-bottom: 250px solid rgba(50,50,51,0.3);
}
.elogo .u4 {
transform: rotateY(-90deg) translateZ(50px) rotateX(23.5deg);
border-bottom: 250px solid rgba(50,50,51,0.3);
}

.elogo .ct {
width: 200px;
height: 200px;
border: 0;
transform: rotateX(-90deg) translateZ(140px);
background-color: rgba(60,60,61,1);
}
.elogo .l1 {
transform: translateY(55px) translateZ(50px) rotateX(156.5deg);
border-bottom: 250px solid rgba(50,50,51,0.85);
}
.elogo .l4 {
transform: translateY(55px) rotateY(-90deg) rotateZ(0deg) translateZ(50px) rotateX(156.5deg);
border-bottom: 250px solid rgba(50,50,51,0.45);
}

@keyframes aniether {
20% {transform: perspective(400px) rotateY(46deg); }
30% {transform: perspective(400px) rotateY(10deg); }
50% {transform: perspective(400px) rotateY(46deg); }
60% {transform: perspective(400px) rotateY(80deg); }
80% {transform: perspective(400px) rotateY(46deg); }
100% {transform: perspective(400px) rotateY(46deg) rotateX(-5deg) rotateZ(-5deg); }
}

Loading