mirror of https://github.com/vector-im/riot-web
Add 'groups' page
parent
aa7a113324
commit
a2ff289ed8
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright 2015, 2016 OpenMarket Ltd
|
Copyright 2015, 2016 OpenMarket Ltd
|
||||||
|
Copyright 2017 Vector Creations Ltd
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
you may not use this file except in compliance with the License.
|
you may not use this file except in compliance with the License.
|
||||||
|
@ -23,4 +24,5 @@ export default {
|
||||||
RoomDirectory: "room_directory",
|
RoomDirectory: "room_directory",
|
||||||
UserView: "user_view",
|
UserView: "user_view",
|
||||||
GroupView: "group_view",
|
GroupView: "group_view",
|
||||||
|
MyGroups: "my_groups",
|
||||||
};
|
};
|
||||||
|
|
|
@ -211,6 +211,7 @@ export default React.createClass({
|
||||||
const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
|
const RoomDirectory = sdk.getComponent('structures.RoomDirectory');
|
||||||
const HomePage = sdk.getComponent('structures.HomePage');
|
const HomePage = sdk.getComponent('structures.HomePage');
|
||||||
const GroupView = sdk.getComponent('structures.GroupView');
|
const GroupView = sdk.getComponent('structures.GroupView');
|
||||||
|
const MyGroups = sdk.getComponent('structures.MyGroups');
|
||||||
const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
|
const MatrixToolbar = sdk.getComponent('globals.MatrixToolbar');
|
||||||
const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
|
const NewVersionBar = sdk.getComponent('globals.NewVersionBar');
|
||||||
const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
|
const UpdateCheckBar = sdk.getComponent('globals.UpdateCheckBar');
|
||||||
|
@ -248,6 +249,11 @@ export default React.createClass({
|
||||||
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
|
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case PageTypes.MyGroups:
|
||||||
|
page_element = <MyGroups />;
|
||||||
|
if (!this.props.collapse_rhs) right_panel = <RightPanel opacity={this.props.rightOpacity}/>;
|
||||||
|
break;
|
||||||
|
|
||||||
case PageTypes.CreateRoom:
|
case PageTypes.CreateRoom:
|
||||||
page_element = <CreateRoom
|
page_element = <CreateRoom
|
||||||
onRoomCreated={this.props.onRoomCreated}
|
onRoomCreated={this.props.onRoomCreated}
|
||||||
|
|
|
@ -486,6 +486,10 @@ module.exports = React.createClass({
|
||||||
this._setPage(PageTypes.RoomDirectory);
|
this._setPage(PageTypes.RoomDirectory);
|
||||||
this.notifyNewScreen('directory');
|
this.notifyNewScreen('directory');
|
||||||
break;
|
break;
|
||||||
|
case 'view_my_groups':
|
||||||
|
this._setPage(PageTypes.MyGroups);
|
||||||
|
this.notifyNewScreen('groups');
|
||||||
|
break;
|
||||||
case 'view_group':
|
case 'view_group':
|
||||||
{
|
{
|
||||||
const groupId = payload.group_id;
|
const groupId = payload.group_id;
|
||||||
|
@ -1151,6 +1155,10 @@ module.exports = React.createClass({
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'view_room_directory',
|
action: 'view_room_directory',
|
||||||
});
|
});
|
||||||
|
} else if (screen == 'groups') {
|
||||||
|
dis.dispatch({
|
||||||
|
action: 'view_my_groups',
|
||||||
|
});
|
||||||
} else if (screen == 'post_registration') {
|
} else if (screen == 'post_registration') {
|
||||||
dis.dispatch({
|
dis.dispatch({
|
||||||
action: 'start_post_registration',
|
action: 'start_post_registration',
|
||||||
|
|
|
@ -925,5 +925,7 @@
|
||||||
"Encryption key request": "Encryption key request",
|
"Encryption key request": "Encryption key request",
|
||||||
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
"Autocomplete Delay (ms):": "Autocomplete Delay (ms):",
|
||||||
"This Home server does not support groups": "This Home server does not support groups",
|
"This Home server does not support groups": "This Home server does not support groups",
|
||||||
"Loading device info...": "Loading device info..."
|
"Loading device info...": "Loading device info...",
|
||||||
|
"Groups": "Groups",
|
||||||
|
"Create a new group": "Create a new group"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue