Skip to content

Commit 426bf26

Browse files
mathieuLivebardonmathieuLivebardon
authored
Merge pull request #128 from VCityTeam/exhibitShow
Exhibit show
2 parents 71fa364 + e584151 commit 426bf26

40 files changed

+6337
-5854
lines changed

‎client/.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"browser": true,
44
"es2021": true
55
},
6-
"extends": "eslint:recommended",
6+
"extends": ["eslint:recommended", "prettier"],
77
"parserOptions": {
88
"ecmaVersion": 12,
99
"sourceType": "module"

‎client/assets/css/ui.css

Lines changed: 188 additions & 131 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,188 @@
1-
.fadeIn_GameView {
2-
position: fixed;
3-
width: 100%;
4-
height: 100%;
5-
background: rgb(0, 0, 0);
6-
animation: fadein 1s linear forwards;
7-
opacity: 0;
8-
}
9-
10-
@keyframes fadein {
11-
100% {
12-
opacity: 1;
13-
}
14-
}
15-
16-
.fadeOut_GameView {
17-
position: fixed;
18-
width: 100%;
19-
height: 100%;
20-
background: rgb(0, 0, 0);
21-
animation: fadeinout 1s linear forwards;
22-
opacity: 1;
23-
}
24-
25-
@keyframes fadeout {
26-
100% {
27-
opacity: 0;
28-
}
29-
}
30-
31-
.popup_ui {
32-
width: 300px;
33-
position: fixed;
34-
right: 0px;
35-
bottom: 0px;
36-
}
37-
38-
.popup-signage {
39-
position: fixed;
40-
left: 50%;
41-
top: 50%;
42-
transform: translate(-50%, -50%);
43-
text-align: center;
44-
background-color: white;
45-
}
46-
47-
.lds-default {
48-
display: inline-block;
49-
position: relative;
50-
width: 80px;
51-
height: 80px;
52-
}
53-
.lds-default div {
54-
position: absolute;
55-
width: 6px;
56-
height: 6px;
57-
background: black;
58-
border-radius: 50%;
59-
animation: lds-default 1.2s linear infinite;
60-
}
61-
.lds-default div:nth-child(1) {
62-
animation-delay: 0s;
63-
top: 37px;
64-
left: 66px;
65-
}
66-
.lds-default div:nth-child(2) {
67-
animation-delay: -0.1s;
68-
top: 22px;
69-
left: 62px;
70-
}
71-
.lds-default div:nth-child(3) {
72-
animation-delay: -0.2s;
73-
top: 11px;
74-
left: 52px;
75-
}
76-
.lds-default div:nth-child(4) {
77-
animation-delay: -0.3s;
78-
top: 7px;
79-
left: 37px;
80-
}
81-
.lds-default div:nth-child(5) {
82-
animation-delay: -0.4s;
83-
top: 11px;
84-
left: 22px;
85-
}
86-
.lds-default div:nth-child(6) {
87-
animation-delay: -0.5s;
88-
top: 22px;
89-
left: 11px;
90-
}
91-
.lds-default div:nth-child(7) {
92-
animation-delay: -0.6s;
93-
top: 37px;
94-
left: 7px;
95-
}
96-
.lds-default div:nth-child(8) {
97-
animation-delay: -0.7s;
98-
top: 52px;
99-
left: 11px;
100-
}
101-
.lds-default div:nth-child(9) {
102-
animation-delay: -0.8s;
103-
top: 62px;
104-
left: 22px;
105-
}
106-
.lds-default div:nth-child(10) {
107-
animation-delay: -0.9s;
108-
top: 66px;
109-
left: 37px;
110-
}
111-
.lds-default div:nth-child(11) {
112-
animation-delay: -1s;
113-
top: 62px;
114-
left: 52px;
115-
}
116-
.lds-default div:nth-child(12) {
117-
animation-delay: -1.1s;
118-
top: 52px;
119-
left: 62px;
120-
}
121-
@keyframes lds-default {
122-
0%,
123-
20%,
124-
80%,
125-
100% {
126-
transform: scale(1);
127-
}
128-
50% {
129-
transform: scale(1.5);
130-
}
131-
}
1+
.fadeIn_GameView {
2+
position: fixed;
3+
width: 100%;
4+
height: 100%;
5+
background: rgb(0, 0, 0);
6+
animation: fadein 1s linear forwards;
7+
opacity: 0;
8+
}
9+
10+
@keyframes fadein {
11+
100% {
12+
opacity: 1;
13+
}
14+
}
15+
16+
.fadeOut_GameView {
17+
position: fixed;
18+
width: 100%;
19+
height: 100%;
20+
background: rgb(0, 0, 0);
21+
animation: fadeinout 1s linear forwards;
22+
opacity: 1;
23+
}
24+
25+
@keyframes fadeout {
26+
100% {
27+
opacity: 0;
28+
}
29+
}
30+
31+
/* Image Popup */
32+
.popup_wrapper img {
33+
width: 100%;
34+
height: 100%;
35+
object-fit: contain;
36+
}
37+
38+
.popup_wrapper {
39+
display: grid;
40+
grid-template-columns: repeat(10, 1fr);
41+
grid-template-rows: repeat(10, 1fr);
42+
grid-gap: 15px;
43+
position: fixed;
44+
height: 100%;
45+
width: 100%;
46+
top: 0;
47+
left: 0;
48+
}
49+
50+
.popup_descr {
51+
background-color: white;
52+
height: fit-content;
53+
max-height: 100%;
54+
width: 100%;
55+
overflow: auto;
56+
text-align: center;
57+
padding: 1%;
58+
}
59+
60+
.popup_close_button {
61+
height: 100%;
62+
width: 100%;
63+
}
64+
65+
.grid_item--image {
66+
grid-column-start: 2;
67+
grid-column-end: 7;
68+
grid-row-start: 3;
69+
grid-row-end: 10;
70+
}
71+
72+
.grid_item--map {
73+
grid-column-start: 7;
74+
grid-column-end: 10;
75+
grid-row-start: 5;
76+
grid-row-end: 10;
77+
}
78+
79+
.grid_item--descr {
80+
grid-column-start: 7;
81+
grid-column-end: 10;
82+
grid-row-start: 2;
83+
grid-row-end: 5;
84+
}
85+
86+
.grid_item--close {
87+
grid-column-start: 2;
88+
grid-column-end: 3;
89+
grid-row-start: 2;
90+
grid-row-end: 2;
91+
margin: 0;
92+
}
93+
94+
.popup-signage {
95+
position: fixed;
96+
left: 50%;
97+
top: 50%;
98+
transform: translate(-50%, -50%);
99+
text-align: center;
100+
background-color: white;
101+
}
102+
103+
/*Loading Element*/
104+
.lds-default {
105+
display: inline-block;
106+
position: relative;
107+
width: 80px;
108+
height: 80px;
109+
}
110+
.lds-default div {
111+
position: absolute;
112+
width: 6px;
113+
height: 6px;
114+
background: black;
115+
border-radius: 50%;
116+
animation: lds-default 1.2s linear infinite;
117+
}
118+
.lds-default div:nth-child(1) {
119+
animation-delay: 0s;
120+
top: 37px;
121+
left: 66px;
122+
}
123+
.lds-default div:nth-child(2) {
124+
animation-delay: -0.1s;
125+
top: 22px;
126+
left: 62px;
127+
}
128+
.lds-default div:nth-child(3) {
129+
animation-delay: -0.2s;
130+
top: 11px;
131+
left: 52px;
132+
}
133+
.lds-default div:nth-child(4) {
134+
animation-delay: -0.3s;
135+
top: 7px;
136+
left: 37px;
137+
}
138+
.lds-default div:nth-child(5) {
139+
animation-delay: -0.4s;
140+
top: 11px;
141+
left: 22px;
142+
}
143+
.lds-default div:nth-child(6) {
144+
animation-delay: -0.5s;
145+
top: 22px;
146+
left: 11px;
147+
}
148+
.lds-default div:nth-child(7) {
149+
animation-delay: -0.6s;
150+
top: 37px;
151+
left: 7px;
152+
}
153+
.lds-default div:nth-child(8) {
154+
animation-delay: -0.7s;
155+
top: 52px;
156+
left: 11px;
157+
}
158+
.lds-default div:nth-child(9) {
159+
animation-delay: -0.8s;
160+
top: 62px;
161+
left: 22px;
162+
}
163+
.lds-default div:nth-child(10) {
164+
animation-delay: -0.9s;
165+
top: 66px;
166+
left: 37px;
167+
}
168+
.lds-default div:nth-child(11) {
169+
animation-delay: -1s;
170+
top: 62px;
171+
left: 52px;
172+
}
173+
.lds-default div:nth-child(12) {
174+
animation-delay: -1.1s;
175+
top: 52px;
176+
left: 62px;
177+
}
178+
@keyframes lds-default {
179+
0%,
180+
20%,
181+
80%,
182+
100% {
183+
transform: scale(1);
184+
}
185+
50% {
186+
transform: scale(1.5);
187+
}
188+
}

‎client/assets/img/uploaded/DD7EAE25-4472-4769-9F80-7B03F3914590.jpeg renamed to ‎client/assets/img/uploaded/086B8EE4-6001-476E-A7CA-07B90925BC53.jpeg

File renamed without changes.

‎client/assets/img/uploaded/3748532D-27A1-4DCF-AB65-3237D45DA212.jpeg renamed to ‎client/assets/img/uploaded/12A0CD13-18EC-454B-BC5D-E2C681BEFECC.jpeg

File renamed without changes.

‎client/assets/img/uploaded/635AB97F-B9D4-4A6B-B388-E64EA05566F5.jpeg renamed to ‎client/assets/img/uploaded/19387331-44B8-48DA-B881-A417BE4CD592.jpeg

File renamed without changes.

‎client/assets/img/uploaded/22D2592E-AE44-4C67-AEEF-D2BE799431E4.jpeg

13.1 KB
Loading

‎client/assets/img/uploaded/33850062-2053-42DA-88AE-B6BCE3119194.jpeg

-1.1 MB
Binary file not shown.

‎client/assets/img/uploaded/B76BDD00-154D-422D-8C05-8EAB642A18B4.jpeg renamed to ‎client/assets/img/uploaded/3BA0C92F-6360-458A-BA65-D35854D51678.jpeg

File renamed without changes.

‎client/assets/img/uploaded/B6D526D6-6A3A-4B7F-B324-53F3EA5CBCF9.jpeg renamed to ‎client/assets/img/uploaded/43368117-905F-416E-B36D-CF65619022B0.jpeg

File renamed without changes.

‎client/assets/img/uploaded/D7D1C8E3-5DEF-4C4C-B34D-55363CDDB0E4.jpeg renamed to ‎client/assets/img/uploaded/58F1B857-1509-4E6E-8053-95B99E1AA698.jpeg

File renamed without changes.

0 commit comments

Comments
 (0)