Skip to content

Commit 9022bb4

Browse files
BlariBlari
committed
Clear code
1 parent b226ac5 commit 9022bb4

File tree

13 files changed

+7
-208
lines changed

13 files changed

+7
-208
lines changed

‎angular.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
"node_modules/jquery/dist/jquery.js",
3131
"node_modules/popper.js/dist/umd/popper.js",
3232
"node_modules/bootstrap/dist/js/bootstrap.js",
33-
"src/assets/raphael.min.js",
3433
"node_modules/hammerjs/hammer.min.js",
3534
"node_modules/d3/d3.min.js",
3635
"node_modules/nvd3/build/nv.d3.min.js",
@@ -135,7 +134,6 @@
135134
"projectType": "application"
136135
}
137136
},
138-
"defaultProject": "Sing",
139137
"schematics": {
140138
"@schematics/angular:component": {
141139
"prefix": "app",

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,14 @@
9797
},
9898
"devDependencies": {
9999
"@angular-builders/custom-webpack": "14.0.1",
100-
"@angular-devkit/build-angular": "~13.3.9",
101-
"@angular/cli": "13.3.9",
100+
"@angular-devkit/build-angular": "^14.2.1",
101+
"@angular/cli": "14.2.1",
102102
"@angular/compiler-cli": "14.2.0",
103103
"@angular/language-service": "14.2.0",
104104
"@angularclass/hmr": "^2.1.3",
105105
"@types/googlemaps": "3.39.12",
106106
"@types/hammerjs": "2.0.36",
107-
"@types/node": "^12.11.1",
107+
"@types/node": "^14.18.27",
108108
"@types/select2": "4.0.53",
109109
"codelyzer": "^6.0.0",
110110
"metrojs": "0.9.77",
@@ -128,4 +128,4 @@
128128
"resolutions": {
129129
"terser-webpack-plugin": "4.2.3"
130130
}
131-
}
131+
}

‎src/app/layout/layout.component.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import {HelperService} from './helper/helper.service';
66

77
declare let jQuery: any;
88
declare let Hammer: any;
9-
declare let Raphael: any;
109

1110
@Component({
1211
selector: 'app-layout',
@@ -40,7 +39,6 @@ export class LayoutComponent implements OnInit {
4039
private ngZone: NgZone,
4140
private helperService: HelperService
4241
) {
43-
Raphael.prototype.safari = function(): any { return; };
4442
this.el = el;
4543
this.config = config.getConfig();
4644
this.configFn = config;

‎src/app/layout/layout.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<router-outlet></router-outlet>
3030
</div>
3131
<footer class="content-footer">
32-
2021 &copy; Sing App Angular - Angular Admin Dashboard Template Made by <a href="https://flatlogic.com" target="_blank">Flatlogic</a>
32+
2022 &copy; Sing App Angular - Angular Admin Dashboard Template Made by <a href="https://flatlogic.com" target="_blank">Flatlogic</a>
3333
</footer>
3434
</main>
3535
</div>

‎src/app/layout/navbar/navbar.template.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ <h6 class="title">
9393
</span>
9494
Jess Smith
9595
</h6>
96-
<p class="text">Hi there! <br> This is a completely new version of Sing App <br> built with <strong class="text-danger">Angular 11.2 Final Release</strong> </p>
96+
<p class="text">Hi there! <br> This is a completely new version of Sing App <br> built with <strong class="text-danger">Angular 14.2 Final Release</strong> </p>
9797
</div>
9898
</div>
9999
</li>

‎src/app/layout/sidebar/sidebar.template.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,6 @@ <h5 class="sidebar-nav-title">Template
192192
<li routerLinkActive="active">
193193
<a [routerLink]=" ['forms/validation'] ">Form Validation</a>
194194
</li>
195-
<li routerLinkActive="active">
196-
<a [routerLink]=" ['forms/wizard'] ">Form Wizard</a>
197-
</li>
198195
</ul>
199196
</li>
200197
<li>
@@ -212,9 +209,6 @@ <h5 class="sidebar-nav-title">Template
212209
<li routerLinkActive="active">
213210
<a [routerLink]=" ['charts/flot'] ">Flot Charts</a>
214211
</li>
215-
<li routerLinkActive="active">
216-
<a [routerLink]=" ['charts/morris'] ">Morris Charts</a>
217-
</li>
218212
<li routerLinkActive="active">
219213
<a [routerLink]=" ['charts/sparkline'] ">Sparkline Charts</a>
220214
</li>

‎src/app/pages/charts/charts.module.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Nvd3ChartModule } from '../../components/nvd3/nvd3.module';
99
import { JqSparklineModule } from '../../components/sparkline/sparkline.module';
1010
import { RickshawChartModule } from '../../components/rickshaw/rickshaw.module';
1111
import { FlotChartAnimatorDirective } from './overview/components/flot-chart-animator/flot-chart-animator.directive';
12-
// import {MorrisComponent} from './morris/morris';
1312
import {FlotComponent} from './flot/flot';
1413
import {SparklineComponent} from './sparkline/sparkline';
1514
import {OverviewComponent} from './overview/overview';
@@ -29,7 +28,6 @@ export const routes: Routes = [
2928
{path: '', redirectTo: 'overview', pathMatch: 'full'},
3029
{path: 'overview', component: OverviewComponent},
3130
{path: 'flot', component: FlotComponent},
32-
// {path: 'morris', component: MorrisComponent},
3331
{path: 'sparkline', component: SparklineComponent},
3432
{path: 'easy-pie', component: EasyPieComponent},
3533
];
@@ -51,7 +49,6 @@ export const routes: Routes = [
5149
declarations: [
5250
OverviewComponent,
5351
FlotComponent,
54-
// MorrisComponent,
5552
SparklineComponent,
5653
EasyPieComponent,
5754
FlotChartAnimatorDirective,

‎src/app/pages/charts/overview/overview.html

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -229,54 +229,6 @@ <h5>
229229
</section>
230230
</div>
231231
</div>
232-
<div class="row">
233-
<div class="col-lg-6 col-12">
234-
<section class="widget" widget>
235-
<header>
236-
<h5>
237-
Morris <span class="fw-semi-bold">Area Charts</span>
238-
</h5>
239-
<div class="widget-controls">
240-
<a data-widgster="expand" title="Expand" href="#"><i class="la la-angle-up"></i></a>
241-
<a data-widgster="collapse" title="Collapse" href="#"><i class="la la-angle-down"></i></a>
242-
<a href="#" data-widgster="close"><i class="la la-remove"></i></a>
243-
</div>
244-
</header>
245-
<div class="widget-body">
246-
<p class="fs-mini text-muted">
247-
Good-looking charts shouldn't be difficult.
248-
The public API is terribly simple. It's just one function: <code>Morris.Line(options)</code>,
249-
where options is an object containing some of the following configuration options.
250-
</p>
251-
<div morris-chart [type]="'area'" [height]="343" [options]="morris2Options">
252-
</div>
253-
</div>
254-
</section>
255-
</div>
256-
<div class="col-lg-6 col-12">
257-
<section class="widget" widget>
258-
<header>
259-
<h5>
260-
Morris <span class="fw-semi-bold">Line Charts</span>
261-
</h5>
262-
<div class="widget-controls">
263-
<a data-widgster="expand" title="Expand" href="#"><i class="la la-angle-up"></i></a>
264-
<a data-widgster="collapse" title="Collapse" href="#"><i class="la la-angle-down"></i></a>
265-
<a href="#" data-widgster="close"><i class="la la-remove"></i></a>
266-
</div>
267-
</header>
268-
<div class="widget-body">
269-
<p class="fs-mini text-muted">
270-
Good-looking charts shouldn't be difficult.
271-
The public API is terribly simple. It's just one function: <code>Morris.Line(options)</code>,
272-
where options is an object containing some of the following configuration options.
273-
</p>
274-
<div morris-chart [type]="'line'" [height]="343" [options]="morris1Options">
275-
</div>
276-
</div>
277-
</section>
278-
</div>
279-
</div>
280232
<div class="row">
281233
<div class="col-12 col-lg-6 col-xl-3">
282234
<section class="widget" widget>
@@ -335,30 +287,6 @@ <h5>
335287
</div>
336288
</section>
337289
</div>
338-
<div class="col-lg-6 col-xl-3 col-12">
339-
<section class="widget" widget>
340-
<header>
341-
<h5>
342-
Morris <span class="fw-semi-bold">Donut Charts</span>
343-
</h5>
344-
<div class="widget-controls">
345-
<a data-widgster="expand" title="Expand" href="#"><i class="la la-angle-up"></i></a>
346-
<a data-widgster="collapse" title="Collapse" href="#"><i class="la la-angle-down"></i></a>
347-
<a href="#" data-widgster="close"><i class="la la-remove"></i></a>
348-
</div>
349-
</header>
350-
<div class="widget-body">
351-
<div morris-chart [type]="'donut'" [height]="180" [options]="morris3Options">
352-
</div>
353-
<p class="fs-mini text-muted">
354-
Donuts a great for representing some parted information like traffice sources,
355-
disk partitions, etc.
356-
This really couldn't be easier. Create a Donut chart using <code>Morris.Donut(options)</code>,
357-
with only few options.
358-
</p>
359-
</div>
360-
</section>
361-
</div>
362290

363291
</div>
364292
</div>

‎src/app/pages/forms/forms.module.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,11 @@ import { Autosize } from 'ng-autosize';
88
import { NgSelect2Module } from 'ng-select2';
99
import { WidgetModule } from '../../layout/widget/widget.module';
1010
import { NgxMaskModule } from 'ngx-mask';
11-
/* tslint:disable */
12-
// import { BootstrapWizardModule } from '../../components/wizard/wizard.module';
13-
// import { BootstrapApplicationWizardComponent } from './wizard/bootstrap-application-wizard/bootstrap-application-wizard.component';
1411
import { DropzoneDemoDirective } from '../../components/dropzone/dropzone.directive';
1512
import { NKDatetimeModule } from 'ng2-datetime/ng2-datetime';
1613
/* tslint:enable */
1714
import { ElementsComponent } from './elements/elements.component';
1815
import { ValidationComponent } from './validation/validation.component';
19-
// import { WizardComponent } from './wizard/wizard.component';
2016
import { EditorModule } from '@tinymce/tinymce-angular';
2117

2218
export const routes: Routes = [
@@ -31,8 +27,6 @@ export const routes: Routes = [
3127
Autosize,
3228
ElementsComponent,
3329
ValidationComponent,
34-
// BootstrapApplicationWizardComponent,
35-
// WizardComponent,
3630
DropzoneDemoDirective
3731
],
3832
imports: [
@@ -43,7 +37,6 @@ export const routes: Routes = [
4337
AlertModule.forRoot(),
4438
BsDropdownModule.forRoot(),
4539
WidgetModule,
46-
// BootstrapWizardModule,
4740
NKDatetimeModule,
4841
NgSelect2Module,
4942
RouterModule.forChild(routes),

‎src/app/pages/visits/visits.template.html

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,4 @@
11
<h1 class="page-title">Dashboard <small><small>The Lucky One</small></small></h1>
2-
<div class="row">
3-
<div class="col-lg-7 col-12">
4-
<!-- minimal widget consist of .widget class. note bg-transparent - it can be any background like bg-gray,
5-
bg-primary, bg-white -->
6-
<section class="widget bg-transparent">
7-
<!-- .widget-body is a mostly semantic class. may be a sibling to .widget>header or .widget>footer -->
8-
<div class="widget-body">
9-
<!-- for this particular example we also need to preload us map, as this is mapael's extension -->
10-
<div class="mapael" geo-locations-widget>
11-
<div class="stats">
12-
<h6 class="mt-1">GEO-LOCATIONS</h6>
13-
<p class="h3 m-0">
14-
<span class="fw-normal" number-animate>1 656 843</span>
15-
<i class="fa fa-map-marker mb-2"></i>
16-
</p>
17-
</div>
18-
<div class="map">
19-
<span>Alternative content for the map</span>
20-
</div>
21-
</div>
22-
</div>
23-
</section>
24-
</div>
25-
<div class="col-lg-4 offset-lg-1 col-12">
26-
<section widget class="widget bg-transparent">
27-
<header>
28-
<h5>
29-
Map
30-
<span class="fw-semi-bold">Statistics</span>
31-
</h5>
32-
<div class="widget-controls widget-controls-hover">
33-
<a href="#"><i class="la la-cog"></i></a>
34-
<a href="#"><i class="la la-refresh"></i></a>
35-
<a href="#" data-widgster="close"><i class="la la-remove"></i></a>
36-
</div>
37-
</header>
38-
<div class="widget-body">
39-
<p>Status: <strong>Live</strong></p>
40-
<p>
41-
<span class="circle bg-warning"><i class="fa fa-map-marker text-white"></i></span>
42-
146 Countries, 2759 Cities
43-
</p>
44-
<div class="row progress-stats">
45-
<div class="col-md-9 col-12">
46-
<h6 class="name">Foreign Visits</h6>
47-
<p class="description deemphasize">Some Cool Text</p>
48-
<div class="bg-white progress progress-xs">
49-
<div progress-animate class="progress-bar bg-primary" style="width: 60%;" data-width="60%"></div>
50-
</div>
51-
</div>
52-
<div class="col-md-3 col-12 text-center">
53-
<span class="status rounded rounded-lg bg-body-light">
54-
<small><span number-animate>75</span>%</small>
55-
</span>
56-
</div>
57-
</div>
58-
<div class="row progress-stats">
59-
<div class="col-md-9 col-12">
60-
<h6 class="name">Local Visits</h6>
61-
<p class="description deemphasize">P. to C. Conversion</p>
62-
<div class="bg-white progress progress-xs">
63-
<div progress-animate class="progress-bar bg-danger" style="width: 39%;" data-width="39%"></div>
64-
</div>
65-
</div>
66-
<div class="col-md-3 col-12 text-center">
67-
<span class="status rounded rounded-lg bg-body-light">
68-
<small><span number-animate>84</span>%</small>
69-
</span>
70-
</div>
71-
</div>
72-
<div class="row progress-stats">
73-
<div class="col-md-9 col-12">
74-
<h6 class="name">Sound Frequencies</h6>
75-
<p class="description deemphasize">Average Bitrate</p>
76-
<div class="bg-white progress progress-xs">
77-
<div progress-animate class="progress-bar bg-success" style="width: 80%;" data-width="80%"></div>
78-
</div>
79-
</div>
80-
<div class="col-md-3 col-12 text-center">
81-
<span class="status rounded rounded-lg bg-body-light">
82-
<small><span number-animate>92</span>%</small>
83-
</span>
84-
</div>
85-
</div>
86-
<h6 class="fw-semi-bold mt">Map Distributions</h6>
87-
<p>Tracking: <strong>Active</strong></p>
88-
<p>
89-
<span class="circle bg-warning"><i class="fa fa-cog text-white"></i></span>
90-
391 elements installed, 84 sets
91-
</p>
92-
<div class="input-group mt">
93-
<input type="text" class="form-control" placeholder="Search Map">
94-
<span class="input-group-append">
95-
<button type="submit" class="btn btn-default">
96-
<i class="fa fa-search text-gray"></i>
97-
</button>
98-
</span>
99-
</div>
100-
</div>
101-
</section>
102-
</div>
103-
</div>
1042
<div class="row">
1053
<div class="col-lg-4 col-12">
1064
<section widget class="widget">

‎src/app/pages/widgets/flot-chart-widget/flot-chart-widget.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { Component } from '@angular/core';
22
import { AppConfig } from '../../../app.config';
3-
declare let jQuery: any;
43

54
@Component({
65
selector: '[flot-chart-widget]',

‎src/app/pages/widgets/widgets.template.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -475,12 +475,6 @@ <h6>Server <span class="fw-semi-bold">Overview</span></h6>
475475
</div>
476476
</div>
477477
<div class="row">
478-
<div class="col-lg-4 col-12">
479-
<section class="widget">
480-
<div class="widget-body" years-map-widget>
481-
</div>
482-
</section>
483-
</div>
484478
<div class="col-lg-4 col-12">
485479
<section class="widget">
486480
<header class="bb">

‎tsconfig.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"emitDecoratorMetadata": true,
1111
"experimentalDecorators": true,
1212
"importHelpers": true,
13-
"target": "es5",
13+
"target": "es2020",
1414
"typeRoots": [
1515
"node_modules/@types"
1616
],

0 commit comments

Comments
 (0)