RTS Welcome Pages #3103
Merged
RTS Welcome Pages #3103
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… geektime techfest
Conflicts: src/component-index.js src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
added 4 commits
February 2, 2017 13:58
See matrix-org/riot-team-server#14
Conflicts: src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
dbkr
reviewed
Feb 6, 2017
| @@ -0,0 +1,39 @@ | |||
| /* | |||
| Copyright 2016 OpenMarket Ltd | |||
|
|
||
| 'use strict'; | ||
|
|
||
| var React = require("react"); |
There was a problem hiding this comment.
It would be awesome if we used import when writing new stuff (although I realise this probably wasn't yours)
| render: function() { | ||
| return ( | ||
| <div className="mx_HomePage"> | ||
| <iframe src={`${this.props.teamServerUrl}/static/${this.props.teamToken}/welcome.html`} style={{width: '100%', border: 'none'}}/> |
There was a problem hiding this comment.
Unless there's a backwards-compat reason for it being 'welcome', I'd suggest maybe 'home'html', or just blank and use the index page.
There was a problem hiding this comment.
Also would be nice to have the CSS not inline (in fact it looks like this is actually in the scss files, so probably just hasn't been removed from here).
| @@ -0,0 +1,31 @@ | |||
| /* | |||
| Copyright 2016 OpenMarket Ltd | |||
| @@ -98,9 +112,21 @@ module.exports = React.createClass({ | |||
|
|
|||
| render: function() { | |||
| var TintableSvg = sdk.getComponent('elements.TintableSvg'); | |||
|
|
|||
| var homeButton; | |||
| if (window.localStorage.getItem('mx_team_token')) { | |||
There was a problem hiding this comment.
Might be nice if this loaded the team token at mount time & then used the state here, which wouldn't hit localstorage on every render (and makes render more a function of the state).
dbkr
approved these changes
Feb 7, 2017
|
No probs :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This tracks the changes required to re-use the "hompages" concept as a way of displaying welcome pages for RTS team members.
Goes with matrix-org/matrix-react-sdk#666
TODO: