Kraut.World/server
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into user_interface

Browse source 
# Conflicts:
#	front/dist/resources/style/style.css
This commit is contained in:
Gregoire Parant 2020-11-04 13:39:59 +01:00
commit d924e03966
491 changed files with 16587 additions and 3781 deletions
Download patch file Download diff file Expand all files Collapse all files

11
front/.eslintrc.json
View file

@ -7,7 +7,8 @@
},
"extends": [
"eslint:recommended",
"plugin:@typescript-eslint/eslint-recommended"
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking"
],
"globals": {
"Atomics": "readonly",
@ -16,12 +17,14 @@
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2018,
"sourceType": "module"
"sourceType": "module",
"project": "./tsconfig.json"
},
"plugins": [
"@typescript-eslint"
],
"rules": {
"no-unused-vars": "off"
"no-unused-vars": "off",
"@typescript-eslint/no-explicit-any": "error"
}
}
}

1
front/.gitignore vendored
View file

@ -4,3 +4,4 @@
/dist/webpack.config.js
/dist/webpack.config.js.map
/dist/src
*.sh

12
front/Dockerfile
View file

@ -1,7 +1,13 @@
# we are rebuilding on each deploy to cope with the API_URL environment URL
FROM thecodingmachine/nodejs:12-apache
FROM thecodingmachine/workadventure-back-base:latest as builder
WORKDIR /var/www/messages
COPY --chown=docker:docker messages .
RUN yarn install && yarn proto
COPY --chown=docker:docker . .
# we are rebuilding on each deploy to cope with the API_URL environment URL
FROM thecodingmachine/nodejs:14-apache
COPY --chown=docker:docker front .
COPY --from=builder --chown=docker:docker /var/www/messages/generated /var/www/html/src/Messages/generated
RUN yarn install
ENV NODE_ENV=production

3
front/dist/.htaccess vendored
View file

@ -20,4 +20,5 @@ RewriteBase /
# We only want to let Apache serve files and not directories.
# Rewrite all other queries starting with _ to index.ts.
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule "^_/" "/index.html" [L]
RewriteRule "^[_@]/" "/index.html" [L]
RewriteRule "^register/" "/index.html" [L]

59
front/dist/index.html vendored
View file

@ -15,6 +15,7 @@
gtag('config', 'UA-10196481-11');
</script>
<link rel="apple-touch-icon" sizes="57x57" href="static/images/favicons/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="static/images/favicons/apple-icon-60x60.png">
<link rel="apple-touch-icon" sizes="72x72" href="static/images/favicons/apple-icon-72x72.png">
@ -39,7 +40,45 @@
<title>WorkAdventure</title>
</head>
<body id="body" style="margin: 0">
<div id="webRtc" class="webrtc">
<div class="main-container" id="main-container">
<!-- Create the editor container -->
<div id="game" class="game">
<div id="game-overlay" class="game-overlay">
<div id="main-section" class="main-section">
</div>
<aside id="sidebar" class="sidebar">
</aside>
<div id="chat-mode" class="chat-mode three-col" style="display: none;">
</div>
<div id="activeCam" class="activeCam">
<div id="div-myCamVideo" class="video-container">
<video id="myCamVideo" autoplay muted></video>
</div>
</div>
<div class="btn-cam-action">
<div id="btn-micro" class="btn-micro">
<img id="microphone" src="resources/logos/microphone.svg">
<img id="microphone-close" src="resources/logos/microphone-close.svg">
</div>
<div id="btn-video" class="btn-video">
<img id="cinema" src="resources/logos/cinema.svg">
<img id="cinema-close" src="resources/logos/cinema-close.svg">
</div>
<div id="btn-monitor" class="btn-monitor">
<img id="monitor" src="resources/logos/monitor.svg">
<img id="monitor-close" src="resources/logos/monitor-close.svg">
</div>
</div>
</div>
</div>
<div id="cowebsite" class="cowebsite hidden"></div>
<div class="audio-playing">
<img src="/resources/logos/megaphone.svg"/>
</div>
</div>
<!--
<div id="webRtc" class="webrtc">
<div id="activeCam" class="activeCam">
<div id="div-myCamVideo" class="video-container">
<video id="myCamVideo" autoplay muted></video>
@ -54,13 +93,25 @@
<img id="cinema" src="resources/logos/CAM-ON.png">
<img id="cinema-close" src="resources/logos/CAM-OFF.png">
</div>
<!--<div class="btn-call">
<img src="resources/logos/phone.svg">
</div>-->
<div class="btn-monitor">
<img id="monitor" src="resources/logos/monitor.svg">
<img id="monitor-close" src="resources/logos/monitor-close.svg">
</div>
</div>
</div>
-->
<div id="activeScreenSharing" class="active-screen-sharing active">
</div>
<div id="webRtcSetup" class="webrtcsetup">
<img id="webRtcSetupNoVideo" class="background-img" src="resources/logos/cinema-close.svg">
<video id="myCamVideoSetup" autoplay muted></video>
</div>
<audio id="audio-webrtc-in">
<source src="/resources/objects/webrtc-in.mp3" type="audio/mp3">
</audio>
<audio id="report-message">
<source src="/resources/objects/report-message.mp3" type="audio/mp3">
</audio>
</body>
</html>

BIN
front/dist/resources/customisation/character_accessories/character_accessories1.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 293 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories10.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 517 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories11.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 517 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories12.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 524 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories13.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories14.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 525 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories15.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 517 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories16.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 743 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories17.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 798 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories18.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 754 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories19.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 814 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories2.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 452 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories20.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 810 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories21.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 827 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories22.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories23.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories24.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories25.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories26.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 281 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories27.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories28.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 368 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories29.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 332 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories3.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 450 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories30.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories31.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 349 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories32.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 347 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories4.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 486 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories5.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 390 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories6.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 495 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories7.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 389 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories8.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 516 B

BIN
front/dist/resources/customisation/character_accessories/character_accessories9.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 505 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes0.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 454 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes1.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 454 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes10.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,000 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes11.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1,011 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes12.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 965 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes13.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 965 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes14.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 910 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes15.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 980 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes16.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 938 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes17.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 961 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes18.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 977 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes19.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 977 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes2.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 388 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes20.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 977 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes21.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes22.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes23.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes24.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes25.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes26.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes27.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes28.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes29.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes3.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 388 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes30.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes31.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes32.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes33.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes34.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes35.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes36.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes37.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.9 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes38.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes39.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes4.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 354 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes40.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes41.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes42.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes43.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes44.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes45.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes46.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes47.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes48.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes49.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 922 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes5.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 356 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes50.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 955 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes51.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 972 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes52.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 866 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes53.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 877 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes54.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 905 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes55.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 388 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes56.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 465 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes57.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 465 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes58.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 550 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes59.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 550 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes6.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 469 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes60.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 457 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes61.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 457 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes62.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.8 KiB

BIN
front/dist/resources/customisation/character_clothes/character_clothes63.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 529 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes64.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 529 B

BIN
front/dist/resources/customisation/character_clothes/character_clothes65.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.4 KiB

Some files were not shown because too many files have changed in this diff Show more