From a0c8d63e7857e8eb5197252651a033d90ed3a1eb Mon Sep 17 00:00:00 2001 From: SylTi Date: Sat, 29 Nov 2014 01:36:00 +0100 Subject: [PATCH] broken fucking async directives.. --- client/app/admin/admin.controller.js | 12 ++++- client/app/admin/admin.jade | 46 +++++++++---------- .../adminProjectList.directive.js | 24 ++++++++-- server/api/refund/refund.spec.js | 10 ++-- 4 files changed, 59 insertions(+), 33 deletions(-) diff --git a/client/app/admin/admin.controller.js b/client/app/admin/admin.controller.js index a58a953..2e2dbfa 100644 --- a/client/app/admin/admin.controller.js +++ b/client/app/admin/admin.controller.js @@ -5,7 +5,7 @@ angular.module('bitCrowdFundsApp') // Use the User $resource to fetch all users $scope.message = ''; - + $scope.projects = [{}]; $scope.init = function () { $scope.users = User.query(function () @@ -26,7 +26,10 @@ angular.module('bitCrowdFundsApp') $scope.message = 'Something wrong happend'; }); }); - $scope.projects = ProjectRes.query(); + $scope.projects = ProjectRes.query(function (err) + { + $scope.$broadcast("Data_Ready"); + }); }; $scope.isAdmin = function () @@ -96,4 +99,9 @@ angular.module('bitCrowdFundsApp') $scope.message = 'Something wrong happend'; }); }; + + /*$scope.$watch('projects', function(projs) + { + //$scope.$digest(); + });*/ }); diff --git a/client/app/admin/admin.jade b/client/app/admin/admin.jade index 52ba3e3..ce71bde 100644 --- a/client/app/admin/admin.jade +++ b/client/app/admin/admin.jade @@ -67,29 +67,29 @@ div(ng-include='"components/navbar/navbar.html"') ul.list-group.well tabset(justified='true', type="'pills'") tab(heading='All').tabText.label-primary - //- adminProjectList(projects="projects") - li.list-group-item(ng-repeat='project in projects') - strong - span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished - span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing - span.label.label-default(ng-show="project.amountRaised === 0") Not started - |    - span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}}) - br - small.text-muted - span Project created - |   - b(am-time-ago="project.dateCreat") - |   - span and finishing - |   - b(am-time-ago="project.dateEndCampaign") - .pull-right - a(ng-href='/projects/{{project.slug}}/edit') - span.glyphicon.glyphicon-pencil - |      - a.trash(ng-click='deleteProject(project)') - span.glyphicon.glyphicon-trash + span(adminProjectList projects="projects") + //- li.list-group-item(ng-repeat='project in projects') + //- strong + //- span.label.label-success(ng-show="project.amountRaised >= project.amountToRaise") Finished + //- span.label.label-warning(ng-show="project.amountRaised !== 0 && project.amountRaised < project.amountToRaise") Ongoing + //- span.label.label-default(ng-show="project.amountRaised === 0") Not started + //- |    + //- span {{project.name}} ({{project.amountRaised | toBTC}} / {{project.amountToRaise | toBTC}}) + //- br + //- small.text-muted + //- span Project created + //- |   + //- b(am-time-ago="project.dateCreat") + //- |   + //- span and finishing + //- |   + //- b(am-time-ago="project.dateEndCampaign") + //- .pull-right + //- a(ng-href='/projects/{{project.slug}}/edit') + //- span.glyphicon.glyphicon-pencil + //- |      + //- a.trash(ng-click='deleteProject(project)') + //- span.glyphicon.glyphicon-trash tab(heading='Not Started').label-default.tabText li.list-group-item(ng-repeat='project in projects' ng-if='project.amountRaised === 0') strong diff --git a/client/components/adminProjectList/adminProjectList.directive.js b/client/components/adminProjectList/adminProjectList.directive.js index 7ac9972..2edbfec 100644 --- a/client/components/adminProjectList/adminProjectList.directive.js +++ b/client/components/adminProjectList/adminProjectList.directive.js @@ -3,14 +3,30 @@ angular.module('bitCrowdFundsApp') .directive('adminProjectList', function () { return { - templateUrl: 'components/adminProjectList/adminProjectList.html', + //templateUrl: 'components/adminProjectList/adminProjectList.html', restrict: 'EA', + //replace: true, + //transclude: true, + //scope: true scope: { projects: '=' - }/*, - link: function (scope, element, attrs) + }, + //replace: true, + //transclude: true, + /*controller: function($scope) { - + $scope.$watch('projects', function(v) { + $scope.projects = v; + }); }*/ + link: function(scope, element, attrs) + { + element.text('
shit
'); + scope.$on("Data_Ready", function () + { + element.text('
shit
'); + }); + } + }; }); diff --git a/server/api/refund/refund.spec.js b/server/api/refund/refund.spec.js index 2a363ff..1c942cb 100644 --- a/server/api/refund/refund.spec.js +++ b/server/api/refund/refund.spec.js @@ -1,20 +1,22 @@ 'use strict'; +/* jshint undef:false */ var should = require('should'); var app = require('../../app'); var request = require('supertest'); +var User = require('../user/user.model.js'); describe('GET /api/refunds', function() { it('should respond with JSON array', function(done) { request(app) .get('/api/refunds') - .expect(200) - .expect('Content-Type', /json/) + .expect(401) + .expect('Content-Type', 'text/html') .end(function(err, res) { if (err) return done(err); - res.body.should.be.instanceof(Array); + //res.body.should.be.instanceof(Array); done(); }); }); -}); \ No newline at end of file +});