controltower
Advanced tools
Comparing version 0.7.4 to 0.7.5
{ | ||
"name": "controltower", | ||
"version": "0.7.4", | ||
"version": "0.7.5", | ||
"main": "./src/index.js", | ||
@@ -57,2 +57,3 @@ "license": "AGPL-3.0", | ||
"bankai": "^3.3.0", | ||
"bootstrap": "^3.3.7", | ||
"eslint": "^3.4.0", | ||
@@ -62,2 +63,3 @@ "eslint-config-calamar": "^2.1.1", | ||
"eslint-plugin-import": "^1.14.0", | ||
"gentelella": "^1.3.0", | ||
"http-server": "^0.9.0", | ||
@@ -91,5 +93,4 @@ "npm-scripts-info": "^0.3.6", | ||
"choo": "^4.0.0-0", | ||
"normalize.css": "^4.2.0", | ||
"ramda": "^0.22.1" | ||
} | ||
} |
@@ -15,1 +15,8 @@ # controltower | ||
[license]: https://github.com/fczuardi/controltower/blob/master/LICENSE | ||
## Bootstrap theme | ||
This branch uses the [gentelella][gentelella] Bootstrap theme by [Colorlib][colorlib]. | ||
[gentelella]: https://github.com/puikinsh/gentelella | ||
[colorlib]: https://colorlib.com/ |
@@ -33,10 +33,6 @@ 'use strict'; | ||
var _defaultTheme = require('./style/defaultTheme'); | ||
var _login = require('./views/login'); | ||
var _defaultTheme2 = _interopRequireDefault(_defaultTheme); | ||
var _login2 = _interopRequireDefault(_login); | ||
var _main = require('./views/main'); | ||
var _main2 = _interopRequireDefault(_main); | ||
var _dashboard = require('./views/dashboard'); | ||
@@ -50,5 +46,23 @@ | ||
var _defaultTheme = require('./style/defaultTheme'); | ||
var _defaultTheme2 = _interopRequireDefault(_defaultTheme); | ||
var _loginWrapper = require('./style/loginWrapper'); | ||
var _loginWrapper2 = _interopRequireDefault(_loginWrapper); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
// styling | ||
// views | ||
// models | ||
const app = (0, _choo2.default)({ href: true, history: true }); | ||
// config | ||
app.model(_app2.default); | ||
@@ -59,4 +73,5 @@ app.model(_customer2.default); | ||
const authWrapper = (loggedView, anonView = _main2.default) => (state, prev, send) => state.customer.isLogged && state.customer.id ? loggedView(state, prev, send) : anonView(state, prev, send); | ||
const viewWrapper = (0, _ramda.pipe)(_defaultTheme2.default, authWrapper); | ||
const defaultAnonView = (0, _loginWrapper2.default)(_login2.default); | ||
const authWrapper = (loggedView, anonView = defaultAnonView) => (state, prev, send) => state.customer.isLogged && state.customer.id ? loggedView(state, prev, send) : anonView(state, prev, send); | ||
const viewWrapper = (0, _ramda.pipe)(authWrapper, _defaultTheme2.default); | ||
@@ -63,0 +78,0 @@ app.router([['/', viewWrapper(_dashboard2.default)], ['/b/:botId', viewWrapper(_bot2.default)], |
@@ -55,2 +55,3 @@ 'use strict'; | ||
effects: { | ||
signIn: (data, state, send) => signInToggle(false, config.facebook.loginParams, send), | ||
signInToggle: (data, state, send) => signInToggle(data.isLogged, config.facebook.loginParams, send), | ||
@@ -57,0 +58,0 @@ fetchInfo: (data, state, send, done) => getUserInfo(config.facebook.userFields, send, done) |
'use strict'; | ||
const html = require('choo/html'); | ||
const sf = require('sheetify'); | ||
sf('normalize.css'); | ||
const mainCss = sf` | ||
h1 { | ||
color: red | ||
} | ||
`; | ||
const fontAwesome = require('./fontAwesome'); | ||
const mainCss = require('./main.css'); | ||
module.exports = view => (state, prev, send) => html` | ||
<div class=${ mainCss }> | ||
${ view(state, prev, send) } | ||
${ fontAwesome } | ||
<div class="nav-md"> | ||
<div class="container body"> | ||
<div class="main_container"> | ||
${ view(state, prev, send) } | ||
</div> | ||
</div> | ||
</div> | ||
</div>`; |
Sorry, the diff of this file is not supported yet
59225
2
28
587
22
22
- Removednormalize.css@^4.2.0
- Removednormalize.css@4.2.0(transitive)