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.

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

Exhibit show #128

Merged
merged 25 commits into from
Mar 7, 2022
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
cba3f1b
collision table
mathieuLivebardon Feb 10, 2022
2c1cc08
Change Images of exhibit room
mathieuLivebardon Feb 15, 2022
0a893c9
New Map Lyon Img + Lng and Lat params (popup img)
mathieuLivebardon Feb 15, 2022
e00383c
Re set Exhibit Images (with number)
mathieuLivebardon Feb 16, 2022
cc18967
parse images object to change config Localscripts
mathieuLivebardon Feb 16, 2022
fcf82da
Set json in relative to new config
mathieuLivebardon Feb 16, 2022
6bd0a58
Add tool for change Lng/Lat in Editor
mathieuLivebardon Feb 16, 2022
3db5611
Chose Coordinates on the map
mathieuLivebardon Feb 17, 2022
4e00643
Linter + eslint-config-prettier
mathieuLivebardon Feb 17, 2022
9a0dfee
New Popup Image with fullscreen + descr
mathieuLivebardon Feb 21, 2022
df4a6b5
closeButton + doubleclick
mathieuLivebardon Feb 22, 2022
cfdd0d1
Image Respect Ratio
mathieuLivebardon Feb 22, 2022
596afdf
Popup enhancement
mathieuLivebardon Feb 23, 2022
949f123
ratio fix computing
mathieuLivebardon Feb 24, 2022
50919d9
upload new images with GeoRef
mathieuLivebardon Feb 28, 2022
2d4bc71
Add Description in Editor
mathieuLivebardon Mar 1, 2022
d8b1b81
textArea + Add info panels
mathieuLivebardon Mar 2, 2022
24fcf5a
Fix a description
mathieuLivebardon Mar 2, 2022
6b7d968
move code
mathieuLivebardon Mar 2, 2022
411bcec
FIX : remove check if gameView, raycast Image
mathieuLivebardon Mar 3, 2022
b9cf8fc
Fix collision portal room expo + remove bbb ls
mathieuLivebardon Mar 3, 2022
65a1993
Exhibit+SignageFix+Zeppelin
mathieuLivebardon Mar 4, 2022
f0f080a
Merge branch 'master' into exhibitShow
valentinMachado Mar 4, 2022
e75eccf
fix eslint
valentinMachado Mar 4, 2022
e584151
remove capitalization image's ls conf attributes
mathieuLivebardon Mar 7, 2022
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: 1 addition & 1 deletion client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"browser": true,
"es2021": true
},
"extends": "eslint:recommended",
"extends": ["eslint:recommended", "prettier"],
"parserOptions": {
"ecmaVersion": 12,
"sourceType": "module"
Expand Down
319 changes: 188 additions & 131 deletions client/assets/css/ui.css
Original file line number Diff line number Diff line change
@@ -1,131 +1,188 @@
.fadeIn_GameView {
position: fixed;
width: 100%;
height: 100%;
background: rgb(0, 0, 0);
animation: fadein 1s linear forwards;
opacity: 0;
}

@keyframes fadein {
100% {
opacity: 1;
}
}

.fadeOut_GameView {
position: fixed;
width: 100%;
height: 100%;
background: rgb(0, 0, 0);
animation: fadeinout 1s linear forwards;
opacity: 1;
}

@keyframes fadeout {
100% {
opacity: 0;
}
}

.popup_ui {
width: 300px;
position: fixed;
right: 0px;
bottom: 0px;
}

.popup-signage {
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
text-align: center;
background-color: white;
}

.lds-default {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-default div {
position: absolute;
width: 6px;
height: 6px;
background: black;
border-radius: 50%;
animation: lds-default 1.2s linear infinite;
}
.lds-default div:nth-child(1) {
animation-delay: 0s;
top: 37px;
left: 66px;
}
.lds-default div:nth-child(2) {
animation-delay: -0.1s;
top: 22px;
left: 62px;
}
.lds-default div:nth-child(3) {
animation-delay: -0.2s;
top: 11px;
left: 52px;
}
.lds-default div:nth-child(4) {
animation-delay: -0.3s;
top: 7px;
left: 37px;
}
.lds-default div:nth-child(5) {
animation-delay: -0.4s;
top: 11px;
left: 22px;
}
.lds-default div:nth-child(6) {
animation-delay: -0.5s;
top: 22px;
left: 11px;
}
.lds-default div:nth-child(7) {
animation-delay: -0.6s;
top: 37px;
left: 7px;
}
.lds-default div:nth-child(8) {
animation-delay: -0.7s;
top: 52px;
left: 11px;
}
.lds-default div:nth-child(9) {
animation-delay: -0.8s;
top: 62px;
left: 22px;
}
.lds-default div:nth-child(10) {
animation-delay: -0.9s;
top: 66px;
left: 37px;
}
.lds-default div:nth-child(11) {
animation-delay: -1s;
top: 62px;
left: 52px;
}
.lds-default div:nth-child(12) {
animation-delay: -1.1s;
top: 52px;
left: 62px;
}
@keyframes lds-default {
0%,
20%,
80%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.5);
}
}
.fadeIn_GameView {
position: fixed;
width: 100%;
height: 100%;
background: rgb(0, 0, 0);
animation: fadein 1s linear forwards;
opacity: 0;
}

@keyframes fadein {
100% {
opacity: 1;
}
}

.fadeOut_GameView {
position: fixed;
width: 100%;
height: 100%;
background: rgb(0, 0, 0);
animation: fadeinout 1s linear forwards;
opacity: 1;
}

@keyframes fadeout {
100% {
opacity: 0;
}
}

/* Image Popup */
.popup_wrapper img {
width: 100%;
height: 100%;
object-fit: contain;
}

.popup_wrapper {
display: grid;
grid-template-columns: repeat(10, 1fr);
grid-template-rows: repeat(10, 1fr);
grid-gap: 15px;
position: fixed;
height: 100%;
width: 100%;
top: 0;
left: 0;
}

.popup_descr {
background-color: white;
height: fit-content;
max-height: 100%;
width: 100%;
overflow: auto;
text-align: center;
padding: 1%;
}

.popup_close_button {
height: 100%;
width: 100%;
}

.grid_item--image {
grid-column-start: 2;
grid-column-end: 7;
grid-row-start: 3;
grid-row-end: 10;
}

.grid_item--map {
grid-column-start: 7;
grid-column-end: 10;
grid-row-start: 5;
grid-row-end: 10;
}

.grid_item--descr {
grid-column-start: 7;
grid-column-end: 10;
grid-row-start: 2;
grid-row-end: 5;
}

.grid_item--close {
grid-column-start: 2;
grid-column-end: 3;
grid-row-start: 2;
grid-row-end: 2;
margin: 0;
}

.popup-signage {
position: fixed;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
text-align: center;
background-color: white;
}

/*Loading Element*/
.lds-default {
display: inline-block;
position: relative;
width: 80px;
height: 80px;
}
.lds-default div {
position: absolute;
width: 6px;
height: 6px;
background: black;
border-radius: 50%;
animation: lds-default 1.2s linear infinite;
}
.lds-default div:nth-child(1) {
animation-delay: 0s;
top: 37px;
left: 66px;
}
.lds-default div:nth-child(2) {
animation-delay: -0.1s;
top: 22px;
left: 62px;
}
.lds-default div:nth-child(3) {
animation-delay: -0.2s;
top: 11px;
left: 52px;
}
.lds-default div:nth-child(4) {
animation-delay: -0.3s;
top: 7px;
left: 37px;
}
.lds-default div:nth-child(5) {
animation-delay: -0.4s;
top: 11px;
left: 22px;
}
.lds-default div:nth-child(6) {
animation-delay: -0.5s;
top: 22px;
left: 11px;
}
.lds-default div:nth-child(7) {
animation-delay: -0.6s;
top: 37px;
left: 7px;
}
.lds-default div:nth-child(8) {
animation-delay: -0.7s;
top: 52px;
left: 11px;
}
.lds-default div:nth-child(9) {
animation-delay: -0.8s;
top: 62px;
left: 22px;
}
.lds-default div:nth-child(10) {
animation-delay: -0.9s;
top: 66px;
left: 37px;
}
.lds-default div:nth-child(11) {
animation-delay: -1s;
top: 62px;
left: 52px;
}
.lds-default div:nth-child(12) {
animation-delay: -1.1s;
top: 52px;
left: 62px;
}
@keyframes lds-default {
0%,
20%,
80%,
100% {
transform: scale(1);
}
50% {
transform: scale(1.5);
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading