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

Diff against hubs-cloud to consider modular plugin refactor #62

Draft
wants to merge 234 commits into
base: hubs-cloud
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
234 commits
Select commit Hold shift + click to select a range
be79e49
immers integration: login, arrive/leave, follow requests and friends …
wmurphyrd May 10, 2020
15b99fb
fix broken profile update
wmurphyrd May 14, 2020
40bd400
authorize with immer on load, fetch authorized profile as part of ini…
wmurphyrd May 14, 2020
467149c
undo obsolete changes to hubs source
wmurphyrd May 14, 2020
f97603e
connect to home Immer for token actor lookup and update streaming
wmurphyrd May 14, 2020
3fca521
add authorization to friends request
wmurphyrd May 15, 2020
143386b
updated immers auth paths and us tokens in requests
wmurphyrd May 17, 2020
ade011c
authenticate socketio connections
wmurphyrd May 18, 2020
d6d0803
arrive after socket connection, authorize prepared Leave
wmurphyrd May 18, 2020
bdda369
wait until after phoenix connection for immers initialization to avoi…
wmurphyrd May 21, 2020
23618e4
save avatar urls to profile so they can be fetched from other immers
wmurphyrd May 22, 2020
79299e9
Revert obosolete package.json changes
wmurphyrd May 23, 2020
ec9be50
refactor local immer config to be compatible with hubs could admin pa…
wmurphyrd May 23, 2020
cceb8c8
hub redirect uri compatible with both query param and route params forms
wmurphyrd May 23, 2020
13caeea
add socket.io client
wmurphyrd May 23, 2020
40afe21
immers integration squash merge
wmurphyrd May 23, 2020
d11b3c0
fix home immer not identified correctly when tokens requested for alr…
wmurphyrd May 25, 2020
ed66b70
Merge branch 'immers' into immers-integration: immers v0.0.3
wmurphyrd May 25, 2020
5f759aa
fix profile entry panel to show one time per immer
wmurphyrd May 26, 2020
029e3c5
move immer credentials into store.state.credentials so hubs.link will…
wmurphyrd May 26, 2020
a8a000b
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
wmurphyrd May 27, 2020
253942f
Merge branch 'immers' into immers-integration
wmurphyrd May 27, 2020
8740b32
update ui-root to avoid errors with early state updates; move initial…
wmurphyrd May 27, 2020
cfb2f74
fix: tokens not getting reused
wmurphyrd May 27, 2020
7574117
bump client version to match server
wmurphyrd May 29, 2020
49f8000
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
wmurphyrd Sep 29, 2020
1a6a348
api for communicating monetization status to the A-Frame scene
wmurphyrd Oct 29, 2020
b6dc530
delay monetization scene events until loading finished to simplify ap…
wmurphyrd Oct 30, 2020
c8a3118
add system for adding monetization logic to elements from spoke scene
wmurphyrd Oct 31, 2020
cd9d2f6
network monetization status and refactor monetization-visible system …
wmurphyrd Oct 31, 2020
3acfc00
bump version
wmurphyrd Nov 1, 2020
68a5740
improve code structure and do umentation
wmurphyrd Nov 1, 2020
ffad27a
Merge pull request #1 from immers-space/monetization-basic
quinn-madson Nov 9, 2020
c94ed67
move auth after hubChannel connection and pass hub entry code to imme…
wmurphyrd Nov 13, 2020
a8af964
Merge pull request #2 from immers-space/hub-info-in-auth
quinn-madson Nov 14, 2020
1ea964a
switch to web monetization polyfill for support in CSP contexts
wmurphyrd Dec 8, 2020
425d59c
prevent hubs from displaying error messages from interrupting scene l…
wmurphyrd Dec 8, 2020
20b8eb3
revert changes related to passing room link info to now-removed VR in…
wmurphyrd Dec 8, 2020
c14398f
temporarily disable all reticulum sign in buttons by blanking out the…
wmurphyrd Dec 8, 2020
5426c02
Merge pull request #3 from immers-space/immers-login-redesign
quinn-madson Dec 8, 2020
244ae1e
add users handle to friends list link queries and auth requests
wmurphyrd Dec 12, 2020
cd82369
Move me param to auth request query so it can be added either by
wmurphyrd Dec 12, 2020
529384c
bump client version
wmurphyrd Dec 12, 2020
93ab74b
Merge pull request #4 from immers-space/pass-along-handle
quinn-madson Dec 15, 2020
45dc6ca
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into hub…
wmurphyrd Dec 15, 2020
83bf22d
sync lockfile with package
wmurphyrd Dec 26, 2020
0d3258b
Merge pull request #5 from immers-space/hubs-cloud-2020-10-13-upgrade
quinn-madson Dec 31, 2020
fa9f2aa
consume new avatar format, add new avatars to personal avatar collection
wmurphyrd Jan 17, 2021
ac28891
fix occasional, inconsequential error in monetization-visible
wmurphyrd Jan 17, 2021
90b482c
bump client version
wmurphyrd Jan 17, 2021
2e88cbc
hijack my avatars tab in hubs UI for immers personal avatar collection
wmurphyrd Jan 22, 2021
ad29c00
Merge pull request #6 from immers-space/avatar-update
wmurphyrd Jan 22, 2021
eca830d
bugfix not loading actor's avatar
wmurphyrd Jan 22, 2021
d7e60b5
add spoke tagger and more monetization features
wmurphyrd Feb 5, 2021
e267049
fix networked monetization not turning off
wmurphyrd Feb 5, 2021
4c4f3d8
Merge pull request #11 from immers-space/premium-avatars
quinn-madson Feb 6, 2021
c74e856
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
wmurphyrd Feb 6, 2021
60c2841
Merge pull request #14 from immers-space/immers-hubs-sync-feb-2021
wmurphyrd Feb 6, 2021
236e20d
Merge branch 'master' into immers-newui
wmurphyrd Feb 7, 2021
0147723
Merge branch 'master' of https://github.com/mozilla/hubs into immers-…
wmurphyrd Feb 12, 2021
e9e7cb6
friends update notification
wmurphyrd Feb 7, 2021
df20078
immers friends in people menu
wmurphyrd Feb 12, 2021
100711f
disable edit button on avatar collection avatars, add in source immer…
wmurphyrd Feb 12, 2021
9a178be
alter sign-in message to clarify difference from immers profile login
wmurphyrd Feb 12, 2021
d2e2820
restore handle injection in friends links
wmurphyrd Feb 12, 2021
6adade5
update scene loaded event for monetization setup
wmurphyrd Feb 12, 2021
6553ba6
bump version
wmurphyrd Feb 12, 2021
4d9f9a0
fix static asset location
wmurphyrd Feb 13, 2021
087a28f
extra check to prevent conflicting updates in people list
wmurphyrd Feb 13, 2021
cdef6fb
avoid error when loading into room without changing avatar, avoid unn…
wmurphyrd Feb 13, 2021
d6d28a9
fix wrong target in leave activity
wmurphyrd Feb 13, 2021
137253b
Merge pull request #20 from immers-space/skip-unnecessary-profile-upd…
quinn-madson Feb 14, 2021
e4e6cb9
fix react warning about untyped prop
wmurphyrd Feb 14, 2021
7ec586a
Merge pull request #19 from immers-space/immers-ui-refactor
quinn-madson Feb 14, 2021
54fa311
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Feb 14, 2021
c555cc6
clear state on load if invalid
wmurphyrd Feb 7, 2021
9e5d0ca
Merge pull request #23 from immers-space/recover-from-invalid-state-i…
quinn-madson Feb 27, 2021
57a4389
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Feb 28, 2021
8c33c4e
News feed & chat integration
wmurphyrd Mar 3, 2021
5d10f50
bump client version to match immers server
wmurphyrd Mar 3, 2021
c6a020a
Immers feed & chat integration in React UI
wmurphyrd Mar 3, 2021
5e518dd
Revert "bump version"
wmurphyrd Mar 3, 2021
7be5327
Merge branch 'immers-ui-refactor2' into news-feed-in-chat-ui
wmurphyrd Mar 3, 2021
8983b46
also push live feed to VR mode users
wmurphyrd Mar 5, 2021
3038d7e
hook into in-world message system for VR users
wmurphyrd Mar 5, 2021
e2eda91
friend behavior: require manual acceptance of follow requests via imm…
wmurphyrd Mar 5, 2021
9ddd384
Load new players into pending request state if they have one, fix tex…
wmurphyrd Mar 5, 2021
0c7b596
unfriend action & update friends status in response to unfriend
wmurphyrd Mar 7, 2021
d757e33
Merge pull request #26 from immers-space/news-feed-in-chat-ui
quinn-madson Mar 7, 2021
58dc962
Merge pull request #25 from immers-space/news-feed-integration
quinn-madson Mar 7, 2021
e8d6ee2
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Mar 7, 2021
ca0d7dd
Merge branch 'immers-ui-refactor2' of github.com:immers-space/hubs in…
wmurphyrd Mar 7, 2021
e89ffac
hotfix UI crash when trying to render posts from Mastodon
wmurphyrd Mar 7, 2021
0de74bc
Merge branch 'immers-ui-refactor2' into immers-newui
wmurphyrd Mar 7, 2021
5b8d110
hotfix people list ui crash if friend has no icon
wmurphyrd Mar 8, 2021
44c331f
Merge branch 'immers-ui-refactor2' into immers-newui
wmurphyrd Mar 8, 2021
bf4cdcc
hotfix cross-immer media chats need proxy
wmurphyrd Mar 8, 2021
ded3495
Merge branch 'immers-ui-refactor2' into immers-newui
wmurphyrd Mar 8, 2021
8d5472c
Merge pull request #27 from immers-space/friends
quinn-madson Mar 10, 2021
59b5649
Merge branch 'immers-integration' into immers-newui
wmurphyrd Mar 14, 2021
5e89b3b
reconnection reliability: bump socketio for fewer reconnects (longer …
wmurphyrd Mar 20, 2021
9cb2c27
bump version
wmurphyrd Mar 22, 2021
3bd386e
Merge pull request #31 from immers-space/misc-updates
quinn-madson Mar 25, 2021
9756cec
hotfix high quality level by default on Quest due to importing immers…
wmurphyrd Mar 30, 2021
fcc4afb
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Mar 30, 2021
a6f6d6c
Merge branch 'immers-ui-refactor2' into immers-newui
wmurphyrd Mar 30, 2021
47519f3
connect monetization state to UI, allow bypass room size when monetiz…
wmurphyrd Apr 2, 2021
e3ecd96
connect monetization state to UI, allow bypass room size when monetiz…
wmurphyrd Apr 2, 2021
0b082d0
add premium scene section to homepage that searches reticulum for sce…
wmurphyrd Apr 2, 2021
6ccd222
docker container that will deploy immers client to a hubs cloud and s…
wmurphyrd Apr 9, 2021
7f8f0d0
scripts for docker tasks
wmurphyrd Apr 9, 2021
8f99443
fix admin install, use correct package json and use same install orde…
wmurphyrd Apr 9, 2021
0946826
fix immers server meta tag
wmurphyrd Apr 11, 2021
a6fea21
separate immers feed into its own message dispatch
wmurphyrd Apr 11, 2021
cd468f1
repalace the Tweet button on selgies images/videos with Immers Space …
wmurphyrd Apr 11, 2021
7fe9cde
sanitize & display html in federated chats
wmurphyrd Apr 10, 2021
822cae3
separate local chat from immers posts in two different sidebars, loca…
wmurphyrd Apr 10, 2021
2e46ad2
update packagelock
wmurphyrd Apr 11, 2021
e538838
correct executable in docker cmd, improve error handling, lint
wmurphyrd Apr 12, 2021
1d60d52
change Hubs hide button to block. Adds user your blocklist. Automatic…
wmurphyrd Apr 17, 2021
4c5b433
Merge pull request #36 from immers-space/chatmvp
quinn-madson Apr 18, 2021
940c990
Merge pull request #35 from immers-space/core-split-chat
quinn-madson Apr 18, 2021
d890c93
Merge pull request #32 from immers-space/core-monetize-ui
quinn-madson Apr 18, 2021
1b520a7
Merge pull request #33 from immers-space/monetized-room-features
quinn-madson Apr 18, 2021
d1a6d04
Merge pull request #34 from immers-space/autodeploy
quinn-madson Apr 18, 2021
441b997
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Apr 18, 2021
522b705
Merge branch 'immers-ui-refactor2' of github.com:immers-space/hubs in…
wmurphyrd Apr 18, 2021
ef65707
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into hub…
wmurphyrd Apr 23, 2021
fcb67c8
Merge branch 'hubs-cloud-resync' into resync-temp
wmurphyrd Apr 23, 2021
5b06cd6
udpate color names for hubs cloud theme update, fix toolbar getting s…
wmurphyrd Apr 23, 2021
6aa29c1
hotfix broken immers share buttons appearing on webcam/screenshare
wmurphyrd Apr 28, 2021
36d2e8b
basic support for oauth scopes, default requested level, and caching …
wmurphyrd Apr 23, 2021
811c173
don't crash the people list sidebar if friends list is not loaded/aut…
wmurphyrd Apr 26, 2021
75098c8
show explanations & prompts ot upgrade when permissions denied for re…
wmurphyrd Apr 30, 2021
b3991d4
hide in-world buttons that lack required permissions
wmurphyrd Apr 30, 2021
d797293
Merge pull request #37 from immers-space/persistent-blocks
wmurphyrd Apr 30, 2021
8badbae
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Apr 30, 2021
c6d75f1
toggle label on block button between hide & block based on permissions
wmurphyrd Apr 30, 2021
9dd31e3
avoid errors from race on authorizedScopes
wmurphyrd Apr 30, 2021
c9ceb00
bump client version
wmurphyrd Apr 30, 2021
003f32a
1.1.0-alpha.0
wmurphyrd Apr 30, 2021
410f216
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Apr 30, 2021
2aa73f7
Merge pull request #39 from immers-space/hubs-cloud-april-2021
quinn-madson May 6, 2021
b722d2d
Popup Auth & scope bugfixes
wmurphyrd May 7, 2021
5cff20c
drop support for samsung internet on oculus go so we can finally use …
wmurphyrd May 7, 2021
5250481
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd May 7, 2021
07effae
Merge pull request #40 from immers-space/roles
quinn-madson May 9, 2021
11d8d5e
1.1.0
wmurphyrd May 10, 2021
f226126
typo
wmurphyrd May 18, 2021
9ef5764
fix plain urls in chat no longer getting linkified and fix html links…
wmurphyrd May 19, 2021
40a269c
Merge pull request #46 from immers-space/fix-chat-links
quinn-madson May 19, 2021
613fd19
version number
wmurphyrd May 19, 2021
a514101
1.2.0
wmurphyrd May 19, 2021
a2aaa6f
clean up room entry: show only login & register buttons if not logged…
wmurphyrd May 23, 2021
a6fbcd2
don't show avatar settings or scope upgrade prompts prior to login
wmurphyrd May 23, 2021
e8731aa
cleanup UX - do not prompt users with options that require Hubs accou…
wmurphyrd May 23, 2021
67edc0b
fix showing create room option on servers with it disabled
wmurphyrd May 23, 2021
9fc16c8
consistent use of 'space' to decsribe a room in entry panel tips
wmurphyrd May 24, 2021
4ca539c
don't show custom avatar import link if not logged in
wmurphyrd May 28, 2021
7a10481
Revert "don't show custom avatar import link if not logged in"
wmurphyrd Jun 4, 2021
2301e86
support avatars from URL by filling in default icon when creating ava…
wmurphyrd Jun 4, 2021
8b732c1
fix hubs disconnecting while doing auth on mobile/standalone
wmurphyrd Jun 4, 2021
083e433
Merge pull request #50 from immers-space/onboarding-flow
wmurphyrd Jun 4, 2021
7ccd515
1.2.1
wmurphyrd Jun 4, 2021
ee8cea7
insert placeholders for build vars and update via string replacement …
wmurphyrd Jun 18, 2021
836b93e
bump web monetization polyfill, remove now-obsolete script-src CSP co…
wmurphyrd Jun 25, 2021
f225f40
fix immers monetization sometimes never initializing
wmurphyrd Jun 25, 2021
b2175c5
Merge pull request #52 from immers-space/prebuilt-bundle
wmurphyrd Jun 25, 2021
914441b
1.3.0
wmurphyrd Jun 25, 2021
f6dbb4e
add version tag to docker deploy script
wmurphyrd Jun 25, 2021
13519d2
fix bug in touchscreen grab calculations
wmurphyrd May 14, 2021
dbc2039
Merge pull request #53 from immers-space/fix-grab-immers
wmurphyrd Jul 25, 2021
4a483ae
update buttons on players to reflect whether the remote player is log…
wmurphyrd Sep 24, 2021
9538528
update room entry flow to allow joining without logging in, if featur…
wmurphyrd Sep 24, 2021
5a3e394
fix other players not seeing your immers id after late registration, …
wmurphyrd Sep 24, 2021
de33252
Tweak media query and avatar settings heights to avoid cutoff and scr…
brianpeiris Sep 7, 2021
a92391e
Only reduce avatar settings padding on top edge
brianpeiris Sep 7, 2021
c2aba06
Remove redundant min-height and add a comment explaining AvatarPrevie…
brianpeiris Sep 8, 2021
567e358
do not fail to get media if last device no longer available
wmurphyrd Sep 26, 2021
7bf303c
Merge pull request #55 from immers-space/hotfixes-sep-2021
wmurphyrd Sep 26, 2021
be7b29a
add late registration prompt to VR HUD, add interstitial modal explai…
wmurphyrd Sep 26, 2021
f2fd2ef
fix detection of when auth popup closes, avoiding cross-origin error
wmurphyrd Sep 26, 2021
90ec292
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Sep 26, 2021
8207e5f
Bump A-Frame for safari15 fixes
takahirox Sep 23, 2021
8337011
bring back spectate, but only when joining is impossible
wmurphyrd Sep 30, 2021
13b5525
Merge pull request #57 from immers-space/safari-15-hotfixes
wmurphyrd Sep 30, 2021
5812ba5
current hubs-cloud version of A-Frame patched for Safari 15 crashes, …
wmurphyrd Oct 1, 2021
5986033
Tweak media query and avatar settings heights to avoid cutoff and scr…
brianpeiris Sep 7, 2021
a378bf2
Only reduce avatar settings padding on top edge
brianpeiris Sep 7, 2021
1bd87f9
Remove redundant min-height and add a comment explaining AvatarPrevie…
brianpeiris Sep 8, 2021
73125c2
do not fail to get media if last device no longer available
wmurphyrd Sep 26, 2021
c55f9ff
Merge branch 'immers-integration' of github.com:immers-space/hubs int…
wmurphyrd Oct 1, 2021
eced1e6
Merge pull request #58 from immers-space/hubs-cloud-sep-2021-patches
wmurphyrd Oct 1, 2021
0c2c674
Merge pull request #56 from immers-space/late-registration
wmurphyrd Dec 26, 2021
176dd92
bump
wmurphyrd Feb 3, 2022
0114066
1.5.0
wmurphyrd Feb 3, 2022
0c41778
1.6.0
wmurphyrd Feb 3, 2022
e0c0fc7
fix indeterminate node_modules in docker
wmurphyrd Feb 3, 2022
518f8bb
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into hub…
wmurphyrd Feb 11, 2022
b6fb25d
resync aframe version with upstream
wmurphyrd Feb 11, 2022
4e5e62f
Merge pull request #61 from immers-space/hubs-cloud-feb-2022
wmurphyrd Feb 11, 2022
97bf411
include the new BASE_ASSETS_PATH env var in build environments
wmurphyrd Feb 12, 2022
3d98ee3
Merge branch 'admin-assets-fix' into immers-integration
wmurphyrd Feb 12, 2022
78d5832
1.7.0
wmurphyrd Feb 12, 2022
c190b9e
Merge branch 'hubs-cloud' of https://github.com/mozilla/hubs into imm…
wmurphyrd Jun 3, 2022
ddeddbb
loosen avatar import requirements to support nice.freetreasures.com a…
wmurphyrd Jun 3, 2022
ba264d9
update for immers v3 breaking change on friends API - ignore outgoing…
wmurphyrd Jun 3, 2022
0707efd
clarfiy homepage sign-in is only for admins
wmurphyrd Jun 3, 2022
616ee64
Merge branch 'hubs-cloud' of github.com:mozilla/hubs into hubs-cloud-…
metamanxr Jun 10, 2022
8f77a46
Begin migration to immers-client, making a connected immersClient ins…
wmurphyrd Jun 17, 2022
89494d7
Merge pull request #64 from immers-space/hubs-cloud-june-2022
wmurphyrd Jun 17, 2022
274f6b5
1.8.0
wmurphyrd Jun 17, 2022
61a1f66
version
wmurphyrd Jun 17, 2022
4cb4d0b
fix troika text ignoring newlines
wmurphyrd Jun 17, 2022
b1b5682
fix text align & size on media share buttons
wmurphyrd Jun 17, 2022
baabb37
1.8.1
wmurphyrd Jun 17, 2022
351ac18
version
wmurphyrd Jun 17, 2022
4633826
fix room id omitted from shared location
wmurphyrd Jul 15, 2022
9c29108
1.8.2
wmurphyrd Jul 15, 2022
92f7010
bump immers client, fixup package-lock
wmurphyrd Aug 26, 2022
c9f556f
update shared hub metadata, handle HTML in location status updates
wmurphyrd Aug 27, 2022
7e4bcdb
version
wmurphyrd Aug 27, 2022
7630143
1.9.0
wmurphyrd Aug 27, 2022
b8e0c49
On branch hubs-cloud-aug-2022
quinn-madson Aug 27, 2022
3d78711
use immersClient for avatar creation, upload claimed avatars to your …
wmurphyrd Aug 29, 2022
4ebb823
1.10.0
wmurphyrd Aug 29, 2022
80389a0
Replaced mixins lost in merge. Removed "#" prefix from IDs in slice9 …
quinn-madson Sep 3, 2022
7819da1
Merge pull request #65 from immers-space/hubs-cloud-aug-2022
wmurphyrd Sep 8, 2022
f9c8a1e
Reverting August Hubs Cloud update because it gutted A-Frame
wmurphyrd Oct 21, 2022
31fbd13
finish transitioning to ImmersClient login, fixes user handle not bei…
wmurphyrd Oct 24, 2022
42e4df8
fix immers-uploaded media not renderable
wmurphyrd Oct 24, 2022
3a43f4f
Merge pull request #68 from immers-space/fix-prefilled-handles
wmurphyrd Oct 24, 2022
527eed7
1.10.1
wmurphyrd Oct 24, 2022
02b7c05
version
wmurphyrd Oct 24, 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
3 changes: 0 additions & 3 deletions .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
"transform-react-jsx-img-import",
["@babel/proposal-class-properties", { "loose": true }],
"@babel/proposal-object-rest-spread",
// Samsung Internet on the Oculus Go version is stuck at version 5.2, which is a
// Chromium 51, as of this writing. It needs babel to transpile async/await.
"@babel/plugin-transform-async-to-generator",
"@babel/plugin-proposal-optional-chaining"
]
}
4 changes: 4 additions & 0 deletions .defaults.env
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,7 @@ DEFAULT_SCENE_SID="JGLt8DP"
# Uncomment to load the app config from the reticulum server in development.
# Useful when testing the admin panel.
# LOAD_APP_CONFIG=true

IMMERS_SERVER="https://localhost:8081"
IMMERS_SCOPE="modAdditive"
IMMERS_ALLOW_GUESTS="true"
12 changes: 12 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
node_modules
certs
dist
admin/node_modules
admin/certs
admin/dist
npm-debug.log
.vscode
.cache
.parcel-cache
.env
.ret.credentials
3 changes: 0 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
{
// Format on save for Prettier
"editor.formatOnSave": true,
// Disable html formatting for now
"html.format.enable": false,
// Disable the default javascript formatter
"javascript.format.enable": false,
Expand Down
18 changes: 18 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM node:14

WORKDIR /usr/src/hubs
COPY package*.json ./

WORKDIR /usr/src/hubs/admin
COPY admin/package*.json ./
RUN npm ci

WORKDIR /usr/src/hubs
RUN npm ci

WORKDIR /usr/src/hubs
COPY . .

RUN npm run deploy -- --skipCI --noUpload --envPlaceholders

CMD [ "/bin/bash", "dockerdeploy.sh" ]
11 changes: 11 additions & 0 deletions dockerdeploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env bash
set -e
echo "Logging into to hub $hub as $email"
npm run login -- --host $hub --email $email
echo "Updating hubs config for immer $domain"
# this one reads from env because of issues with dollar sign in payment pointer
npm run immers-configure
echo "Deploying Immers Space hubs client"
npm run deploy -- --noBuild --replacePlaceholders

echo "Done"
Loading