didier/doormanserver
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

so mamy things...

Browse Source
This commit is contained in:
didier amyot committed 2015-07-05 17:17:01 -04:00
1 parent f7a8d416c1
commit 78d50d9a6d
24 files changed
+516 -173
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

static/.bowerrc
+3
View File
@@ -0,0 +1,3 @@
{
"directory": "app/bower_components"
}
static/bower.json
+2 -1
View File
@@ -22,6 +22,7 @@
"angularAMD": "~0.2.1",
"angular-foundation": "~0.5.1",
"lodash": "~3.9.3",
"font-awesome": "~4.3.0"
"font-awesome": "~4.3.0",
"bourbon": "~4.2.3"
}
}
static/coffee/app.coffee
+21 -1
View File
@@ -1,9 +1,11 @@
define [
"angularAMD"
"lodash"
"angular-route"
"foundation"
], (angularAMD) ->
], (angularAMD, _) ->
app = angular.module("webapp", ["ngRoute", "mm.foundation"])
app.config ($routeProvider) ->
$routeProvider.when("/", angularAMD.route(
@@ -39,6 +41,24 @@ define [
document.getElementsByTagName("body")[0].style.visibility = ""
return
app.controller "topbarCtrl", ["$scope", "$rootScope", "$location", ($scope, $rootScope, $location) ->
$scope.init = () ->
$scope.email = localStorage.getItem("email")
$scope.loggedIn = !!$scope.email
if !$scope.loggedIn
$location.path('/').replace()
$scope.logout = () ->
localStorage.setItem("email", "")
$scope.email = ""
$scope.loggedIn = false
$scope.$emit("logout")
$scope.init()
$rootScope.$on('login', $scope.init)
return
]
angularAMD.bootstrap(app)
static/coffee/controllers/apispecCtrl.coffee
+4 -4
View File
@@ -25,8 +25,8 @@ define ["app", "angularAMD"], (app, angularAMD) ->
angularAMD.directive "wabApi", () ->
directive =
restrict: 'E',
scope:
endpoint: '@'
template: '<a>/api{{ endpoint }}</a>'
restrict: 'E',
scope:
endpoint: '@'
template: '<a>/api{{ endpoint }}</a>'
return directive
static/coffee/controllers/doormanCtrl.coffee
+12 -2
View File
@@ -1,6 +1,8 @@
define ["app", "lodash"], (app, _) ->
define ["app", "lodash", "directives/ratinput"], (app, _, ratinput) ->
app.controller "DoormanCtrl", ["$scope", "$http","$routeParams","$location", ($scope, $http, $routeParams, $location) ->
$scope.doorman = {values: []}
$scope.somevalue = "2/6"
$scope.apiurl = "/api/doormen/#{$routeParams.id}"
$scope.user = localStorage.getItem("email")
@@ -20,10 +22,18 @@ define ["app", "lodash"], (app, _) ->
$scope.initEmails = () ->
[$scope.leftEmailColumns, $scope.rightEmailColumns] = _.chunk($scope.doorman.emails, 2)
$scope.rationalToFloat = (rat) ->
if _.contains(rat, "/")
num = Number(rat.substr(0, rat.indexOf("/")))
denum = Number(rat.substr(rat.indexOf("/") + 1))
return num / denum
Number(rat)
$scope.validate = ()->
ret = 0
for val in $scope.doorman.values
ret += val.probability
ret += $scope.rationalToFloat(val.probability)
return Math.abs(ret - 1.0) < 0.000001
$scope.addNewAuthorEmail = () ->
static/coffee/controllers/homeCtrl.coffee
+8 -4
View File
@@ -1,11 +1,15 @@
define ["app"], (app) ->
app.controller "HomeCtrl", ($scope) ->
$scope.message = "message from home ctrl"
$scope.loggedEmail = localStorage.getItem("email")
app.controller "HomeCtrl", ['$scope', '$rootScope', ($scope, $rootScope) ->
$scope.init = () ->
$scope.loggedEmail = localStorage.getItem("email")
$scope.login = () ->
if $scope.email
localStorage.setItem("email", $scope.email)
$scope.loggedEmail = $scope.email
$scope.email = ""
$scope.$emit("login")
return
$scope.init()
$rootScope.$on('logout', $scope.init)
]
static/coffee/controllers/newdoormanCtrl.coffee
+22 -12
View File
@@ -1,10 +1,10 @@
epsilon = 0.0001
define ["app", "../filters"], (app, filters) ->
app.controller "NewDoormanCtrl", ["$scope", "$http", "$location", ($scope, $http, $location) ->
define ["app", "lodash", "../filters", "directives/ratinput"], (app, _, filters, ratinput) ->
app.controller "NewDoormanCtrl", ["$scope", "$http", "$location", "rationals", ($scope, $http, $location, rationals) ->
$scope.error = ""
$scope.user = localStorage.getItem("email")
$scope.value = {probability: 0, name: ""}
$scope.value = {probability: "1", name: ""}
$scope.payload =
name: ""
values: []
@@ -17,27 +17,34 @@ define ["app", "../filters"], (app, filters) ->
if !$scope.isValidValue()
return
$scope.payload.values.push($scope.value)
$scope.value = {name: "", probability: 0}
$scope.value =
name: ""
probability: $scope.getProbabilityRemaining()
$scope.removeValue = (idx) ->
$scope.payload.values.splice(idx, 1);
$scope.getProbabilityRemaining = () ->
ret = 0
for v in $scope.payload.values
ret += v.probability
return 1 - ret
sum = rationals.sum(_.pluck($scope.payload.values, "probability")...)
return rationals.minus("1", sum)
$scope.redirectToDoorman = (doormanLocation) ->
$http.get(doormanLocation).then (res) ->
id = res.data.id
return $location.url("/doormen/#{id}")
$scope.getPayload = () ->
payload = _.cloneDeep($scope.payload)
for value in payload.values
value.probability = value.probability
return payload
$scope.createDoorman = () ->
if not $scope.isDoormanValid()
return
params = {params: {user: $scope.user}}
$http.post("/api/doormen", $scope.payload, params).
$http.post("/api/doormen", $scope.getPayload(), params).
then((res, s) ->
$scope.redirectToDoorman(res.headers("location"))
).catch((res) ->
@@ -49,9 +56,8 @@ define ["app", "../filters"], (app, filters) ->
return false
if $scope.payload.values.length < 2
return false
if Math.abs($scope.getProbabilityRemaining()) > epsilon
return false
return true
rationals.equal($scope.getProbabilityRemaining(), "0" )
$scope.addEmail = () ->
if not $scope.newEmail
@@ -64,6 +70,10 @@ define ["app", "../filters"], (app, filters) ->
return
$scope.payload.emails.splice(idx, 1);
$scope.getSum = () ->
probs = _.pluck($scope.payload.values, "probability")
return rationals.pp(rationals.sum(probs...))
return
static/coffee/directives/ratinput.coffee
+64
View File
@@ -0,0 +1,64 @@
template = """
<div class="row rat-input">
<div class="row" ng-show="!edit" >
<div class="columns large-12" style="text-align: center;">
<span class="fraction-box" ng-click="enableEdit()">
<span ng-bind="nominator"></span> &frasl; <span ng-bind="denominator" ></span>
<i class="fa fa-pencil-square-o" ng-show="!ngDisabled"></i>
</span>
</div>
</div>
<div ng-show="edit" class="edit">
<form ng-submit="edit=false">
<div class="large-12 columns" style="text-align: center;">
<input ng-model="nominator" type="text" ng-change="changeModel()" ng-disabled="ngDisabled">
<span style="text-align: center;">&frasl;<span>
<input ng-model="denominator" type="text" ng-change="changeModel()" ng-disabled="ngDisabled">
<i class="fa fa-check" ng-click="edit=false"></i>
<input type="submit" style="display:none;">
</div>
</form>
</div>
</div>
"""
define ["app", "angularAMD", "lodash", "services/rationals"], (app, angularAMD, _, rationals) ->
angularAMD.directive "ratInput", () ->
directive =
restrict: 'E',
template: template
scope:
ngModel: "="
ngDisabled: "="
controller: [ '$scope', "rationals", ($scope, rationals) ->
$scope.getNominator = ()->
if _.contains($scope.ngModel, "/")
return Number($scope.ngModel.substr(0, $scope.ngModel.indexOf("/")))
Number($scope.ngModel)
$scope.getDenominator = () ->
if _.contains($scope.ngModel, "/")
return Number($scope.ngModel.substr($scope.ngModel.indexOf("/") + 1))
1
$scope.changeModel = ()->
$scope.ngModel = rationals.newRat($scope.nominator, $scope.denominator)
$scope.enableEdit = () ->
if not $scope.ngDisabled
$scope.edit = true
$scope.init = () ->
$scope.nominator = rationals.getNominator($scope.ngModel)
$scope.denominator = $scope.getDenominator()
$scope.$watch 'ngModel', () ->
$scope.init()
$scope.init()
]
return directive
static/coffee/services/rationals.coffee
+80
View File
@@ -0,0 +1,80 @@
define ["app", "angularAMD", "lodash"], (app, angularAMD, _) ->
app.service "rationals", () ->
service =
getNominator: (rat) ->
if _.contains(rat, "/")
return Number(rat.substr(0, rat.indexOf("/")))
Number(rat)
getDenominator: (rat) ->
if _.contains(rat, "/")
return Number(rat.substr(rat.indexOf("/") + 1))
1
getNomDenom: (rat) ->
return [service.getNominator(rat), service.getDenominator(rat)]
gcd: (a, b) ->
if b == 0
return a
return service.gcd(b, a % b)
lcm: (a, b) ->
return a * b / service.gcd(a, b)
changeDenominator: (rat, newDenom) ->
[nom, denom] = service.getNomDenom(rat)
return service.newRat( nom * newDenom / denom, newDenom)
add: (rat1, rat2) ->
[nom, denom] = service.getNomDenom(rat2)
[nNom, nDenom] = service.getNomDenom(rat1)
gcd = service.gcd(nDenom, denom)
rNom = nom*nDenom + nNom * denom
rDenom = denom * nDenom
return service.newRat(rNom/gcd , rDenom/gcd)
minus: (rat1, rat2) ->
return service.add(rat1, service.opposite(rat2))
reduce: (rat) ->
[nom, denom] = service.getNomDenom(rat)
gcd = service.gcd(nom, denom)
return service.newRat(nom/gcd, denom/gcd)
opposite: (rat) ->
[nom, denom] = service.getNomDenom(rat)
return service.newRat(-nom, denom)
sum: (rats...) ->
ret = "0/1"
for rat in rats
ret = service.add(ret, rat)
return service.reduce(ret)
equal: (rat1, rat2) ->
[nom1, denom1] = service.getNomDenom(rat1)
[nom2, denom2] = service.getNomDenom(rat2)
return nom1 * denom2 == nom2 * denom1
pp: (x) ->
[num, denum] = service.getNomDenom(service.reduce(x))
if denum == 1
return num
return "#{num}/#{denum}"
newRat: (nom , denom) ->
if nom * denom >= 0
return "#{Math.abs(nom)}/#{Math.abs(denom)}"
return "#{-Math.abs(nom)}/#{Math.abs(denom)}"
return service
app.filter "ratpp", ["rationals", (rationals) ->
filter = (n) ->
return rationals.pp(n)
]
static/gulpfile.js
+1 -1
View File
@@ -17,7 +17,7 @@ gulp.task('bower', function() {
gulp.task('sass', ['bower'], function () {
return gulp.src('./scss/*.scss')
.pipe(sass({includePaths: ['bower_components/foundation/scss']}))
.pipe(sass({includePaths: ['bower_components/foundation/scss', 'bower_components/bourbon/app/assets/stylesheets']}))
.pipe(gulp.dest('./css'));
});
static/index.html
+31 -27
View File
@@ -9,35 +9,39 @@
</head>
<body style="visibility:hidden;">
<div ng-controller="topbarCtrl">
<top-bar>
<ul class="title-area">
<li class="name">
<h1><a href="#/">Doorman</a></h1>
</li>
<li toggle-top-bar class="menu-icon"><a >Menu</a></li>
</ul>
<top-bar-section>
<ul class="left show-for-large-up">
<li>
<a ng-bind="email" href="#"></a>
</li>
</ul>
<top-bar>
<ul class="title-area">
<li class="name">
<h1><a href="#">Doorman</a></h1>
</li>
<li toggle-top-bar class="menu-icon"><a href="#">Menu</a></li>
</ul>
<ul class="right">
<li has-dropdown>
<a >Dropdown</a>
<ul top-bar-dropdown ng-show="loggedIn">
<li><a href="#/doormen">doormen</a></li>
<li><a href="#/newdoorman">new doorman</a></li>
<li><a href="#/apispec">api specification</a></li>
<li><a href="#/serverspec">server specification</a></li>
<li ng-click="logout()"><a href="#/">logout</a></li>
</ul>
</li>
</ul>
</top-bar-section>
</top-bar>
</div>
<top-bar-section>
<!-- Right Nav Section -->
<ul class="right">
<li has-dropdown>
<a href="#">Dropdown</a>
<ul top-bar-dropdown>
<li><a href="#/doormen">doormen</a></li>
<li><a href="#/newdoorman">new doorman</a></li>
<li><a href="#/apispec">api specification</a></li>
<li><a href="#/serverspec">server specification</a></li>
</ul>
</li>
</ul>
</top-bar-section>
</top-bar>
<div class="large-12 small-12 columns" ng-view></div>
</body>
<div class="large-12 small-12 columns" ng-view></div>
</body>
</html>
static/partials/doorman.html
+4 -10
View File
@@ -12,19 +12,13 @@
</div>
<div class="row" ng-repeat="value in doorman.values">
<div class="columns large-8 small-10">
<div class="columns large-7 small-10">
<label >name<input type="text" placeholder="value name" ng-value="value.name" disabled></label>
</div>
<div class="columns large-4 small-2">
<label >
probability
<input type="number"
placeholder="value probability"
ng-model="value.probability"
ng-disabled="!isAdmin"
min="0"
max="1"
step="0.01"></label>
<rat-input ng-model="value.probability" ng-disabled="!isAdmin"></rat-input>
</div>
</div>
@@ -55,11 +49,11 @@
<label>
new admin
<div class="row collapse">
<div class="columns large-10">
<div class="columns large-10 small-10">
<input type="text" ng-model="newEmail"/>
</div>
<div class="columns large-2">
<div class="columns large-2 small-2">
<a class="button postfix" ng-click="addNewAuthorEmail()" ng-class=" canAddNewEmail() ? '' : 'disabled' " >+</a>
</div>
static/partials/home.html
+3 -1
View File
@@ -7,6 +7,7 @@
<div class="row">
<form ng-submit="login()" >
<fieldset>
<legend>Login</legend>
<div class="large-12 columns">
@@ -15,11 +16,12 @@
<input type="text" placeholder="email" ng-model="email">
</div>
<div class="small-2 columns">
<a class="button postfix" ng-click="login()">Login!</a>
<input type="submit" class="button postfix" >Login!</input>
</div>
</div>
</div>
</fieldset>
<form>
</div>
<div class="row" ng-show="loggedEmail">
static/partials/newdoorman.html
+82 -73
View File
@@ -4,89 +4,98 @@
</div>
</div>
<form>
<div class="row">
<div class="columns large-12">
<label >name<input type="text" placeholder="unique doorman name" ng-model="payload.name"></label>
</div>
<div class="row">
<div class="columns large-12">
<label >name<input type="text" placeholder="unique doorman name" ng-model="payload.name"></label>
</div>
</div>
<div class="row">
<div class="columns large-12">
<fieldset>
<legend>doorman state</legend>
<div class="row">
<div class="columns large-12">
<fieldset>
<legend>doorman state</legend>
<div class="row">
<div class="columns large-8">
<label >name<input type="text" placeholder="value name" ng-model="value.name"></label>
</div>
<div class="columns large-3">
<label >probability<input type="number" placeholder="value probability" ng-model="value.probability" min="0" max="1" step="0.01"></label>
</div>
<div class="columns large-1">
<br>
<a class="button round tiny" ng-class="{disabled: !isValidValue()}" ng-click="addNewValue()">+</a>
</div>
<div class="row">
<div class="columns large-8">
<label >name<input type="text" placeholder="value name" ng-model="value.name"></label>
</div>
<div class="columns large-3">
<label >probability
<rat-input ng-model="value.probability"></rat-input>
</label>
</div>
<div class="row" ng-repeat="value in payload.values | reverse">
<div class="columns large-8">
<label >value<input type="text" placeholder="value name" ng-model="value.name"></label>
</div>
<div class="columns large-3">
<label >probability<input type="number" placeholder="value probability" ng-model="value.probability" min="0" max="1" step="0.01"></label>
</div>
<div class="columns large-1">
<br>
<a class="button round tiny" ng-click="removeValue( payload.values.length - $index - 1 )">-</a>
</div>
<div class="columns large-1">
<br>
<a class="button round tiny" ng-class="{disabled: !isValidValue()}" ng-click="addNewValue()">
<i class="fa fa-plus"></i>
</a>
</div>
</fieldset>
</div>
</div>
</div>
<div class="row">
<div class="columns large-12">
<fieldset>
<legend>administrator</legend>
<div class="row">
<div class="columns large-11">
<label>admin email <input type="text" placeholder="wild cards are allow here" ng-model="newEmail"></label>
</div>
<div class="columns large-1">
<br><a class="button round tiny" ng-click="addEmail()" ng-class="{disabled: !newEmail}">+</a>
</div>
<div class="row" ng-repeat="value in payload.values | reverse">
<div class="columns large-8">
<label >value<input type="text" placeholder="value name" ng-model="value.name"></label>
</div>
<div class="row" ng-repeat="email in payload.emails | reverse">
<div class="columns large-11">
<label>admin email <input type="text" ng-disabled="email==user" placeholder="wild cards are allow here" ng-model="email"></label>
</div>
<div class="columns large-1">
<br><a class="button round tiny" ng-click="removeEmail(payload.emails.length - $index -1)" ng-disabled="email==user? 'disabled' : ''">-</a>
</div>
<div class="columns large-3">
<label >probability
<rat-input ng-model="value.probability"></rat-input>
</label>
</div>
<div class="columns large-1">
<br>
<a class="button round tiny" ng-click="removeValue( payload.values.length - $index - 1 )">
<i class="fa fa-times"></i>
</a>
</div>
</div>
</fieldset>
</div>
</div>
</fieldset>
</div>
<div class="row">
<div class="columns large-12">
<fieldset>
<legend>administrator</legend>
<div class="row">
<div class="columns large-11">
<label>admin email <input type="text" placeholder="admin email" ng-model="newEmail"></label>
</div>
<div class="columns large-1">
<br><a class="button round tiny" ng-click="addEmail()" ng-class="{disabled: !newEmail}">
<i class="fa fa-plus"></i>
</a>
</div>
</div>
<div class="row" ng-repeat="email in payload.emails | reverse">
<div class="columns large-11">
<label>admin email <input type="text" ng-disabled="email==user" placeholder="wild cards are allow here" ng-model="email"></label>
</div>
<div class="columns large-1">
<br><a class="button round tiny" ng-click="removeEmail(payload.emails.length - $index -1)" ng-disabled="email==user? 'disabled' : ''">
<i class="fa fa-times"></i>
</a>
</div>
</div>
</fieldset>
</div>
</div>
<div class="row" ng-show="error">
<div class="columns large-12">
<code style="width:100%; height:100%; display:block; margin-bottom: 1em;">{{ error }}</code>
</div>
</div>
<div class="row">
<div class="large-11 columns">
<button ng-click="createDoorman()" ng-class="{disabled: !isDoormanValid()}">create</button>
</div>
<div class="row" ng-show="error">
<div class="columns large-12">
<code style="width:100%; height:100%; display:block; margin-bottom: 1em;">{{ error }}</code>
</div>
<div class="large-1 columns">
<span >propability remaning: {{ getProbabilityRemaining() | ratpp}}</span>
</div>
<div class="row">
<div class="large-11 columns">
<button ng-click="createDoorman()" ng-class="{disabled: !isDoormanValid()}">create</button>
</div>
<div class="large-1 columns">
<span >propability remaning: {{ getProbabilityRemaining() }}</span>
</div>
</div>
</form>
</div>
static/scss/_doorman.scss
+35
View File
@@ -1,4 +1,6 @@
@import "settings";
@import "bourbon";
// @import url(http://fonts.googleapis.com/css?family=Orbitron:400,900,500,700);
@font-face {
font-family: 'Orbitron';
@@ -26,3 +28,36 @@ h1, h2{
text-align: center;
}
}
.rat-input{
.fraction-box{
font-family: monospace;
font-size: 1.3em;
border: 2px;
padding: 0.3em;
box-shadow: 2px 2px 1px #888;
@include border-top-radius(5px);
@include border-bottom-radius(5px);
i{
font-size: 1em;
margin-left: 0.2em;
}
}
.fraction-box:hover{
border: 2px;
padding: 0.3em;
box-shadow: 2px 2px 1px red;
}
.edit{
input{
width: 4em;
height: 2em;
display: inline;
padding: 0px;
padding-left: 0.5em;
}
}
}