Skip to content

Commit 5e62fd9

Browse files
evereqevereq
authored
Merge pull request #510 from ever-co/develop
Develop
2 parents e226d09 + 1b14e13 commit 5e62fd9

File tree

63 files changed

+6788
-2871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+6788
-2871
lines changed

‎LICENSE.md

+4-1
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,16 @@ Different parts of the Platform are made available under the terms of the separa
1616
- Pyro shared modules - [MIT License](https://opensource.org/licenses/MIT)
1717
- Other shared modules - [GNU General Public License v3.0](https://www.gnu.org/licenses/gpl-3.0.txt)
1818

19+
We suggest to check a great overview about different open-source licenses at https://choosealicense.com/licenses.
20+
Feel free to [Contact Us](https://github.com/ever-co/ever#contact-us) for an additional information about used open-source licenses!
21+
1922
If you decide to choose the Ever Platform Community Edition License, you must comply with the following terms:
2023

2124
This program is free software: you can redistribute it and/or modify it under the terms of the corresponding licenses described in the LICENSE.md files located in software sub-folders and under the terms of licenses described in individual files.
2225

2326
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
2427

25-
You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses/.
28+
You should have received a copy of the relevant GNU Licenses along with this program. If not, see http://www.gnu.org/licenses.
2629

2730
### _Ever Platform Enterprise_ License
2831

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# Open-Source On-Demand Commerce Platform
66

7-
[Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform build with [TypeScript](http://www.typescriptlang.org).
7+
[Ever](https://ever.co)® is an Open-Source, Real-Time, Reactive, **On-Demand** Commerce Platform built with [TypeScript](http://www.typescriptlang.org).
88

99
![overview](https://docs.ever.co/docs/assets/overview_small.png)
1010

‎admin/website-angular/.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,7 @@ Thumbs.db
5757
.env.prod
5858
/src/environments/environment.ts
5959
/src/environments/environment.prod.ts
60+
61+
# storybook builds
62+
63+
/storybook-static

‎admin/website-angular/.storybook/addons.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
import '@storybook/addon-actions/register';
2+
import '@storybook/addon-links/register';
3+
import '@storybook/addon-notes/register';

‎admin/website-angular/.storybook/config.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
import { configure } from '@storybook/angular';
22

3+
// automatically import all files ending in *.stories.ts
4+
const req = require.context('../src/', true, /\.stories\.ts$/);
35
function loadStories() {
4-
require('../src/stories/index.ts');
6+
req.keys().forEach((filename) => req(filename));
57
}
68

79
configure(loadStories, module);

‎admin/website-angular/.storybook/tsconfig.json

+10-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
{
2-
"extends": "../tsconfig.json",
3-
"exclude": ["../src/test.ts", "../src/**/*.spec.ts"],
4-
"include": ["../src/**/*"]
2+
"extends": "../src/tsconfig.app.json",
3+
"compilerOptions": {
4+
"types": ["node", "googlemaps"]
5+
},
6+
"exclude": [
7+
"../src/test.ts",
8+
"../src/**/*.spec.ts",
9+
"../projects/**/*.spec.ts"
10+
],
11+
"include": ["../src/**/*", "../projects/**/*"]
512
}

‎admin/website-angular/package.json

+84-78
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
"config": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn ts-node ./scripts/configure.ts",
4141
"config:dev": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=dev",
4242
"config:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config -- --environment=prod",
43-
"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn build && ng serve",
43+
"start": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng serve",
4444
"build": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng build",
4545
"build:prod": "cross-env NODE_ENV=production NODE_OPTIONS=--max_old_space_size=4096 yarn run config:prod && yarn run build -- --prod --aot",
4646
"test": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && ng test",
@@ -54,153 +54,159 @@
5454
"docs": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs",
5555
"docs:serve": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && compodoc -p src/tsconfig.app.json -d docs -s",
5656
"release:changelog": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && yarn run conventional-changelog -- -p angular -i CHANGELOG.md -s",
57-
"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && start-storybook -p 9001 -c .storybook"
57+
"storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && start-storybook -p 9001 -c .storybook",
58+
"build-storybook": "cross-env NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 yarn run config:dev && build-storybook -c .storybook"
5859
},
5960
"dependencies": {
6061
"@agm/core": "^1.0.0-beta.5",
61-
"@angular/animations": "^7.2.11",
62-
"@angular/cdk": "^7.3.6",
63-
"@angular/common": "^7.2.11",
64-
"@angular/compiler": "^7.2.11",
65-
"@angular/core": "^7.2.11",
66-
"@angular/forms": "^7.2.11",
67-
"@angular/http": "^7.2.11",
68-
"@angular/platform-browser": "^7.2.11",
69-
"@angular/platform-browser-dynamic": "^7.2.11",
70-
"@angular/router": "^7.2.11",
71-
"@asymmetrik/ngx-leaflet": "^5.0.1",
72-
"@fortawesome/fontawesome-free": "^5.7.2",
73-
"@nebular/auth": "^3.2.1",
74-
"@nebular/bootstrap": "^3.2.1",
75-
"@nebular/security": "^3.2.1",
76-
"@nebular/theme": "^3.2.1",
77-
"@ng-bootstrap/ng-bootstrap": "^4.0.3",
78-
"@ng-select/ng-select": "^2.15.3",
62+
"@angular/animations": "^7.2.14",
63+
"@angular/cdk": "^7.3.7",
64+
"@angular/common": "^7.2.14",
65+
"@angular/compiler": "^7.2.14",
66+
"@angular/core": "^7.2.14",
67+
"@angular/forms": "^7.2.14",
68+
"@angular/http": "^7.2.14",
69+
"@angular/platform-browser": "^7.2.14",
70+
"@angular/platform-browser-dynamic": "^7.2.14",
71+
"@angular/router": "^7.2.14",
72+
"@asymmetrik/ngx-leaflet": "^5.0.2",
73+
"@fortawesome/fontawesome-free": "^5.8.1",
74+
"@nebular/auth": "^3.5.0",
75+
"@nebular/bootstrap": "^3.5.0",
76+
"@nebular/security": "^3.5.0",
77+
"@nebular/theme": "^3.5.0",
78+
"@ng-bootstrap/ng-bootstrap": "^4.1.1",
79+
"@ng-select/ng-select": "^2.18.0",
7980
"@ngx-translate/core": "^11.0.1",
8081
"@ngx-translate/http-loader": "^4.0.0",
81-
"@swimlane/ngx-charts": "^10.0.0",
82+
"@swimlane/ngx-charts": "^11.1.0",
8283
"angular-2-dropdown-multiselect": "^1.9.0",
83-
"angular-tree-component": "^8.2.0",
84+
"angular-tree-component": "^8.3.0",
8485
"angular2-chartjs": "^0.5.1",
8586
"angular2-logger": "^0.7.0",
8687
"angular2-toaster": "^7.0.0",
8788
"angular2-wizard": "github:maiyaporn/angular2-wizard#pull/56/head",
8889
"apollo-angular": "^1.5.0",
89-
"apollo-angular-link-http": "^1.4.0",
90-
"apollo-cache-inmemory": "^1.4.3",
91-
"apollo-client": "^2.4.13",
92-
"apollo-link": "^1.2.8",
93-
"apollo-link-context": "^1.0.14",
94-
"apollo-link-ws": "^1.0.14",
90+
"apollo-angular-link-http": "^1.6.0",
91+
"apollo-cache-inmemory": "^1.5.1",
92+
"apollo-client": "^2.5.1",
93+
"apollo-link": "^1.2.11",
94+
"apollo-link-context": "^1.0.17",
95+
"apollo-link-ws": "^1.0.17",
9596
"apollo-upload-client": "^10.0.0",
9697
"bootstrap": "^4.3.1",
9798
"buffer": "^5.2.1",
98-
"chart.js": "^2.7.3",
99-
"ckeditor": "^4.11.2",
99+
"chart.js": "^2.8.0",
100+
"ckeditor": "^4.11.4",
100101
"classlist.js": "1.1.20150312",
101-
"core-js": "^2.6.4",
102+
"core-js": "^3.0.1",
102103
"cryptiles": "^4.1.3",
103-
"echarts": "^4.2.1-rc.1",
104+
"echarts": "^4.2.1",
104105
"eva-icons": "^1.1.1",
105106
"faker": "^4.1.0",
106107
"fingerprintjs2": "^2.0.6",
107108
"global": "^4.3.2",
108-
"graphql": "^14.1.1",
109+
"graphql": "^14.2.1",
109110
"graphql-tag": "^2.10.1",
110111
"highlight.js": "^9.14.2",
111-
"intl": "1.2.5",
112-
"ionicons": "^4.5.5",
112+
"intl": "^1.2.5",
113+
"ionicons": "^4.5.6",
113114
"is-url": "^1.2.4",
114-
"jquery": "^3.3.1",
115+
"jquery": "^3.4.0",
115116
"jsbarcode": "^3.11.0",
116117
"leaflet": "^1.4.0",
117118
"moment": "^2.24.0",
118119
"nebular-icons": "1.1.0",
119-
"ng-simple-slideshow": "^1.2.8",
120+
"ng-simple-slideshow": "^1.2.9",
120121
"ng2-ckeditor": "^1.2.2",
121122
"ng2-completer": "2.0.8",
122123
"ng2-file-upload": "^1.3.0",
123124
"ng2-simple-timer": "^6.0.0",
124-
"ng2-smart-table": "1.3.5",
125+
"ng2-smart-table": "^1.4.0",
125126
"ng2-tree": "^2.0.0-rc.11",
126-
"ngx-echarts": "^4.1.0",
127+
"ngx-echarts": "^4.1.1",
127128
"ngx-highlightjs": "^2.1.4",
128-
"ngx-moment": "^3.3.0",
129+
"ngx-moment": "^3.4.0",
130+
"ngx-translate-multi-http-loader": "^3.0.0",
129131
"node-sass": "^4.11.0",
130132
"normalize.css": "^8.0.1",
131133
"pace-js": "1.0.2",
132-
"popper.js": "^1.14.7",
134+
"popper.js": "^1.15.0",
133135
"qrcode": "^1.3.3",
134136
"reflect-metadata": "^0.1.13",
135137
"roboto-fontface": "^0.10.0",
136-
"rxjs": "^6.4.0",
137-
"rxjs-compat": "^6.4.0",
138-
"socicon": "3.0.5",
138+
"rxjs": "^6.5.1",
139+
"rxjs-compat": "^6.5.1",
140+
"socicon": "^3.0.5",
139141
"socket.io-client": "^2.2.0",
140-
"stripe": "^6.25.0",
141-
"subscriptions-transport-ws": "^0.9.15",
142-
"tinymce": "^5.0.0",
142+
"stripe": "^7.0.0",
143+
"subscriptions-transport-ws": "^0.9.16",
144+
"tinymce": "^5.0.4",
143145
"tslib": "^1.9.3",
144146
"typeface-exo": "^0.0.61",
145147
"uuid": "^3.3.2",
146148
"web-animations-js": "^2.3.1",
147-
"zen-observable": "^0.8.13",
148-
"zone.js": "^0.8.29"
149+
"zen-observable": "^0.8.14",
150+
"zone.js": "^0.9.0"
149151
},
150152
"devDependencies": {
151-
"conventional-changelog-cli": "^2.0.12",
153+
"@angular-devkit/architect": "^0.13.8",
152154
"@angular-devkit/build-angular": "^0.13.8",
153155
"@angular-devkit/build-webpack": "^0.13.8",
154-
"@angular-devkit/architect": "^0.13.8",
155156
"@angular-devkit/core": "^7.3.8",
156157
"@angular-devkit/schematics": "^7.3.8",
157158
"@angular/cli": "^7.3.8",
158-
"@angular/compiler-cli": "^7.2.11",
159-
"@angular/language-service": "^7.2.11",
160-
"@babel/core": "^7.4.0",
159+
"@angular/compiler-cli": "^7.2.14",
160+
"@angular/language-service": "^7.2.14",
161+
"@babel/core": "^7.4.3",
161162
"@compodoc/compodoc": "^1.1.9",
162-
"@storybook/addon-actions": "^5.0.6",
163-
"@storybook/angular": "^5.0.6",
163+
"@storybook/addon-actions": "^5.0.10",
164+
"@storybook/addon-knobs": "^5.0.10",
165+
"@storybook/addon-links": "^5.0.10",
166+
"@storybook/addon-notes": "^5.0.10",
167+
"@storybook/addons": "^5.0.10",
168+
"@storybook/angular": "^5.0.10",
164169
"@types/async": "^2.4.1",
165170
"@types/d3-color": "^1.2.2",
166171
"@types/faker": "^4.1.5",
167-
"@types/googlemaps": "^3.30.16",
172+
"@types/googlemaps": "^3.30.19",
168173
"@types/highlight.js": "^9.12.3",
169-
"@types/jasmine": "^3.3.9",
174+
"@types/jasmine": "^3.3.12",
170175
"@types/jasminewd2": "^2.0.6",
171-
"@types/leaflet": "^1.4.2",
172-
"@types/mongodb": "^3.1.19",
173-
"@types/mongoose": "^5.3.16",
174-
"@types/node": "^11.9.3",
176+
"@types/leaflet": "^1.4.4",
177+
"@types/mongodb": "^3.1.25",
178+
"@types/mongoose": "^5.3.26",
179+
"@types/node": "^12.0.2",
175180
"@types/socket.io-client": "^1.4.32",
176-
"@types/stripe": "^6.25.7",
181+
"@types/stripe": "^6.25.17",
177182
"@types/uuid": "^3.4.4",
178183
"@types/yargs": "^13.0.0",
179184
"babel-loader": "^8.0.5",
180-
"codelyzer": "^4.5.0",
185+
"codelyzer": "^5.0.1",
186+
"conventional-changelog-cli": "^2.0.17",
181187
"cross-env": "^5.2.0",
182-
"dotenv": "^6.2.0",
183-
"envalid": "^4.2.2",
184-
"husky": "^1.3.1",
185-
"jasmine-core": "^3.3.0",
188+
"dotenv": "^8.0.0",
189+
"envalid": "^5.0.0",
190+
"husky": "^2.3.0",
191+
"jasmine-core": "^3.4.0",
186192
"jasmine-spec-reporter": "^4.2.1",
187-
"karma": "^4.0.0",
193+
"karma": "^4.1.0",
188194
"karma-chrome-launcher": "^2.2.0",
189195
"karma-cli": "^2.0.0",
190-
"karma-coverage-istanbul-reporter": "^2.0.4",
196+
"karma-coverage-istanbul-reporter": "^2.0.5",
191197
"karma-jasmine": "^2.0.1",
192-
"karma-jasmine-html-reporter": "^1.4.0",
198+
"karma-jasmine-html-reporter": "^1.4.2",
193199
"npm-run-all": "^4.1.5",
194200
"protractor": "^5.4.2",
195201
"rimraf": "^2.6.3",
196202
"rxjs-tslint": "0.1.5",
197-
"stylelint": "^9.10.1",
198-
"ts-node": "^8.0.2",
199-
"tslint": "^5.12.1",
200-
"tslint-language-service": "^0.9.9",
201-
"typescript": "~3.1.6",
202-
"webpack-dev-server": "^3.2.1",
203-
"yargs": "^13.1.0"
203+
"stylelint": "^10.0.1",
204+
"ts-node": "^8.1.0",
205+
"tslint": "^5.16.0",
206+
"typescript": "~3.2.4",
207+
"typescript-tslint-plugin": "^0.3.1",
208+
"webpack-dev-server": "^3.3.1",
209+
"yargs": "^13.2.4"
204210
},
205211
"engines": {
206212
"node": ">=10.15.0",

‎admin/website-angular/src/app/@core/utils/i18n.module.ts

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
import { NgModule } from '@angular/core';
2+
import { HttpClientModule, HttpClient } from '@angular/common/http';
3+
import {
4+
TranslateModule,
5+
TranslateLoader,
6+
TranslateService
7+
} from '@ngx-translate/core';
8+
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
9+
10+
// AoT requires an exported function for factories
11+
export function HttpLoaderFactory(http: HttpClient) {
12+
return new TranslateHttpLoader(http);
13+
}
14+
15+
@NgModule({
16+
declarations: [],
17+
imports: [
18+
HttpClientModule,
19+
TranslateModule.forRoot({
20+
loader: {
21+
provide: TranslateLoader,
22+
useFactory: HttpLoaderFactory,
23+
deps: [HttpClient]
24+
}
25+
})
26+
],
27+
exports: [TranslateModule]
28+
})
29+
export class I18nModule {
30+
constructor(translate: TranslateService) {
31+
translate.setDefaultLang('en');
32+
translate.use('en');
33+
}
34+
}

‎admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.html

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<ng2-smart-table
2+
class="category-table"
23
[settings]="settingsSmartTable"
34
[source]="sourceSmartTable"
45
(userRowSelect)="selectCategoryTmp($event)"

‎admin/website-angular/src/app/@shared/product/categories/categories-table/categories-table.component.ts

+4-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,10 @@ export class CategoriesTableComponent implements OnInit, OnDestroy {
6565
private readonly _modalService: NgbModal,
6666
private readonly _notifyService: NotifyService,
6767
private readonly modalService: NgbModal
68-
) {}
68+
) {
69+
this._translateService.setDefaultLang('en');
70+
this._translateService.use('en');
71+
}
6972

7073
get hasSelectedCategories(): boolean {
7174
return this._selectedCategories.length > 0;

0 commit comments

Comments
 (0)