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

RTS Welcome Pages #3103

Merged
merged 23 commits into from Feb 7, 2017

Conversation

@lukebarnard1
Copy link
Contributor

lukebarnard1 commented Feb 1, 2017

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:

  • Move statically-hosted content to the RTS
ara4n and others added 13 commits Nov 13, 2016
Conflicts:
	src/component-index.js
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
@lukebarnard1 lukebarnard1 changed the title RTS Team Welcome Pages RTS Welcome Pages Feb 2, 2017
@lukebarnard1 lukebarnard1 referenced this pull request Feb 2, 2017
lukebarnard1 added 4 commits Feb 2, 2017
See matrix-org/riot-team-server#14
Conflicts:
	src/skins/vector/css/matrix-react-sdk/views/rooms/_RoomPreviewBar.scss
@lukebarnard1 lukebarnard1 requested a review from dbkr Feb 2, 2017
@@ -0,0 +1,39 @@
/*
Copyright 2016 OpenMarket Ltd

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

2017 Vector Creations Ltd

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Feb 7, 2017

Author Contributor

Done


'use strict';

var React = require("react");

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

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'}}/>

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

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.

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

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

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

copyright again

This comment has been minimized.

Copy link
@lukebarnard1

lukebarnard1 Feb 7, 2017

Author Contributor

Done

@@ -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')) {

This comment has been minimized.

Copy link
@dbkr

dbkr Feb 6, 2017

Member

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
dbkr approved these changes Feb 7, 2017
Copy link
Member

dbkr left a comment

Awesome, thanks for fixing those (especially since most of them were not your code in the first place!)

@dbkr dbkr merged commit 2f54034 into develop Feb 7, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@lukebarnard1

This comment has been minimized.

Copy link
Contributor Author

lukebarnard1 commented Feb 7, 2017

No probs :)

@lukebarnard1 lukebarnard1 deleted the luke/rts-welcome-pages branch Feb 7, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.