Skip to content

Commit 4858f9e

Browse files
mledourmledour
committed
resolve conflics
2 parents ad3be3a + c08548b commit 4858f9e

File tree

239 files changed

+11798
-5642
lines changed

Some content is hidden

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

239 files changed

+11798
-5642
lines changed

‎.gitignore‎

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

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

@@ -31,13 +30,10 @@ dist.tgz
3130
/coverage
3231
/libpeerconnection.log
3332
npm-debug.log
33+
yarn-error.log
3434
testem.log
3535
/typings
3636

37-
# e2e
38-
/e2e/*.js
39-
/e2e/*.map
40-
4137
# System Files
4238
.DS_Store
4339
Thumbs.db

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ $ npm run build:lib
3636

3737
## Dependencies
3838

39-
* admin-lte css
40-
* bootstrap css
39+
* admin-lte-css
4140

4241
## Todos
4342

‎angular.json‎

Lines changed: 77 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,40 @@
11
{
22
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
33
"version": 1,
4-
"newProjectRoot": "projects",
4+
"newProjectRoot": "library",
55
"projects": {
6-
"angular-admin-lte": {
6+
"angular-admin-lte-demo": {
77
"root": "",
88
"sourceRoot": "src",
99
"projectType": "application",
10+
"prefix": "app",
11+
"schematics": {},
1012
"architect": {
1113
"build": {
1214
"builder": "@angular-devkit/build-angular:browser",
1315
"options": {
14-
"outputPath": "demo/dist",
15-
"index": "demo/src/index.html",
16-
"main": "demo/src/main.ts",
17-
"tsConfig": "demo/src/tsconfig.app.json",
18-
"polyfills": "demo/src/polyfills.ts",
16+
"outputPath": "dist/angular-admin-lte-demo",
17+
"index": "src/index.html",
18+
"main": "src/main.ts",
19+
"polyfills": "src/polyfills.ts",
20+
"tsConfig": "src/tsconfig.app.json",
1921
"assets": [
20-
{ "glob": "**/*", "input": "demo/src/assets/", "output": "/assets/" },
21-
{ "glob": "favicon.ico", "input": "demo/src", "output": "/" },
22+
"src/favicon.ico",
23+
"src/assets"
2224
],
2325
"styles": [
24-
"node_modules/bootstrap/dist/css/bootstrap.css",
25-
"node_modules/font-awesome/css/font-awesome.css",
26-
"node_modules/ionicons/css/ionicons.css",
27-
"node_modules/morris.js/morris.css",
28-
"node_modules/prismjs/themes/prism-tomorrow.css",
29-
"node_modules/admin-lte/dist/css/AdminLTE.css",
30-
"node_modules/admin-lte/dist/css/skins/_all-skins.css",
31-
"demo/src/styles.css"
26+
"src/styles.css"
3227
],
33-
"scripts": [
34-
"node_modules/prismjs/prism.js",
35-
"node_modules/prismjs/components/prism-typescript.js"
36-
]
28+
"scripts": []
3729
},
3830
"configurations": {
3931
"production": {
32+
"fileReplacements": [
33+
{
34+
"replace": "src/environments/environment.ts",
35+
"with": "src/environments/environment.prod.ts"
36+
}
37+
],
4038
"optimization": true,
4139
"outputHashing": "all",
4240
"sourceMap": false,
@@ -45,66 +43,50 @@
4543
"aot": true,
4644
"extractLicenses": true,
4745
"vendorChunk": false,
48-
"buildOptimizer": true,
49-
"fileReplacements": [
50-
{
51-
"replace": "demo/src/environments/environment.ts",
52-
"with": "demo/src/environments/environment.prod.ts"
53-
}
54-
]
46+
"buildOptimizer": true
5547
}
5648
}
5749
},
5850
"serve": {
5951
"builder": "@angular-devkit/build-angular:dev-server",
6052
"options": {
61-
"browserTarget": "angular-admin-lte:build"
53+
"browserTarget": "angular-admin-lte-demo:build"
6254
},
6355
"configurations": {
6456
"production": {
65-
"browserTarget": "angular-admin-lte:build:production"
57+
"browserTarget": "angular-admin-lte-demo:build:production"
6658
}
6759
}
6860
},
6961
"extract-i18n": {
7062
"builder": "@angular-devkit/build-angular:extract-i18n",
7163
"options": {
72-
"browserTarget": "angular-admin-lte:build"
64+
"browserTarget": "angular-admin-lte-demo:build"
7365
}
7466
},
7567
"test": {
7668
"builder": "@angular-devkit/build-angular:karma",
7769
"options": {
78-
"main": "demo/src/test.ts",
79-
"karmaConfig": "./karma.conf.js",
80-
"polyfills": "demo/src/polyfills.ts",
81-
"tsConfig": "demo/src/tsconfig.spec.json",
82-
"scripts": [
83-
"node_modules/prismjs/prism.js",
84-
"node_modules/prismjs/components/prism-typescript.js"
85-
],
70+
"main": "src/test.ts",
71+
"polyfills": "src/polyfills.ts",
72+
"tsConfig": "src/tsconfig.spec.json",
73+
"karmaConfig": "src/karma.conf.js",
8674
"styles": [
87-
"node_modules/bootstrap/dist/css/bootstrap.css",
88-
"node_modules/font-awesome/css/font-awesome.css",
89-
"node_modules/ionicons/css/ionicons.css",
90-
"node_modules/morris.js/morris.css",
91-
"node_modules/prismjs/themes/prism-tomorrow.css",
92-
"node_modules/admin-lte/dist/css/AdminLTE.css",
93-
"node_modules/admin-lte/dist/css/skins/_all-skins.css",
94-
"demo/src/styles.css"
75+
"styles.css"
9576
],
77+
"scripts": [],
9678
"assets": [
97-
"demo/src/assets",
98-
"demo/src/favicon.ico"
79+
"src/favicon.ico",
80+
"src/assets"
9981
]
10082
}
10183
},
10284
"lint": {
10385
"builder": "@angular-devkit/build-angular:tslint",
10486
"options": {
10587
"tsConfig": [
106-
"demo/src/tsconfig.app.json",
107-
"demo/src/tsconfig.spec.json"
88+
"src/tsconfig.app.json",
89+
"src/tsconfig.spec.json"
10890
],
10991
"exclude": [
11092
"**/node_modules/**"
@@ -113,23 +95,60 @@
11395
}
11496
}
11597
},
116-
"angular-admin-lte-e2e": {
117-
"root": "",
118-
"sourceRoot": "",
98+
"angular-admin-lte-demo-e2e": {
99+
"root": "e2e/",
119100
"projectType": "application",
120101
"architect": {
121102
"e2e": {
122103
"builder": "@angular-devkit/build-angular:protractor",
123104
"options": {
124-
"protractorConfig": "./protractor.conf.js",
125-
"devServerTarget": "angular-admin-lte:serve"
105+
"protractorConfig": "e2e/protractor.conf.js",
106+
"devServerTarget": "angular-admin-lte-demo:serve"
107+
}
108+
},
109+
"lint": {
110+
"builder": "@angular-devkit/build-angular:tslint",
111+
"options": {
112+
"tsConfig": "e2e/tsconfig.e2e.json",
113+
"exclude": [
114+
"**/node_modules/**"
115+
]
116+
}
117+
}
118+
}
119+
},
120+
"angular-admin-lte": {
121+
"root": "library/angular-admin-lte",
122+
"sourceRoot": "library/angular-admin-lte/src",
123+
"projectType": "library",
124+
"prefix": "lib",
125+
"architect": {
126+
"build": {
127+
"builder": "@angular-devkit/build-ng-packagr:build",
128+
"options": {
129+
"tsConfig": "library/angular-admin-lte/tsconfig.lib.json",
130+
"project": "library/angular-admin-lte/ng-package.json"
131+
},
132+
"configurations": {
133+
"production": {
134+
"project": "library/angular-admin-lte/ng-package.prod.json"
135+
}
136+
}
137+
},
138+
"test": {
139+
"builder": "@angular-devkit/build-angular:karma",
140+
"options": {
141+
"main": "library/angular-admin-lte/src/test.ts",
142+
"tsConfig": "library/angular-admin-lte/tsconfig.spec.json",
143+
"karmaConfig": "library/angular-admin-lte/karma.conf.js"
126144
}
127145
},
128146
"lint": {
129147
"builder": "@angular-devkit/build-angular:tslint",
130148
"options": {
131149
"tsConfig": [
132-
"e2e/tsconfig.e2e.json"
150+
"library/angular-admin-lte/tsconfig.lib.json",
151+
"library/angular-admin-lte/tsconfig.spec.json"
133152
],
134153
"exclude": [
135154
"**/node_modules/**"
@@ -139,14 +158,5 @@
139158
}
140159
}
141160
},
142-
"defaultProject": "angular-admin-lte",
143-
"schematics": {
144-
"@schematics/angular:component": {
145-
"prefix": "app",
146-
"styleext": "css"
147-
},
148-
"@schematics/angular:directive": {
149-
"prefix": "app"
150-
}
151-
}
161+
"defaultProject": "angular-admin-lte-demo"
152162
}

‎e2e/protractor.conf.js‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// Protractor configuration file, see link for more information
2+
// https://github.com/angular/protractor/blob/master/lib/config.ts
3+
4+
const { SpecReporter } = require('jasmine-spec-reporter');
5+
6+
exports.config = {
7+
allScriptsTimeout: 11000,
8+
specs: [
9+
'./lib/**/*.e2e-spec.ts'
10+
],
11+
capabilities: {
12+
'browserName': 'chrome'
13+
},
14+
directConnect: true,
15+
baseUrl: 'http://localhost:4200/',
16+
framework: 'jasmine',
17+
jasmineNodeOpts: {
18+
showColors: true,
19+
defaultTimeoutInterval: 30000,
20+
print: function() {}
21+
},
22+
onPrepare() {
23+
require('ts-node').register({
24+
project: require('path').join(__dirname, './tsconfig.e2e.json')
25+
});
26+
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
27+
}
28+
};

‎e2e/src/app.e2e-spec.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
import { AppPage } from './app.po';
2+
3+
describe('workspace-project App', () => {
4+
let page: AppPage;
5+
6+
beforeEach(() => {
7+
page = new AppPage();
8+
});
9+
10+
it('should display welcome message', () => {
11+
page.navigateTo();
12+
expect(page.getParagraphText()).toEqual('Welcome to app!');
13+
});
14+
});

‎e2e/src/app.po.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { browser, by, element } from 'protractor';
2+
3+
export class AppPage {
4+
navigateTo() {
5+
return browser.get('/');
6+
}
7+
8+
getParagraphText() {
9+
return element(by.css('app-root h1')).getText();
10+
}
11+
}

‎e2e/tsconfig.e2e.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
22
"extends": "../tsconfig.json",
33
"compilerOptions": {
4+
<<<<<<< HEAD
45
"outDir": "../out-tsc/e2e",
56
"baseUrl": "./",
7+
=======
8+
"outDir": "../out-tsc/app",
9+
>>>>>>> c08548b2e36c1d723eaa5ad02ef75a7fab9227f6
610
"module": "commonjs",
711
"target": "es5",
812
"types": [
@@ -11,4 +15,8 @@
1115
"node"
1216
]
1317
}
18+
<<<<<<< HEAD
1419
}
20+
=======
21+
}
22+
>>>>>>> c08548b2e36c1d723eaa5ad02ef75a7fab9227f6

‎library/angular-admin-lte/karma.conf.js‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Karma configuration file, see link for more information
2+
// https://karma-runner.github.io/1.0/config/configuration-file.html
3+
4+
module.exports = function (config) {
5+
config.set({
6+
basePath: '',
7+
frameworks: ['jasmine', '@angular-devkit/build-angular'],
8+
plugins: [
9+
require('karma-jasmine'),
10+
require('karma-chrome-launcher'),
11+
require('karma-jasmine-html-reporter'),
12+
require('karma-coverage-istanbul-reporter'),
13+
require('@angular-devkit/build-angular/plugins/karma')
14+
],
15+
client: {
16+
clearContext: false // leave Jasmine Spec Runner output visible in browser
17+
},
18+
coverageIstanbulReporter: {
19+
dir: require('path').join(__dirname, '../../coverage'),
20+
reports: ['html', 'lcovonly'],
21+
fixWebpackSourcePaths: true
22+
},
23+
reporters: ['progress', 'kjhtml'],
24+
port: 9876,
25+
colors: true,
26+
logLevel: config.LOG_INFO,
27+
autoWatch: true,
28+
browsers: ['Chrome'],
29+
singleRun: false
30+
});
31+
};

‎library/angular-admin-lte/ng-package.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"dest": "../../dist/angular-admin-lte",
4+
"deleteDestPath": false,
5+
"lib": {
6+
"entryFile": "src/public_api.ts"
7+
}
8+
}

‎library/angular-admin-lte/ng-package.prod.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
3+
"dest": "../../dist/angular-admin-lte",
4+
"lib": {
5+
"entryFile": "src/public_api.ts"
6+
}
7+
}

0 commit comments

Comments
 (0)