From dcecd85b252f0abe5ea08ed233ab3b2506918fb8 Mon Sep 17 00:00:00 2001 From: "skparkk@gmail.com" Date: Wed, 18 Mar 2015 11:07:13 -0400 Subject: [PATCH 1/3] Adding in detail footer for projects --- .../detail/projects.detail.controller.js | 24 ++++++-- .../app/projects/detail/projects.detail.html | 48 ++++++++++++++++ .../app/projects/detail/projects.detail.scss | 52 ++++++++++++++++++ .../filter/projects.filter.controller.spec.js | 2 +- .../projects/list/projects.list.controller.js | 3 + client/app/projects/list/projects.list.html | 2 +- .../assets/images/icon_view_all_projects.png | Bin 0 -> 1132 bytes 7 files changed, 124 insertions(+), 7 deletions(-) create mode 100644 client/assets/images/icon_view_all_projects.png diff --git a/client/app/projects/detail/projects.detail.controller.js b/client/app/projects/detail/projects.detail.controller.js index 939d712..7a1e1e2 100644 --- a/client/app/projects/detail/projects.detail.controller.js +++ b/client/app/projects/detail/projects.detail.controller.js @@ -13,15 +13,17 @@ angular.module('espnCreativeworksShowcaseApp') }; $scope.project = Project.get({ id: $stateParams.id }); - + $scope.project.$promise.then(function (project){ Page.meta.title = project.meta.title || (project.title + ' Project Details'); Page.meta.description = project.meta.description || fullDescriptionFilter(project.description, { plaintext: true }); $scope.project.hero.file.transformedUrl = $.cloudinary.url($scope.project.hero.file.public_id, { secure: true, transformation: 'project_detail_hero' }); - $scope.project.$executions = Project.executions({ id: project._id }); + + $scope.project.$executions = Project.executions({ id: project._id }); return $scope.project.$executions.$promise; + }).then(function (executions){ - $scope.project.$tags = []; + $scope.project.$tags = []; angular.forEach(executions, function (execution){ angular.forEach(execution.tags, function (tag){ @@ -34,9 +36,21 @@ angular.module('espnCreativeworksShowcaseApp') angular.forEach(execution.videos, function (video){ video.embed.trustedHtml = $sce.trustAsHtml(video.embed.html) - }); - + }); }); + + $scope.project.$related = $scope.project.related; + return $scope.project.$related.$promise; + + }).then(function(){ + $scope.project.$related = []; + + for(var i = 0; i < $scope.project.related.length; i++){ + $scope.project.$rel = Project.get({ id: $scope.project.related[i] }); + $scope.project.$related.push($scope.project.$rel); + console.log($scope.project.$rel); + } + }); }]); diff --git a/client/app/projects/detail/projects.detail.html b/client/app/projects/detail/projects.detail.html index 928f23c..49429a6 100644 --- a/client/app/projects/detail/projects.detail.html +++ b/client/app/projects/detail/projects.detail.html @@ -68,4 +68,52 @@

+
+
+
+
+
Tags
+
+
+
    + +
  • + +
    • +
+
+
+
+
+
Related Projects
+
+
+
+
+ + + + +
+
+

{{project.tagline}}

+

{{project.title}}

+
+
+
+
+
+
+
View All Projects
+
+ + + +
+
+
+
+
+ diff --git a/client/app/projects/detail/projects.detail.scss b/client/app/projects/detail/projects.detail.scss index b3a04fd..c67d214 100644 --- a/client/app/projects/detail/projects.detail.scss +++ b/client/app/projects/detail/projects.detail.scss @@ -86,6 +86,58 @@ body.project-detail { font-style: italic; font-weight: 300; } + + .footer { + background-color: #fff; + color: #000; + padding: 20px 0px; + + .title { + text-transform: uppercase; + font-size: 11px; + font-weight: bold; + } + + .footer-tags { + .tags { + padding-top: 20px; + } + .tag-text { + font-style: italic; + } + } + .related-projects { + border-left: 1px solid rgb(0, 0, 0); + border-left: 1px solid rgba(0, 0, 0, 0.3); + border-right: 1px solid rgb(0, 0, 0); + border-right: 1px solid rgba(0, 0, 0, 0.3); + + .project { + padding: 20px 20px 0 20px; + } + } + .footer-view-all { + .icon { + padding-top: 20px; + } + img { + height: 35px; + } + } + + .card-header { + font-family: $espn-font-family-headings; + color: #000; + text-transform: uppercase; + margin: 5px 0 0 0 !important; + } + .card-desc { + font-family: $font-family-sans-serif; + color: #b7b7b7; + font-style: italic; + font-size: 12px; + } + } } @media (min-width: $screen-md-min){ diff --git a/client/app/projects/filter/projects.filter.controller.spec.js b/client/app/projects/filter/projects.filter.controller.spec.js index 2a498c2..0e8090b 100644 --- a/client/app/projects/filter/projects.filter.controller.spec.js +++ b/client/app/projects/filter/projects.filter.controller.spec.js @@ -10,7 +10,7 @@ describe('Controller: ProjectsFilterCtrl', function () { // Initialize the controller and a mock scope beforeEach(inject(function ($controller, $rootScope) { scope = $rootScope.$new(); - ProjectsFilterCtrl = $controller('ProjectsListCtrl', { + ProjectsFilterCtrl = $controller('ProjectsFilterCtrl', { $scope: scope }); })); diff --git a/client/app/projects/list/projects.list.controller.js b/client/app/projects/list/projects.list.controller.js index 63f108e..10246d6 100644 --- a/client/app/projects/list/projects.list.controller.js +++ b/client/app/projects/list/projects.list.controller.js @@ -96,6 +96,9 @@ angular.module('espnCreativeworksShowcaseApp') if ($scope.filters.active[key] && project[key]){ var filterIds = _.map($scope.filters.active[key], function (item){ return item._id; }) , projectKeyIds = _.map(project[key], function (item){ return item._id; }); + + console.log("filterIds: " + filterIds); + console.log("projectKeyIds: " + projectKeyIds); // check each project keyId against those in the filter // if found, set result to true diff --git a/client/app/projects/list/projects.list.html b/client/app/projects/list/projects.list.html index 3741009..3f31ce1 100644 --- a/client/app/projects/list/projects.list.html +++ b/client/app/projects/list/projects.list.html @@ -9,7 +9,7 @@

Work

-
+
diff --git a/client/assets/images/icon_view_all_projects.png b/client/assets/images/icon_view_all_projects.png new file mode 100644 index 0000000000000000000000000000000000000000..5927ce47a1fdbd719c3159fcec138311f9c1d861 GIT binary patch literal 1132 zcmaJ=TWHfz7|xuNI#d)CnfP$b5GL4MYHLkcH?yYIqM4&BI#6L*a<;}UIazYHcJslp zhk*(rK1>+8r-2V%z{|uTDBcx8MRCG}`7luM!hG<8h?kSDojzCt$$!cJegA*{|33$t z8n-O2TvbU?)Z)ZeIY}h%y}kwH>zTU3kE1fs}+ zAjE|H8W-R}SYY^2C>#!~2LX-`vK-Iy8~nT=27@BUfx<(RY>wV8Cgpe`7qKFA8e>~z z*=#n;WH&I#>0o(55Lhn21_FK(;dgs2tmgcdTU}(3p{qHDjSXZ0k5O$y-8e#%N@tH? z+Ho(>|#?IVdSQf4WiL}*FcS;YKG-G*X2=)A|@;stCj{6a)c&4jA7`aAjLwl zjbR}g3JN?Q3kp(Pk{SX;=VIZw6f9z8q;;Fn!bPn92P>7tdJAFNB(n@1qX+772bmy$ zaM37TOSmLo0jrm;Wm8EkONwE=@%}aLqKoX1r_L=eG3M4ET4d)PvfO3gSM-pJF`1C1 zRBrP9alZ2A=B2TYmFJfqdze1^;>pvAN3GKppDKGsZcROtFD>hwSlD?!Hqdor?;_MX zq$cWW8(K%kAD_~e3H#WwZQu5UKV1CM5GO#C9XbMo#C zb7$qt>AEWqht(7AfnPfomCsw(aOfyK>hpnqYMyV@S1|J;?*im+P1oJs{bf{B-|*L| SjjtAZ_dgM9l+QJ^4*Ujz{&*?? literal 0 HcmV?d00001 From ad7f164d4a86a393c730fc9a70179ca9612d4d37 Mon Sep 17 00:00:00 2001 From: "skparkk@gmail.com" Date: Wed, 18 Mar 2015 11:37:34 -0400 Subject: [PATCH 2/3] Get rid of console.log --- client/app/projects/detail/projects.detail.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/client/app/projects/detail/projects.detail.controller.js b/client/app/projects/detail/projects.detail.controller.js index 7a1e1e2..ef85609 100644 --- a/client/app/projects/detail/projects.detail.controller.js +++ b/client/app/projects/detail/projects.detail.controller.js @@ -48,7 +48,6 @@ angular.module('espnCreativeworksShowcaseApp') for(var i = 0; i < $scope.project.related.length; i++){ $scope.project.$rel = Project.get({ id: $scope.project.related[i] }); $scope.project.$related.push($scope.project.$rel); - console.log($scope.project.$rel); } }); From 733bf30dd36677e23ab751857b401183f10a1d22 Mon Sep 17 00:00:00 2001 From: "skparkk@gmail.com" Date: Wed, 18 Mar 2015 11:40:54 -0400 Subject: [PATCH 3/3] Revert back to proper controller --- client/app/projects/filter/projects.filter.controller.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/projects/filter/projects.filter.controller.spec.js b/client/app/projects/filter/projects.filter.controller.spec.js index 0e8090b..2a498c2 100644 --- a/client/app/projects/filter/projects.filter.controller.spec.js +++ b/client/app/projects/filter/projects.filter.controller.spec.js @@ -10,7 +10,7 @@ describe('Controller: ProjectsFilterCtrl', function () { // Initialize the controller and a mock scope beforeEach(inject(function ($controller, $rootScope) { scope = $rootScope.$new(); - ProjectsFilterCtrl = $controller('ProjectsFilterCtrl', { + ProjectsFilterCtrl = $controller('ProjectsListCtrl', { $scope: scope }); }));