Skip to content

Commit

Permalink
bump chart.js (#263)
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveSkender authored May 25, 2023
1 parent 3c3e73a commit 4b6b89f
Show file tree
Hide file tree
Showing 5 changed files with 112 additions and 67 deletions.
5 changes: 3 additions & 2 deletions .github/build.main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ jobs:
- task: Npm@1
displayName: Install packages
inputs:
workingDir: Client
verbose: false
command: 'custom'
workingDir: 'Client'
customCommand: 'install --legacy-peer-deps'

- task: qetza.replacetokens.replacetokens-task.replacetokens@3
displayName: Update GA tag
Expand Down
10 changes: 9 additions & 1 deletion Client/.vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@
"cSpell.words": [
"chartjs",
"devkit",
"lookback",
"MACD",
"matero",
"noselect",
"Ohlc",
"tinycolor"
"SUPERTREND",
"timeseries",
"tinycolor",
"ucid",
"uiid",
"unsavable",
"Xaxes"
]
}
148 changes: 90 additions & 58 deletions Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@
"@angular/router": "^15.2.5",
"@ctrl/tinycolor": "^3.6.0",
"@ng-matero/extensions": "^15.2.1",
"chart.js": "^3.9.1",
"chartjs-adapter-date-fns": "^2.0.0",
"chart.js": "^4.3.0",
"chartjs-adapter-date-fns": "^3.0.0",
"chartjs-chart-financial": "^0.1.1",
"chartjs-plugin-annotation": "^2.0.1",
"chartjs-plugin-annotation": "^3.0.1",
"chartjs-plugin-crosshair": "^1.2.0",
"date-fns": "^2.29.3",
"date-fns": "^2.30.0",
"guid-typescript": "^1.0.9",
"ngx-color": "^8.0.3",
"rxjs": "^7.5.6",
Expand Down
8 changes: 6 additions & 2 deletions Client/src/app/chart/chart.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,12 @@ export class ChartService {
right: 2
},
},
border: {
display: false
},
grid: {
drawOnChartArea: true,
drawTicks: false,
drawBorder: false,
lineWidth: 0.5,
color: function (context) {
if (context.tick.label === null) {
Expand Down Expand Up @@ -258,9 +260,11 @@ export class ChartService {
size: 9
},
},
border: {
display: false
},
grid: {
drawOnChartArea: false,
drawBorder: false,
tickLength: 2
}
};
Expand Down

0 comments on commit 4b6b89f

Please sign in to comment.