Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit c9d119c

Browse files
authored
Merge pull request #103 from Rebolon/feature/move-on-angular6
Feature/move on angular6
2 parents b607a4d + aa88c79 commit c9d119c

File tree

87 files changed

+5634
-14697
lines changed

Some content is hidden

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

87 files changed

+5634
-14697
lines changed

‎README.md‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ Then some php controllers has been created on following routes :
5151
* /demo/vuejs : VuejsController with route config in annotations and VueJS app with specific js/css import
5252
* /demo/quasar : QuasarController like VuejsController but with the Quasar framework for UX components
5353
* /demo/form/quasar-vuejs : [Work in progress] authentification with javascript, and a full web application with vuejs and api-platform(rest/graphql)
54+
* /demo/form/devxpress-angular : Angular6 demo with DevXpress UI components (Datagrid and a Wizard sample with local storage and a sumup zone)
5455
* /demo/form/devxpress-vuejs : VueJS demo with DevXpress UI components (Datagrid)
55-
* /demo/form/devxpress-angular : Angular5 demo with DevXpress UI components (Datagrid and a Wizard sample with local storage and a sumup zone)
5656
* /api : access ApiPlatform api doc (you need to be authentified from /demo/form if you want to play with it: all entities are configured to be accessed with ROLE_USER)
5757
* /api/graphql : access ApiPlatform GraphQL implementation (beta release)
5858
* /demo/api-platform-admin-react : the react admin provided by api platform package (more info here [https://api-platform.com/docs/admin/getting-started](https://api-platform.com/docs/admin/getting-started))
@@ -501,6 +501,10 @@ It takes the following JSON string as Body:
501501
- [x] front: setup VueJS
502502
- [x] front: use Quasar with VueJS
503503
- [x] front: move on Quasar 0.15.x
504+
- [ ] front: move on Quasar 0.17.x
505+
- [x] front: move on Angular 6 with HttpInterceptor, Guards, SSR
506+
- [x] front: Angular6 with prod build, the assets (js/css) are not wel loaded coz they are generated with versoning hash whereas the twig template load them in hard without hash (no manijest may help the asset helper)
507+
- [x] front: move on Devxtreme 18.x and use it with VueJS
504508
- [x] front: setup CSRF protection with VueJS app
505509
- [ ] front: migrate app 'form-devextrem-angular' to angular6 when there will be compatible (this thread may helps: https://stackoverflow.com/questions/48970553/want-to-upgrade-project-from-angular-v5-to-angular-v6)
506510
- [x] quality: setup unit tests for JS (karma/jasmine)
@@ -511,7 +515,7 @@ It takes the following JSON string as Body:
511515
- [x] quality: write some PHP tests
512516
- [ ] quality: fix testcafe role where sometimes they are not played: https://testcafe-discuss.devexpress.com/t/role-sometime-it-doesnt-seem-to-be-played/875
513517
- [x] quality: setup tests reports
514-
- [] security: setup security with Symfony (ticket open coz i get 500 instead of 403: https://github.com/symfony/symfony/issues/25806) and choose between cookie (stateful), JWT (with Lexik bundle) or ApiKey (https://symfony.com/doc/current/security/guard_authentication.html)
518+
- [x] security: setup security with Symfony (ticket open coz i get 500 instead of 403: https://github.com/symfony/symfony/issues/25806 Still WIP at this time) and choose between cookie (stateful), JWT (with Lexik bundle) or ApiKey (https://symfony.com/doc/current/security/guard_authentication.html) : I implement both statefull and JWT samples, but i didn't take the time for ApiKey
515519
- [x] back: setup EasyAdminBundle
516520
- [ ] back: improve EasyAdminBundle with custom screen
517521
- [x] back: setup React Admin from ApiPlatform (take care at this issue is mandatory https://github.com/api-platform/api-platform/issues/584)

‎assets/js/form-devxpress-angular/.angular-cli.json‎

Lines changed: 0 additions & 67 deletions
This file was deleted.

‎assets/js/form-devxpress-angular/.gitignore‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
# compiled output
44
/dist
5-
/dist-server
65
/tmp
76
/out-tsc
87

@@ -35,10 +34,6 @@ yarn-error.log
3534
testem.log
3635
/typings
3736

38-
# e2e
39-
/e2e/*.js
40-
/e2e/*.map
41-
4237
# System Files
4338
.DS_Store
4439
Thumbs.db

‎assets/js/form-devxpress-angular/README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# DevxpressAngular
1+
# devxpress
22

3-
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.7.3.
3+
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.2.1.
44

55
## Development server
66

@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
1212

1313
## Build
1414

15-
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
15+
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
1616

1717
## Running unit tests
1818

Lines changed: 133 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,133 @@
1+
{
2+
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
3+
"version": 1,
4+
"newProjectRoot": "projects",
5+
"projects": {
6+
"devxpress": {
7+
"root": "",
8+
"sourceRoot": "src",
9+
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {
12+
"@schematics/angular:component": {
13+
"styleext": "scss"
14+
}
15+
},
16+
"targets": {
17+
"build": {
18+
"builder": "@angular-devkit/build-angular:browser",
19+
"options": {
20+
"outputPath": "../../../public/dist-ng/devxpress/",
21+
"index": "src/index.html",
22+
"main": "src/main.ts",
23+
"polyfills": "src/polyfills.ts",
24+
"tsConfig": "src/tsconfig.app.json",
25+
"assets": [
26+
"src/favicon.ico",
27+
"src/assets"
28+
],
29+
"styles": [
30+
"node_modules/devextreme/dist/css/dx.common.css",
31+
"node_modules/devextreme/dist/css/dx.light.compact.css",
32+
"src/styles.css"
33+
],
34+
"scripts": []
35+
},
36+
"configurations": {
37+
"production": {
38+
"fileReplacements": [
39+
{
40+
"replace": "src/environments/environment.ts",
41+
"with": "src/environments/environment.prod.ts"
42+
}
43+
],
44+
"optimization": true,
45+
"outputHashing": "all",
46+
"sourceMap": false,
47+
"extractCss": true,
48+
"namedChunks": false,
49+
"aot": true,
50+
"extractLicenses": true,
51+
"vendorChunk": false,
52+
"buildOptimizer": true
53+
}
54+
}
55+
},
56+
"serve": {
57+
"builder": "@angular-devkit/build-angular:dev-server",
58+
"options": {
59+
"browserTarget": "devxpress:build"
60+
},
61+
"configurations": {
62+
"production": {
63+
"browserTarget": "devxpress:build:production"
64+
}
65+
}
66+
},
67+
"extract-i18n": {
68+
"builder": "@angular-devkit/build-angular:extract-i18n",
69+
"options": {
70+
"browserTarget": "devxpress:build"
71+
}
72+
},
73+
"test": {
74+
"builder": "@angular-devkit/build-angular:karma",
75+
"options": {
76+
"main": "src/test.ts",
77+
"polyfills": "src/polyfills.ts",
78+
"tsConfig": "src/tsconfig.spec.json",
79+
"karmaConfig": "src/karma.conf.js",
80+
"styles": [
81+
"src/styles.css"
82+
],
83+
"scripts": [],
84+
"assets": [
85+
"src/favicon.ico",
86+
"src/assets"
87+
]
88+
}
89+
},
90+
"lint": {
91+
"builder": "@angular-devkit/build-angular:tslint",
92+
"options": {
93+
"tsConfig": [
94+
"src/tsconfig.app.json",
95+
"src/tsconfig.spec.json"
96+
],
97+
"exclude": [
98+
"**/node_modules/**"
99+
]
100+
}
101+
}
102+
}
103+
},
104+
"devxpress-e2e": {
105+
"root": "e2e/",
106+
"projectType": "application",
107+
"targets": {
108+
"e2e": {
109+
"builder": "@angular-devkit/build-angular:protractor",
110+
"options": {
111+
"protractorConfig": "e2e/protractor.conf.js",
112+
"devServerTarget": "devxpress:serve"
113+
},
114+
"configurations": {
115+
"production": {
116+
"devServerTarget": "devxpress:serve:production"
117+
}
118+
}
119+
},
120+
"lint": {
121+
"builder": "@angular-devkit/build-angular:tslint",
122+
"options": {
123+
"tsConfig": "e2e/tsconfig.e2e.json",
124+
"exclude": [
125+
"**/node_modules/**"
126+
]
127+
}
128+
}
129+
}
130+
}
131+
},
132+
"defaultProject": "devxpress"
133+
}

‎assets/js/form-devxpress-angular/protractor.conf.js‎ renamed to ‎assets/js/form-devxpress-angular/e2e/protractor.conf.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter');
66
exports.config = {
77
allScriptsTimeout: 11000,
88
specs: [
9-
'./e2e/**/*.e2e-spec.ts'
9+
'./src/**/*.e2e-spec.ts'
1010
],
1111
capabilities: {
1212
'browserName': 'chrome'
@@ -21,8 +21,8 @@ exports.config = {
2121
},
2222
onPrepare() {
2323
require('ts-node').register({
24-
project: 'e2e/tsconfig.e2e.json'
24+
project: require('path').join(__dirname,'./tsconfig.e2e.json')
2525
});
2626
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
2727
}
28-
};
28+
};
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { AppPage } from './app.po';
22

3-
describe('devxpress-angular App', () => {
3+
describe('workspace-project App', () => {
44
let page: AppPage;
55

66
beforeEach(() => {
@@ -9,6 +9,6 @@ describe('devxpress-angular App', () => {
99

1010
it('should display welcome message', () => {
1111
page.navigateTo();
12-
expect(page.getParagraphText()).toEqual('Welcome to app!');
12+
expect(page.getParagraphText()).toEqual('Welcome to devxpress!');
1313
});
1414
});
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4-
"outDir": "../out-tsc/e2e",
5-
"baseUrl": "./",
4+
"outDir": "../out-tsc/app",
65
"module": "commonjs",
76
"target": "es5",
87
"types": [
@@ -11,4 +10,4 @@
1110
"node"
1211
]
1312
}
14-
}
13+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /