Update browserify dependencies and move controllers into views folder.
Update templates to support new React views.
This commit is contained in:
parent
d8ee2a2d91
commit
dd02fd66f6
|
@ -3,10 +3,10 @@
|
||||||
"version": "0.5.0",
|
"version": "0.5.0",
|
||||||
"description": "Modern web app construction kit.",
|
"description": "Modern web app construction kit.",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"browserify": "10.1.0",
|
"browserify": "10.1.3",
|
||||||
"coffee-script": "1.9.2",
|
"coffee-script": "1.9.2",
|
||||||
"less": "1.7.5",
|
"less": "2.5.0",
|
||||||
"react": "0.13.2",
|
"react": "0.13.3",
|
||||||
"coffee-reactify": "3.0.0",
|
"coffee-reactify": "3.0.0",
|
||||||
"font-awesome": "4.3.0",
|
"font-awesome": "4.3.0",
|
||||||
"angular": "1.3.1",
|
"angular": "1.3.1",
|
||||||
|
@ -27,11 +27,12 @@
|
||||||
"karma-phantomjs-launcher": "0.1.4",
|
"karma-phantomjs-launcher": "0.1.4",
|
||||||
"karma-mocha": "0.1.9",
|
"karma-mocha": "0.1.9",
|
||||||
"karma-coffee-preprocessor": "0.2.1",
|
"karma-coffee-preprocessor": "0.2.1",
|
||||||
|
"karma-chrome-launcher": "0.1.8",
|
||||||
"karma-coverage": "0.2.6",
|
"karma-coverage": "0.2.6",
|
||||||
"mocha": "2.0.1",
|
"mocha": "2.0.1",
|
||||||
"protractor": "2.0.0",
|
"protractor": "2.0.0",
|
||||||
"protractor-coffee-preprocessor": "0.0.1",
|
"protractor-coffee-preprocessor": "0.0.1",
|
||||||
"react-tools": "~0.13.2"
|
"react-tools": "~0.13.3"
|
||||||
},
|
},
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -1,45 +0,0 @@
|
||||||
###*
|
|
||||||
* Rookeries frontend - Login controller.
|
|
||||||
*
|
|
||||||
* @copyright (c) Copyright 2013-2015 Dorian Pula
|
|
||||||
* @license AGPL v3
|
|
||||||
* @author Dorian Pula [dorian.pula@amber-penguin-software.ca]
|
|
||||||
###
|
|
||||||
|
|
||||||
rookeries_app = require('../app.coffee')
|
|
||||||
|
|
||||||
rookeries_app.controller 'UserLoginController', [
|
|
||||||
'$scope', '$modal', '$log'
|
|
||||||
($scope, $modal, $log) ->
|
|
||||||
|
|
||||||
$scope.items = ['item1', 'item2', 'item3']
|
|
||||||
$scope.open = () ->
|
|
||||||
modalInstance = $modal.open(
|
|
||||||
templateUrl: 'static/partials/user-login.html',
|
|
||||||
controller: 'ModalInstanceCtrl',
|
|
||||||
resolve:
|
|
||||||
items: () ->
|
|
||||||
return $scope.items
|
|
||||||
)
|
|
||||||
|
|
||||||
modalInstance.result.then(
|
|
||||||
(selectedItem) -> $scope.selected = selectedItem,
|
|
||||||
() -> $log.info('Modal dismissed at: ' + new Date())
|
|
||||||
)
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
rookeries_app.controller 'ModalInstanceCtrl', [
|
|
||||||
'$scope', '$modalInstance', 'items'
|
|
||||||
($scope, $modalInstance, items) ->
|
|
||||||
|
|
||||||
$scope.items = items
|
|
||||||
$scope.selected =
|
|
||||||
item: $scope.items[0]
|
|
||||||
|
|
||||||
$scope.ok = () ->
|
|
||||||
$modalInstance.close($scope.selected.item)
|
|
||||||
|
|
||||||
$scope.cancel = () ->
|
|
||||||
$modalInstance.dismiss('cancel')
|
|
||||||
]
|
|
|
@ -0,0 +1,54 @@
|
||||||
|
#
|
||||||
|
# Rookeries frontend - Modal Login view.
|
||||||
|
# @copyright (c) Copyright 2013-2015 Dorian Pula
|
||||||
|
# @license AGPL v3
|
||||||
|
# @author Dorian Pula [dorian.pula@amber-penguin-software.ca]
|
||||||
|
#
|
||||||
|
|
||||||
|
'use strict'
|
||||||
|
|
||||||
|
React = require('react')
|
||||||
|
Button = require('react-bootstrap').Button
|
||||||
|
Panel = require('react-bootstrap').Panel
|
||||||
|
Modal = require('react-bootstrap').Modal
|
||||||
|
ModalTrigger = require('react-bootstrap').ModalTrigger
|
||||||
|
|
||||||
|
UserLoginModal = React.createClass(
|
||||||
|
render: () ->
|
||||||
|
return(
|
||||||
|
|
||||||
|
<Modal {...this.props} bsStyle='primary' title='Login' animation={false}>
|
||||||
|
|
||||||
|
<div class="modal-body">
|
||||||
|
<div class="error_message">Nothing to see here</div>
|
||||||
|
<div class="row">
|
||||||
|
<label class="control-label col-lg-2" for="username">Username</label>
|
||||||
|
<div class="col-lg-8">
|
||||||
|
<input class="form-control" type="text" id="username" placeholder="Username" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="row">
|
||||||
|
<label class="control-label col-lg-2" for="password">Password</label>
|
||||||
|
<div class="col-lg-8">
|
||||||
|
<input class="form-control" type="password" id="password" />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="modal-footer">
|
||||||
|
<Button bsStyle="warning">Cancel</Button>
|
||||||
|
<Button>Login</Button>
|
||||||
|
</div>
|
||||||
|
</Modal>
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# TODO: Clean this guy up.
|
||||||
|
|
||||||
|
overlayTriggerInstance = (
|
||||||
|
<ModalTrigger modal={<UserLoginModal />}>
|
||||||
|
<Button bsStyle='primary' bsSize='large'>Launch demo modal</Button>
|
||||||
|
</ModalTrigger>
|
||||||
|
)
|
||||||
|
|
||||||
|
React.render(overlayTriggerInstance, document.getElementById('user-login-trigger'))
|
|
@ -1,7 +1,9 @@
|
||||||
|
'use strict'
|
||||||
|
|
||||||
React = require('react')
|
React = require('react')
|
||||||
|
ProgressBar = require('react-bootstrap').ProgressBar
|
||||||
|
|
||||||
Hello = React.createClass(
|
Hello = React.createClass(
|
||||||
displayName: 'Hello',
|
|
||||||
render: () ->
|
render: () ->
|
||||||
return <h1>Hacking away...</h1>
|
return <h1>Hacking away...</h1>
|
||||||
)
|
)
|
||||||
|
@ -9,3 +11,9 @@ Hello = React.createClass(
|
||||||
React.render(
|
React.render(
|
||||||
React.createElement(Hello), document.getElementById('cortanna')
|
React.createElement(Hello), document.getElementById('cortanna')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Comments break stuff??
|
||||||
|
|
||||||
|
React.render(
|
||||||
|
<ProgressBar now={45} />, document.getElementById('progress')
|
||||||
|
)
|
Loading…
Reference in New Issue