move from grunt to gulp, remove dependency on bower, break up points …

…center js into separate files and incorporate browserify, update datatables to new api, update typeaheadjs to new api, replace hogan with lodash.template, namespace points table css so it can be included with global css, lint js with eslint, and lots more

.eslintrc

@@ -0,0 +1,110 @@
+root: true
+
+env:
+    browser: true
+    node: true
+
+ecmaFeatures:
+    globalReturn: false
+
+globals:
+    $: false
+
+rules:
+    # Default rules recommended by ESLint (http://eslint.org/docs/rules/):
+    comma-dangle: [2, "never"]
+    no-cond-assign: 2
+    no-console: 2
+    no-constant-condition: 2
+    no-control-regex: 2
+    no-debugger: 2
+    no-dupe-args: 2
+    no-dupe-keys: 2
+    no-duplicate-case: 2
+    no-empty-character-class: 2
+    no-empty: 2
+    no-ex-assign: 2
+    no-extra-boolean-cast: 2
+    no-extra-semi: 2
+    no-func-assign: 2
+    no-inner-declarations: [2, "both"]
+    no-invalid-regexp: 2
+    no-irregular-whitespace: 2
+    no-negated-in-lhs: 2
+    no-obj-calls: 2
+    no-regex-spaces: 2
+    no-sparse-arrays: 2
+    no-unreachable: 2
+    use-isnan: 2
+    valid-typeof: 2
+    no-unexpected-multiline: 2
+
+    # Best Practice Rules:
+    block-scoped-var: 2
+    consistent-return: 2
+    curly: [2, "all"]
+    dot-location: [1, "property"]
+    dot-notation: 1
+    eqeqeq: [2, "allow-null"]
+    guard-for-in: 2
+    no-caller: 2
+    no-eq-null: 2
+    no-eval: 2
+    no-extend-native: 2
+    no-fallthrough: 2 # recommended
+    no-floating-decimal: 1
+    no-implicit-coercion: 1
+    no-implied-eval: 2
+    no-lone-blocks: 1
+    no-loop-func: 1
+    no-multi-str: 1
+    no-native-reassign: 2
+    no-new: 2
+    no-octal: 2 # recommended
+    no-redeclare: [2, {"builtinGlobals": true}] # recommended
+    no-void: 2
+    no-with: 2
+    radix: 2
+    strict: [2, "global"]
+    vars-on-top: 1
+    wrap-iife: [1, "inside"]
+
+    # Variable Declaration Rules
+    no-delete-var: 2
+    no-shadow-restricted-names: 2
+    no-shadow: 1
+    no-undef: 2
+    no-undefined: 2
+    no-unused-vars: [1, {"vars": "local", "args": "after-used"}]
+    no-use-before-define: 2
+
+    # Stylistic Rules
+    brace-style: [1, "1tbs"]
+    camelcase: [1, {"properties": "never"}]
+    comma-spacing: 1
+    comma-style: [2, "last"]
+    consistent-this: [1, "self"]
+    eol-last: 1
+    func-style: [2, "expression"]
+    indent: [1, 4]
+    key-spacing: [1, {"beforeColon": false, "afterColon": true}]
+    linebreak-style: 2
+    max-len: [1, 120]
+    new-cap: [2, {"capIsNewExceptions": ["HmacSHA256"]}]
+    newline-after-var: 1
+    no-array-constructor: 1
+    no-mixed-spaces-and-tabs: 1
+    no-nested-ternary: 1
+    no-new-object: 1
+    no-spaced-func: 2
+    no-trailing-spaces: 1
+    object-curly-spacing: [1, "always"]
+    one-var: [1, {"initialized": "never"}]
+    padded-blocks: [1, "never"]
+    quotes: [1, "single"]
+    semi: [2, "always"]
+    space-after-keywords: [1, "always"]
+    space-before-blocks: [1, "always"]
+    space-before-function-paren: [1, "never"]
+    spaced-comment: [1, "always"]
+    space-infix-ops: 1

.gitignore

@@ -11,8 +11,6 @@ ajax/tmp.php
 **.sql
 
 ajax/sendPointsCorrection.php
-pointsCenter.built.js
-css/pointsCenter.built.css
-css/pointsCenter.built.min.css
+build
 bower_components
 node_modules

ajax/PointsCenter.php

@@ -211,6 +211,8 @@ public function getSlivkans()
     {
         $absentSlivkans = self::fetchAllQuery('SELECT nu_email FROM absences WHERE qtr=:qtr', PDO::FETCH_COLUMN);
 
+        $nicknames = self::fetchAllQuery("SELECT nu_email,nickname FROM nicknames", PDO::FETCH_GROUP | PDO::FETCH_COLUMN);
+
         $slivkans = self::fetchAllQuery(
             "SELECT CONCAT(first_name, ' ', last_name) AS full_name,
                 slivkans.nu_email,gender,wildcard,committee,photo,suite,year
@@ -226,16 +228,14 @@ public function getSlivkans()
         $n = count($slivkans);
         for ($i=0; $i<$n; $i++) {
             $slivkans[$i]["tokens"] = explode(" ", $slivkans[$i]["full_name"]);
-        }
 
+            if (array_key_exists($slivkans[$i]["nu_email"], $nicknames)) {
+                $slivkans[$i]["tokens"] = array_merge($slivkans[$i]["tokens"], $nicknames[$slivkans[$i]["nu_email"]]);
+            }
+        }
         return $slivkans;
     }
 
-    public function getNicknames()
-    {
-        return self::fetchAllQuery("SELECT nu_email,nickname FROM nicknames", PDO::FETCH_NAMED);
-    }
-
     public function getFellows()
     {
         return self::fetchAllQuery(

ajax/getSlivkans.php

@@ -3,9 +3,8 @@
 $points_center = new \Slivka\PointsCenter();
 $qtrs = $points_center->getQuarters();
 $slivkans = $points_center->getSlivkans();
-$nicknames = $points_center->getNicknames();
 $fellows = $points_center->getFellows();
 $quarter_info = $points_center->getQuarterInfo();
 $im_teams = $quarter_info['im_teams'];
 
-echo json_encode(array("qtrs"=>$qtrs,"slivkans"=>$slivkans,"nicknames"=>$nicknames,"fellows"=>$fellows,"im_teams"=>$im_teams));
+echo json_encode(array("qtrs"=>$qtrs,"slivkans"=>$slivkans,"fellows"=>$fellows,"im_teams"=>$im_teams));

base.php

@@ -7,7 +7,7 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
-    <link rel="stylesheet" href="/points/css/pointsCenter.built.min.css" />
+    <link rel="stylesheet" href="/points/build/points-center.css" />
     <style type="text/css">
         body {
             background: transparent url('/points/img/slivka-wallpaper-compressed.jpg') repeat;
@@ -29,8 +29,8 @@
 <div class="container">
     <div class="content">
         <?php include('nav.html'); ?>
-        <div class="row">
-            <div class="col-lg-12">
+        <div class="panel panel-default">
+            <div class="panel-body">
                 <?php
                 if ($page == 'index') {
                     echo '<script type="text/javascript">window.location.href = "/points/breakdown/";</script>';