Clean project

Victor Costa
1 parent 2f459e2b
Showing 9 changed files with 9 additions and 157 deletions Show diff stats
gulp/server.js
src/app/components/malarkey/malarkey.directive.js
src/app/components/malarkey/malarkey.directive.spec.js
src/app/components/malarkey/malarkey.scss
src/app/components/navbar/navbar.html
src/app/components/navbar/navbar.scss
src/app/index.constants.js
src/assets/images/logo-noosfero.png
src/favicon.ico
@@ -29,8 +29,8 @@ function browserSyncInit(baseDir, browser) {
   server.middleware = [proxyMiddleware('http://localhost:3000/api', {changeOrigin:true}),
                        proxyMiddleware('http://localhost:3000/myprofile', {changeOrigin:true}),
                        proxyMiddleware('http://localhost:3000/designs', {changeOrigin:true}),
-                       proxyMiddleware('http://localhost:3000/images', {changeOrigin:true}),
-                       proxyMiddleware('http://localhost:3000/assets', {changeOrigin:true})];
+                       proxyMiddleware('http://localhost:3000/images', {changeOrigin:true})];
+                      //  proxyMiddleware('http://localhost:3000/assets', {changeOrigin:true})];
   browserSync.instance = browserSync.init({
     startPath: '/',
@@ -1,75 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('acmeMalarkey', acmeMalarkey);
-
-  /** @ngInject */
-  function acmeMalarkey(malarkey) {
-    var directive = {
-      restrict: 'E',
-      scope: {
-        extraValues: '='
-      },
-      template: '&nbsp;',
-      link: linkFunc,
-      controller: MalarkeyController,
-      controllerAs: 'vm'
-    };
-
-    return directive;
-
-    function linkFunc(scope, el, attr, vm) {
-      var watcher;
-      var typist = malarkey(el[0], {
-        typeSpeed: 40,
-        deleteSpeed: 40,
-        pauseDelay: 800,
-        loop: true,
-        postfix: ' '
-      });
-
-      el.addClass('acme-malarkey');
-
-      angular.forEach(scope.extraValues, function(value) {
-        typist.type(value).pause().delete();
-      });
-
-      watcher = scope.$watch('vm.contributors', function() {
-        angular.forEach(vm.contributors, function(contributor) {
-          typist.type(contributor.login).pause().delete();
-        });
-      });
-
-      scope.$on('$destroy', function () {
-        watcher();
-      });
-    }
-
-    /** @ngInject */
-    function MalarkeyController($log, githubContributor) {
-      var vm = this;
-
-      vm.contributors = [];
-
-      activate();
-
-      function activate() {
-        return getContributors().then(function() {
-          $log.info('Activated Contributors View');
-        });
-      }
-
-      function getContributors() {
-        return githubContributor.getContributors(10).then(function(data) {
-          vm.contributors = data;
-
-          return vm.contributors;
-        });
-      }
-    }
-
-  }
-
-})();
@@ -1,45 +0,0 @@
-(function() {
-  'use strict';
-
-  /**
-   * @todo Complete the test
-   * This example is not perfect.
-   * The `link` function is not tested.
-   * (malarkey usage, addClass, $watch, $destroy)
-   */
-  describe('directive malarkey', function() {
-    var $log;
-    var vm;
-    var el;
-
-    beforeEach(module('angular'));
-    beforeEach(inject(function($compile, $rootScope, githubContributor, $q, _$log_) {
-      $log = _$log_;
-
-      spyOn(githubContributor, 'getContributors').and.callFake(function() {
-        return $q.when([{}, {}, {}, {}, {}, {}]);
-      });
-
-      el = angular.element('<acme-malarkey extra-values="[\'Poney\', \'Monkey\']"></acme-malarkey>');
-
-      $compile(el)($rootScope.$new());
-      $rootScope.$digest();
-      vm = el.isolateScope().vm;
-    }));
-
-    it('should be compiled', function() {
-      expect(el.html()).not.toEqual(null);
-    });
-
-    it('should have isolate scope object with instanciate members', function() {
-      expect(vm).toEqual(jasmine.any(Object));
-
-      expect(vm.contributors).toEqual(jasmine.any(Array));
-      expect(vm.contributors.length).toEqual(6);
-    });
-
-    it('should log a info', function() {
-      expect($log.info.logs).toEqual(jasmine.stringMatching('Activated Contributors View'));
-    });
-  });
-})();
@@ -1,25 +0,0 @@
-.acme-malarkey {
-  text-transform: capitalize;
-  color: #cb3837;
-
-  &:after {
-    animation: cursor-blink 0.4s linear infinite;
-    content: "|";
-    color: #cb3837;
-  }
-}
-
-@keyframes cursor-blink {
-  1% {
-    opacity: 0;
-  }
-  40% {
-    opacity: 0;
-  }
-  60% {
-    opacity: 1;
-  }
-  100% {
-    opacity: 1;
-  }
-}
 <nav class="navbar navbar-static-top navbar-inverse">
   <div class="container-fluid">
     <div class="navbar-header">
-      <a class="navbar-brand" href="https://github.com/Swiip/generator-gulp-angular">
-        <span class="glyphicon glyphicon-home"></span> Gulp Angular
+      <a class="navbar-brand" ng-href="/">
+        <span class="noosfero-logo"><img src="assets/images/logo-noosfero.png"></span> Noosfero
       </a>
     </div>
     <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-6">
       <ul class="nav navbar-nav">
         <li class="active"><a ng-href="#">Home</a></li>
-        <li><a ng-href="#">About</a></li>
-        <li><a ng-href="#">Contact</a></li>
       </ul>
-      <ul class="nav navbar-nav navbar-right acme-navbar-text">
-        <li>Application was created {{ vm.relativeDate }}.</li>
+      <ul class="nav navbar-nav navbar-right">
+        <li><a ng-href="#">Login</a></li>
       </ul>
     </div>
   </div>
-.acme-navbar-text{
-  color: white;
+.noosfero-logo img {
+  height: 35px;
 }
-/* global malarkey:false, moment:false */
+/* global moment:false */
 (function() {
   'use strict';
   angular
     .module('angular')
-    .constant('malarkey', malarkey)
     .constant('moment', moment);
 })();
 Binary files a/src/favicon.ico and b/src/favicon.ico differ
	@@ -1,75 +0,0 @@	@@ -1,75 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- angular
5	- .module('angular')
6	- .directive('acmeMalarkey', acmeMalarkey);
7	-
8	- /** @ngInject */
9	- function acmeMalarkey(malarkey) {
10	- var directive = {
11	- restrict: 'E',
12	- scope: {
13	- extraValues: '='
14	- },
15	- template: ' ',
16	- link: linkFunc,
17	- controller: MalarkeyController,
18	- controllerAs: 'vm'
19	- };
20	-
21	- return directive;
22	-
23	- function linkFunc(scope, el, attr, vm) {
24	- var watcher;
25	- var typist = malarkey(el[0], {
26	- typeSpeed: 40,
27	- deleteSpeed: 40,
28	- pauseDelay: 800,
29	- loop: true,
30	- postfix: ' '
31	- });
32	-
33	- el.addClass('acme-malarkey');
34	-
35	- angular.forEach(scope.extraValues, function(value) {
36	- typist.type(value).pause().delete();
37	- });
38	-
39	- watcher = scope.$watch('vm.contributors', function() {
40	- angular.forEach(vm.contributors, function(contributor) {
41	- typist.type(contributor.login).pause().delete();
42	- });
43	- });
44	-
45	- scope.$on('$destroy', function () {
46	- watcher();
47	- });
48	- }
49	-
50	- /** @ngInject */
51	- function MalarkeyController($log, githubContributor) {
52	- var vm = this;
53	-
54	- vm.contributors = [];
55	-
56	- activate();
57	-
58	- function activate() {
59	- return getContributors().then(function() {
60	- $log.info('Activated Contributors View');
61	- });
62	- }
63	-
64	- function getContributors() {
65	- return githubContributor.getContributors(10).then(function(data) {
66	- vm.contributors = data;
67	-
68	- return vm.contributors;
69	- });
70	- }
71	- }
72	-
73	- }
74	-
75	-})();
	@@ -1,45 +0,0 @@	@@ -1,45 +0,0 @@
1	-(function() {
2	- 'use strict';
3	-
4	- /**
5	- * @todo Complete the test
6	- * This example is not perfect.
7	- * The `link` function is not tested.
8	- * (malarkey usage, addClass, $watch, $destroy)
9	- */
10	- describe('directive malarkey', function() {
11	- var $log;
12	- var vm;
13	- var el;
14	-
15	- beforeEach(module('angular'));
16	- beforeEach(inject(function($compile, $rootScope, githubContributor, $q, _$log_) {
17	- $log = _$log_;
18	-
19	- spyOn(githubContributor, 'getContributors').and.callFake(function() {
20	- return $q.when([{}, {}, {}, {}, {}, {}]);
21	- });
22	-
23	- el = angular.element('<acme-malarkey extra-values="[\'Poney\', \'Monkey\']"></acme-malarkey>');
24	-
25	- $compile(el)($rootScope.$new());
26	- $rootScope.$digest();
27	- vm = el.isolateScope().vm;
28	- }));
29	-
30	- it('should be compiled', function() {
31	- expect(el.html()).not.toEqual(null);
32	- });
33	-
34	- it('should have isolate scope object with instanciate members', function() {
35	- expect(vm).toEqual(jasmine.any(Object));
36	-
37	- expect(vm.contributors).toEqual(jasmine.any(Array));
38	- expect(vm.contributors.length).toEqual(6);
39	- });
40	-
41	- it('should log a info', function() {
42	- expect($log.info.logs).toEqual(jasmine.stringMatching('Activated Contributors View'));
43	- });
44	- });
45	-})();
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-.acme-malarkey {
2	- text-transform: capitalize;
3	- color: #cb3837;
4	-
5	- &:after {
6	- animation: cursor-blink 0.4s linear infinite;
7	- content: "\|";
8	- color: #cb3837;
9	- }
10	-}
11	-
12	-@keyframes cursor-blink {
13	- 1% {
14	- opacity: 0;
15	- }
16	- 40% {
17	- opacity: 0;
18	- }
19	- 60% {
20	- opacity: 1;
21	- }
22	- 100% {
23	- opacity: 1;
24	- }
25	-}
1	-.acme-navbar-text{
2	- color: white;	1	+.noosfero-logo img {
		2	+ height: 35px;
3	}	3	}