Skip to content

Commit

Permalink
Add d3 as npm dependency and remove from bower (#683)
Browse files Browse the repository at this point in the history
  • Loading branch information
Tonkpils authored Feb 2, 2024
1 parent f0bf386 commit d184126
Show file tree
Hide file tree
Showing 15 changed files with 11 additions and 12 deletions.
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-blank-flat.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Ember from 'ember';
import Graphable from 'flaredown/components/chart/graphable';
import * as d3 from "d3";

const {
get,
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-blank-trackable.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Ember from 'ember';
import Graphable from 'flaredown/components/chart/graphable';
import * as d3 from "d3";

const {
computed,
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-flat.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Ember from 'ember';
import moment from 'moment';
import Graphable from 'flaredown/components/chart/graphable';
import * as d3 from "d3";

const {
get,
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-hbi.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import Ember from 'ember';
import moment from 'moment';
import Colorable from 'flaredown/mixins/colorable';
import Graphable from 'flaredown/components/chart/graphable';
import * as d3 from "d3";

const {
$,
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-timeline.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Ember from 'ember';
import moment from 'moment';
import * as d3 from "d3";

export default Ember.Component.extend( {
tagName: 'g',
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-trackable.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import Ember from 'ember';
import moment from 'moment';
import Graphable from 'flaredown/components/chart/graphable';
import * as d3 from "d3";

const {
$,
Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/g-weather.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Ember from 'ember';
import moment from 'moment';
import * as d3 from "d3";
import Colorable from 'flaredown/mixins/colorable';
import Graphable from 'flaredown/components/chart/graphable';

Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/chart/graphable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import Ember from 'ember';
import * as d3 from "d3";

/* no-unexpected-multiline: "error" */

Expand Down
1 change: 1 addition & 0 deletions frontend/app/components/health-chart.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { extendMoment } from 'moment-range';
import Resizable from './chart/resizable';
import FieldsByUnits from 'flaredown/mixins/fields-by-units';
import DatesRetriever from 'flaredown/mixins/chart/dates-retriever';
import * as d3 from "d3";

const moment = extendMoment(Moment);

Expand Down
3 changes: 1 addition & 2 deletions frontend/app/components/pattern/chart-group.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Ember from 'ember';
import moment from 'moment';

/* global d3 */
import * as d3 from "d3";

const {
get,
Expand Down
2 changes: 0 additions & 2 deletions frontend/app/components/pattern/chart-hover.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Ember from 'ember';
import moment from 'moment';

/* global d3 */

const {
$,
get,
Expand Down
3 changes: 1 addition & 2 deletions frontend/app/components/pattern/chart-item.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Ember from 'ember';
import moment from 'moment';

/* global d3 */
import * as d3 from "d3";

const {
$,
Expand Down
2 changes: 0 additions & 2 deletions frontend/app/components/pattern/chart-legend-item.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import Ember from 'ember';

/* global d3 */

const {
get,
computed,
Expand Down
1 change: 0 additions & 1 deletion frontend/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "flaredown",
"dependencies": {
"pace": "vectart/pace",
"d3": "~3.5.13",
"pickadate": "^3.5.6",
"At.js": "^1.5.4"
}
Expand Down
3 changes: 0 additions & 3 deletions frontend/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,6 @@ module.exports = function(defaults) {
// Spinkit
app.import('node_modules/spinkit/spinkit.css')

// d3
app.import(app.bowerDirectory + '/d3/d3.min.js');

// HTML5 Drag and Drop Polyfill for Mobile
app.import('node_modules/mobile-drag-drop/default.css')
app.import('node_modules/mobile-drag-drop/icons.css')
Expand Down

0 comments on commit d184126

Please sign in to comment.