diff --git a/src/app/global.d.ts b/src/app/global.d.ts new file mode 100644 index 0000000..8ee94f6 --- /dev/null +++ b/src/app/global.d.ts @@ -0,0 +1 @@ +declare function require(module: string): any; diff --git a/src/app/index.config.js b/src/app/index.config.js deleted file mode 100644 index 4de2459..0000000 --- a/src/app/index.config.js +++ /dev/null @@ -1,15 +0,0 @@ -"use strict"; -/** @ngInject */ -function noosferoModuleConfig($logProvider, $locationProvider, RestangularProvider, $httpProvider, $provide) { - $logProvider.debugEnabled(true); - $locationProvider.html5Mode({ enabled: true }); - RestangularProvider.setBaseUrl("/api/v1"); - RestangularProvider.setFullResponse(true); - $httpProvider.defaults.headers.post = { "Content-Type": "application/x-www-form-urlencoded; charset=utf-8" }; - $provide.decorator("$uiViewScroll", function ($delegate, $document) { - return function (uiViewElement) { - $document.scrollToElementAnimated(uiViewElement); - }; - }); -} -exports.noosferoModuleConfig = noosferoModuleConfig; diff --git a/src/app/index.js b/src/app/index.js deleted file mode 100644 index f7d511b..0000000 --- a/src/app/index.js +++ /dev/null @@ -1,39 +0,0 @@ -"use strict"; -var index_module_1 = require("./index.module"); -var index_config_1 = require("./index.config"); -var index_run_1 = require("./index.run"); -var index_route_1 = require("./index.route"); -index_module_1.NoosferoApp.init(); -index_module_1.NoosferoApp.addConstants("moment", moment); -index_module_1.NoosferoApp.addConstants("AUTH_EVENTS", { - loginSuccess: "auth-login-success", - loginFailed: "auth-login-failed", - logoutSuccess: "auth-logout-success" -}); -index_module_1.NoosferoApp.addConfig(index_config_1.noosferoModuleConfig); -index_module_1.NoosferoApp.run(index_run_1.noosferoAngularRunBlock); -require("./cms/cms.controller.js"); -require("./components/auth/auth.controller.js"); -require("./components/auth/auth.service.js"); -require("./components/navbar/navbar.directive.js"); -require("./components/noosfero-activities/activities.component.js"); -require("./components/noosfero-activities/activity/activity.component.js"); -require("./components/noosfero-articles/article/article.directive.js"); -require("./components/noosfero-articles/blog/blog.component.js"); -require("./components/noosfero-blocks/block.directive.js"); -require("./components/noosfero-blocks/link-list/link-list.component.js"); -require("./components/noosfero-blocks/main-block/main-block.component.js"); -require("./components/noosfero-blocks/members-block/members-block.component.js"); -require("./components/noosfero-blocks/profile-image/profile-image.component.js"); -require("./components/noosfero-blocks/recent-documents/recent-documents.component.js"); -require("./components/noosfero-boxes/boxes.component.js"); -require("./components/noosfero/noosfero-template.filter.js"); -require("./components/noosfero/noosfero.service.js"); -require("./components/noosfero/profile-image/profile-image.component.js"); -require("./content-viewer/content-viewer-actions.controller.js"); -require("./content-viewer/content-viewer.controller.js"); -require("./main/main.controller.js"); -require("./profile-info/profile-info.controller.js"); -require("./profile/profile-home.controller.js"); -require("./profile/profile.controller.js"); -index_module_1.NoosferoApp.addConfig(index_route_1.routeConfig); diff --git a/src/app/index.module.js b/src/app/index.module.js deleted file mode 100644 index 80a2847..0000000 --- a/src/app/index.module.js +++ /dev/null @@ -1,27 +0,0 @@ -"use strict"; -var NoosferoApp = (function () { - function NoosferoApp() { - } - NoosferoApp.init = function () { - angular.module(NoosferoApp.appName, ["ngAnimate", "ngCookies", "ngStorage", "ngTouch", - "ngSanitize", "ngMessages", "ngAria", "restangular", - "ui.router", "ui.bootstrap", "toastr", - "angularMoment", "angular.filter", "akoenig.deckgrid", - "angular-timeline", "duScroll", "oitozero.ngSweetAlert"]); - }; - NoosferoApp.addConfig = function (configFunc) { - angular.module(NoosferoApp.appName).config(configFunc); - }; - NoosferoApp.addConstants = function (constantName, value) { - angular.module(NoosferoApp.appName).constant(constantName, value); - }; - NoosferoApp.addService = function (serviceName, value) { - angular.module(NoosferoApp.appName).service(serviceName, value); - }; - NoosferoApp.run = function (runFunction) { - angular.module(NoosferoApp.appName).run(runFunction); - }; - NoosferoApp.appName = "noosferoApp"; - return NoosferoApp; -}()); -exports.NoosferoApp = NoosferoApp; diff --git a/src/app/index.module.ts b/src/app/index.module.ts index 0cd9bc1..0eafcc3 100644 --- a/src/app/index.module.ts +++ b/src/app/index.module.ts @@ -26,4 +26,3 @@ export class NoosferoApp { angular.module(NoosferoApp.appName).run(runFunction); } } - diff --git a/src/app/index.route.js b/src/app/index.route.js deleted file mode 100644 index 86ab0f7..0000000 --- a/src/app/index.route.js +++ /dev/null @@ -1,76 +0,0 @@ -"use strict"; -/** @ngInject */ -function routeConfig($stateProvider, $urlRouterProvider) { - $stateProvider - .state("main", { - url: "/", - templateUrl: "app/main/main.html", - controller: "MainController", - controllerAs: "vm", - resolve: { - currentUser: function (AuthService) { - return AuthService.loginFromCookie(); - } - } - }) - .state("main.profile.cms", { - url: "^/myprofile/:profile/cms", - views: { - "mainBlockContent": { - templateUrl: "app/cms/cms.html", - controller: "CmsController", - controllerAs: "vm" - } - } - }) - .state("main.profile.settings", { - url: "^/myprofile/:profile" - }) - .state("main.profile", { - url: "^/:profile", - abstract: true, - views: { - "content": { - templateUrl: "app/profile/profile.html", - controller: "ProfileController", - controllerAs: "vm" - } - } - }) - .state("main.profile.home", { - url: "", - views: { - "mainBlockContent": { - controller: "ProfileHomeController", - controllerAs: "vm" - } - } - }) - .state("main.profile.info", { - url: "^/profile/:profile", - views: { - "mainBlockContent": { - templateUrl: "app/profile-info/profile-info.html", - controller: "ProfileInfoController", - controllerAs: "vm" - } - } - }) - .state("main.profile.page", { - url: "/{page:any}", - views: { - "mainBlockContent": { - templateUrl: "app/content-viewer/page.html", - controller: "ContentViewerController", - controllerAs: "vm" - }, - "actions@main": { - templateUrl: "app/content-viewer/navbar-actions.html", - controller: "ContentViewerActionsController", - controllerAs: "vm" - } - } - }); - $urlRouterProvider.otherwise("/"); -} -exports.routeConfig = routeConfig; diff --git a/src/app/index.run.js b/src/app/index.run.js deleted file mode 100644 index 481c249..0000000 --- a/src/app/index.run.js +++ /dev/null @@ -1,11 +0,0 @@ -"use strict"; -/** @ngInject */ -function noosferoAngularRunBlock($log, Restangular, Session) { - Restangular.addFullRequestInterceptor(function (element, operation, route, url, headers) { - if (Session.getCurrentUser()) { - headers["Private-Token"] = Session.getCurrentUser().private_token; - } - return { headers: headers }; - }); -} -exports.noosferoAngularRunBlock = noosferoAngularRunBlock; diff --git a/src/app/index.ts b/src/app/index.ts index be4a6b4..be1bee1 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -19,8 +19,7 @@ NoosferoApp.addConfig(noosferoModuleConfig); NoosferoApp.run(noosferoAngularRunBlock); -declare function require(module): any; - +require("./main/main.controller.js"); require("./cms/cms.controller.js"); require("./components/auth/auth.controller.js"); require("./components/auth/auth.service.js"); @@ -41,7 +40,6 @@ require("./components/noosfero/noosfero.service.js"); require("./components/noosfero/profile-image/profile-image.component.js"); require("./content-viewer/content-viewer-actions.controller.js"); require("./content-viewer/content-viewer.controller.js"); -require("./main/main.controller.js"); require("./profile-info/profile-info.controller.js"); require("./profile/profile-home.controller.js"); require("./profile/profile.controller.js"); diff --git a/src/index.html b/src/index.html index 53fe124..2e2933a 100644 --- a/src/index.html +++ b/src/index.html @@ -35,8 +35,7 @@ - - + diff --git a/tsconfig.json b/tsconfig.json index 4631c30..c09f483 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -9,5 +9,10 @@ "node_modules", "typings/main", "typings/main.d.ts" - ] -} \ No newline at end of file + ], + "compileOnSave": false, + "atom": { + "rewriteTsconfig": false, + "formatOnSave": true + } +} -- libgit2 0.21.2