@@ -1,7 +1,7 @@

 bin

 bower_components

 include

-lib

+/lib

 local

 *.pyc

 .*.swp

@@ -182,4 +182,19 @@ BEGIN

   DELETE FROM user_ak WHERE user_id=uid AND user_ak.ak=supplied_ak RETURNING user_ak.ak INTO result;

   RETURN result;

 END

-$$ LANGUAGE plpgsql

+$$ LANGUAGE plpgsql;

+

+DROP FUNCTION IF EXISTS check_password(text,text);

+CREATE OR REPLACE FUNCTION check_password(username text, provided_pass text) RETURNS bool

+AS $$

+DECLARE

+  uid INT;

+  stored_hash TEXT;

+  hash TEXT;

+  result BOOL;

+BEGIN

+  SELECT id,password INTO uid,stored_hash FROM users WHERE users.name = username;

+  SELECT stored_hash = crypt(provided_pass, stored_hash) INTO result;

+  RETURN result;

+END

+$$ LANGUAGE plpgsql;

@@ -83,7 +83,7 @@ def adduser():

             username = username.strip().lower()

             password = password.strip()

             try:

-                cur.execute('INSERT INTO users (name,password,email) VALUES (%s,%s,%s)',

+                cur.execute("INSERT INTO users (name,password,email) VALUES (%s,crypt(%s, gen_salt('bf', 11)),%s)",

                             (username, password, 'abc@def.com'))

                 session['username'] = username

                 result['status'] = True

@@ -147,19 +147,23 @@ def login():

     username = username.strip().lower()

     password = password.strip()

     user = users.get(username, {})

-    rightPassword = user.get('password',None)

-    if password == rightPassword:

-        if 'ak' in request.args and request.args['ak']:

-            ak = base64.b64encode(os.urandom(24))

-            with database.get_db() as db:

-                with db.cursor() as cur:

-                    cur.callproc('put_ak', (username, ak))

-            result = {'success': True, 'ak': ak}

-        else:

-            session['username'] = username

-            result['status'] = True

-    else:

-        result['message'] = 'Wrong Username or Password'

+    rightPassword = user.get('password',object())

+    with database.get_db() as db:

+        with db.cursor() as cur:

+            cur.callproc('check_password', (username, password))

+            success = cur.fetchone()[0]

+            if success:

+                if 'ak' in request.args and request.args['ak']:

+                    ak = base64.b64encode(os.urandom(24))

+                    with database.get_db() as db:

+                        with db.cursor() as cur:

+                            cur.callproc('put_ak', (username, ak))

+                    result = {'success': True, 'ak': ak}

+                else:

+                    session['username'] = username

+                    result['status'] = True

+            else:

+                result['message'] = 'Wrong Username or Password'

     return json.dumps(result)

 @user_blueprint.route('/logout')

@@ -52,6 +52,17 @@ img {

 /* @end */

+.avatar-image {

+  display: inline-block;

+  vertical-align: middle;

+}

+.avatar-image img {

+  border-radius: 12px;

+}

+.bone-details {

+  display: inline-block;

+  vertical-align: middle;

+}

 .sub-ctrl {

   display: inline-block;

   vertical-align: middle;

@@ -167,6 +178,7 @@ main form input[type="text"] {

   white-space: nowrap;

   text-overflow: ellipsis;

   padding-right: 1em;

+  margin-bottom: 12px;

 }

 /* @end */

@@ -24,9 +24,11 @@

   <meta name="msapplication-config" content="/images/icons/browserconfig.xml">

   <meta name="theme-color" content="#000000">

   <!-- JS -->

+  <script src="http://crypto-js.googlecode.com/svn/tags/3.0.2/build/rollups/md5.js"></script>

   <script src="/lib/angular.js"></script>

   <script src="/lib/angular-route.min.js"></script>

   <script src="/lib/angular-resource.min.js"></script>

+  <script src="/js/new/directives.js"></script>

   <script src="/js/new/services.js"></script>

   <script src="/js/new/controller.js"></script>

   <!-- CSS -->

@@ -1,4 +1,4 @@

-var marrowApp = angular.module('marrowApp', ['ngRoute', 'marrowApp.services']);

+var marrowApp = angular.module('marrowApp', ['ngRoute', 'marrowApp.services', 'marrowApp.directives']);

 var compareTo = function() { return {

   require: "ngModel",

@@ -150,8 +150,14 @@ function controllerFactory(name, getendpoint, cb, afterGet) {

     $scope.sectionTitle = "";

     $scope.friends = SubscribedTo.get();

+    $scope.gravURL = function(uid) {

+      var hash = CryptoJS.MD5(uid);

+      return '//gravatar.com/avatar/'+hash+'?d=identicon&s=24';

+    };

     $scope.update = function() {

-      return $http.get(getendpoint).success(function(data) {

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

+      q = config;

+      return $http.get(getendpoint, config).success(function(data) {

         $scope.sectionTitle = data.sectionTitle;

         $scope.bone = data.marrow;

       });

@@ -184,7 +190,7 @@ function toggleSubscribe($http,$scope) {

     } else {

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

     }

-    

+

     return promise.success(function(result) {

         console.log('bing!');

         result = JSON.parse(result);

@@ -289,14 +295,19 @@ controllerFactory('RandomMarrowCtrl', '/api/bones/random',

   },

   function ($scope,$http) {

+    $scope.args = {last: $scope.sectionTitle};

     $http.get('/api/user/follows/'+$scope.sectionTitle).success(function(result) {

       $scope.subscribed = result.follows;

       $scope.subscribeLabel = $scope.subscribed ? 'unSubscribe': 'Subscribe';

   });

 });

-controllerFactory('SubscriptionCtrl', '/api/bones/subscriptions', 

+controllerFactory('SubscriptionCtrl', '/api/bones/subscriptions',

   function($scope, $http, Bones, SubscribedTo){

+    $scope.gravURL = function(uid) {

+      var hash = CryptoJS.MD5(uid);

+      return '//gravatar.com/avatar/'+hash+'?d=identicon&s=24';

+    };

     $scope.emptyOrEquals = function(actual, expected) {

       if (!expected) { return true;}

       else {return actual === expected;}

@@ -20,4 +20,3 @@ serviceModule.factory('SubscribedTo', ['$resource',

   function subscriberFactory($resource) {

     return $resource('/api/user/following', {}, {});

   }]);

-

@@ -2,6 +2,9 @@

   <h2 class="section-title">

     <a class="fa fa-cog user-settings" href="/settings"></a>

     <a class="user-link" ng-href="{{path('UserCtrl', {'user': sectionTitle})}}">{{path('UserCtrl', {'user': sectionTitle})}}</a>

+    <a class="avatar-image" href="{{ path('UserCtrl', {'user': marrow.poster}) }}" title="{{marrow.poster}}">

+      <img ng-src="{{gravURL(sectionTitle)}}" />

+    </a>

   </h2>

   <form>

     <input type="text" ng-model="url" placeholder="http:// . . ."/>

@@ -2,6 +2,9 @@

   <h2 class="section-title">

     <button type="submit" ng-class="['sub-ctrl']"   ng-click="toggleSubscribe()">{{subscribeLabel}}</button>

     <a class="user-link" ng-href="{{path('UserCtrl', {'user': sectionTitle})}}">{{path('UserCtrl', {'user': sectionTitle})}}</a>

+    <a class="avatar-image" href="{{ path('UserCtrl', {'user': marrow.poster}) }}" title="{{marrow.poster}}">

+      <img ng-src="{{gravURL(sectionTitle)}}" />

+    </a>

   </h2>

   <ul class="bone-list">

     <li ng-repeat="marrow in bone" class="bone-item" data-id="{{marrow.id}}" data-url="{{marrow.url}}" data-posted="{{marrow.posted}}" data-title="{{marrow.title}}">

@@ -12,8 +12,13 @@

   </form>

   <ul class="bone-list">

     <li ng-repeat="marrow in bone | filter:{poster:friend}:emptyOrEquals" class="bone-item" data-id="{{marrow.id}}" data-url="{{marrow.url}}" data-posted="{{marrow.posted}}" data-title="{{marrow.title}}" data-poster="{{marrow.poster}}">

-      <span ng-if="marrow.title"><a href="{{marrow.url}}" class="list-item" >{{marrow.title}}</a><br /></span>

-      <a href="{{marrow.url}}" class="{{marrow.title? 'de-emphasize' : ''}}" >{{marrow.url}}</a>

+      <div class="bone-details">

+        <span ng-if="marrow.title"><a href="{{marrow.url}}" class="list-item" >{{marrow.title}}</a><br /></span>

+        <a href="{{marrow.url}}" ng-class="{'de-emphasize':marrow.title}" >{{marrow.url}}</a>

+      </div>

+      <a class="avatar-image" href="{{ path('UserCtrl', {'user': marrow.poster}) }}" title="{{marrow.poster}}">

+        <img ng-src="{{gravURL(marrow.poster)}}" />

+      </a>

     </li>

   </ul>

 </section>