Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Anderson, Danny H
gist-charts
Commits
0e5792aa
Commit
0e5792aa
authored
Jul 31, 2019
by
David Anderson
Browse files
library upgrade
parent
00b7bcbf
Changes
41
Expand all
Hide whitespace changes
Inline
Side-by-side
app/app.module.ts
0 → 100644
View file @
0e5792aa
import
{
NgModule
}
from
'
@angular/core
'
;
import
{
FlexLayoutModule
}
from
'
@angular/flex-layout
'
;
import
{
FormsModule
}
from
'
@angular/forms
'
;
import
{
MatCardModule
}
from
'
@angular/material/card
'
;
import
{
MatToolbarModule
}
from
'
@angular/material/toolbar
'
;
import
{
BrowserModule
}
from
'
@angular/platform-browser
'
;
import
{
AppRoutingModule
}
from
'
./app-routing.module
'
;
import
{
AppComponent
}
from
'
./app.component
'
;
import
{
AreaChartDemoComponent
}
from
'
./areachart-demo/areachart-demo.component
'
;
import
{
BarChartDemoComponent
}
from
'
./barchart-demo/barchart-demo.component
'
;
import
{
BoxplotDemoComponent
}
from
'
./boxplot-demo/boxplot-demo.component
'
;
import
{
DemoAppComponent
}
from
'
./demo-app/demo-app.component
'
;
import
{
HeatmapChartDemoComponent
}
from
'
./heatmapchart-demo/heatmapchart-demo.component
'
;
import
{
LineChartDemoComponent
}
from
'
./linechart-demo/linechart-demo.component
'
;
import
{
RadialChartDemoComponent
}
from
'
./radialchart-demo/radialchart-demo.component
'
;
import
{
ResizeableChartDemoComponent
}
from
'
./resizeable-demo/resizeable-demo.component
'
;
import
{
ScatterChartDemoComponent
}
from
'
./scatterchart-demo/scatterchart-demo.component
'
;
import
{
ZoomPanDemoComponent
}
from
'
./zoom-pan-demo/zoom-pan-demo.component
'
;
const
materialItems
=
[
MatToolbarModule
,
MatCardModule
];
@
NgModule
(
{
declarations
:
[
AppComponent
,
AreaChartDemoComponent
,
BarChartDemoComponent
,
BoxplotDemoComponent
,
DemoAppComponent
,
HeatmapChartDemoComponent
,
LineChartDemoComponent
,
RadialChartDemoComponent
,
ScatterChartDemoComponent
,
ResizeableChartDemoComponent
,
ZoomPanDemoComponent
],
imports
:
[
BrowserModule
,
FormsModule
,
AppRoutingModule
,
FlexLayoutModule
].
concat
(
materialItems
),
exports
:
materialItems
,
providers
:
[],
bootstrap
:
[
AppComponent
]
}
)
export
class
AppModule
{
}
demo-angularIO/.angular-cli.json
deleted
100644 → 0
View file @
00b7bcbf
{
"$schema"
:
"./node_modules/@angular/cli/lib/config/schema.json"
,
"project"
:
{
"name"
:
"demo-angular-io"
},
"apps"
:
[
{
"root"
:
"src"
,
"outDir"
:
"dist"
,
"assets"
:
[
"assets"
,
"favicon.ico"
],
"index"
:
"index.html"
,
"main"
:
"main.ts"
,
"polyfills"
:
"polyfills.ts"
,
"test"
:
"test.ts"
,
"tsconfig"
:
"tsconfig.app.json"
,
"testTsconfig"
:
"tsconfig.spec.json"
,
"prefix"
:
"app"
,
"styles"
:
[
"styles.css"
],
"scripts"
:
[],
"environmentSource"
:
"environments/environment.ts"
,
"environments"
:
{
"dev"
:
"environments/environment.ts"
,
"prod"
:
"environments/environment.prod.ts"
}
}
],
"e2e"
:
{
"protractor"
:
{
"config"
:
"./protractor.conf.js"
}
},
"lint"
:
[
{
"project"
:
"src/tsconfig.app.json"
,
"exclude"
:
"**/node_modules/**"
},
{
"project"
:
"src/tsconfig.spec.json"
,
"exclude"
:
"**/node_modules/**"
},
{
"project"
:
"e2e/tsconfig.e2e.json"
,
"exclude"
:
"**/node_modules/**"
}
],
"test"
:
{
"karma"
:
{
"config"
:
"./karma.conf.js"
}
},
"defaults"
:
{
"styleExt"
:
"css"
,
"component"
:
{}
}
}
demo-angularIO/.editorconfig
View file @
0e5792aa
# Editor configuration, see http://editorconfig.org
# Editor configuration, see http
s
://editorconfig.org
root = true
[*]
...
...
demo-angularIO/.gitignore
View file @
0e5792aa
...
...
@@ -2,13 +2,18 @@
# compiled output
/dist
/dist-server
/tmp
/out-tsc
# Only exists if Bazel was run
/bazel-out
# dependencies
/node_modules
# profiling files
chrome-profiler-events*.json
speed-measure-plugin*.json
# IDEs and editors
/.idea
.project
...
...
@@ -24,6 +29,7 @@
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*
# misc
/.sass-cache
...
...
@@ -35,10 +41,6 @@ yarn-error.log
testem.log
/typings
# e2e
/e2e/*.js
/e2e/*.map
# System Files
.DS_Store
Thumbs.db
demo-angularIO/.vscode/settings.json
deleted
100644 → 0
View file @
00b7bcbf
{
"files.exclude"
:
{
"**/node_modules"
:
true
,
"**/gen"
:
true
,
"*.d.ts"
:
true
,
"*.js"
:
true
,
"*.js.map"
:
true
,
"demo-script"
:
true
,
"gist-charts"
:
true
}
}
\ No newline at end of file
demo-angularIO/README.md
View file @
0e5792aa
# DemoAngularIO
This project was generated with
[
Angular CLI
](
https://github.com/angular/angular-cli
)
version
1.7.4
.
This project was generated with
[
Angular CLI
](
https://github.com/angular/angular-cli
)
version
8.1.3
.
## Development server
...
...
@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
## Build
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.
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.
## Running unit tests
...
...
demo-angularIO/angular.json
0 → 100644
View file @
0e5792aa
{
"$schema"
:
"./node_modules/@angular/cli/lib/config/schema.json"
,
"version"
:
1
,
"newProjectRoot"
:
"projects"
,
"projects"
:
{
"demo-angularIO"
:
{
"projectType"
:
"application"
,
"schematics"
:
{},
"root"
:
""
,
"sourceRoot"
:
"src"
,
"prefix"
:
"app"
,
"architect"
:
{
"build"
:
{
"builder"
:
"@angular-devkit/build-angular:browser"
,
"options"
:
{
"outputPath"
:
"dist/demo-angularIO"
,
"index"
:
"src/index.html"
,
"main"
:
"src/main.ts"
,
"polyfills"
:
"src/polyfills.ts"
,
"tsConfig"
:
"tsconfig.app.json"
,
"aot"
:
false
,
"assets"
:
[
"src/favicon.ico"
,
"src/assets"
],
"styles"
:
[
"./node_modules/@angular/material/prebuilt-themes/pink-bluegrey.css"
,
"src/styles.css"
],
"scripts"
:
[]
},
"configurations"
:
{
"production"
:
{
"fileReplacements"
:
[
{
"replace"
:
"src/environments/environment.ts"
,
"with"
:
"src/environments/environment.prod.ts"
}
],
"optimization"
:
true
,
"outputHashing"
:
"all"
,
"sourceMap"
:
false
,
"extractCss"
:
true
,
"namedChunks"
:
false
,
"aot"
:
true
,
"extractLicenses"
:
true
,
"vendorChunk"
:
false
,
"buildOptimizer"
:
true
,
"budgets"
:
[
{
"type"
:
"initial"
,
"maximumWarning"
:
"2mb"
,
"maximumError"
:
"5mb"
}
]
}
}
},
"serve"
:
{
"builder"
:
"@angular-devkit/build-angular:dev-server"
,
"options"
:
{
"browserTarget"
:
"demo-angularIO:build"
},
"configurations"
:
{
"production"
:
{
"browserTarget"
:
"demo-angularIO:build:production"
}
}
},
"extract-i18n"
:
{
"builder"
:
"@angular-devkit/build-angular:extract-i18n"
,
"options"
:
{
"browserTarget"
:
"demo-angularIO:build"
}
},
"test"
:
{
"builder"
:
"@angular-devkit/build-angular:karma"
,
"options"
:
{
"main"
:
"src/test.ts"
,
"polyfills"
:
"src/polyfills.ts"
,
"tsConfig"
:
"tsconfig.spec.json"
,
"karmaConfig"
:
"karma.conf.js"
,
"assets"
:
[
"src/favicon.ico"
,
"src/assets"
],
"styles"
:
[
"./node_modules/@angular/material/prebuilt-themes/pink-bluegrey.css"
,
"src/styles.css"
],
"scripts"
:
[]
}
},
"lint"
:
{
"builder"
:
"@angular-devkit/build-angular:tslint"
,
"options"
:
{
"tsConfig"
:
[
"tsconfig.app.json"
,
"tsconfig.spec.json"
,
"e2e/tsconfig.json"
],
"exclude"
:
[
"**/node_modules/**"
]
}
},
"e2e"
:
{
"builder"
:
"@angular-devkit/build-angular:protractor"
,
"options"
:
{
"protractorConfig"
:
"e2e/protractor.conf.js"
,
"devServerTarget"
:
"demo-angularIO:serve"
},
"configurations"
:
{
"production"
:
{
"devServerTarget"
:
"demo-angularIO:serve:production"
}
}
}
}
}
},
"defaultProject"
:
"demo-angularIO"
}
\ No newline at end of file
demo-angularIO/browserslist
0 → 100644
View file @
0e5792aa
# 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
# You can see what browsers were selected by your queries by running:
# npx browserslist
> 0.5%
last 2 versions
Firefox ESR
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.
\ No newline at end of file
demo-angularIO/demo-package.json
0 → 100644
View file @
0e5792aa
{
"name"
:
"demo-angular-io"
,
"version"
:
"0.0.0"
,
"license"
:
"MIT"
,
"scripts"
:
{
"ng"
:
"ng"
,
"start"
:
"ng serve"
,
"build"
:
"ng build --prod"
,
"test"
:
"ng test"
,
"lint"
:
"ng lint"
,
"e2e"
:
"ng e2e"
},
"private"
:
true
,
"dependencies"
:
{
"@angular/animations"
:
"^5.2.0"
,
"@angular/cdk"
:
"^5.2.4"
,
"@angular/common"
:
"^5.2.0"
,
"@angular/compiler"
:
"^5.2.0"
,
"@angular/core"
:
"^5.2.0"
,
"@angular/flex-layout"
:
"^5.0.0-beta.14"
,
"@angular/forms"
:
"^5.2.0"
,
"@angular/http"
:
"^5.2.0"
,
"@angular/material"
:
"^5.2.4"
,
"@angular/platform-browser"
:
"^5.2.0"
,
"@angular/platform-browser-dynamic"
:
"^5.2.0"
,
"@angular/router"
:
"^5.2.0"
,
"core-js"
:
"^2.4.1"
,
"moment"
:
"^2.22.0"
,
"rxjs"
:
"^5.5.6"
,
"zone.js"
:
"^0.8.19"
},
"devDependencies"
:
{
"@angular/cli"
:
"~1.7.4"
,
"@angular/compiler-cli"
:
"^5.2.0"
,
"@angular/language-service"
:
"^5.2.0"
,
"@types/jasmine"
:
"~2.8.3"
,
"@types/jasminewd2"
:
"~2.0.2"
,
"@types/node"
:
"~6.0.60"
,
"codelyzer"
:
"^4.0.1"
,
"jasmine-core"
:
"~2.8.0"
,
"jasmine-spec-reporter"
:
"~4.2.1"
,
"karma"
:
"~2.0.0"
,
"karma-chrome-launcher"
:
"~2.2.0"
,
"karma-coverage-istanbul-reporter"
:
"^1.2.1"
,
"karma-jasmine"
:
"~1.1.0"
,
"karma-jasmine-html-reporter"
:
"^0.2.2"
,
"protractor"
:
"~5.1.2"
,
"ts-node"
:
"~4.1.0"
,
"tslint"
:
"~5.9.1"
,
"typescript"
:
"~2.5.3"
}
}
demo-angularIO/protractor.conf.js
→
demo-angularIO/
e2e/
protractor.conf.js
View file @
0e5792aa
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
const
{
SpecReporter
}
=
require
(
'
jasmine-spec-reporter
'
);
/**
* @type { import("protractor").Config }
*/
exports
.
config
=
{
allScriptsTimeout
:
11000
,
specs
:
[
'
./
e2e
/**/*.e2e-spec.ts
'
'
./
src
/**/*.e2e-spec.ts
'
],
capabilities
:
{
'
browserName
'
:
'
chrome
'
...
...
@@ -21,8 +25,8 @@ exports.config = {
},
onPrepare
()
{
require
(
'
ts-node
'
).
register
({
project
:
'
e2e
/tsconfig.
e2e.
json
'
project
:
require
(
'
path
'
).
join
(
__dirname
,
'
.
/tsconfig.json
'
)
});
jasmine
.
getEnv
().
addReporter
(
new
SpecReporter
({
spec
:
{
displayStacktrace
:
true
}
}));
}
};
};
\ No newline at end of file
demo-angularIO/e2e/app.e2e-spec.ts
→
demo-angularIO/e2e/
src/
app.e2e-spec.ts
View file @
0e5792aa
import
{
AppPage
}
from
'
./app.po
'
;
import
{
browser
,
logging
}
from
'
protractor
'
;
describe
(
'
demo-angular-io
App
'
,
()
=>
{
describe
(
'
workspace-project
App
'
,
()
=>
{
let
page
:
AppPage
;
beforeEach
(()
=>
{
...
...
@@ -9,6 +10,14 @@ describe('demo-angular-io App', () => {
it
(
'
should display welcome message
'
,
()
=>
{
page
.
navigateTo
();
expect
(
page
.
getParagraphText
()).
toEqual
(
'
Welcome to app!
'
);
expect
(
page
.
getTitleText
()).
toEqual
(
'
Welcome to demo-angularIO!
'
);
});
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
));
});
});
demo-angularIO/e2e/app.po.ts
→
demo-angularIO/e2e/
src/
app.po.ts
View file @
0e5792aa
...
...
@@ -2,10 +2,10 @@ import { browser, by, element } from 'protractor';
export
class
AppPage
{
navigateTo
()
{
return
browser
.
get
(
'
/
'
)
;
return
browser
.
get
(
browser
.
baseUrl
)
as
Promise
<
any
>
;
}
get
Paragraph
Text
()
{
return
element
(
by
.
css
(
'
app-root h1
'
)).
getText
();
get
Title
Text
()
{
return
element
(
by
.
css
(
'
app-root h1
'
)).
getText
()
as
Promise
<
string
>
;
}
}
demo-angularIO/e2e/tsconfig.
e2e.
json
→
demo-angularIO/e2e/tsconfig.json
View file @
0e5792aa
...
...
@@ -2,7 +2,6 @@
"extends"
:
"../tsconfig.json"
,
"compilerOptions"
:
{
"outDir"
:
"../out-tsc/e2e"
,
"baseUrl"
:
"./"
,
"module"
:
"commonjs"
,
"target"
:
"es5"
,
"types"
:
[
...
...
demo-angularIO/karma.conf.js
View file @
0e5792aa
...
...
@@ -4,30 +4,29 @@
module
.
exports
=
function
(
config
)
{
config
.
set
({
basePath
:
''
,
frameworks
:
[
'
jasmine
'
,
'
@angular
/cli
'
],
frameworks
:
[
'
jasmine
'
,
'
@angular
-devkit/build-angular
'
],
plugins
:
[
require
(
'
karma-jasmine
'
),
require
(
'
karma-chrome-launcher
'
),
require
(
'
karma-jasmine-html-reporter
'
),
require
(
'
karma-coverage-istanbul-reporter
'
),
require
(
'
@angular
/cli
/plugins/karma
'
)
require
(
'
@angular
-devkit/build-angular
/plugins/karma
'
)
],
client
:{
client
:
{
clearContext
:
false
// leave Jasmine Spec Runner output visible in browser
},
coverageIstanbulReporter
:
{
reports
:
[
'
html
'
,
'
lcovonly
'
],
dir
:
require
(
'
path
'
).
join
(
__dirname
,
'
./coverage/demo-angularIO
'
),
reports
:
[
'
html
'
,
'
lcovonly
'
,
'
text-summary
'
],
fixWebpackSourcePaths
:
true
},
angularCli
:
{
environment
:
'
dev
'
},
reporters
:
[
'
progress
'
,
'
kjhtml
'
],
port
:
9876
,
colors
:
true
,
logLevel
:
config
.
LOG_INFO
,
autoWatch
:
true
,
browsers
:
[
'
Chrome
'
],
singleRun
:
false
singleRun
:
false
,
restartOnFileChange
:
true
});
};
demo-angularIO/package-lock.json
View file @
0e5792aa
This diff is collapsed.
Click to expand it.
demo-angularIO/package.json
View file @
0e5792aa
{
"name"
:
"demo-angular-io"
,
"version"
:
"0.0.0"
,
"license"
:
"MIT"
,
"scripts"
:
{
"ng"
:
"ng"
,
"start"
:
"ng serve"
,
"build"
:
"ng build
--prod
"
,
"build"
:
"ng build"
,
"test"
:
"ng test"
,
"lint"
:
"ng lint"
,
"e2e"
:
"ng e2e"
},
"private"
:
true
,
"dependencies"
:
{
"@angular/animations"
:
"^5.2.0"
,
"@angular/cdk"
:
"^5.2.4"
,
"@angular/common"
:
"^5.2.0"
,
"@angular/compiler"
:
"^5.2.0"
,
"@angular/core"
:
"^5.2.0"
,
"@angular/flex-layout"
:
"^5.0.0-beta.14"
,
"@angular/forms"
:
"^5.2.0"
,
"@angular/http"
:
"^5.2.0"
,
"@angular/material"
:
"^5.2.4"
,
"@angular/platform-browser"
:
"^5.2.0"
,
"@angular/platform-browser-dynamic"
:
"^5.2.0"
,
"@angular/router"
:
"^5.2.0"
,
"core-js"
:
"^2.4.1"
,
"moment"
:
"^2.22.0"
,
"rxjs"
:
"^5.5.6"
,
"zone.js"
:
"^0.8.19"
"@angular/animations"
:
"~8.1.3"
,
"@angular/cdk"
:
"~8.1.2"
,
"@angular/common"
:
"~8.1.3"
,
"@angular/compiler"
:
"~8.1.3"
,
"@angular/core"
:
"~8.1.3"
,
"@angular/flex-layout"
:
"^8.0.0-beta.26"
,
"@angular/forms"
:
"~8.1.3"
,
"@angular/material"
:
"^8.1.2"
,
"@angular/platform-browser"
:
"~8.1.3"
,
"@angular/platform-browser-dynamic"
:
"~8.1.3"
,
"@angular/router"
:
"~8.1.3"
,
"rxjs"
:
"~6.4.0"
,
"tslib"
:
"^1.9.0"
,
"zone.js"
:
"~0.9.1"
},
"devDependencies"
:
{
"@angular/cli"
:
"~1.7.4"
,
"@angular/compiler-cli"
:
"^5.2.0"
,
"@angular/language-service"
:
"^5.2.0"
,
"@types/jasmine"
:
"~2.8.3"
,
"@types/jasminewd2"
:
"~2.0.2"
,
"@types/node"
:
"~6.0.60"
,
"codelyzer"
:
"^4.0.1"
,
"jasmine-core"
:
"~2.8.0"
,
"@angular-devkit/build-angular"
:
"~0.801.3"
,
"@angular/cli"
:
"~8.1.3"
,
"@angular/compiler-cli"
:
"~8.1.3"
,
"@angular/language-service"
:
"~8.1.3"
,
"@types/node"
:
"~8.9.4"
,
"@types/jasmine"
:
"~3.3.8"
,
"@types/jasminewd2"
:
"~2.0.3"
,
"codelyzer"
:
"^5.0.0"
,
"jasmine-core"
:
"~3.4.0"
,
"jasmine-spec-reporter"
:
"~4.2.1"
,
"karma"
:
"~
2.0
.0"
,
"karma"
:
"~
4.1
.0"
,
"karma-chrome-launcher"
:
"~2.2.0"
,
"karma-coverage-istanbul-reporter"
:
"
^1.2
.1"
,
"karma-jasmine"
:
"~
1.1.0
"
,
"karma-jasmine-html-reporter"
:
"^
0.2.2
"
,
"protractor"
:
"~5.
1.2
"
,
"ts-node"
:
"~
4.1
.0"
,
"tslint"
:
"~5.
9.1
"
,
"typescript"
:
"~
2.5
.3"
"karma-coverage-istanbul-reporter"
:
"
~2.0
.1"
,
"karma-jasmine"
:
"~
2.0.1
"
,
"karma-jasmine-html-reporter"
:
"^
1.4.0
"
,
"protractor"
:
"~5.
4.0
"
,
"ts-node"
:
"~
7.0
.0"
,
"tslint"
:
"~5.
15.0
"
,
"typescript"
:
"~
3.4
.3"
}
}
demo-angularIO/src/app/app-routing.module.ts
View file @
0e5792aa
...
...
@@ -10,7 +10,7 @@ import { LineChartDemoComponent } from './linechart-demo/linechart-demo.componen
import
{
RadialChartDemoComponent
}
from
'
./radialchart-demo/radialchart-demo.component
'
;
import
{
ResizeableChartDemoComponent
}
from
'
./resizeable-demo/resizeable-demo.component
'
;
import
{
ScatterChartDemoComponent
}
from
'
./scatterchart-demo/scatterchart-demo.component
'
;
import
{
ZoomPanDem
m
oComponent
}
from
'
./zoom-pan-dem
m
o/zoom-pan-dem
m
o.component
'
;
import
{
ZoomPanDemoComponent
}
from
'
./zoom-pan-demo/zoom-pan-demo.component
'
;
@
NgModule
(
{
imports
:
[
...
...
@@ -53,7 +53,7 @@ import { ZoomPanDemmoComponent } from './zoom-pan-demmo/zoom-pan-demmo.component
},
{
path
:
'
zoom
'
,
component
:
ZoomPanDem
m
oComponent
,
component
:
ZoomPanDemoComponent
,
},
{
path
:
'
**
'
,
...
...
demo-angularIO/src/app/app.component.spec.ts
View file @
0e5792aa
import
{
TestBed
,
async
}
from
'
@angular/core/testing
'
;
import
{
RouterTestingModule
}
from
'
@angular/router/testing
'
;
import
{
AppComponent
}
from
'
./app.component
'
;
describe
(
'
AppComponent
'
,
()
=>
{
beforeEach
(
async
(()
=>
{
TestBed
.
configureTestingModule
({
imports
:
[
RouterTestingModule