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

Room permissions, settings and improved entry flow #843

Merged
merged 54 commits into from
Jan 17, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
eb343a2
Revert "Remove roles"
brianpeiris Jan 3, 2019
53de046
Revert "Remove postWithAuth"
brianpeiris Jan 3, 2019
1c50ede
Revert "Remove sign in UI from home page"
brianpeiris Jan 3, 2019
3f10142
Revert "Remove sign in UI from home page"
brianpeiris Jan 3, 2019
0355073
Fix link click callback
brianpeiris Jan 3, 2019
b2ca98a
Fix signin/out on home page
brianpeiris Jan 3, 2019
5ea75a8
Send auth token in hub channel join payload
brianpeiris Jan 4, 2019
513b565
Avatar selection using routes
gfodor Jan 4, 2019
f949561
Start working on entry flow paths
gfodor Jan 4, 2019
0be4bdc
Entry flow now using HTML history
gfodor Jan 5, 2019
5e803c6
Fix up forced entry mode
gfodor Jan 5, 2019
880ad99
Link dialog working
gfodor Jan 5, 2019
60c173d
Rest of dialogs done
gfodor Jan 5, 2019
70d15fe
Turn off testing for support
gfodor Jan 5, 2019
67d4eb9
Merge masteR
gfodor Jan 5, 2019
9c9f3a4
Refactor const names
gfodor Jan 5, 2019
04d48c4
Fix up comments
gfodor Jan 5, 2019
28c3767
Refactor rename constant
gfodor Jan 5, 2019
f5549d6
Translations for Back
gfodor Jan 5, 2019
9b8f067
Fix race condition on 2d now
gfodor Jan 5, 2019
35f19b1
Add hacky commands to test out scene update and room rename
gfodor Jan 5, 2019
ae8784f
isOwner instead of roles
brianpeiris Jan 8, 2019
309c9e2
Remove gltf-bundle component
gfodor Jan 10, 2019
bf0de69
Refactor initial load to support changing environment scene URL
gfodor Jan 10, 2019
2135cf8
WIP
gfodor Jan 11, 2019
2426620
Scene changing command works
gfodor Jan 11, 2019
300223e
Get /rename command working
gfodor Jan 11, 2019
1cb9b16
Comment
gfodor Jan 11, 2019
4f88edc
Remove logging
gfodor Jan 11, 2019
01a2637
Merge branch 'master' of github.com:mozilla/hubs into feature/room-ow…
brianpeiris Jan 11, 2019
502cffb
Fix signedIn boolean
brianpeiris Jan 11, 2019
8cdfd06
Remove todo
brianpeiris Jan 11, 2019
fd43000
Remove postWithAuth
brianpeiris Jan 11, 2019
70fb53b
Merge
gfodor Jan 12, 2019
69e1f34
Use push state instead of URL
gfodor Jan 12, 2019
8cf60f3
Fix up profile entry during entry flow
gfodor Jan 13, 2019
53fc079
Remove unneeded code
gfodor Jan 13, 2019
b1024d2
Bump timeout for force entry
gfodor Jan 13, 2019
4b017c2
Refactor
gfodor Jan 13, 2019
135371d
Fix mic flow
gfodor Jan 13, 2019
73068e8
Fixes for Chrome
gfodor Jan 13, 2019
c17a0c3
Refactor and remove the need to keep track of previous history entry …
gfodor Jan 13, 2019
118622f
Fix for forced avatar picker flow
gfodor Jan 13, 2019
5315c07
Fix for chrome for avatar picker flow
gfodor Jan 13, 2019
8c34484
Merge branch 'feature/react-router' of github.com:mozilla/hubs into f…
gfodor Jan 14, 2019
60bd1c0
Rename token to auth_token
brianpeiris Jan 14, 2019
fd3ed31
Merge branch 'feature/room-ownership' into feature/authed-scene-update
brianpeiris Jan 14, 2019
e406fa9
Retrieve and decode permissions on join and sign-in. Enforce permissi…
brianpeiris Jan 16, 2019
dfc8562
Fix for dev
gfodor Jan 16, 2019
534f008
Fix refresh for dev
gfodor Jan 16, 2019
0cc04b0
Merge branch 'master' of github.com:mozilla/hubs into feature/react-r…
brianpeiris Jan 16, 2019
e767608
Merge branch 'feature/react-router' into feature/scene-update
brianpeiris Jan 16, 2019
f8c9bfc
Merge branch 'feature/scene-update' into feature/authed-scene-update
brianpeiris Jan 16, 2019
d669027
Rename authenticated to signedin
brianpeiris Jan 16, 2019
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
167 changes: 167 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"form-urlencoded": "^2.0.4",
"hls.js": "^0.12.2",
"jsonschema": "^1.2.2",
"jsonwebtoken": "^8.4.0",
"jszip": "^3.1.5",
"markdown-it": "^8.4.2",
"moving-average": "^1.0.0",
Expand All @@ -58,6 +59,8 @@
"react-infinite-scroller": "^1.2.2",
"react-intl": "^2.4.0",
"react-linkify": "^0.2.2",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-youtube": "^7.8.0",
"screenfull": "^3.3.2",
"super-hands": "github:mozillareality/aframe-super-hands-component#feature/drawing",
Expand Down
23 changes: 21 additions & 2 deletions src/assets/stylesheets/entry.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
position: relative;
}

:local(.collapse) {
:local(.info-button) {
@extend %fa-icon-button;
color: $action-color;
display: inline;
Expand Down Expand Up @@ -85,6 +85,10 @@
height: 100%;
width: 100%;

a {
text-decoration: none;
}

:local(.title) {
@extend %top-title;
@extend %glass-text;
Expand Down Expand Up @@ -120,7 +124,7 @@
@extend %default-font;
font-size: 1.1em;
color: $action-color;
cursor: pointer;
text-decoration: none;
font-weight: bold;
display: flex;
align-items: center;
Expand Down Expand Up @@ -204,3 +208,18 @@
}
}
}

:local(.back) {
@extend %fa-icon-button;

display: flex;
position: absolute;
top: 12px;
left: 26px;
font-size: 1.0em;
font-weight: bold;

i {
margin-right: 18px;
}
}
13 changes: 13 additions & 0 deletions src/assets/stylesheets/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ body {
}
}
}

:local(.sign-in) {
flex: 3;
display: flex;
align-items: center;
justify-content: end;

a {
text-decoration: underline;
font-weight: bold;
cursor: pointer;
}
}
}

:local(.video-container) {
Expand Down
5 changes: 5 additions & 0 deletions src/assets/translations.data.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"entry.return-to-vr": "Return to VR",
"entry.enter-in-vr": "Enter in VR",
"entry.lobby": "Lobby",
"entry.back": "Back",
"entry.notify_me": "Notify me when others are here",
"profile.save": "Accept",
"profile.display_name.validation_warning": "Alphanumerics and hyphens. At least 3 characters, no more than 32",
Expand Down Expand Up @@ -72,6 +73,8 @@
"presence.join_lobby": "joined the lobby.",
"presence.leave": "left.",
"presence.name_change": "is now known as",
"presence.scene_change": "changed the scene to",
"presence.hub_name_change": "changed the name of the room to",
"presence.in_lobby": "Lobby",
"presence.in_room": "In Room",
"home.room_create_options": "options",
Expand Down Expand Up @@ -126,6 +129,8 @@
"commands.fly": "Toggle fly mode.",
"commands.grow": "Increase your avatar's size.",
"commands.shrink": "Decrease your avatar's size.",
"commands.scene": "Change the scene.",
"commands.rename": "Rename the room.",
"commands.help": "Show help.",
"commands.leave": "Disconnect from the room.",
"commands.duck": "The duck tested well. Quack.",
Expand Down
Loading