Commit 5cad1aa3 authored by Lidor Cohen's avatar Lidor Cohen

- add login layout

- fix login pages design
parent 80cfc4d6
@import "{}/imports/ui/stylesheets/game-layout.less";
@import "{}/imports/ui/stylesheets/manage-layout.less";
@import "{}/imports/ui/stylesheets/login-layout.less";
@import "{}/imports/ui/stylesheets/not-found.less";
@import "{}/imports/ui/stylesheets/home.less";
@import "{}/imports/ui/stylesheets/manage-navbar.less";
......
......@@ -4,8 +4,9 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
import { mount } from 'react-mounter';
// Import layouts
import GameLayout from '../../ui/layouts/game/game.js';
import ManageLayout from '../../ui/layouts/manage/manage.js';
import GameLayout from '../../ui/layouts/game.js';
import ManageLayout from '../../ui/layouts/manage.js';
import LoginLayout from '../../ui/layouts/login.js';
// Import pages
import Home from '../../ui/pages/game-shared/home';
......@@ -97,14 +98,14 @@ FlowRouter.route('/ViewQuiz/:_id', {
FlowRouter.route('/Login', {
name: 'Game.Login',
action() {
mount(GameLayout, { main: <Login /> });
mount(LoginLayout, { main: <Login /> });
},
});
FlowRouter.route('/LoginError', {
name: 'Game.LoginError',
action() {
mount(GameLayout, { main: <LoginError /> });
mount(LoginLayout, { main: <LoginError /> });
},
});
......
import React from 'react';
export default ({ main }) =>
<div id="login-layout">
<div className="container">
{main}
</div>
</div>;
import React from 'react';
import { Meteor } from 'meteor/meteor';
import { createContainer } from 'meteor/react-meteor-data';
import ManageNavbar from '../../components/manage-navbar.js';
import Loading from '../../components/loading';
import ManageNavbar from '../components/manage-navbar.js';
import Loading from '../components/loading';
const ManageLayout = ({ main }) =>
<div id="manage">
<div id="manage-layout">
<ManageNavbar />
<div className="container">
{main}
......
......@@ -2,14 +2,10 @@ import React from 'react';
const LoginError = () =>
<div id="login-error">
<div className="game-background" />
<div className="container">
<div className="row">
<div className="col-md-4" />
<div className="col-md-4">Login Error</div>
<div className="col-md-4" />
</div>
</div>
<h1 className="center-block">
התחברות נכשלה
<i className="fa fa-frown-o" aria-hidden="true" />
</h1>
</div>;
export default LoginError;
......@@ -14,19 +14,12 @@ const Login = () => {
return (
<div id="login">
<div className="game-background" />
<div className="container">
<div className="row">
<div className="col-md-4" />
<div className="col-md-4">
<button className="btn btn-lg btn-warning btn-block" onClick={login}>
Login
<i className="fa fa-gitlab" aria-hidden="true" />
</button>
</div>
<div className="col-md-4" />
</div>
</div>
<button className="btn btn-lg btn-warning btn-block" onClick={login}>
<i className="fa fa-gitlab fa-2x pull-right" aria-hidden="true" />
<span style={{ fontSize: 'large', paddingTop: '5px', verticalAlign: 'middle' }}>
התחבר
</span>
</button>
</div>
);
};
......
#login-layout {
.container {
padding: 300px 400px;
}
}
#manage {
#manage-layout {
.container {
padding: 125px 100px;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment