mirror of
https://github.com/ascribe/onion.git
synced 2024-12-22 17:33:14 +01:00
Working on landing
This commit is contained in:
parent
33d599b923
commit
3fbe60692e
@ -18,7 +18,7 @@
|
|||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="main" class="container"></div>
|
<div id="main"></div>
|
||||||
<script src="<%= BASE_URL %>static/js/app.js"></script>
|
<script src="<%= BASE_URL %>static/js/app.js"></script>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
@ -8,6 +8,7 @@ import Router from 'react-router';
|
|||||||
import fetch from 'isomorphic-fetch';
|
import fetch from 'isomorphic-fetch';
|
||||||
|
|
||||||
import ApiUrls from './constants/api_urls';
|
import ApiUrls from './constants/api_urls';
|
||||||
|
import constants from './constants/application_constants';
|
||||||
import getRoutes from './routes';
|
import getRoutes from './routes';
|
||||||
import requests from './utils/requests';
|
import requests from './utils/requests';
|
||||||
|
|
||||||
@ -40,7 +41,7 @@ class AppGateway {
|
|||||||
|
|
||||||
loadSubdomain(data) {
|
loadSubdomain(data) {
|
||||||
let settings = data.whitelabel;
|
let settings = data.whitelabel;
|
||||||
|
constants.whitelabel = settings;
|
||||||
this.load('prize');
|
this.load('prize');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -13,7 +13,7 @@ let RouteHandler = Router.RouteHandler;
|
|||||||
let AscribeApp = React.createClass({
|
let AscribeApp = React.createClass({
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div className="container ascribe-default-app">
|
||||||
<Header />
|
<Header />
|
||||||
<RouteHandler />
|
<RouteHandler />
|
||||||
<Footer />
|
<Footer />
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Router from 'react-router';
|
import Router from 'react-router';
|
||||||
import Footer from '../../footer';
|
// import Footer from '../../footer';
|
||||||
import GlobalNotification from '../../global_notification';
|
import GlobalNotification from '../../global_notification';
|
||||||
|
|
||||||
let RouteHandler = Router.RouteHandler;
|
let RouteHandler = Router.RouteHandler;
|
||||||
@ -11,9 +11,8 @@ let RouteHandler = Router.RouteHandler;
|
|||||||
let PrizeApp = React.createClass({
|
let PrizeApp = React.createClass({
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div class="whitelabel-prize">
|
<div className="whitelabel-prize">
|
||||||
<RouteHandler />
|
<RouteHandler />
|
||||||
<Footer />
|
|
||||||
<GlobalNotification />
|
<GlobalNotification />
|
||||||
<div id="modal" className="container"></div>
|
<div id="modal" className="container"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -2,21 +2,31 @@
|
|||||||
|
|
||||||
import React from 'react';
|
import React from 'react';
|
||||||
import Router from 'react-router';
|
import Router from 'react-router';
|
||||||
|
import constants from '../../../../constants/application_constants';
|
||||||
|
|
||||||
let Link = Router.Link;
|
import ButtonLink from 'react-router-bootstrap/lib/ButtonLink';
|
||||||
|
import ButtonGroup from 'react-bootstrap/lib/ButtonGroup';
|
||||||
|
|
||||||
|
|
||||||
let Landing = React.createClass({
|
let Landing = React.createClass({
|
||||||
render() {
|
render() {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<div class="hero">
|
<div className="hero">
|
||||||
Yay art prize!
|
<img className="logo" src={constants.whitelabel.logo} alt="Sluice Art Prize" />
|
||||||
|
<h1>Sluice Art Prize 2015</h1>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="buttons">
|
<div className="container">
|
||||||
<Link to="login">Login</Link>
|
<ButtonGroup className="enter" bsSize="large" vertical block>
|
||||||
<Link to="signup">Signup</Link>
|
<ButtonLink to="signup">
|
||||||
|
Signup
|
||||||
|
</ButtonLink>
|
||||||
|
|
||||||
|
<ButtonLink to="login">
|
||||||
|
Login
|
||||||
|
</ButtonLink>
|
||||||
|
</ButtonGroup>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -10,7 +10,10 @@ let constants = {
|
|||||||
'serverUrl': window.SERVER_URL,
|
'serverUrl': window.SERVER_URL,
|
||||||
'baseUrl': window.BASE_URL,
|
'baseUrl': window.BASE_URL,
|
||||||
'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
|
'aclList': ['edit', 'consign', 'consign_request', 'unconsign', 'unconsign_request', 'transfer',
|
||||||
'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection']
|
'loan', 'loan_request', 'share', 'download', 'view', 'delete', 'del_from_collection', 'add_to_collection'],
|
||||||
|
|
||||||
|
// in case of whitelabel cusomization, we store stuff here
|
||||||
|
'whitelabel': {}
|
||||||
};
|
};
|
||||||
|
|
||||||
export default constants;
|
export default constants;
|
||||||
|
5
sass/ascribe_app.scss
Normal file
5
sass/ascribe_app.scss
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
.ascribe-default-app {
|
||||||
|
background-color: #FDFDFD;
|
||||||
|
border-radius: 0;
|
||||||
|
padding-top: 70px;
|
||||||
|
}
|
@ -11,6 +11,7 @@ $BASE_URL: '<%= BASE_URL %>';
|
|||||||
@import 'ascribe_theme';
|
@import 'ascribe_theme';
|
||||||
@import './ascribe-fonts/style';
|
@import './ascribe-fonts/style';
|
||||||
@import './ascribe-fonts/ascribe-fonts';
|
@import './ascribe-fonts/ascribe-fonts';
|
||||||
|
@import 'ascribe_app';
|
||||||
@import 'ascribe_login';
|
@import 'ascribe_login';
|
||||||
@import 'ascribe_table';
|
@import 'ascribe_table';
|
||||||
@import 'ascribe_accordion_list';
|
@import 'ascribe_accordion_list';
|
||||||
@ -28,10 +29,11 @@ $BASE_URL: '<%= BASE_URL %>';
|
|||||||
@import 'ascribe_slides_container';
|
@import 'ascribe_slides_container';
|
||||||
@import 'ascribe_form';
|
@import 'ascribe_form';
|
||||||
|
|
||||||
body {
|
@import 'whitelabel/index';
|
||||||
background-color: #FDFDFD;
|
|
||||||
border-radius: 0;
|
|
||||||
margin-top: 70px;
|
html, body {
|
||||||
|
height: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
html {
|
html {
|
||||||
@ -42,6 +44,10 @@ hr {
|
|||||||
margin-bottom: 15px;
|
margin-bottom: 15px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#main {
|
||||||
|
height: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
1
sass/whitelabel/index.scss
Normal file
1
sass/whitelabel/index.scss
Normal file
@ -0,0 +1 @@
|
|||||||
|
@import 'prize/index';
|
1
sass/whitelabel/prize/index.scss
Normal file
1
sass/whitelabel/prize/index.scss
Normal file
@ -0,0 +1 @@
|
|||||||
|
@import 'landing'
|
16
sass/whitelabel/prize/landing.scss
Normal file
16
sass/whitelabel/prize/landing.scss
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
.whitelabel-prize {
|
||||||
|
.hero {
|
||||||
|
overflow: hidden;
|
||||||
|
|
||||||
|
.logo {
|
||||||
|
float: left;
|
||||||
|
padding-right: 2em;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.enter {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user