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.

Sign up for GitHub

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

Novo Layout: Morpheus #174

Merged
merged 39 commits into from
Jul 18, 2019
Merged

Novo Layout: Morpheus #174

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
6bef460
Initial commit for Morpheus Office
Jun 28, 2019
60f37b5
Add the White Rabbit
Jun 28, 2019
e974ba5
Add .vscode dir to git ignore
Jun 28, 2019
4e0c0cf
Add room page to morpheus
Jun 28, 2019
7884b2c
organize a little more the morpheus store
Jun 30, 2019
642e235
Add office search filter to app bar
Jun 30, 2019
8b3e5bb
add users search filter in drawer
Jun 30, 2019
7629185
improving RoomCard layout
Jun 30, 2019
6963c46
Add snackbar and new socket events
Jun 30, 2019
68ffada
Add room name to users list
Jun 30, 2019
41b09e1
add invitaion feature to morpheus
Jun 30, 2019
6690ec4
Fix user name in app bar
Jun 30, 2019
ca45b33
Merge branch 'master' into feature/morpheus
juliemar Jul 2, 2019
bd10ee7
Change useReducer to Redux
Jul 3, 2019
42b5c22
Extracted the App routes to a specialized component
Jul 3, 2019
8a70d55
organized the snackbar action to a component in component dir
Jul 3, 2019
aa918ba
reorganized the components
Jul 4, 2019
eb8608d
Share button in app bar
Jul 4, 2019
c92c205
fix invitation
Jul 4, 2019
09fbd6c
Emit event when user enter and left meeting
Jul 4, 2019
0a307e1
Add headset in user of RoomCard when connected
Jul 5, 2019
a548c7d
Fix AppBarRouter component's name
Jul 5, 2019
9aa4090
Add headset to users avatar when they're in meeting and only show inv…
Jul 5, 2019
2d28fc4
Add error 500 and 404 page
Jul 6, 2019
2f916d0
Add some tests to Morpheus
Jul 7, 2019
bc5249f
Add roomId to office route
Jul 7, 2019
e0e3bc6
Add more components tests
megatroom Jul 7, 2019
c217562
Add test to MenuUsers
Jul 7, 2019
6087d3d
Implemented Google autologin in Morpheus
Jul 9, 2019
5386c31
Only show notification if a user enter in current room
Jul 9, 2019
9be8657
Close socket client connection before opening again
Jul 9, 2019
1e31953
Add option in app bar to disable notification temporarily
Jul 9, 2019
1e4b208
Add permission validation for browser notification
Jul 10, 2019
b25c4ee
Removed the Jest and passed the Morpheus tests for Mocha
Jul 12, 2019
48bb2eb
Enable "react/forbid-prop-types" ESLint rule and add shape to all obj…
Jul 12, 2019
97251ab
Divide MenuUsers to MenuUsers and MenuUsersItem
Jul 12, 2019
10599f7
Transform logic to use early return in frontend/morpheus.js
Jul 12, 2019
a4ffc18
Create hooks dir to separate the useEvents and useSocket that were in…
Jul 12, 2019
6bc70c8
small fix on the function call
Jul 12, 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
Prev Previous commit
Next Next commit
Fix user name in app bar
  • Loading branch information
Bruno Nardini committed Jun 30, 2019
commit 6690ec486395929cf44176b3ff1c24d839e02b4c
3 changes: 2 additions & 1 deletion frontend/components/EnterMeetingDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ import VideocamOff from "@material-ui/icons/VideocamOff";

const useStyles = makeStyles(() => ({
toolbar: {
textAlign: "center"
textAlign: "center",
minWidth: 260
},
sideMargin: {
marginRight: 8
Expand Down
6 changes: 5 additions & 1 deletion frontend/components/MenuAuth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import Button from "@material-ui/core/Button";
const MenuAuth = ({ userName }) => <Button color="inherit">{userName}</Button>;

MenuAuth.propTypes = {
userName: PropTypes.string.isRequired
userName: PropTypes.string
};

MenuAuth.defaultProps = {
userName: ""
};

export default MenuAuth;
2 changes: 1 addition & 1 deletion frontend/morpheus/MorpheusApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ const MorpheusApp = ({ history, location }) => {
dispatch(changeOfficeFilter(key, value));
}}
/>
<MenuAuth userName={state.userName} />
<MenuAuth userName={currentUser.name} />
</>
)}
/>
Expand Down