Merge "Searching for models into client cache"
diff --git a/conf/app/app.config.local.ts b/conf/app/app.config.local.ts
new file mode 100644
index 0000000..a00155b
--- /dev/null
+++ b/conf/app/app.config.local.ts
@@ -0,0 +1,5 @@
+import {IAppConfig} from './interfaces';
+export const AppConfig: IAppConfig = {
+ apiEndpoint: 'http://localhost:4000/api',
+ websocketClient: 'http://localhost:4000/'
+};
diff --git a/conf/webpack-dist.conf.js b/conf/webpack-dist.conf.js
index 85ec542..54ac67e 100644
--- a/conf/webpack-dist.conf.js
+++ b/conf/webpack-dist.conf.js
@@ -90,6 +90,7 @@
]
},
entry: {
+ config: `./${conf.path.src('app/config/style.config.ts')}`,
app: `./${conf.path.src('index')}`,
vendor: Object.keys(pkg.dependencies)
},
@@ -100,3 +101,4 @@
configuration: require('../tslint.json')
}
};
+
diff --git a/src/app/core/login/login.ts b/src/app/core/login/login.ts
index 2dcabe9..a08c17d 100644
--- a/src/app/core/login/login.ts
+++ b/src/app/core/login/login.ts
@@ -38,7 +38,9 @@
.then(() => {
this.$state.go('xos.dashboard');
})
- .catch(e => console.error);
+ .catch(e => {
+ console.error(e);
+ });
}
private getImg(img: string) {
diff --git a/src/app/core/services/helpers/config.helpers.spec.ts b/src/app/core/services/helpers/config.helpers.spec.ts
index 837491a..3e90d33 100644
--- a/src/app/core/services/helpers/config.helpers.spec.ts
+++ b/src/app/core/services/helpers/config.helpers.spec.ts
@@ -89,7 +89,7 @@
it('should pluralize string', () => {
expect(service.pluralize('test')).toEqual('tests');
expect(service.pluralize('test', 1)).toEqual('test');
- expect(service.pluralize('xos')).toEqual('xosses');
+ expect(service.pluralize('xos')).toEqual('xoses');
expect(service.pluralize('slice')).toEqual('slices');
expect(service.pluralize('Slice', 1)).toEqual('Slice');
});
diff --git a/src/app/core/services/helpers/config.helpers.ts b/src/app/core/services/helpers/config.helpers.ts
index d0fbed9..dce81b6 100644
--- a/src/app/core/services/helpers/config.helpers.ts
+++ b/src/app/core/services/helpers/config.helpers.ts
@@ -61,7 +61,7 @@
private AuthService: IXosAuthService,
private ModelStore: IModelStoreService
) {
- pluralize.addIrregularRule('xos', 'xosses');
+ pluralize.addIrregularRule('xos', 'xoses');
pluralize.addPluralRule(/slice$/i, 'slices');
pluralize.addSingularRule(/slice$/i, 'slice');
}
diff --git a/src/app/datasources/helpers/store.helpers.spec.ts b/src/app/datasources/helpers/store.helpers.spec.ts
index b8ba662..2cb1eaf 100644
--- a/src/app/datasources/helpers/store.helpers.spec.ts
+++ b/src/app/datasources/helpers/store.helpers.spec.ts
@@ -43,7 +43,7 @@
it('should convert a core model name in an URL', () => {
expect(service.urlFromCoreModel('Slice')).toBe('/core/slices');
- expect(service.urlFromCoreModel('Xos')).toBe('/core/xosses');
+ expect(service.urlFromCoreModel('Xos')).toBe('/core/xoses');
// handling exceptions
expect(service.urlFromCoreModel('SiteRole')).toBe('/core/site_roles');