diff --git a/.browserslistrc b/.browserslistrc deleted file mode 100644 index fb92325..0000000 --- a/.browserslistrc +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used by the build system to adjust CSS and JS output to support the specified browsers below. -# For additional information regarding the format and rule options, please see: -# https://github.com/browserslist/browserslist#queries - -# For the full list of supported browsers by the Angular framework, please see: -# https://angular.io/guide/browser-support - -# You can see what browsers were selected by your queries by running: -# npx browserslist - -last 1 Chrome version -last 1 Firefox version -last 2 Edge major versions -last 2 Safari major version -last 2 iOS major versions -Firefox ESR -not IE 9-11 # For IE 9-11 support, remove 'not'. diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ed26754 --- /dev/null +++ b/.gitignore @@ -0,0 +1,15 @@ +dist/ +*d.ts +*.map +.vscode/ +src/**/*.js +*.ngstyle.ts +src/**/*.map +node_modules/ +npm-debug.log +*ngfactory.ts +*metadata.json +*ngsummary.json +src/assets/index.css +src/assets/*.css +*.css \ No newline at end of file diff --git a/angular.json b/angular.json index ae9af5a..9112057 100644 --- a/angular.json +++ b/angular.json @@ -16,7 +16,7 @@ "outputPath": "output", "index": "src/index.html", "main": "src/main.ts", - "polyfills": "src/polyfills.ts", + "polyfills": "", "tsConfig": "tsconfig.app.json", "aot": true, "assets": [ @@ -80,7 +80,7 @@ "builder": "@angular-devkit/build-angular:karma", "options": { "main": "src/test.ts", - "polyfills": "src/polyfills.ts", + "polyfills": "", "tsConfig": "tsconfig.spec.json", "karmaConfig": "karma.conf.js", "assets": [ @@ -120,5 +120,8 @@ } } }}, - "defaultProject": "ej2-ng-expense-tracker" -} + "defaultProject": "ej2-ng-expense-tracker", + "cli": { + "analytics": false + } +} \ No newline at end of file diff --git a/config.json b/config.json index 1211233..205b388 100644 --- a/config.json +++ b/config.json @@ -1,7 +1,4 @@ { - "sasslint": ["./src/assets/**/*.scss"], "tslint": ["./src/app/**/*.ts", "!./src/app/**/*-model.d.ts", "!./src/app/**/**/*.d.ts", "!./src/app/**/**/*.ngfactory.ts"], - "ts": ["./src/app/**/*.ts", "!./node_modules/**/*.ts"], - "styleDependency":["ej2"], - "isShowCase": true + "productOwner": "Satheeskumar S" } \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js new file mode 100644 index 0000000..e69de29 diff --git a/package.json b/package.json index 6f1c5f4..4164b66 100644 --- a/package.json +++ b/package.json @@ -8,22 +8,19 @@ "ng": "ng", "start": "ng serve", "build": "ng build", - "test": "ng test", - "lint": "ng lint", - "e2e": "ng e2e", - "scss": "gulp styles", - "ci-publish": "gulp publish-samples" + "watch": "ng build --watch --configuration development", + "test": "ng test" }, "private": true, "dependencies": { - "@angular/animations": "^15.0.0", - "@angular/common": "^15.0.0", - "@angular/compiler": "^15.0.0", - "@angular/core": "^15.0.0", - "@angular/forms": "^15.0.0", - "@angular/platform-browser": "^15.0.0", - "@angular/platform-browser-dynamic": "^15.0.0", - "@angular/router": "^15.0.0", + "@angular/animations": "^15.2.0", + "@angular/common": "^15.2.0", + "@angular/compiler": "^15.2.0", + "@angular/core": "^15.2.0", + "@angular/forms": "^15.2.0", + "@angular/platform-browser": "^15.2.0", + "@angular/platform-browser-dynamic": "^15.2.0", + "@angular/router": "^15.2.0", "@syncfusion/ej2-angular-base": "*", "@syncfusion/ej2-angular-buttons": "*", "@syncfusion/ej2-angular-calendars": "*", @@ -33,33 +30,21 @@ "@syncfusion/ej2-angular-inputs": "*", "@syncfusion/ej2-angular-navigations": "*", "@syncfusion/ej2-angular-popups": "*", - "ajv": "^8.11.2", - "gulp": "^3.9.0", - "gulp-sass": "^3.1.0", - "run-sequence": "2.2.0", - "rxjs": "~7.5.0", - "shelljs": "^0.7.0", - "tslib": "^2.3.0", + "rxjs": "~7.8.0", + "tslib": "^2.6.2", "zone.js": "~0.12.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^15.0.4", - "@angular/cli": "~15.0.4", - "@angular/compiler-cli": "^15.0.0", + "@angular-devkit/build-angular": "^15.2.6", + "@angular/cli": "~15.2.6", + "@angular/compiler-cli": "^15.2.0", "@types/jasmine": "~4.3.0", - "@types/jasminewd2": "~2.0.3", - "@types/node": "^10.13.0", - "codelyzer": "^6.0.0-next.1", "jasmine-core": "~4.5.0", - "jasmine-spec-reporter": "~5.0.0", "karma": "~6.4.0", "karma-chrome-launcher": "~3.1.0", - "karma-coverage-istanbul-reporter": "~3.0.2", + "karma-coverage": "~2.2.0", "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", - "protractor": "~7.0.0", - "ts-node": "~8.3.0", - "tslint": "~6.1.0", - "typescript": "~4.8.2" + "typescript": "~4.9.4" } } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index b0b32a5..04cb2a4 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -2,6 +2,11 @@ import { Component, Directive, HostListener } from '@angular/core'; import { expenseData, startDate, endDate } from './common/common.data'; +// @Directive({ +// selector: '[routerLinkActive]', +// exportAs: 'routerLinkActive' +// }) + @Component({ selector: 'app-root', templateUrl: 'app.component.html' diff --git a/src/app/app.module.ts b/src/app/app.module.ts index b1a7edd..38b454b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -2,7 +2,7 @@ import { BrowserModule } from '@angular/platform-browser'; import { NgModule, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; import { APP_BASE_HREF, HashLocationStrategy, Location, LocationStrategy} from '@angular/common'; -import { GridModule, PagerModule } from '@syncfusion/ej2-angular-grids'; +import { GridModule, PagerModule, ToolbarService } from '@syncfusion/ej2-angular-grids'; import { NumericTextBoxAllModule } from '@syncfusion/ej2-angular-inputs'; import { CheckBoxAllModule, RadioButtonAllModule } from '@syncfusion/ej2-angular-buttons'; import { ChartAllModule, AccumulationChartAllModule } from '@syncfusion/ej2-angular-charts'; @@ -70,6 +70,7 @@ import { DashBoardService } from './dashboard/dashboard.service'; CommonService, DashBoardService, ContentComponent, + ToolbarService, {provide: APP_BASE_HREF, useValue : '/' }, {provide: LocationStrategy, useClass: HashLocationStrategy} ] diff --git a/src/app/dashboard/pie-chart/pie-chart.component.html b/src/app/dashboard/pie-chart/pie-chart.component.html index 9471982..500aad8 100644 --- a/src/app/dashboard/pie-chart/pie-chart.component.html +++ b/src/app/dashboard/pie-chart/pie-chart.component.html @@ -8,7 +8,7 @@
- diff --git a/src/app/menu/menu.component.ts b/src/app/menu/menu.component.ts index 0f0e8df..07a23ff 100644 --- a/src/app/menu/menu.component.ts +++ b/src/app/menu/menu.component.ts @@ -5,6 +5,11 @@ import { Browser, rippleEffect, isNullOrUndefined as isNOU, enableRipple } from import { userInfo } from '../common/common.data'; enableRipple(true); +// @Directive({ +// selector: '[routerLinkActive]', +// exportAs: 'routerLinkActive' +// }) + @Component({ selector: 'ng-app', templateUrl: 'menu.component.html' diff --git a/src/assets/styles.scss b/src/assets/styles.scss index b90cc9c..10ca6f7 100644 --- a/src/assets/styles.scss +++ b/src/assets/styles.scss @@ -1,68 +1,12 @@ -//sass-lint:disable-all -@import 'definition/material.scss'; -@import 'ej2-base/styles/material-definition.scss'; -@import 'ej2-base/styles/all.scss'; -@import 'ej2-base/styles/definition/_material.scss'; -@import 'ej2-icons/styles/material.scss'; +@import 'ej2-base/styles/material.scss'; $accent: #4273F9; $accent-font: #fff; -@import 'ej2-buttons/styles/button/material-definition.scss'; -@import 'ej2-buttons/styles/button/all.scss'; -@import 'ej2-inputs/styles/input/material-definition.scss'; -@import 'ej2-inputs/styles/input/icons/material.scss'; -@import 'ej2-inputs/styles/input/all.scss'; -@import 'ej2-inputs/styles/numerictextbox/material-definition.scss'; -@import 'ej2-inputs/styles/numerictextbox/icons/material.scss'; -@import 'ej2-inputs/styles/numerictextbox/all.scss'; -@import 'ej2-calendars/styles/calendar/material-definition.scss'; -@import 'ej2-calendars/styles/calendar/icons/material.scss'; -@import 'ej2-calendars/styles/calendar/all.scss'; -@import 'ej2-buttons/styles/check-box/material-definition.scss'; -@import 'ej2-buttons/styles/check-box/icons/material.scss'; -@import 'ej2-buttons/styles/check-box/all.scss'; -@import 'ej2-navigations/styles/context-menu/material-definition.scss'; -@import 'ej2-navigations/styles/context-menu/icons/material.scss'; -@import 'ej2-navigations/styles/context-menu/all.scss'; -@import 'ej2-calendars/styles/datepicker/material-definition.scss'; -@import 'ej2-calendars/styles/datepicker/icons/material.scss'; -@import 'ej2-calendars/styles/datepicker/all.scss'; -@import 'ej2-calendars/styles/daterangepicker/material-definition.scss'; -@import 'ej2-calendars/styles/daterangepicker/icons/material.scss'; -@import 'ej2-calendars/styles/daterangepicker/all.scss'; -@import 'ej2-popups/styles/dialog/material-definition.scss'; -@import 'ej2-popups/styles/dialog/icons/material.scss'; -@import 'ej2-popups/styles/dialog/all.scss'; -@import 'ej2-dropdowns/styles/drop-down-base/material-definition.scss'; -@import 'ej2-dropdowns/styles/drop-down-base/all.scss'; -@import 'ej2-dropdowns/styles/drop-down-list/material-definition.scss'; -@import 'ej2-dropdowns/styles/drop-down-list/icons/material.scss'; -@import 'ej2-dropdowns/styles/drop-down-list/all.scss'; -@import 'ej2-navigations/styles/h-scroll/material-definition.scss'; -@import 'ej2-navigations/styles/h-scroll/icons/material.scss'; -@import 'ej2-navigations/styles/h-scroll/all.scss'; -@import 'ej2-lists/styles/list-view/material-definition.scss'; -@import 'ej2-lists/styles/list-view/icons/material.scss'; -@import 'ej2-lists/styles/list-view/all.scss'; -@import 'ej2-dropdowns/styles/multi-select/material-definition.scss'; -@import 'ej2-dropdowns/styles/multi-select/icons/material.scss'; -@import 'ej2-dropdowns/styles/multi-select/all.scss'; -@import 'ej2-popups/styles/popup/all.scss'; -@import 'ej2-buttons/styles/radio-button/material-definition.scss'; -@import 'ej2-buttons/styles/radio-button/all.scss'; -@import 'ej2-popups/styles/spinner/material-definition.scss'; -@import 'ej2-popups/styles/spinner/all.scss'; -@import 'ej2-calendars/styles/timepicker/material-definition.scss'; -@import 'ej2-calendars/styles/timepicker/icons/material.scss'; -@import 'ej2-calendars/styles/timepicker/all.scss'; -@import 'ej2-navigations/styles/toolbar/material-definition.scss'; -@import 'ej2-navigations/styles/toolbar/icons/material.scss'; -@import 'ej2-navigations/styles/toolbar/all.scss'; -@import 'ej2-popups/styles/tooltip/material-definition.scss'; -@import 'ej2-popups/styles/tooltip/icons/material.scss'; -@import 'ej2-popups/styles/tooltip/all.scss'; -@import 'ej2-grids/styles/grid/icons/material.scss'; -@import 'ej2-grids/styles/grid/material-definition.scss'; -@import 'ej2-grids/styles/grid/all.scss'; -@import 'ej2-grids/styles/pager/material-definition.scss'; -@import 'ej2-grids/styles/pager/icons/material.scss'; -@import 'ej2-grids/styles/pager/all.scss'; +@import 'ej2-buttons/styles/material.scss'; +@import 'ej2-popups/styles/material.scss'; +@import 'ej2-inputs/styles/material.scss'; +@import 'ej2-calendars/styles/material.scss'; +@import 'ej2-navigations/styles/material.scss'; +@import 'ej2-lists/styles/material.scss'; +@import 'ej2-dropdowns/styles/material.scss'; +@import 'ej2-grids/styles/material.scss'; +@import 'ej2-treegrid/styles/material.scss'; \ No newline at end of file diff --git a/src/index.html b/src/index.html index 9b90a47..bf82597 100644 --- a/src/index.html +++ b/src/index.html @@ -39,4 +39,6 @@ + + \ No newline at end of file diff --git a/src/main.ts b/src/main.ts index 91ec6da..bdc7513 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,12 +1,7 @@ -import { enableProdMode } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; -import { environment } from './environments/environment'; -if (environment.production) { - enableProdMode(); -} platformBrowserDynamic().bootstrapModule(AppModule) - .catch(err => console.log(err)); + .catch(err => console.error(err)); \ No newline at end of file diff --git a/tsconfig.app.json b/tsconfig.app.json index 232c3a5..69378eb 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -1,15 +1,14 @@ /* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "extends": "./tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/app", "types": [] }, "files": [ - "src/main.ts", - "src/polyfills.ts" + "src/main.ts" ], "include": [ "src/**/*.d.ts" ] -} +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index bd7d44a..60a39e0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,3 +1,4 @@ +/* To learn more about this file see: https://angular.io/config/tsconfig. */ { "compileOnSave": false, "compilerOptions": { @@ -5,17 +6,17 @@ "outDir": "./dist/out-tsc", "sourceMap": true, "declaration": false, - "module": "es2015", - "moduleResolution": "node", - "emitDecoratorMetadata": false, + "downlevelIteration": true, "experimentalDecorators": true, - "target": "es2015", - "typeRoots": [ - "node_modules/@types" - ], + "emitDecoratorMetadata": true, + "moduleResolution": "node", + "importHelpers": true, + "target": "ES2022", + "module": "ES2022", + "useDefineForClassFields": false, "lib": [ - "es2017", + "ES2022", "dom" ] } -} +} \ No newline at end of file diff --git a/tsconfig.spec.json b/tsconfig.spec.json index 729a6d6..ad696d1 100644 --- a/tsconfig.spec.json +++ b/tsconfig.spec.json @@ -1,18 +1,14 @@ /* To learn more about this file see: https://angular.io/config/tsconfig. */ { - "extends": "./tsconfig.base.json", + "extends": "./tsconfig.json", "compilerOptions": { "outDir": "./out-tsc/spec", "types": [ "jasmine" ] }, - "files": [ - "src/test.ts", - "src/polyfills.ts" - ], "include": [ "src/**/*.spec.ts", "src/**/*.d.ts" ] -} +} \ No newline at end of file