purchasing/fuse-angular
3
0
Fork 0
mirror of https://github.com/richard-loafle/fuse-angular.git synced 2025-01-10 04:25:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 'master' into 'skeleton'

Browse Source
This commit is contained in:
sercan 2019-07-04 18:12:28 +03:00
commit 612a4827dc
13 changed files with 716 additions and 541 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browserslist
View File

@ -5,12 +5,8 @@
# You can see what browsers were selected by your queries by running: # You can see what browsers were selected by your queries by running:
# npx browserslist # npx browserslist
# Googlebot uses an older version of Chrome
# For additional information see: https://developers.google.com/search/docs/guides/rendering
> 0.5% > 0.5%
last 2 versions last 2 versions
Firefox ESR Firefox ESR
Chrome 41 # Support for Googlebot
not dead not dead
not IE 9-11 # For IE 9-11 support, remove 'not'. not IE 9-11 # For IE 9-11 support, remove 'not'.

8
e2e/protractor.conf.js
View File

@ -1,8 +1,12 @@
// @ts-check
// Protractor configuration file, see link for more information // Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts // https://github.com/angular/protractor/blob/master/lib/config.ts
const {SpecReporter} = require('jasmine-spec-reporter'); const { SpecReporter } = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = { exports.config = {
allScriptsTimeout: 11000, allScriptsTimeout: 11000,
specs : [ specs : [
@ -24,7 +28,7 @@ exports.config = {
onPrepare() onPrepare()
{ {
require('ts-node').register({ require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json') project: require('path').join(__dirname, './tsconfig.json')
}); });
jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}})); jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
} }

9
e2e/src/app.e2e-spec.ts
View File

@ -1,4 +1,5 @@
import { FusePage } from './app.po'; import { FusePage } from './app.po';
import { browser, logging } from 'protractor';
describe('Fuse App', () => { describe('Fuse App', () => {
let page: FusePage; let page: FusePage;
@ -11,4 +12,12 @@ describe('Fuse App', () => {
page.navigateTo(); page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to Fuse!'); expect(page.getParagraphText()).toEqual('Welcome to Fuse!');
}); });
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
expect(logs).not.toContain(jasmine.objectContaining({
level: logging.Level.SEVERE
} as logging.Entry));
});
}); });

13
e2e/src/app.po.ts
View File

@ -1,11 +1,14 @@
import { browser, by, element } from 'protractor'; import { browser, by, element } from 'protractor';
export class FusePage { export class FusePage
navigateTo(): any { {
return browser.get('/'); navigateTo(): Promise<any>
{
return browser.get('/') as Promise<any>;
} }
getParagraphText(): any { getParagraphText(): Promise<string>
return element(by.css('app #main')).getText(); {
return element(by.css('app #main')).getText() as Promise<string>;
} }
} }

22
e2e/tsconfig.e2e.json
View File

@ -1,13 +1,13 @@
{ {
"extends": "../tsconfig.json", "extends": "../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/app", "outDir": "../out-tsc/app",
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es5",
"types": [ "types": [
"jasmine", "jasmine",
"jasminewd2", "jasminewd2",
"node" "node"
] ]
} }
} }

13
e2e/tsconfig.json Normal file
View File

@ -0,0 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}

1096
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

62
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fuse", "name": "fuse",
"version": "8.0.0", "version": "8.1.0",
"license": "https://themeforest.net/licenses/terms/regular", "license": "https://themeforest.net/licenses/terms/regular",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
@ -19,58 +19,58 @@
"private": true, "private": true,
"dependencies": { "dependencies": {
"@agm/core": "1.0.0-beta.5", "@agm/core": "1.0.0-beta.5",
"@angular/animations": "8.0.0", "@angular/animations": "8.1.0",
"@angular/cdk": "8.0.0", "@angular/cdk": "8.0.2",
"@angular/common": "8.0.0", "@angular/common": "8.1.0",
"@angular/compiler": "8.0.0", "@angular/compiler": "8.1.0",
"@angular/core": "8.0.0", "@angular/core": "8.1.0",
"@angular/flex-layout": "8.0.0-beta.26", "@angular/flex-layout": "8.0.0-beta.26",
"@angular/forms": "8.0.0", "@angular/forms": "8.1.0",
"@angular/material": "8.0.0", "@angular/material": "8.0.2",
"@angular/material-moment-adapter": "8.0.0", "@angular/material-moment-adapter": "8.0.2",
"@angular/platform-browser": "8.0.0", "@angular/platform-browser": "8.1.0",
"@angular/platform-browser-dynamic": "8.0.0", "@angular/platform-browser-dynamic": "8.1.0",
"@angular/router": "8.0.0", "@angular/router": "8.1.0",
"@ngrx/effects": "8.0.0-beta.2", "@ngrx/effects": "8.0.1",
"@ngrx/router-store": "8.0.0-beta.2", "@ngrx/router-store": "8.0.1",
"@ngrx/store": "8.0.0-beta.2", "@ngrx/store": "8.0.1",
"@ngrx/store-devtools": "8.0.0-beta.2", "@ngrx/store-devtools": "8.0.1",
"@ngx-translate/core": "11.0.1", "@ngx-translate/core": "11.0.1",
"@swimlane/dragula": "3.8.0", "@swimlane/dragula": "3.8.0",
"@swimlane/ngx-charts": "11.1.0", "@swimlane/ngx-charts": "12.0.1",
"@swimlane/ngx-datatable": "15.0.0", "@swimlane/ngx-datatable": "15.0.2",
"@swimlane/ngx-dnd": "7.0.0", "@swimlane/ngx-dnd": "8.0.0",
"@types/prismjs": "1.16.0", "@types/prismjs": "1.16.0",
"angular-calendar": "0.27.8", "angular-calendar": "0.27.12",
"angular-in-memory-web-api": "0.8.0", "angular-in-memory-web-api": "0.8.0",
"chart.js": "2.8.0", "chart.js": "2.8.0",
"classlist.js": "1.1.20150312", "classlist.js": "1.1.20150312",
"d3": "5.9.2", "d3": "5.9.7",
"date-fns": "1.30.1", "date-fns": "1.30.1",
"hammerjs": "2.0.8", "hammerjs": "2.0.8",
"lodash": "4.17.11", "lodash": "4.17.11",
"moment": "2.24.0", "moment": "2.24.0",
"ng2-charts": "2.2.4", "ng2-charts": "2.3.0",
"ngrx-store-freeze": "0.2.4", "ngrx-store-freeze": "0.2.4",
"ngx-color-picker": "7.5.0", "ngx-color-picker": "8.0.1",
"ngx-cookie-service": "2.2.0", "ngx-cookie-service": "2.2.0",
"perfect-scrollbar": "1.4.0", "perfect-scrollbar": "1.4.0",
"prismjs": "1.16.0", "prismjs": "1.16.0",
"rxjs": "6.5.2", "rxjs": "6.5.2",
"web-animations-js": "github:angular/web-animations-js#release_pr208", "web-animations-js": "2.3.2",
"zone.js": "0.9.1" "zone.js": "0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@angular/cli": "8.0.0", "@angular/cli": "8.1.0",
"@angular/compiler-cli": "8.0.0", "@angular/compiler-cli": "8.1.0",
"@angular/language-service": "8.0.0", "@angular/language-service": "8.1.0",
"@angular-devkit/build-angular": "0.800.0", "@angular-devkit/build-angular": "0.801.0",
"@angularclass/hmr": "2.1.3", "@angularclass/hmr": "2.1.3",
"@types/jasmine": "3.3.13", "@types/jasmine": "3.3.13",
"@types/jasminewd2": "2.0.6", "@types/jasminewd2": "2.0.6",
"@types/lodash": "4.14.132", "@types/lodash": "4.14.135",
"@types/node": "8.9.5", "@types/node": "8.9.5",
"codelyzer": "5.0.1", "codelyzer": "5.1.0",
"jasmine-core": "3.4.0", "jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1", "jasmine-spec-reporter": "4.2.1",
"karma": "4.1.0", "karma": "4.1.0",
@ -80,7 +80,7 @@
"karma-jasmine-html-reporter": "1.4.2", "karma-jasmine-html-reporter": "1.4.2",
"protractor": "5.4.2", "protractor": "5.4.2",
"ts-node": "7.0.1", "ts-node": "7.0.1",
"tslib": "1.9.3", "tslib": "1.10.0",
"tslint": "5.15.0", "tslint": "5.15.0",
"typescript": "3.4.5", "typescript": "3.4.5",
"webpack-bundle-analyzer": "3.3.2" "webpack-bundle-analyzer": "3.3.2"

13
src/@fuse/scss/partials/plugins/_ngx-datatable.scss
View File

@ -144,7 +144,7 @@
.datatable-footer-inner { .datatable-footer-inner {
padding: 0 24px; padding: 0 24px;
@include media-breakpoint('sm') { @include media-breakpoint('lt-md') {
flex-direction: column; flex-direction: column;
padding: 16px 0; padding: 16px 0;
height: auto !important; height: auto !important;
@ -166,7 +166,18 @@
li { li {
a { a {
display: flex;
align-items: center;
justify-content: center;
text-decoration: none !important; text-decoration: none !important;
i {
width: 20px;
min-width: 20px;
height: 20px;
min-height: 20px;
padding: 0;
}
} }
} }
} }

2
src/main.ts
View File

@ -26,5 +26,5 @@ if ( environment.hmr )
} }
else else
{ {
bootstrap().catch(err => console.log(err)); bootstrap().catch(err => console.error(err));
} }

1
src/polyfills.ts
View File

@ -57,6 +57,7 @@ import 'web-animations-js'; // Run `npm install --save web-animations-js`.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js/dist/zone'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************
* APPLICATION IMPORTS * APPLICATION IMPORTS
*/ */

8
tsconfig.json
View File

@ -5,10 +5,10 @@
"outDir": "./dist/out-tsc", "outDir": "./dist/out-tsc",
"sourceMap": true, "sourceMap": true,
"declaration": false, "declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext", "module": "esnext",
"moduleResolution": "node", "moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "es2015",
"typeRoots": [ "typeRoots": [
@ -23,5 +23,9 @@
"@fuse/" "@fuse/"
] ]
} }
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true
} }
} }

2
tslint.json
View File

@ -4,7 +4,7 @@
"array-type": false, "array-type": false,
"arrow-parens": false, "arrow-parens": false,
"deprecation": { "deprecation": {
"severity": "warn" "severity": "warning"
}, },
"component-class-suffix": true, "component-class-suffix": true,
"contextual-lifecycle": true, "contextual-lifecycle": true,