self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-22 10:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(web) minor css fixes and some clean-up

Browse source
This commit is contained in:
Alexey Kontsevoy 2016-03-21 10:59:31 -04:00
parent 530888fcc4
commit 477804aa4c
10 changed files with 41 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
web/dist/app/app.js vendored
View file

File diff suppressed because one or more lines are too long

2
web/dist/app/styles.js vendored
View file

File diff suppressed because one or more lines are too long

14
web/dist/app/vendor.js vendored
View file

File diff suppressed because one or more lines are too long

6
web/dist/index.html vendored
View file

@ -14,11 +14,11 @@
<script src="/web/app/assets/js/bootstrap-3.3.6.js"></script>
<script src="/web/app/assets/js/term-0.0.7.js"></script>
<script src="/web/app/assets/js/bootstrap-datepicker-1.6.0.js"></script>
<script src="/web/app/vendor.js?ver=0.11458497448341"></script>
<script src="/web/app/styles.js?ver=0.11458497448341"></script>
<script src="/web/app/vendor.js?ver=0.11458572266555"></script>
<script src="/web/app/styles.js?ver=0.11458572266555"></script>
</head>
<body class="grv">
<div id="app"></div>
</body>
<script src="/web/app/app.js?ver=0.11458497448341"></script>
<script src="/web/app/app.js?ver=0.11458572266555"></script>
</html>

53
web/src/app/components/currentSession/activeSession.jsx
View file

@ -26,32 +26,6 @@ var SelectNodeDialog = require('./../selectNodeDialog.jsx');
var ActiveSession = React.createClass({
componentWillUnmount(){
closeSelectNodeDialog();
},
render: function() {
let {login, parties, serverId} = this.props.session;
let serverLabelText = '';
if(serverId){
let hostname = reactor.evaluate(nodeHostNameByServerId(serverId));
serverLabelText = `${login}@${hostname}`;
}
return (
<div className="grv-current-session">
<SessionLeftPanel parties={parties}/>
<div className="grv-current-session-server-info">
<h3>{serverLabelText}</h3>
</div>
<TtyConnection {...this.props.session} />
</div>
);
}
});
var TtyConnection = React.createClass({
getInitialState() {
this.tty = new Tty(this.props)
this.tty.on('open', ()=> this.setState({ ...this.state, isConnected: true }));
@ -61,11 +35,11 @@ var TtyConnection = React.createClass({
},
componentDidMount(){
// temporary hack
SelectNodeDialog.onServerChangeCallBack = this.componentWillReceiveProps.bind(this);
},
componentWillUnmount() {
closeSelectNodeDialog();
SelectNodeDialog.onServerChangeCallBack = null;
this.tty.disconnect();
},
@ -79,13 +53,26 @@ var TtyConnection = React.createClass({
}
},
render() {
render: function() {
let {login, parties, serverId} = this.props;
let serverLabelText = '';
if(serverId){
let hostname = reactor.evaluate(nodeHostNameByServerId(serverId));
serverLabelText = `${login}@${hostname}`;
}
return (
<div style={{height: '100%'}}>
<TtyTerminal ref="ttyCmntInstance" tty={this.tty} cols={this.props.cols} rows={this.props.rows} />
{ this.state.isConnected ? <EventStreamer sid={this.props.sid}/> : null }
</div>
)
<div className="grv-current-session">
<SessionLeftPanel parties={parties}/>
<div className="grv-current-session-server-info">
<h3>{serverLabelText}</h3>
</div>
<div style={{height: '100%'}}>
<TtyTerminal ref="ttyCmntInstance" tty={this.tty} cols={this.props.cols} rows={this.props.rows} />
{ this.state.isConnected ? <EventStreamer sid={this.props.sid}/> : null }
</div>
</div>
);
}
});

4
web/src/app/components/currentSession/main.jsx
View file

@ -44,10 +44,10 @@ var CurrentSessionHost = React.createClass({
}
if(currentSession.isNewSession || currentSession.active){
return <ActiveSession session={currentSession}/>;
return <ActiveSession {...currentSession}/>;
}
return <SessionPlayer session={currentSession}/>;
return <SessionPlayer {...currentSession}/>;
}
});

2
web/src/app/components/currentSession/sessionLeftPanel.jsx
View file

@ -50,7 +50,7 @@ const SessionLeftPanel = ({parties}) => {
</button>
</li>
</ul>
<hr className="grv-divider"/>
{ userIcons.length > 0 ? <hr className="grv-divider"/> : null }
<ReactCSSTransitionGroup className="nav" component='ul'
transitionEnterTimeout={500}
transitionLeaveTimeout={500}

2
web/src/app/components/currentSession/sessionPlayer.jsx
View file

@ -32,7 +32,7 @@ var SessionPlayer = React.createClass({
},
getInitialState() {
var sid = this.props.session.sid;
var sid = this.props.sid;
this.tty = new TtyPlayer({sid});
return this.calculateState();
},

3
web/src/app/modules/sessions/getters.js
View file

@ -92,5 +92,6 @@ export default {
sessionsByServer,
sessionsView,
sessionViewById,
createView
createView,
count: [['tlpt_sessions'], sessions => sessions.size ]
}

2
web/src/styles/grv-session-player.scss
View file

@ -15,5 +15,5 @@ limitations under the License.
*/
.grv-session-player{
padding: 70px 50px 80px 90px;
padding: 30px 50px 80px 90px;
}