diff --git a/imports/api/images/collection.js b/imports/api/images/collection.ts similarity index 100% rename from imports/api/images/collection.js rename to imports/api/images/collection.ts diff --git a/imports/api/images/helpers.js b/imports/api/images/helpers.ts similarity index 100% rename from imports/api/images/helpers.js rename to imports/api/images/helpers.ts diff --git a/imports/api/images/index.js b/imports/api/images/index.ts similarity index 100% rename from imports/api/images/index.js rename to imports/api/images/index.ts diff --git a/imports/api/images/methods.js b/imports/api/images/methods.ts similarity index 100% rename from imports/api/images/methods.js rename to imports/api/images/methods.ts diff --git a/imports/api/images/publish.js b/imports/api/images/publish.ts similarity index 100% rename from imports/api/images/publish.js rename to imports/api/images/publish.ts diff --git a/imports/api/images/store.js b/imports/api/images/store.ts similarity index 100% rename from imports/api/images/store.js rename to imports/api/images/store.ts diff --git a/imports/api/parties/collection.js b/imports/api/parties/collection.ts similarity index 100% rename from imports/api/parties/collection.js rename to imports/api/parties/collection.ts diff --git a/imports/api/parties/index.js b/imports/api/parties/index.ts similarity index 100% rename from imports/api/parties/index.js rename to imports/api/parties/index.ts diff --git a/imports/api/parties/methods.tests.js b/imports/api/parties/methods.tests.ts similarity index 100% rename from imports/api/parties/methods.tests.js rename to imports/api/parties/methods.tests.ts diff --git a/imports/api/parties/methods.js b/imports/api/parties/methods.ts similarity index 100% rename from imports/api/parties/methods.js rename to imports/api/parties/methods.ts diff --git a/imports/api/parties/publish.js b/imports/api/parties/publish.ts similarity index 100% rename from imports/api/parties/publish.js rename to imports/api/parties/publish.ts diff --git a/imports/api/users.js b/imports/api/users.ts similarity index 100% rename from imports/api/users.js rename to imports/api/users.ts diff --git a/imports/startup/fixtures.js b/imports/startup/fixtures.ts similarity index 100% rename from imports/startup/fixtures.js rename to imports/startup/fixtures.ts diff --git a/imports/ui/components/auth/auth.js b/imports/ui/components/auth/auth.js deleted file mode 100644 index a87dd5e45..000000000 --- a/imports/ui/components/auth/auth.js +++ /dev/null @@ -1,47 +0,0 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; - -import { Meteor } from 'meteor/meteor'; -import { Accounts } from 'meteor/accounts-base'; - -import template from './auth.html'; -import { name as DisplayNameFilter } from '../../filters/displayNameFilter'; -import { name as Login } from '../login/login'; -import { name as Register } from '../register/register'; -import { name as Password } from '../password/password'; - -const name = 'auth'; - -class Auth { - constructor($scope, $reactive) { - 'ngInject'; - - $reactive(this).attach($scope); - - this.helpers({ - isLoggedIn() { - return !!Meteor.userId(); - }, - currentUser() { - return Meteor.user(); - } - }); - } - - logout() { - Accounts.logout(); - } -} - -// create a module -export default angular.module(name, [ - angularMeteor, - DisplayNameFilter, - Login, - Register, - Password -]).component(name, { - template, - controllerAs: name, - controller: Auth -}); diff --git a/imports/ui/components/auth/auth.ts b/imports/ui/components/auth/auth.ts new file mode 100644 index 000000000..b091db235 --- /dev/null +++ b/imports/ui/components/auth/auth.ts @@ -0,0 +1,52 @@ +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; + +import { Meteor } from 'meteor/meteor'; +import { Accounts } from 'meteor/accounts-base'; + +import template from './auth.html'; +import DisplayNameFilter from '../../filters/displayNameFilter'; +import { LoginNg1Module } from '../login/login'; +import { RegisterNg1Module } from '../register/register'; +import { PasswordNg1Module } from '../password/password'; + +const name = 'auth'; + +class Auth { + constructor($scope, $reactive) { + 'ngInject'; + + $reactive(this).attach($scope); + + this.helpers({ + isLoggedIn() { + return !!Meteor.userId(); + }, + currentUser() { + return Meteor.user(); + } + }); + } + + logout() { + Accounts.logout(); + } +} + +// create a module +export const AuthNg1Module = angular.module(name, [ + angularMeteor, + DisplayNameFilter.name, + LoginNg1Module.name, + RegisterNg1Module.name, + PasswordNg1Module.name +]); + +export function registerAuth() { + AuthNg1Module + .component(name, { + template, + controllerAs: name, + controller: Auth + }); +} diff --git a/imports/ui/components/login/login.js b/imports/ui/components/login/login.ts similarity index 52% rename from imports/ui/components/login/login.js rename to imports/ui/components/login/login.ts index 376fcafb8..31c0f921d 100644 --- a/imports/ui/components/login/login.js +++ b/imports/ui/components/login/login.ts @@ -1,29 +1,33 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import uiRouter from 'angular-ui-router'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as uiRouter from 'angular-ui-router'; import { Meteor } from 'meteor/meteor'; import webTemplate from './web.html'; -import { Login as LoginWeb } from './web'; +import LoginWeb from './web'; import mobileTemplate from './mobile.html'; -import { Login as LoginMobile } from './mobile'; +import LoginMobile from './mobile'; const name = 'login'; const template = Meteor.isCordova ? mobileTemplate : webTemplate; const controller = Meteor.isCordova ? LoginMobile : LoginWeb; // create a module -export default angular.module(name, [ +export const LoginNg1Module = angular.module(name, [ angularMeteor, uiRouter -]) - .component(name, { - template, - controller, - controllerAs: name - }) - .config(config); +]); + +export function registerLogin() { + LoginNg1Module + .component(name, { + template, + controller, + controllerAs: name + }) + .config(config); +} function config($stateProvider) { 'ngInject'; diff --git a/imports/ui/components/login/mobile.js b/imports/ui/components/login/mobile.ts similarity index 100% rename from imports/ui/components/login/mobile.js rename to imports/ui/components/login/mobile.ts diff --git a/imports/ui/components/login/web.js b/imports/ui/components/login/web.ts similarity index 100% rename from imports/ui/components/login/web.js rename to imports/ui/components/login/web.ts diff --git a/imports/ui/components/navigation/navigation.js b/imports/ui/components/navigation/navigation.js deleted file mode 100644 index 5e33f5942..000000000 --- a/imports/ui/components/navigation/navigation.js +++ /dev/null @@ -1,14 +0,0 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; - -import template from './navigation.html'; - -const name = 'navigation'; - -// create a module -export default angular.module(name, [ - angularMeteor -]).component(name, { - template, - controllerAs: name -}); diff --git a/imports/ui/components/navigation/navigation.ts b/imports/ui/components/navigation/navigation.ts new file mode 100644 index 000000000..67acb8af4 --- /dev/null +++ b/imports/ui/components/navigation/navigation.ts @@ -0,0 +1,19 @@ +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; + +import template from './navigation.html'; + +const name = 'navigation'; + +// create a module +export const NavigationNg1Module = angular.module(name, [ + angularMeteor +]); + +export function registerNavigation() { + NavigationNg1Module + .component(name, { + template, + controllerAs: name + }); +} diff --git a/imports/ui/components/partiesList/client/partiesList.tests.js b/imports/ui/components/partiesList/client/partiesList.tests.ts similarity index 87% rename from imports/ui/components/partiesList/client/partiesList.tests.js rename to imports/ui/components/partiesList/client/partiesList.tests.ts index 176da85f8..3bee850f2 100644 --- a/imports/ui/components/partiesList/client/partiesList.tests.js +++ b/imports/ui/components/partiesList/client/partiesList.tests.ts @@ -1,9 +1,9 @@ -import { name as PartiesList } from '../partiesList'; +import PartiesList from '../partiesList'; import 'angular-mocks'; describe('PartiesList', () => { beforeEach(() => { - window.module(PartiesList); + window.module(PartiesList.name); }); describe('controller', () => { @@ -11,7 +11,7 @@ describe('PartiesList', () => { beforeEach(() => { inject(($rootScope, $componentController) => { - controller = $componentController(PartiesList, { + controller = $componentController(PartiesList.name, { $scope: $rootScope.$new(true) }); }); diff --git a/imports/ui/components/partiesList/partiesList.js b/imports/ui/components/partiesList/partiesList.ts similarity index 57% rename from imports/ui/components/partiesList/partiesList.js rename to imports/ui/components/partiesList/partiesList.ts index df916d972..0d2fb0f31 100644 --- a/imports/ui/components/partiesList/partiesList.js +++ b/imports/ui/components/partiesList/partiesList.ts @@ -1,7 +1,7 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import uiRouter from 'angular-ui-router'; -import utilsPagination from 'angular-utils-pagination'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as uiRouter from 'angular-ui-router'; +import * as utilsPagination from 'angular-utils-pagination'; import { Counts } from 'meteor/tmeasday:publish-counts'; import { Meteor } from 'meteor/meteor'; @@ -9,14 +9,14 @@ import { Meteor } from 'meteor/meteor'; import webTemplate from './web.html'; import mobileTemplate from './mobile.html'; import { Parties } from '../../../api/parties'; -import { name as PartiesSort } from '../partiesSort/partiesSort'; -import { name as PartiesMap } from '../partiesMap/partiesMap'; -import { name as PartyAddButton } from '../partyAddButton/partyAddButton'; -import { name as PartyRemove } from '../partyRemove/partyRemove'; -import { name as PartyCreator } from '../partyCreator/partyCreator'; -import { name as PartyRsvp } from '../partyRsvp/partyRsvp'; -import { name as PartyRsvpsList } from '../partyRsvpsList/partyRsvpsList'; -import { name as PartyImage } from '../partyImage/partyImage'; +import { PartiesSortNg1Module } from '../partiesSort/partiesSort'; +import { PartiesMapNg1Module } from '../partiesMap/partiesMap'; +import { PartyAddButtonNg1Module } from '../partyAddButton/partyAddButton'; +import { PartyRemoveNg1Module } from '../partyRemove/partyRemove'; +import { PartyCreatorNg1Module } from '../partyCreator/partyCreator'; +import { PartyRsvpNg1Module } from '../partyRsvp/partyRsvp'; +import { PartyRsvpsListNg1Module } from '../partyRsvpsList/partyRsvpsList'; +import { PartyImageNg1Module } from '../partyImage/partyImage'; class PartiesList { constructor($scope, $reactive) { @@ -76,24 +76,29 @@ const name = 'partiesList'; const template = Meteor.isCordova ? mobileTemplate : webTemplate; // create a module -export default angular.module(name, [ +export const PartiesListNg1Module = angular.module(name, [ angularMeteor, uiRouter, utilsPagination, - PartiesSort, - PartiesMap, - PartyAddButton, - PartyRemove, - PartyCreator, - PartyRsvp, - PartyRsvpsList, - PartyImage -]).component(name, { - template, - controllerAs: name, - controller: PartiesList -}) - .config(config); + PartiesSortNg1Module.name, + PartiesMapNg1Module.name, + PartyAddButtonNg1Module.name, + PartyRemoveNg1Module.name, + PartyCreatorNg1Module.name, + PartyRsvpNg1Module.name, + PartyRsvpsListNg1Module.name, + PartyImageNg1Module.name +]); + +export function registerPartiesList() { + PartiesListNg1Module + .component(name, { + template, + controllerAs: name, + controller: PartiesList + }) + .config(config); +} function config($stateProvider) { 'ngInject'; diff --git a/imports/ui/components/partiesMap/partiesMap.js b/imports/ui/components/partiesMap/partiesMap.ts similarity index 55% rename from imports/ui/components/partiesMap/partiesMap.js rename to imports/ui/components/partiesMap/partiesMap.ts index 1c94fafe6..66543d748 100644 --- a/imports/ui/components/partiesMap/partiesMap.js +++ b/imports/ui/components/partiesMap/partiesMap.ts @@ -1,5 +1,5 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import 'angular-simple-logger'; import 'angular-google-maps'; @@ -23,15 +23,20 @@ class PartiesMap { const name = 'partiesMap'; // create a module -export default angular.module(name, [ +export const PartiesMapNg1Module = angular.module(name, [ angularMeteor, 'nemLogging', // https://github.com/angular-ui/angular-google-maps/issues/1633 'uiGmapgoogle-maps' -]).component(name, { - template, - controllerAs: name, - bindings: { - parties: '=' - }, - controller: PartiesMap -}); +]); + +export function registerPartiesMap() { + PartiesMapNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + parties: '=' + }, + controller: PartiesMap + }); +} diff --git a/imports/ui/components/partiesSort/client/partiesSort.tests.js b/imports/ui/components/partiesSort/client/partiesSort.tests.ts similarity index 100% rename from imports/ui/components/partiesSort/client/partiesSort.tests.js rename to imports/ui/components/partiesSort/client/partiesSort.tests.ts diff --git a/imports/ui/components/partiesSort/partiesSort.js b/imports/ui/components/partiesSort/partiesSort.js deleted file mode 100644 index 6ce584b47..000000000 --- a/imports/ui/components/partiesSort/partiesSort.js +++ /dev/null @@ -1,36 +0,0 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; - -import template from './partiesSort.html'; - -class PartiesSort { - constructor($timeout) { - 'ngInject'; - - $timeout(() => this.changed()); - } - - changed() { - this.onChange({ - sort: { - [this.property]: parseInt(this.order) - } - }); - } -} - -const name = 'partiesSort'; - -// create a module -export default angular.module(name, [ - angularMeteor -]).component(name, { - template, - bindings: { - onChange: '&', - property: '@', - order: '@' - }, - controllerAs: name, - controller: PartiesSort -}); diff --git a/imports/ui/components/partiesSort/partiesSort.ts b/imports/ui/components/partiesSort/partiesSort.ts new file mode 100644 index 000000000..93dfd2f14 --- /dev/null +++ b/imports/ui/components/partiesSort/partiesSort.ts @@ -0,0 +1,41 @@ +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; + +import template from './partiesSort.html'; + +class PartiesSort { + constructor($timeout) { + 'ngInject'; + + $timeout(() => this.changed()); + } + + changed() { + this.onChange({ + sort: { + [this.property]: parseInt(this.order) + } + }); + } +} + +const name = 'partiesSort'; + +// create a module +export const PartiesSortNg1Module = angular.module(name, [ + angularMeteor +]); + +export function registerPartiesSort() { + PartiesSortNg1Module + .component(name, { + template, + bindings: { + onChange: '&', + property: '@', + order: '@' + }, + controllerAs: name, + controller: PartiesSort + }); +} diff --git a/imports/ui/components/partyAdd/client/partyAdd.tests.js b/imports/ui/components/partyAdd/client/partyAdd.tests.ts similarity index 100% rename from imports/ui/components/partyAdd/client/partyAdd.tests.js rename to imports/ui/components/partyAdd/client/partyAdd.tests.ts diff --git a/imports/ui/components/partyAdd/partyAdd.js b/imports/ui/components/partyAdd/partyAdd.ts similarity index 50% rename from imports/ui/components/partyAdd/partyAdd.js rename to imports/ui/components/partyAdd/partyAdd.ts index 0ac9f9cfd..827acbfd6 100644 --- a/imports/ui/components/partyAdd/partyAdd.js +++ b/imports/ui/components/partyAdd/partyAdd.ts @@ -1,11 +1,11 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import { Meteor } from 'meteor/meteor'; import template from './partyAdd.html'; import { Parties } from '../../../api/parties'; -import { name as PartyUpload } from '../partyUpload/partyUpload'; +import { PartyUploadNg1Module } from '../partyUpload/partyUpload'; class PartyAdd { constructor() { @@ -31,14 +31,19 @@ class PartyAdd { const name = 'partyAdd'; // create a module -export default angular.module(name, [ +export const PartyAddNg1Module = angular.module(name, [ angularMeteor, - PartyUpload -]).component(name, { - template, - bindings: { - done: '&?' - }, - controllerAs: name, - controller: PartyAdd -}); + PartyUploadNg1Module.name +]); + +export function registerPartyAdd() { + PartyAddNg1Module + .component(name, { + template, + bindings: { + done: '&?' + }, + controllerAs: name, + controller: PartyAdd + }); +} diff --git a/imports/ui/components/partyAddButton/partyAddButton.js b/imports/ui/components/partyAddButton/partyAddButton.ts similarity index 53% rename from imports/ui/components/partyAddButton/partyAddButton.js rename to imports/ui/components/partyAddButton/partyAddButton.ts index cadd70ce7..94d34603a 100644 --- a/imports/ui/components/partyAddButton/partyAddButton.js +++ b/imports/ui/components/partyAddButton/partyAddButton.ts @@ -1,9 +1,9 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; -import buttonTemplate from './partyAddButton.html'; -import modalTemplate from './partyAddModal.html'; -import { name as PartyAdd } from '../partyAdd/partyAdd'; +import * as buttonTemplate from './partyAddButton.html'; +import * as modalTemplate from './partyAddModal.html'; +import { PartyAddNg1Module } from '../partyAdd/partyAdd'; class PartyAddButton { constructor($mdDialog, $mdMedia) { @@ -35,11 +35,16 @@ class PartyAddButton { const name = 'partyAddButton'; // create a module -export default angular.module(name, [ +export const PartyAddButtonNg1Module = angular.module(name, [ angularMeteor, - PartyAdd -]).component(name, { - template: buttonTemplate, - controllerAs: name, - controller: PartyAddButton -}); + PartyAddNg1Module.name +]); + +export function registerPartyAddButton() { + PartyAddButtonNg1Module + .component(name, { + template: buttonTemplate, + controllerAs: name, + controller: PartyAddButton + }); +} diff --git a/imports/ui/components/partyCreator/client/partyCreator.tests.js b/imports/ui/components/partyCreator/client/partyCreator.tests.ts similarity index 100% rename from imports/ui/components/partyCreator/client/partyCreator.tests.js rename to imports/ui/components/partyCreator/client/partyCreator.tests.ts diff --git a/imports/ui/components/partyCreator/partyCreator.js b/imports/ui/components/partyCreator/partyCreator.ts similarity index 57% rename from imports/ui/components/partyCreator/partyCreator.js rename to imports/ui/components/partyCreator/partyCreator.ts index b6911db3b..d7c91c13f 100644 --- a/imports/ui/components/partyCreator/partyCreator.js +++ b/imports/ui/components/partyCreator/partyCreator.ts @@ -1,10 +1,10 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import { Meteor } from 'meteor/meteor'; import template from './partyCreator.html'; -import { name as DisplayNameFilter } from '../../filters/displayNameFilter'; +import DisplayNameFilter from '../../filters/displayNameFilter'; /** * PartyCreator component @@ -38,14 +38,19 @@ class PartyCreator { const name = 'partyCreator'; // create a module -export default angular.module(name, [ +export const PartyCreatorNg1Module = angular.module(name, [ angularMeteor, - DisplayNameFilter -]).component(name, { - template, - controllerAs: name, - bindings: { - party: '<' - }, - controller: PartyCreator -}); + DisplayNameFilter.name +]); + +export function registerPartyCreator() { + PartyCreatorNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + party: '<' + }, + controller: PartyCreator + }); +} diff --git a/imports/ui/components/partyDetails/client/partyDetails.tests.js b/imports/ui/components/partyDetails/client/partyDetails.tests.ts similarity index 100% rename from imports/ui/components/partyDetails/client/partyDetails.tests.js rename to imports/ui/components/partyDetails/client/partyDetails.tests.ts diff --git a/imports/ui/components/partyDetails/partyDetails.js b/imports/ui/components/partyDetails/partyDetails.ts similarity index 75% rename from imports/ui/components/partyDetails/partyDetails.js rename to imports/ui/components/partyDetails/partyDetails.ts index 86adc6781..84e1bb26c 100644 --- a/imports/ui/components/partyDetails/partyDetails.js +++ b/imports/ui/components/partyDetails/partyDetails.ts @@ -1,13 +1,13 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import uiRouter from 'angular-ui-router'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as uiRouter from 'angular-ui-router'; import { Meteor } from 'meteor/meteor'; import template from './partyDetails.html'; import { Parties } from '../../../api/parties'; -import { name as PartyUninvited } from '../partyUninvited/partyUninvited'; -import { name as PartyMap } from '../partyMap/partyMap'; +import { PartyUninvitedNg1Module } from '../partyUninvited/partyUninvited'; +import { PartyMapNg1Module } from '../partyMap/partyMap'; class PartyDetails { constructor($stateParams, $scope, $reactive) { @@ -73,17 +73,22 @@ class PartyDetails { const name = 'partyDetails'; // create a module -export default angular.module(name, [ +export const PartyDetailsNg1Module = angular.module(name, [ angularMeteor, uiRouter, - PartyUninvited, - PartyMap -]).component(name, { - template, - controllerAs: name, - controller: PartyDetails -}) - .config(config); + PartyUninvitedNg1Module.name, + PartyMapNg1Module.name +]); + +export function registerPartyDetails() { + PartyDetailsNg1Module + .component(name, { + template, + controllerAs: name, + controller: PartyDetails + }) + .config(config); +} function config($stateProvider) { 'ngInject'; diff --git a/imports/ui/components/partyImage/partyImage.js b/imports/ui/components/partyImage/partyImage.ts similarity index 51% rename from imports/ui/components/partyImage/partyImage.js rename to imports/ui/components/partyImage/partyImage.ts index 64384c04d..84d5905c8 100644 --- a/imports/ui/components/partyImage/partyImage.js +++ b/imports/ui/components/partyImage/partyImage.ts @@ -1,9 +1,9 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import template from './partyImage.html'; import { Images } from '../../../api/images'; -import { name as DisplayImageFilter } from '../../filters/displayImageFilter'; +import DisplayImageFilter from '../../filters/displayImageFilter'; class PartyImage { constructor($scope, $reactive) { @@ -26,14 +26,19 @@ class PartyImage { const name = 'partyImage'; // create a module -export default angular.module(name, [ +export const PartyImageNg1Module = angular.module(name, [ angularMeteor, - DisplayImageFilter -]).component(name, { - template, - bindings: { - images: '<' - }, - controllerAs: name, - controller: PartyImage -}); + DisplayImageFilter.name +]); + +export function registerPartyImage() { + PartyImageNg1Module + .component(name, { + template, + bindings: { + images: '<' + }, + controllerAs: name, + controller: PartyImage + }); +} diff --git a/imports/ui/components/partyMap/partyMap.js b/imports/ui/components/partyMap/partyMap.ts similarity index 74% rename from imports/ui/components/partyMap/partyMap.js rename to imports/ui/components/partyMap/partyMap.ts index c062d3046..2dca6c5d7 100644 --- a/imports/ui/components/partyMap/partyMap.js +++ b/imports/ui/components/partyMap/partyMap.ts @@ -1,5 +1,5 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import 'angular-simple-logger'; import 'angular-google-maps'; @@ -47,15 +47,20 @@ class PartyMap { const name = 'partyMap'; // create a module -export default angular.module(name, [ +export const PartyMapNg1Module = angular.module(name, [ angularMeteor, 'nemLogging', // https://github.com/angular-ui/angular-google-maps/issues/1633 'uiGmapgoogle-maps' -]).component(name, { - template, - controllerAs: name, - bindings: { - location: '=' - }, - controller: PartyMap -}); +]); + +export function registerPartyMap() { + PartyMapNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + location: '=' + }, + controller: PartyMap + }); +} diff --git a/imports/ui/components/partyRemove/client/partyRemove.tests.js b/imports/ui/components/partyRemove/client/partyRemove.tests.ts similarity index 100% rename from imports/ui/components/partyRemove/client/partyRemove.tests.js rename to imports/ui/components/partyRemove/client/partyRemove.tests.ts diff --git a/imports/ui/components/partyRemove/partyRemove.js b/imports/ui/components/partyRemove/partyRemove.js deleted file mode 100644 index ab7356215..000000000 --- a/imports/ui/components/partyRemove/partyRemove.js +++ /dev/null @@ -1,27 +0,0 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; - -import template from './partyRemove.html'; -import { Parties } from '../../../api/parties'; - -class PartyRemove { - remove() { - if (this.party) { - Parties.remove(this.party._id); - } - } -} - -const name = 'partyRemove'; - -// create a module -export default angular.module(name, [ - angularMeteor -]).component(name, { - template, - bindings: { - party: '<' - }, - controllerAs: name, - controller: PartyRemove -}); diff --git a/imports/ui/components/partyRemove/partyRemove.ts b/imports/ui/components/partyRemove/partyRemove.ts new file mode 100644 index 000000000..f4377cb2d --- /dev/null +++ b/imports/ui/components/partyRemove/partyRemove.ts @@ -0,0 +1,32 @@ +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; + +import template from './partyRemove.html'; +import { Parties } from '../../../api/parties'; + +class PartyRemove { + remove() { + if (this.party) { + Parties.remove(this.party._id); + } + } +} + +const name = 'partyRemove'; + +// create a module +export const PartyRemoveNg1Module = angular.module(name, [ + angularMeteor +]); + +export function registerPartyRemove() { + PartyRemoveNg1Module + .component(name, { + template, + bindings: { + party: '<' + }, + controllerAs: name, + controller: PartyRemove + }); +} diff --git a/imports/ui/components/partyRsvp/partyRsvp.js b/imports/ui/components/partyRsvp/partyRsvp.ts similarity index 67% rename from imports/ui/components/partyRsvp/partyRsvp.js rename to imports/ui/components/partyRsvp/partyRsvp.ts index 522cc388a..1d9911536 100644 --- a/imports/ui/components/partyRsvp/partyRsvp.js +++ b/imports/ui/components/partyRsvp/partyRsvp.ts @@ -1,6 +1,6 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import _ from 'underscore'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as _ from 'underscore'; import { Meteor } from 'meteor/meteor'; @@ -50,13 +50,18 @@ class PartyRsvp { const name = 'partyRsvp'; // create a module -export default angular.module(name, [ +export const PartyRsvpNg1Module = angular.module(name, [ angularMeteor -]).component(name, { - template, - controllerAs: name, - bindings: { - party: '<' - }, - controller: PartyRsvp -}); +]) + +export function registerPartyRsvp() { + PartyRsvpNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + party: '<' + }, + controller: PartyRsvp + }); +} diff --git a/imports/ui/components/partyRsvpsList/partyRsvpsList.js b/imports/ui/components/partyRsvpsList/partyRsvpsList.js deleted file mode 100644 index 755c9f9ed..000000000 --- a/imports/ui/components/partyRsvpsList/partyRsvpsList.js +++ /dev/null @@ -1,20 +0,0 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; - -import template from './partyRsvpsList.html'; - -class PartyRsvpsList { } - -const name = 'partyRsvpsList'; - -// create a module -export default angular.module(name, [ - angularMeteor -]).component(name, { - template, - controllerAs: name, - bindings: { - rsvps: '<' - }, - controller: PartyRsvpsList -}); diff --git a/imports/ui/components/partyRsvpsList/partyRsvpsList.ts b/imports/ui/components/partyRsvpsList/partyRsvpsList.ts new file mode 100644 index 000000000..8872f9cdf --- /dev/null +++ b/imports/ui/components/partyRsvpsList/partyRsvpsList.ts @@ -0,0 +1,25 @@ +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; + +import template from './partyRsvpsList.html'; + +class PartyRsvpsList { } + +const name = 'partyRsvpsList'; + +// create a module +export const PartyRsvpsListNg1Module = angular.module(name, [ + angularMeteor +]); + +export function registerPartyRsvpsList() { + PartyRsvpsListNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + rsvps: '<' + }, + controller: PartyRsvpsList + }); +} diff --git a/imports/ui/components/partyUninvited/partyUninvited.js b/imports/ui/components/partyUninvited/partyUninvited.ts similarity index 51% rename from imports/ui/components/partyUninvited/partyUninvited.js rename to imports/ui/components/partyUninvited/partyUninvited.ts index 7958f5a96..4781e8b5a 100644 --- a/imports/ui/components/partyUninvited/partyUninvited.js +++ b/imports/ui/components/partyUninvited/partyUninvited.ts @@ -1,11 +1,11 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; import { Meteor } from 'meteor/meteor'; import template from './partyUninvited.html'; -import { name as UninvitedFilter } from '../../filters/uninvitedFilter'; -import { name as DisplayNameFilter } from '../../filters/displayNameFilter'; +import UninvitedFilter from '../../filters/uninvitedFilter'; +import DisplayNameFilter from '../../filters/displayNameFilter'; class PartyUninvited { constructor($scope) { @@ -36,15 +36,20 @@ class PartyUninvited { const name = 'partyUninvited'; // create a module -export default angular.module(name, [ +export const PartyUninvitedNg1Module = angular.module(name, [ angularMeteor, - UninvitedFilter, - DisplayNameFilter -]).component(name, { - template, - controllerAs: name, - bindings: { - party: '<' - }, - controller: PartyUninvited -}); + UninvitedFilter.name, + DisplayNameFilter.name +]); + +export function registerPartyUninvited() { + PartyUninvitedNg1Module + .component(name, { + template, + controllerAs: name, + bindings: { + party: '<' + }, + controller: PartyUninvited + }); +} diff --git a/imports/ui/components/partyUpload/partyUpload.js b/imports/ui/components/partyUpload/partyUpload.ts similarity index 79% rename from imports/ui/components/partyUpload/partyUpload.js rename to imports/ui/components/partyUpload/partyUpload.ts index 400368ebf..39e04ce37 100644 --- a/imports/ui/components/partyUpload/partyUpload.js +++ b/imports/ui/components/partyUpload/partyUpload.ts @@ -1,6 +1,6 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import ngFileUpload from 'ng-file-upload'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as ngFileUpload from 'ng-file-upload'; import 'angular-sortable-view'; import 'ng-img-crop/compile/minified/ng-img-crop'; import 'ng-img-crop/compile/minified/ng-img-crop.css'; @@ -76,16 +76,21 @@ class PartyUpload { const name = 'partyUpload'; // create a module -export default angular.module(name, [ +export const PartyUploadNg1Module = angular.module(name, [ angularMeteor, ngFileUpload, 'ngImgCrop', 'angular-sortable-view' -]).component(name, { - template, - bindings: { - files: '=?' - }, - controllerAs: name, - controller: PartyUpload -}); +]); + +export function registerPartyUpload() { + PartyUploadNg1Module + .component(name, { + template, + bindings: { + files: '=?' + }, + controllerAs: name, + controller: PartyUpload + }); +} diff --git a/imports/ui/components/password/password.js b/imports/ui/components/password/password.ts similarity index 66% rename from imports/ui/components/password/password.js rename to imports/ui/components/password/password.ts index c417f9518..f7ad1e044 100644 --- a/imports/ui/components/password/password.js +++ b/imports/ui/components/password/password.ts @@ -1,6 +1,6 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import uiRouter from 'angular-ui-router'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as uiRouter from 'angular-ui-router'; import { Accounts } from 'meteor/accounts-base'; @@ -35,16 +35,20 @@ class Register { const name = 'password'; // create a module -export default angular.module(name, [ +export const PasswordNg1Module = angular.module(name, [ angularMeteor, uiRouter -]) - .component(name, { - template, - controllerAs: name, - controller: Register - }) - .config(config); +]); + +export function registerPassword() { + PasswordNg1Module + .component(name, { + template, + controllerAs: name, + controller: Register + }) + .config(config); +} function config($stateProvider) { 'ngInject'; diff --git a/imports/ui/components/register/register.js b/imports/ui/components/register/register.ts similarity index 67% rename from imports/ui/components/register/register.js rename to imports/ui/components/register/register.ts index ab4ae9479..4f5850d4d 100644 --- a/imports/ui/components/register/register.js +++ b/imports/ui/components/register/register.ts @@ -1,6 +1,6 @@ -import angular from 'angular'; -import angularMeteor from 'angular-meteor'; -import uiRouter from 'angular-ui-router'; +import * as angular from 'angular'; +import * as angularMeteor from 'angular-meteor'; +import * as uiRouter from 'angular-ui-router'; import { Accounts } from 'meteor/accounts-base'; @@ -38,16 +38,20 @@ class Register { const name = 'register'; // create a module -export default angular.module(name, [ +export const RegisterNg1Module = angular.module(name, [ angularMeteor, uiRouter -]) - .component(name, { - template, - controllerAs: name, - controller: Register - }) - .config(config); +]); + +export function registerRegister() { + RegisterNg1Module + .component(name, { + template, + controllerAs: name, + controller: Register + }) + .config(config); +} function config($stateProvider) { 'ngInject'; diff --git a/imports/ui/filters/displayImageFilter.js b/imports/ui/filters/displayImageFilter.ts similarity index 93% rename from imports/ui/filters/displayImageFilter.js rename to imports/ui/filters/displayImageFilter.ts index aa2dfda90..2cd8c9ce2 100644 --- a/imports/ui/filters/displayImageFilter.js +++ b/imports/ui/filters/displayImageFilter.ts @@ -1,4 +1,4 @@ -import angular from 'angular'; +import * as angular from 'angular'; import { Meteor } from 'meteor/meteor'; diff --git a/imports/ui/filters/displayNameFilter.js b/imports/ui/filters/displayNameFilter.ts similarity index 91% rename from imports/ui/filters/displayNameFilter.js rename to imports/ui/filters/displayNameFilter.ts index 57d9250a6..05c405961 100644 --- a/imports/ui/filters/displayNameFilter.js +++ b/imports/ui/filters/displayNameFilter.ts @@ -1,4 +1,4 @@ -import angular from 'angular'; +import * as angular from 'angular'; const name = 'displayNameFilter'; diff --git a/imports/ui/filters/uninvitedFilter.js b/imports/ui/filters/uninvitedFilter.ts similarity index 85% rename from imports/ui/filters/uninvitedFilter.js rename to imports/ui/filters/uninvitedFilter.ts index cfe8d2d70..260bd0581 100644 --- a/imports/ui/filters/uninvitedFilter.js +++ b/imports/ui/filters/uninvitedFilter.ts @@ -1,5 +1,5 @@ -import angular from 'angular'; -import _ from 'underscore'; +import * as angular from 'angular'; +import * as _ from 'underscore'; const name = 'uninvitedFilter'; diff --git a/server/main.js b/server/main.ts similarity index 100% rename from server/main.js rename to server/main.ts