ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/AD-499-whitelabel-prize-with-sluice-as-k' into AD-419-decouple-piece-registration-from-

Browse Source
This commit is contained in:
diminator 2015-07-14 17:50:01 +02:00
commit 4dfff8d6a5
11 changed files with 109 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/app.js
View File

@ -8,10 +8,12 @@ import Router from 'react-router';
import fetch from 'isomorphic-fetch';
import ApiUrls from './constants/api_urls';
import constants from './constants/application_constants';
import appConstants from './constants/application_constants';
import getRoutes from './routes';
import requests from './utils/requests';
import { getSubdomainSettings } from './utils/constants_utils';
let headers = {
'Accept': 'application/json',
'Content-Type': 'application/json'
@ -33,26 +35,21 @@ requests.defaults({
class AppGateway {
start() {
console.log('start');
let settings;
let subdomain = window.location.host.split('.')[0];
requests.get('whitelabel_settings', {'subdomain': subdomain})
.then(this.loadSubdomain.bind(this))
.catch(this.loadDefault.bind(this));
}
loadSubdomain(data) {
let settings = data.whitelabel;
constants.whitelabel = settings;
this.load('prize');
}
loadDefault(error) {
console.log('Loading default app, error'. error);
try {
settings = getSubdomainSettings(subdomain);
appConstants.whitelabel = settings;
this.load(settings.type);
} catch(err) {
// if there are no matching subdomains, we're routing
// to the default frontend
this.load('default');
}
}
load(type) {
console.log('loading', type);
Router.run(getRoutes(type), Router.HistoryLocation, (App) => {
React.render(
<App />,

4
js/components/ascribe_slides_container/slides_container.js
View File

@ -34,7 +34,7 @@ let SlidesContainer = React.createClass({
// check if slide_num was defined, and if not then default to 0
let queryParams = this.getQuery();
if(!('slide_num' in queryParams)) {
this.transitionTo(this.getPathname(), null, {slide_num: 0});
this.replaceWith(this.getPathname(), null, {slide_num: 0});
}
// init container width
@ -60,7 +60,7 @@ let SlidesContainer = React.createClass({
setSlideNum(slideNum) {
if(slideNum < 0 || slideNum < React.Children.count(this.props.children)) {
this.transitionTo(this.getPathname(), null, {slide_num: slideNum});
this.replaceWith(this.getPathname(), null, {slide_num: slideNum});
this.setState({
slideNum: slideNum
});

2
js/components/whitelabel/prize/app.js
View File

@ -20,7 +20,7 @@ let PrizeApp = React.createClass({
}
return (
<div className="whitelabel-prize">
<div className="wp">
<Hero />
{header}
<RouteHandler />

5
js/components/whitelabel/prize/components/hero.js
View File

@ -8,7 +8,10 @@ let Hero = React.createClass({
render() {
return (
<div className="hero">
<img className="logo" src={constants.whitelabel.logo} alt="Sluice Art Prize" />
<img
className="logo" src={constants.whitelabel.logo}
alt="Sluice Art Prize"
height="300px"/>
<h1>Sluice Art Prize 2015</h1>
</div>
);

5
js/components/whitelabel/prize/components/landing.js
View File

@ -11,8 +11,10 @@ let Link = Router.Link;
let Landing = React.createClass({
render() {
return (
<div>
<div className="container">
<div className="row">
<div className="col-xs-12 wp-landing-wrapper">
<p></p>
<ButtonGroup className="enter" bsSize="large" vertical block>
<ButtonLink to="signup">
Signup to the prize
@ -22,6 +24,7 @@ let Landing = React.createClass({
</ButtonGroup>
</div>
</div>
</div>
);
}
});

8
js/components/whitelabel/prize/components/piece_list.js
View File

@ -3,11 +3,19 @@
import React from 'react';
import PieceList from '../../../piece_list';
import ButtonLink from 'react-router-bootstrap/lib/ButtonLink';
let PrizePieceList = React.createClass({
render() {
return (
<div>
<ButtonLink to="register_piece">
Submit a new artwork to the prize
</ButtonLink>
<PieceList redirectTo="register_piece" />
</div>
);
}
});

38
js/constants/application_constants.js
View File

@ -5,13 +5,49 @@ let constants = {
//FIXME: referring to a global variable in `window` is not
// super pro. What if we render stuff on the server?
// - super-bro - Senor Developer, 14th July 2015
//'baseUrl': window.BASE_URL,
'apiEndpoint': window.API_ENDPOINT,
'serverUrl': window.SERVER_URL,
'baseUrl': window.BASE_URL,
'aclList': ['acl_coa', 'acl_consign', 'acl_delete', 'acl_download', 'acl_edit', 'acl_editions', 'acl_loan', 'acl_share', 'acl_transfer', 'acl_unconsign', 'acl_unshare', 'acl_view', 'acl_withdraw_transfer'],
// in case of whitelabel cusomization, we store stuff here
'subdomains': [
{
'user': 22,
'subdomain': 'cc',
'name': 'Creative Commons France',
'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/public/creativecommons/cc.logo.sm.png',
'permissions': ['register', 'edit', 'share', 'del_from_collection'],
'type': 'wallet'
},
{
'user': 22,
'subdomain': 'cc-staging',
'name': 'Creative Commons France',
'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/public/creativecommons/cc.logo.sm.png',
'permissions': ['register', 'edit', 'share', 'del_from_collection'],
'type': 'wallet'
},
{
'user': 1,
'subdomain': 'sluice',
'name': 'Sluice Art Fair',
'logo': 'http://sluice.info/images/logo.gif',
'permissions': ['register', 'edit', 'share', 'del_from_collection'],
'type': 'prize'
},
{
'user': 1,
'subdomain': 'sluice-staging',
'name': 'Sluice Art Fair',
'logo': 'https://s3-us-west-2.amazonaws.com/ascribe0/whitelabel/sluice/logo.jpeg',
'permissions': ['register', 'edit', 'share', 'del_from_collection'],
'type': 'prize'
}
],
// in case of whitelabel customization, we store stuff here
'whitelabel': {}
};

2
js/routes.js
View File

@ -39,7 +39,7 @@ const COMMON_ROUTES = (
function getRoutes(type) {
let routes = null;
console.log(type)
if (type === 'prize') {
routes = getPrizeRoutes(COMMON_ROUTES);
} else {

15
js/utils/constants_utils.js Normal file
View File

@ -0,0 +1,15 @@
'use strict';
import appConstants from '../constants/application_constants';
export function getSubdomainSettings(subdomain) {
let settings = appConstants.subdomains.filter((sdSettings) => subdomain === sdSettings.subdomain);
if(settings.length === 1) {
return settings[0];
} else if(settings.length === 0) {
throw new Error('There are no subdomain settings for the subdomain: ' + subdomain);
} else {
throw new Error('Matched multiple subdomains. Adjust constants file.');
}
}

2
js/utils/fetch_api_utils.js
View File

@ -79,6 +79,8 @@ export function getCookie(name) {
Taken from: http://jsfiddle.net/jan_miksovsky/yy7zs/
CURRENTLY NOT USED...
*/
export function fetchImageAsBlob(url) {
return new Promise((resolve, reject) => {

23
sass/whitelabel/prize/landing.scss
View File

@ -1,16 +1,17 @@
.whitelabel-prize {
.hero {
.wp {
background-color: #CCC;
height: 100%;
width: 100%;
> .hero {
overflow: hidden;
.logo {
float: left;
padding-right: 2em;
}
}
.enter {
text-align: center;
}
}
.wp-landing-wrapper {
text-align: center;
}