Skip to content

Commit e3d0855

Browse files
RedHitMarkRedHitMark
committed
new features
1 parent 2da457a commit e3d0855

File tree

15 files changed

+185
-178
lines changed

15 files changed

+185
-178
lines changed

‎.env‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,8 @@ MONGO_PASSWORD=2facesPassword
33
MONGO_DATABASE=2facesdb
44
SERVER_PORT=9999
55
SOCKET_MAIN_PORT=6969
6+
SOCKET_CODE_SENDER=52000
7+
SOCKET_CODE_SENDER1=52500
8+
SOCKET_COLLECTOR=60000
9+
SOCKET_COLLECTOR1=60050
610

‎api/v1.0/deviceManager.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ async function triggerDevice(socketManager, device, payload_id) {
8484
resolve(newAttack);
8585
})
8686
.catch((error) => {
87-
reject(error);
87+
reject({status: 501, message: error});
8888
});
8989
})
9090
.catch((error) => {

‎docker-compose.yml‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,6 @@ services:
1919
links:
2020
- mongo
2121

22-
# MongoExpress
23-
mongo-express:
24-
container_name: 2faces-backend_mongo-express
25-
image: mongo-express:latest
26-
restart: always
27-
env_file: .env
28-
environment:
29-
ME_CONFIG_MONGODB_ADMINUSERNAME: ${MONGO_USER}
30-
ME_CONFIG_MONGODB_ADMINPASSWORD: ${MONGO_PASSWORD}
31-
ports:
32-
- "8081:8081"
33-
depends_on:
34-
- mongo
35-
links:
36-
- mongo
37-
3822
# MongoDB
3923
mongo:
4024
container_name: 2faces-backend_mongo

‎mongo-init/mongo-init.js‎

Lines changed: 89 additions & 101 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/assets/css/responsive.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
display: block;
5353
}
5454
.logo {
55-
padding: 21px 0px 17px;
55+
padding: 25px 0px 10px;
5656
}
5757
.slider-area{
5858
height: 646px;
@@ -171,7 +171,7 @@
171171
display: block;
172172
}
173173
.logo {
174-
padding: 21px 0px 17px;
174+
padding: 25px 0px 10px;
175175
}
176176
.slider-area {
177177
height: auto;
@@ -326,7 +326,7 @@
326326
display: block;
327327
}
328328
.logo {
329-
padding: 21px 0px 17px;
329+
padding: 25px 0px 10px;
330330
}
331331
.slider-area {
332332
height: auto;

‎public/assets/css/style.css‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ textarea {
143143
top: 0;
144144
width: 100%;
145145
z-index: 998;
146-
background-color: #5c1ef9;
146+
background-color: #1c2331;
147147
}
148148

149149
.menu-area {
@@ -247,10 +247,13 @@ textarea {
247247
}
248248

249249
.slicknav_nav {
250-
background: #13c5de;
250+
background: #1c2331;
251251
margin: 10px;
252252
padding: 6px 0px;
253253
}
254+
.slicknav_nav a{
255+
color: white;
256+
}
254257

255258
.slicknav_nav a:hover {
256259
background: #fefefe none repeat scroll 0 0;
@@ -275,11 +278,13 @@ END Header Area
275278
display: flex;
276279
align-items: center;
277280
height: 800px;
278-
background: #5d12f8;
281+
/*background: #5d12f8;*/
279282
padding-top: 80px;
280283
}
281284

282-
.slider-img {}
285+
.slider-img {
286+
margin-bottom: 10px;
287+
}
283288

284289
.slider-img img {
285290
max-height: 100%;
@@ -288,17 +293,19 @@ END Header Area
288293
.slider-inner {}
289294

290295
.slider-inner h2 {
291-
font-size: 48px;
296+
margin-top: 5px;
297+
margin-bottom: 5px;
298+
font-size: 38px;
292299
font-weight: 500;
293-
color: #fff;
300+
color: #121212;
294301
letter-spacing: 0;
295-
line-height: 49px;
302+
line-height: 35px;
296303
}
297304

298305
.slider-inner h5 {
299-
font-size: 30px;
306+
font-size: 25px;
300307
font-weight: 500;
301-
color: #fff;
308+
color: #121212;
302309
letter-spacing: 0;
303310
line-height: 39px;
304311
margin-bottom: 50px;
@@ -308,14 +315,15 @@ END Header Area
308315
.slider-inner a {
309316
display: inline-block;
310317
position: relative;
318+
left: calc(50% - 135px);
311319
height: 60px;
312320
width: 270px;
313321
background: transparent;
314-
border: 2px solid #fff;
322+
border: 2px solid #121212;
315323
border-radius: 30px;
316324
text-align: center;
317325
line-height: 56px;
318-
color: #fff;
326+
color: #121212;
319327
font-size: 20px;
320328
font-weight: 400;
321329
letter-spacing: 0;
@@ -328,10 +336,10 @@ END Header Area
328336
top: 6px;
329337
height: 44px;
330338
width: 44px;
331-
border: 2px solid #fff;
339+
/*border: 2px solid #fff;*/
332340
border-radius: 50%;
333341
line-height: 40px;
334-
font-size: 16px;
342+
font-size: 30px;
335343
padding-left: 2px;
336344
}
337345

‎public/assets/css/typography.css‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@ h1 {
4444
font-size: 36px;
4545
line-height: 70px;
4646
letter-spacing: 1px;
47-
margin-bottom: 0px;
47+
margin-bottom: 0;
4848
}
4949

5050
h2 {
5151
font-size: 22px;
5252
line-height: 24px;
53-
margin-bottom: 0px;
53+
margin-bottom: 0;
5454
}
5555

5656
h3 {
5757
font-size: 24px;
5858
line-height: 30px;
59-
margin-bottom: 0px;
59+
margin-bottom: 0;
6060
}
6161

6262
h4 {
@@ -96,12 +96,14 @@ span {
9696
/* em and strong */
9797

9898
em {
99-
font: 15px/30px;
99+
line-height: 30px;
100+
font-size: 15px;
100101
}
101102

102103
strong,
103104
b {
104-
font: 15px/30px;
105+
line-height: 30px;
106+
font-size: 15px;
105107
}
106108

107109
small {
@@ -167,7 +169,7 @@ abbr {
167169
font-weight: 700;
168170
font-variant: small-caps;
169171
text-transform: lowercase;
170-
letter-spacing: .6px;
172+
letter-spacing: 0.6px;
171173
}
172174

173175
abbr:hover {
@@ -219,8 +221,8 @@ a.active-page {
219221

220222
ul,
221223
ol {
222-
margin-bottom: 0px;
223-
margin-top: 0px;
224+
margin-bottom: 0;
225+
margin-top: 0;
224226
}
225227

226228
ul {
@@ -237,7 +239,7 @@ ol,
237239
ul.square,
238240
ul.circle,
239241
ul.disc {
240-
margin-left: 0px;
242+
margin-left: 0;
241243
}
242244

243245
ul.square {
@@ -263,12 +265,12 @@ ul ul li,
263265
ul ol li,
264266
ol ol li,
265267
ol ul li {
266-
margin-bottom: 0px;
268+
margin-bottom: 0;
267269
}
268270

269271
li {
270272
line-height: 18px;
271-
margin-bottom: 0px;
273+
margin-bottom: 0;
272274
}
273275

274276
ul.large li {}
@@ -581,10 +583,10 @@ div#preloader {
581583
}
582584

583585
.pt--130 {
584-
padding-top: 130px
586+
padding-top: 130px;
585587
}
586588

587-
- .pt--140 {
589+
.pt--140 {
588590
padding-top: 140px
589591
}
590592

‎public/assets/img/icon/icon.png‎

58.2 KB
Loading

‎public/assets/img/icon/logo1.png‎

80 KB
Loading

‎server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function onListening() {
5656
const bind = typeof addr === 'string'
5757
? 'pipe ' + addr
5858
: 'port ' + addr.port;
59-
console.log('Listening on ' + bind);
59+
console.log('Server started and listening on port ' + bind);
6060
}
6161

6262
/**

0 commit comments

Comments
 (0)