Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve naming across rd3g codebase #62

Merged
merged 1 commit into from
Apr 1, 2018
Merged

Improve naming across rd3g codebase #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sandbox/Sandbox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Form from 'react-jsonschema-form';

import './styles.css';

import defaultConfig from '../src/components/graph/config';
import defaultConfig from '../src/components/graph/graph.config';
import { Graph } from '../src';
import data from './data';
import Utils from './utils';
Expand Down
4 changes: 2 additions & 2 deletions src/components/graph/index.jsx → src/components/graph/Graph.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import {
} from 'd3-selection';
import { zoom as d3Zoom } from 'd3-zoom';

import CONST from './const';
import DEFAULT_CONFIG from './config';
import CONST from './graph.const';
import DEFAULT_CONFIG from './graph.config';
import ERRORS from '../../err';

import * as graphRenderer from './graph.renderer';
Expand Down
0 src/components/graph/config.js → src/components/graph/graph.config.js
View file
Open in desktop
File renamed without changes.
0 src/components/graph/const.js → src/components/graph/graph.const.js
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/components/graph/graph.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import {
forceManyBody as d3ForceManyBody
} from 'd3-force';

import CONST from './const';
import DEFAULT_CONFIG from './config';
import CONST from './graph.const';
import DEFAULT_CONFIG from './graph.config';
import ERRORS from '../../err';

import utils from '../../utils';
Expand Down
6 changes: 3 additions & 3 deletions src/components/graph/graph.renderer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
*/
import React from 'react';

import CONST from './const';
import CONST from './graph.const';

import Link from '../link/';
import Node from '../node/';
import Link from '../link/Link';
import Node from '../node/Node';
import {
buildLinkProps,
buildNodeProps
Expand Down
0 src/components/link/index.jsx → src/components/link/Link.jsx
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions src/components/node/index.jsx → src/components/node/Node.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React from 'react';

import CONST from './const';
import CONST from './node.const';

import nodeHelper from './helper';
import nodeHelper from './node.helper';

/**
* Node component is responsible for encapsulating node render.
Expand Down
2 changes: 1 addition & 1 deletion src/components/node/const.js → src/components/node/node.const.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import CONFIG from '../graph/config';
import CONFIG from '../graph/graph.config';
import CONST from '../../const';

export default {
Expand Down
2 changes: 1 addition & 1 deletion src/components/node/helper.js → src/components/node/node.helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
symbol as d3Symbol
} from 'd3-shape';

import CONST from './const';
import CONST from './node.const';

/**
* Converts a string that specifies a symbol into a concrete instance
Expand Down
6 changes: 3 additions & 3 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Graph from './components/graph';
import Node from './components/node';
import Link from './components/link';
import Graph from './components/graph/Graph';
import Node from './components/node/Node';
import Link from './components/link/Link';

export { Graph, Node, Link };
2 changes: 1 addition & 1 deletion test/component/graph/graph.helper.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as graphHelper from '../../../src/components/graph/graph.helper';

import config from '../../../src/components/graph/config';
import config from '../../../src/components/graph/graph.config';

import utils from '../../../src/utils';

Expand Down
2 changes: 1 addition & 1 deletion test/component/graph/graph.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Graph from '../../../src/components/graph';
import Graph from '../../../src/components/graph/Graph';
import graphMock from './graph.mock.js';

describe('Graph Component', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/component/link/link.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Link from '../../../src/components/link';
import Link from '../../../src/components/link/Link';

describe('Link Component', () => {
let that = {};
Expand Down
2 changes: 1 addition & 1 deletion test/component/node/node.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Node from '../../../src/components/node';
import Node from '../../../src/components/node/Node';

describe('Node Component', () => {
let that = {};
Expand Down
2 changes: 1 addition & 1 deletion test/snapshot/graph/graph.snapshot.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Graph from '../../../src/components/graph';
import Graph from '../../../src/components/graph/Graph';
import graphMock from './graph.mock.js';

describe('Snapshot - Graph Component', () => {
Expand Down
2 changes: 1 addition & 1 deletion test/snapshot/link/link.snapshot.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Link from '../../../src/components/link';
import Link from '../../../src/components/link/Link';

describe('Snapshot - Link Component', () => {
let that = {};
Expand Down
2 changes: 1 addition & 1 deletion test/snapshot/node/node.snapshot.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import renderer from 'react-test-renderer';

import Node from '../../../src/components/node';
import Node from '../../../src/components/node/Node';

describe('Snapshot - Node Component', () => {
let that = {};
Expand Down