Download as
Browse Code »

Commit a1f403ae83b94f5c0ea5117e2e0ee3d927d371d5

Authored by Victor Costa
1 parent f6b323e1
Exists in master and in 35 other branches activities_block, btn-new-post, cleaning-the-house, cosmetic_changes_people_and_communities_block, coverage, edit-blocks, edit-header-footer, env-tags-block, forgot_password, header_and_footer, helpers-evolution, layout_support, list_articles_on_blog, loading-indicator-component, login_modal, login_modal_improve, person_info_block, profile-article-resolvers, profile-blocks-sass, profile-view, profile_description_block_component, profile_page_improvements, profile_search, recent-activities, remove-article-confirmation, responsive-fixes, seo, signup_page, skin-small-change, staging, tags-block, theme-skin-yellow, translations, updated_signup_page, users_profile_page

Fix router

Showing 3 changed files with 29 additions and 38 deletions   Show diff stats
src/app/index.ts
  Diff comments   View file @a1f403a
@@ -14,55 +14,49 @@ let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "n @@ -14,55 +14,49 @@ let noosferoApp: any = bundle("noosferoApp", Main, ["ngAnimate", "ngCookies", "n
14 "ui.router", "ui.bootstrap", "toastr", 14 "ui.router", "ui.bootstrap", "toastr",
15 "angularMoment", "angular.filter", "akoenig.deckgrid", 15 "angularMoment", "angular.filter", "akoenig.deckgrid",
16 "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]).publish(); 16 "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]).publish();
17 -console.log(noosferoApp);  
18 -// bootstrap(Main, noosferoApp.requires);  
19 17
20 NoosferoApp.angularModule = noosferoApp; 18 NoosferoApp.angularModule = noosferoApp;
21 -// 19 +
22 NoosferoApp.addConstants("moment", moment); 20 NoosferoApp.addConstants("moment", moment);
23 NoosferoApp.addConstants("AUTH_EVENTS", { 21 NoosferoApp.addConstants("AUTH_EVENTS", {
24 loginSuccess: "auth-login-success", 22 loginSuccess: "auth-login-success",
25 loginFailed: "auth-login-failed", 23 loginFailed: "auth-login-failed",
26 logoutSuccess: "auth-logout-success" 24 logoutSuccess: "auth-logout-success"
27 }); 25 });
28 -//  
29 -// 26 +
  27 +
30 NoosferoApp.addConfig(noosferoModuleConfig); 28 NoosferoApp.addConfig(noosferoModuleConfig);
31 -// 29 +
32 NoosferoApp.run(noosferoAngularRunBlock); 30 NoosferoApp.run(noosferoAngularRunBlock);
33 31
34 noosferoApp.run(() => { 32 noosferoApp.run(() => {
35 console.log("RUN!"); 33 console.log("RUN!");
36 }); 34 });
37 35
38 -// // require("./main/main.controller.js");  
39 -// require("./cms/cms.controller.js");  
40 -// require("./components/auth/auth.controller.js");  
41 -// require("./components/auth/auth.service.js");  
42 -// require("./components/navbar/navbar.directive.js");  
43 -// require("./components/noosfero-activities/activities.component.js");  
44 -// require("./components/noosfero-activities/activity/activity.component.js");  
45 -// require("./components/noosfero-articles/blog/blog.component.js");  
46 -// require("./components/noosfero-blocks/block.directive.js");  
47 -// require("./components/noosfero-blocks/link-list/link-list.component.js");  
48 -// require("./components/noosfero-blocks/main-block/main-block.component.js");  
49 -// require("./components/noosfero-blocks/members-block/members-block.component.js");  
50 -// require("./components/noosfero-blocks/profile-image/profile-image.component.js");  
51 -// require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");  
52 -// require("./components/noosfero-boxes/boxes.component.js");  
53 -// require("./components/noosfero/noosfero-template.filter.js");  
54 -// require("./components/noosfero/noosfero.service.js");  
55 -// require("./components/noosfero/profile-image/profile-image.component.js");  
56 -// require("./content-viewer/content-viewer-actions.controller.js");  
57 -// // require("./content-viewer/content-viewer.controller.js");  
58 -// require("./profile-info/profile-info.controller.js");  
59 -// require("./profile/profile-home.controller.js");  
60 -// require("./profile/profile.controller.js"); 36 +// require("./main/main.controller.js");
  37 +require("./cms/cms.controller.js");
  38 +require("./components/auth/auth.controller.js");
  39 +require("./components/auth/auth.service.js");
  40 +require("./components/navbar/navbar.directive.js");
  41 +require("./components/noosfero-activities/activities.component.js");
  42 +require("./components/noosfero-activities/activity/activity.component.js");
  43 +require("./components/noosfero-articles/blog/blog.component.js");
  44 +require("./components/noosfero-blocks/block.directive.js");
  45 +require("./components/noosfero-blocks/link-list/link-list.component.js");
  46 +require("./components/noosfero-blocks/main-block/main-block.component.js");
  47 +require("./components/noosfero-blocks/members-block/members-block.component.js");
  48 +require("./components/noosfero-blocks/profile-image/profile-image.component.js");
  49 +require("./components/noosfero-blocks/recent-documents/recent-documents.component.js");
  50 +require("./components/noosfero-boxes/boxes.component.js");
  51 +require("./components/noosfero/noosfero-template.filter.js");
  52 +require("./components/noosfero/noosfero.service.js");
  53 +require("./components/noosfero/profile-image/profile-image.component.js");
  54 +require("./content-viewer/content-viewer-actions.controller.js");
  55 +// require("./content-viewer/content-viewer.controller.js");
  56 +require("./profile-info/profile-info.controller.js");
  57 +require("./profile/profile-home.controller.js");
  58 +require("./profile/profile.controller.js");
61 59
62 // NoosferoApp.addController("ContentViewerController", ContentViewerController); 60 // NoosferoApp.addController("ContentViewerController", ContentViewerController);
63 61
64 // NoosferoApp.addConfig(routeConfig); 62 // NoosferoApp.addConfig(routeConfig);
65 -  
66 -  
67 -  
68 -//bootstrap(Main, ['ui.router']);  
src/app/main/main.controller.ts
  Diff comments   View file @a1f403a
@@ -28,6 +28,3 @@ export class Main2 { @@ -28,6 +28,3 @@ export class Main2 {
28 export class Main { 28 export class Main {
29 29
30 } 30 }
31 -  
32 -// bundle('noosferoApp', Main2).publish();  
33 -// bundle('noosferoApp', Main).publish();  
src/index.html
  Diff comments   View file @a1f403a
1 <!doctype html> 1 <!doctype html>
2 -<html> 2 +<html ng-app="noosferoApp">
3 <head> 3 <head>
4 <base href="/"> 4 <base href="/">
5 <meta charset="utf-8"> 5 <meta charset="utf-8">
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p> 25 <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
26 <![endif]--> 26 <![endif]-->
27 27
28 - <main></main> 28 + <div ui-view></div>
29 29
30 <!-- build:js(src) scripts/vendor.js --> 30 <!-- build:js(src) scripts/vendor.js -->
31 <!-- bower:js --> 31 <!-- bower:js -->