@@ -373,14 +373,7 @@ AS $$

 DECLARE

   result bigint;

 BEGIN

-  WITH votes_for as (

-    SELECT

-      DISTINCT ON (link_votes.link_id, link_votes.user_id)

-      vote FROM link_votes INTO result

-      INNER JOIN user_links ON link_votes.link_id=user_links.link_id

-      WHERE user_links.user_id=uid AND link_votes.user_id!=user_links.user_id

-      ORDER BY link_votes.link_id, link_votes.user_id, voted DESC

-  ) SELECT sum(vote) FROM votes_for;

+  SELECT sum(total_votes(link_id)) INTO result FROM user_links WHERE user_id = uid;

   IF result IS NULL AND exists(SELECT 1 FROM users WHERE id=uid LIMIT 1) THEN

     SELECT 0 INTO result;

   END IF;

@@ -161,8 +161,8 @@ def data(username):

         cur.execute("SELECT url, title, posted, linkid, votes from get_bone(%s);", (username,))

         result['marrow'] = [

                 dict(id=linkid, url=url,title=title,posted=posted.isoformat(),votes=votes)

-                    for url,title,posted,linkid,votes

-                    in cur.fetchall()

+                     for url,title,posted,linkid,votes

+                     in cur.fetchall()

         ]

     return json.dumps(result)

@@ -331,7 +331,7 @@ main form {

   padding: 10px 0;

 }

 main form input[type="text"] {

-  width: 315px;

+  width: 100%;

 }

 .more-link {

@@ -357,28 +357,138 @@ main form input[type="text"] {

 /* @end */

 /* @group Login Module */

+#login_form .tab {

+  text-align: center;

+  background: white;

+  position:absolute;

+  width: 39vw;

+  height: 39vh;

+  padding: 3vh 3vw;

+  margin-left: 13vw;

+  overflow: hidden;

+  z-index: 0;

+  border: 1px solid black;

+}

-#login_form div.message{

-  position: absolute;

-  background: red;

+.relCont::after {

+  content: " ";

+  clear: both;

+  overflow: hidden;

+}

+

+.relCont {

+  position: relative;

+}

+

+#login_form .tab.front {

+  z-index: 1;

+}

+

+#login_form .message{

+  /*position: absolute;*/

   width: 100%;

+  height: 2em;

   text-align: center;

+  visibility: hidden;

 }

+#login_form div.error {

+  background: red;

+  visibility: visible;

+}

+

+#login_form button {

+  bottom: 2em;

+  min-width: 33%;

+  margin-top: 1.5em;

+  padding: 1em;

+  font-size: 2rem;

+  color: white;

+  background: blue;

+  text-transform: uppercase;

+  background-image: linear-gradient(transparent, #003 90%);

+}

+

+#login_form ul, #login_form li {

+  list-style: none;

+  display: inline-block;

+  color: black;

+}

+

+#login_form ul {

+  z-index: 2;

+  margin-bottom: 0px;

+  width: 33vw;

+}

+

+#login_form #tab-choice {

+  margin-left: 13vw;

+  /*margin-bottom: 2em;*/

+}

+

+#login_form input[type=radio] {

+  display: none;

+}

+

+#login_form input[type=radio] + label {

+  font-size: 1.5rem;

+  cursor: pointer;

+  border: 1px solid black;

+  background: #aaa;

+  padding: 0.25em;

+  padding-bottom: 0em;

+  margin-right: 0.5em;

+  margin-bottom: -3px;

+  z-index: 5;

+}

+

+#login_form input[type=radio]:checked + label {

+  background: white;

+  border-bottom-color: white;

+  z-index: 3

+}

+

+/*

 #login_form {

   position: absolute;

   z-index: 100;

   height: 100%;

   background: white;

 }

+*/

+

 #login_form form {

-  position: absolute;

-  top: 0;

+  text-align: center;

+}

+

+  

+#login_form div.message{

+}

+

+#login_form form {

+  margin-top: 100px;

+}

+

+#login_form {

+  width: 100%;

   left: 0;

+  top: 0;

+}

+

+#login_form form {

+  margin-top: 20px;

+}

+

+#login_form div.message{

+  margin-top 10px;

+}

+

+form input[type="password"] {

   width: 100%;

-  text-align: center;

 }

+

+

 /* @end */

 /* @group Form Validation */

@@ -464,18 +574,6 @@ main > section {

     text-align: right;

     padding-right: 5px;

   }

-  

-  #login_form {

-    width: 125%;

-    left: -25%;

-    top: 66px;

-  }

-  #login_form div.message{

-    top: -33px;

-  }

-  #login_form form {

-    margin-top: 100px;

-  }

 }

@@ -584,19 +682,6 @@ a.user-settings:hover {

     border-top: 1px solid #ddd;

   }

-  #login_form {

-    width: 100%;

-    left: 0;

-    top: 0;

-  }

-  #login_form form {

-    margin-top: 20px;

-  }

-  #login_form div.message{

-    margin-top 10px;

-  }

-  form input[type="password"] {

-  }

   main::before {

     display: block;

@@ -16,11 +16,13 @@ marrowApp.config(['$routeProvider',

 marrowApp.config(['$locationProvider', function($locationProvider) { $locationProvider.html5Mode(true); }]);

 marrowApp.controller('LoginCtrl', function ($scope,$http,$route,$location) {

+  $scope.tab = 'login';

+

   $scope.message = '';

   var check_login = function () {

-    injector = angular.injector(['ng']);

-    $http = injector.get('$http');

+    var injector = angular.injector(['ng']);

+    var $http = injector.get('$http');

     return $http.get("/api/user/check").success(function(is_loggedon) {

       if (is_loggedon.result === true) {

         angular.element(document.body).addClass('is-logged-on');

new file mode 100644

@@ -0,0 +1,31 @@

+var test = angular.module(test, ngroute());

+test.controller('LoginCtrl', function ($scope) {

+    $scope.tab = 'login';

+    $scope.message = '';

+    function check_login() {

+        var injector26 = angular.injector('ng'());

+        var $http = injector26.get('$http');

+        return $http.get('/api/user/check')(null).success(function (is_loggedon) {

+            return is_loggedon.result === true ? angular.element(document.body).addclass('is-logged-on') : null;

+        });

+    };

+    check_login().success(function (is_loggedon) {

+        return is_loggedon.result ? $location.url('/') : null;

+    });

+    $scope.newuser = function () {

+        var username27 = $scope.username;

+        var password28 = $scope.password;

+        var postobj = { 'username' : username27, 'password' : password28 };

+        return $http.post('/api/user/add')(postobj).success(function (is_l) {

+            return is_l.result === true ? $location.url('/') : ($scope.message = added_user.message);

+        });

+    };

+    return $scope.login = function () {

+        var username29 = $scope.username;

+        var password30 = $scope.password;

+        return $http.post('/api/user/login')({ 'username' : username29, 'password' : password30 }).success(function (login_succeeded) {

+            var el = angular.element(document.queryselector('#login_form'));

+            return login_succeeded.status === true ? $location.url('/') : ($scope.message = login_succeeded.message)();

+        });

+    };

+});

new file mode 100644

@@ -0,0 +1,37 @@

+(def-module login-module '("ngRoute"))

+(defcontroller login-module "LoginCtrl" ($http)

+  (scope-var tab "login")

+  (scope-var message "")

+

+  (defun check_login ()

+    (ng-ajax get "/api/user/check" nil is_loggedon

+             (if (eql (@ is_loggedon result) T)

+               (chain angular

+                      (element (@ document body))

+                      (add-class "is-logged-on")))

+             nil))

+

+  (chain (check_login)

+         (success

+           (lambda (is_loggedon)

+             (if (@ is_loggedon result)

+               (chain $location (url "/")))

+             nil)))

+

+  (scope-function newuser ()

+    (with-slots (username password) $scope

+      (let* ((postObj (create :username username :password password)))

+        (ng-ajax post "/api/user/add" postObj is_l

+          (if (eql (@ is_l result) T)

+            (chain $location (url "/"))

+            (setf ($s message) (@ added_user message)))

+          nil))))

+

+  (scope-function login ()

+    (with-slots (username password) $scope

+      (ng-ajax post "/api/user/login" (create :username username :password password) login_succeeded

+        (let ((el (select->element "#login_form")))

+          (if (eql (@ login_succeeded status) T)

+            (chain $location (url "/"))

+            (scope-var message (@ login_succeeded message)))

+          nil)))))

new file mode 100644

@@ -0,0 +1,71 @@

+(def-module root-module '("ngRoute"))

+(defcontroller root-module "RootCtrl" ($http $location $route -subscribed-to -bone-service -user-service)

+  (scope-var url "")

+  (scope-var title "")

+

+  (scope-function toggle-subscribe (txt) 

+    (let ((post-obj (create :from ($s bone section-title) :to ($s bone section-title)))

+          (promise nil))

+      (if ($s i-follow follows)

+        (setf promise (chain $http (post "/api/bones/unsubscribe" post-obj)))

+        (setf promise (chain $http (post "/api/bones/subscribe" post-obj))))

+      

+      (chain promise (success (lambda (result)

+                                (let ((result (chain JSON (parse result))))

+                                  (if result

+                                    (setf ($s i-follow follows)

+                                          (not ($s i-follow follows))))))))))

+  

+  (setf ($s bone) (create :section-title "" :marrow '()))

+  (setf ($s friends) (create :data '()))

+

+  (scope-function update ()

+    (setf config (create :params (if ($s args)

+                                   ($s args)

+                                   (create))))

+    ((@ ($s (getendpoint

+              service-params

+              (lambda (data)

+                (setf ($s bone section-title) (@ data section-title))

+                (setf ($s bone marrow) (@ data marrow))

+                (setf ($s bone i-follow) (chain -User-Service (follows (create :user ($s bone section-title)))))

+                nil)))

+        $promise then) ($s _update)))

+  

+  (chain -user-service (check

+                       (lambda (is_loggedon)

+                         (if (eql (@ is_loggedon result) t)

+                           (chain angular (element (@ document body))

+                                  (addClass "is-logged-on"))

+                           (chain $location (url "/login")))

+                         

+                         (chain scope (update))))))

+

+(defcontroller marrow-app "RandomMarrowCtrl" ($controller $http $location $route -subscribed-to -bone-service -user-service)

+  (scope-function _update ())

+  (scope-var getendpoint (@ -bone-service random))

+  (chain angular (extend this ($controller "RootCtrl" (create :$scope $scope)))))

+

+(defcontroller marrow-app "SubscriptionCtrl" ($controller $http $location $route -subscribed-to -bone-service -user-service)

+  (scope-function uncheck-others (list)

+    (loop for n in list

+          if (and (/= n "all") (eql (elt list n) F))

+          do (setf (elt list n) F)))

+

+  (scope-var friend (chain Object (create nil)))

+  (setf ($s friend all) t)

+

+  (scope-function up-vote (bone-item)

+    (let ((api-call (if (eql (@ bone-item my-vote) 0)

+                      (@ -bone-service vote_up)

+                      (@ -bone-service vote_down))))

+      (chain (api-call (create :url (@ bone-item url)))

+             $promise

+             (then (lambda (r)

+                     (if (@ r success)

+                       (setf (@ bone-item votes) (@ r votes))

+                       (setf (@ bone-item my-vote) (@ r my-vote)))

+                     nil))

+             (then ($s _update)))))

+  

+  )

new file mode 100644

@@ -0,0 +1,72 @@

+var rootModule = angular.module('rootModule', ['ngRoute']);

+rootModule.controller('RootCtrl', ['$scope', '$http', '$location', '$route', 'SubscribedTo', 'BoneService', 'UserService', function ($scope, $http, $location, $route, SubscribedTo, BoneService, UserService) {

+    $scope.url = '';

+    $scope.title = '';

+    $scope.toggleSubscribe = function (txt) {

+        var postObj = { 'from' : $scope.bone.sectionTitle, 'to' : $scope.bone.sectionTitle };

+        var promise = null;

+        if ($scope.iFollow.follows) {

+            promise = $http.post('/api/bones/unsubscribe', postObj);

+        } else {

+            promise = $http.post('/api/bones/subscribe', postObj);

+        };

+        return promise.success(function (result) {

+            var result1 = json.parse(result);

+            return result1 ? ($scope.iFollow.follows = !$scope.iFollow.follows) : null;

+        });

+    };

+    $scope.bone = { 'section-title' : '', 'marrow' : [] };

+    $scope.friends = { 'data' : [] };

+    $scope.update = function () {

+        config = { 'params' : $scope.args ? $scope.args : {  } };

+        return $scope.getendpoint(serviceParams, function (data) {

+            $scope.bone.sectionTitle = data.sectionTitle;

+            $scope.bone.marrow = data.marrow;

+            $scope.bone.iFollow = UserService.follows({ 'user' : $scope.bone.sectionTitle });

+            return null;

+        }).$promise.then($scope._update);

+    };

+    UserService.check(function (is_loggedon) {

+        if (is_loggedon.result === true) {

+            angular.element(document.body).addclass('is-logged-on');

+        } else {

+            $location.url('/login');

+        };

+        return scope.update();

+    });

+    return null;

+}]);

+marrowApp.controller('RandomMarrowCtrl', ['$scope', '$controller', '$http', '$location', '$route', 'SubscribedTo', 'BoneService', 'UserService', function ($scope, $controller, $http, $location, $route, SubscribedTo, BoneService, UserService) {

+    $scope._update = function () {

+        return null;

+    };

+    $scope.getendpoint = BoneService.random;

+    angular.extend(this, $controller('RootCtrl', { '$scope' : $scope }));

+    return null;

+}]);

+marrowApp.controller('SubscriptionCtrl', ['$scope', '$controller', '$http', '$location', '$route', 'SubscribedTo', 'BoneService', 'UserService', function ($scope, $controller, $http, $location, $route, SubscribedTo, BoneService, UserService) {

+    $scope.uncheckOthers = function (list) {

+        var _js3 = list.length;

+        for (var _js2 = 0; _js2 < _js3; _js2 += 1) {

+            var n = list[_js2];

+            if (n !== 'all' && list[n] === false) {

+                list[n] = false;

+            };

+        };

+    };

+    $scope.friend = object.create(null);

+    $scope.friend.all = true;

+    $scope.upVote = function (boneItem) {

+        var apiCall = boneItem.myVote === 0 ? BoneService.vote_up : BoneService.vote_down;

+        return apiCall({ 'url' : boneItem.url }).$promise.then(function (r) {

+            if (r.success) {

+                boneItem.votes = r.votes;

+            } else {

+                boneItem.myVote = r.myVote;

+            };

+            return null;

+        }).then($scope._update);

+    };

+    return null;

+}]);

+

new file mode 100755

Binary files /dev/null and b/static/parenscript/buildapp differ

new file mode 100644

@@ -0,0 +1,59 @@

+(ql:quickload :parenscript)

+

+(defpackage :angular

+  (:use :parenscript :cl)

+  (:export main))

+

+(in-package :angular)

+(use-package :parenscript)

+

+(defmacro+ps scope-var (name value)

+  `(setf ($s ,name) ,value))

+

+(defmacro+ps scope-function (name arguments &body body)

+  `(scope-var ,name (lambda ,arguments

+                      ,@body)))

+

+; The name of the angular module

+(defvar *ang-module* nil)

+

+

+(defmacro+ps $s (&rest values) `(chain $scope ,@values))

+

+(defmacro+ps def-module (name dependencies)

+  `(progn (var ,name ((@ angular module) ,(symbol-to-js-string name) ,dependencies))))

+

+(defun build-lambda (dependencies body)

+  `(list ,@(mapcar #'symbol-to-js-string dependencies)

+         (lambda ,(loop for x in dependencies

+                        collect x)

+           ,@body

+           nil)))

+

+(defmacro+ps select-> (selector)

+  `(chain document (query-selector ,selector)))

+

+(defmacro+ps select->element (selector)

+  `(chain angular (element (select-> ,selector))))

+

+(defmacro+ps defcontroller (angmodule name dependencies &body body)

+  (let ((dependencies (cons '$scope dependencies)))

+    `(chain ,angmodule (controller ,name ,(build-lambda dependencies body)))))

+

+(defmacro+ps ng-ajax (mthd endpoint data resultS &body callback)

+  `(chain $http

+          (,mthd ,endpoint ,data)

+          (success (lambda (,resultS)

+                     ,@callback))))

+

+(defun translate-file (infile outfile)

+  (let ((*JS-TARGET-VERSION* 1.9))

+    (with-open-file (o outfile :direction :output)

+      (with-open-file (i infile :direction :input)

+        (write-line (ps-compile-file i) o)))))

+

+(defun main (args)

+  (in-package :angular)

+  (apply #'translate-file (cdr args)))

+

+

new file mode 100755

Binary files /dev/null and b/static/parenscript/translator differ

@@ -1,10 +1,31 @@

 <div id="login_form">

-  <form>

-    <div class="message">{{message}}</div>

-    <input type="text" ng-model="username" placeholder="Username" />

-    <input type="password" ng-model="password" placeholder="Password" />

-    <button ng-click="login()">Log In</button>

-    <button ng-click="newuser()">Add User</button>

-  </form>

+  <div class="message" ng-class="{'error': message !== ''}">{{message}}</div>

+  <ul id="tab-choice">

+    <li>

+      <input type="radio" value="login" ng-model="tab" name="choose-tab" id="chLogin" />

+      <label for="chLogin">Login</label>

+    </li>

+    <li>

+      <input type="radio" value="adduser" ng-model="tab" name="choose-tab" id="chAdduser" />

+      <label for="chAdduser">Sign Up</label>

+    </li>

+  </ul>

+  <div class="relCont">

+    <div class="tab" ng-class="{front: tab === 'adduser'}">

+      <form>

+        <input type="text" ng-model="username" placeholder="Username" /><br />

+        <input type="password" ng-model="password" placeholder="Password" /><br />

+        <input type="password" ng-model="confirm" placeholder="Confirm Password" /><br />

+        <button ng-click="newuser()">Sign Up</button>

+      </form>

+    </div>

+    <div class="tab" ng-class="{front: tab === 'login'}">

+      <form ng-submit="login()" method="POST">

+        <input type="text" ng-model="username" placeholder="Username" /><br />

+        <input type="password" ng-model="password" placeholder="Password" /><br />

+        <button type="submit">Log In</button>

+      </form>

+    </div>

+  </div>

 </div>