Commit Graph

232 Commits

Author SHA1 Message Date
Piotr 'pwh' Hanusiak
21e84064b9 Merge branch 'develop' into new_custom_woka_scene 2022-03-29 15:52:16 +02:00
David Négrier
c177173688
Merge pull request #2005 from thecodingmachine/proto-well-known-types
make use of proto well knows types
2022-03-29 14:40:53 +02:00
Gregoire Parant
c1222c1c57 Fix run pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-29 13:45:31 +02:00
Gregoire Parant
dce1ece837 Merge branch 'develop' into changeRegisterAccess
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	front/vite.config.ts
2022-03-29 13:30:40 +02:00
Piotr 'pwh' Hanusiak
82dffff5a7 make use of proto well knows types 2022-03-28 17:08:12 +02:00
Piotr 'pwh' Hanusiak
b95d5f1d10 merged develop 2022-03-28 13:16:29 +02:00
Piotr 'pwh' Hanusiak
f656702bb9 merged develop 2022-03-24 14:56:42 +01:00
David Négrier
705c75e3c7 Adding wokalist type checking on front
Additionally, we are making superLoad.json accept a new "immediateCallback" parameter that resolves during the event handler (and not after)
2022-03-21 11:29:18 +01:00
Gregoire Parant
e618dc6c3d Refactor connexion manager
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-20 14:33:25 +01:00
David Négrier
c529658ef4 Adding first version of SuperLoader
This class is the Phaser loader as it should be: it comes with promises,
can be easily run out of the "preload" phase and won't crash if the
scene is destroyed before textures are loaded.
2022-03-18 18:11:32 +01:00
Gregoire Parant
56fb73c682 Change roomId by playUri
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-17 10:53:56 +01:00
Gregoire Parant
5448596f01 Merge branch 'develop' into changeRegisterAccess
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	pusher/src/Services/AdminApi.ts
2022-03-17 09:54:24 +01:00
David Négrier
53b184e82b Adding support for custom logos
The admin can now set custom logos for the login scene and for the loading screen.
2022-03-15 18:16:56 +01:00
Alexis Faizeau
f4fd686699 Change names of woka textures 2022-03-14 12:58:33 +01:00
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list (#1961)
* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-03-14 10:14:35 +01:00
David Négrier
6f4c3a89cd Improving openapi doc 2022-03-14 09:57:56 +01:00
David Négrier
6540f15c5b
Refactoring Woka management (#1810)
* Wrap websockets with HyperExpress

* Add endpoints on pusher to resolve wokas

* getting textures urls from pusher

* Adding OpenAPI documentation for the pusher.

The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.

* revert FRONT_URL

* playerTextures metadata is being loaded via Phaser.Loader

* fetch textures every time character or customize scene is open

* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

* Sending character layer details to admin

* Cleaning commented code

* Fixing regex

* Fix woka endpoints on pusher

* Change error wording on pusher

* Working on integration of the woka-list with the new admin endpoint.

* Switching from "name" to "id" in texture object + using zod for woka/list validation

* Add position on default woka data

* Remove async on pusher option method

* Fix woka list url

* add options for /register

* Fxiing loading the Woka list

* Actually returning something in logout-callback

* Copying messages to back too

* remove customize button if no body parts are available (#1952)

* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>

* Add returns on pusher endpoints

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
2022-03-11 17:02:58 +01:00
Alexis Faizeau
36646cbdbe Add returns on pusher endpoints 2022-03-11 16:26:45 +01:00
Piotr Hanusiak
2a73400f7c
remove customize button if no body parts are available (#1952)
* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2022-03-11 14:30:00 +01:00
David Négrier
4ebb25e6ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas 2022-03-11 11:55:30 +01:00
David Négrier
f97681cef5 Actually returning something in logout-callback 2022-03-11 10:44:40 +01:00
Hanusiak Piotr
5a8cba24fa much cleaner approach to group lock update 2022-03-10 12:20:53 +01:00
Hanusiak Piotr
3760b9c4ad add options for /register 2022-03-08 15:52:48 +01:00
Lukas
2938aba484
Multi-platform images (#1924)
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
2022-03-08 11:21:17 +01:00
Hanusiak Piotr
5706e5c416 remove console logs 2022-03-03 12:31:17 +01:00
Hanusiak Piotr
a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr
a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr
ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr
d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
Lurkars
c8047bf4fa change to scope variable in enviroment 2022-02-28 14:56:44 +01:00
Alexis Faizeau
4091606f75 Remove async on pusher option method 2022-02-28 12:09:15 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
Alexis Faizeau
394f721638 Add position on default woka data 2022-02-25 19:28:21 +01:00
Lukas
3f3af9b957
improve docker build caching
install dependencies before copying source into image
2022-02-25 18:53:14 +01:00
David Négrier
08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +01:00
David Négrier
da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +01:00
Alexis Faizeau
0543232bc3 Change error wording on pusher 2022-02-24 14:54:36 +01:00
Alexis Faizeau
586e829e2e Fix woka endpoints on pusher 2022-02-24 14:11:28 +01:00
David Négrier
c37046e138 Fixing regex 2022-02-24 12:15:23 +01:00
David Négrier
1b286002ff Cleaning commented code 2022-02-24 12:10:49 +01:00
David Négrier
8e11c4445b Sending character layer details to admin 2022-02-24 10:25:14 +01:00
David Négrier
378a95962a Heavy changes: refactoring the pusher to always send the textures (and the front to accept them) 2022-02-23 21:13:11 +01:00
Hanusiak Piotr
52e15eccfa revert FRONT_URL 2022-02-23 19:53:54 +01:00
David Négrier
3b4f06d659 Adding OpenAPI documentation for the pusher.
The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.
2022-02-23 19:53:54 +01:00
Hanusiak Piotr
80761804a7 getting textures urls from pusher 2022-02-23 19:53:54 +01:00
Alexis Faizeau
2161a40e05 Add endpoints on pusher to resolve wokas 2022-02-23 19:53:54 +01:00
Alexis Faizeau
f993aa4f5a Wrap websockets with HyperExpress 2022-02-23 19:53:53 +01:00
Gregoire Parant
658781e02e Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/public/resources/logos/meet.svg
2022-02-22 23:40:48 +01:00
Gregoire Parant
3a734cc2ae Enable limitation freemium
- Fix warning message
 - Fix post message API pusher

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-18 21:33:23 +01:00
Lurkars
2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00