hasura · rikinsk-zz · Apr 26, 2019 · Apr 26, 2019 · Apr 26, 2019
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import {
   loadInconsistentObjects,
   redirectToMetadataStatus,
-} from '../Services/Data/Metadata/Actions';
+} from '../Services/Metadata/Actions';
 import Spinner from '../Common/Spinner/Spinner';
 
 import { Link } from 'react-router';

@@ -10,7 +10,7 @@ import {
   ADMIN_SECRET_ERROR,
   UPDATE_DATA_HEADERS,
 } from '../Services/Data/DataActions';
-import { changeRequestHeader } from '../ApiExplorer/Actions';
+import { changeRequestHeader } from '../Services/ApiExplorer/Actions';
 
 const SET_MIGRATION_STATUS_SUCCESS = 'Main/SET_MIGRATION_STATUS_SUCCESS';
 const SET_MIGRATION_STATUS_ERROR = 'Main/SET_MIGRATION_STATUS_ERROR';

@@ -13,7 +13,7 @@ import semverCheck from '../../helpers/semver';
 import {
   loadInconsistentObjects,
   redirectToMetadataStatus,
-} from '../Services/Data/Metadata/Actions';
+} from '../Services/Metadata/Actions';
 
 const semver = require('semver');
 
@@ -141,12 +141,12 @@ class Main extends React.Component {
 
     const appPrefix = '';
 
-    const logo = require('./white-logo.svg');
-    const github = require('./Github.svg');
-    const discord = require('./Discord.svg');
-    const mail = require('./mail.svg');
-    const docs = require('./logo.svg');
-    const pixHeart = require('./pix-heart.svg');
+    const logo = require('./images/white-logo.svg');
+    const github = require('./images/Github.svg');
+    const discord = require('./images/Discord.svg');
+    const mail = require('./images/mail.svg');
+    const docs = require('./images/logo.svg');
+    const pixHeart = require('./images/pix-heart.svg');
 
     const currentLocation = location.pathname;
     const currentActiveBlock = currentLocation.split('/')[1];

@@ -7,7 +7,7 @@ import { parse } from 'graphql';
 import { execute } from 'apollo-link';
 
 import { getHeadersAsJSON } from './utils';
-import { saveAppState, clearState } from '../AppState.js';
+import { saveAppState, clearState } from '../../AppState.js';
 
 const CHANGE_TAB = 'ApiExplorer/CHANGE_TAB';
 const CHANGE_API_SELECTION = 'ApiExplorer/CHANGE_API_SELECTION';

@@ -1,4 +1,4 @@
-@import "../Common/Common.scss";
+@import "../../Common/Common.scss";
 
 .display_inl {
   display: inline-block;

@@ -24,11 +24,11 @@ import {
   setGraphiQLHeadersInLocalStorage,
 } from './utils';
 
-import globals from '../../../Globals';
+import globals from '../../../../Globals';
 
 import GraphiQLWrapper from '../GraphiQLWrapper/GraphiQLWrapper';
 
-import CollapsibleToggle from '../../Common/CollapsibleToggle/CollapsibleToggle';
+import CollapsibleToggle from '../../../Common/CollapsibleToggle/CollapsibleToggle';
 
 import styles from '../ApiExplorer.scss';
 

@@ -6,7 +6,7 @@ import OneGraphExplorer from '../OneGraphExplorer/OneGraphExplorer';
 
 import { clearCodeMirrorHints, setQueryVariableSectionHeight } from './utils';
 import { analyzeFetcher, graphQLFetcherFinal } from '../Actions';
-import semverCheck from '../../../helpers/semver';
+import semverCheck from '../../../../helpers/semver';
 
 import './GraphiQL.css';
 
@@ -92,7 +92,7 @@ class GraphiQLWrapper extends Component {
   }
 
   render() {
-    const styles = require('../../Common/Common.scss');
+    const styles = require('../../../Common/Common.scss');
 
     const { supportAnalyze, analyzeApiChange, headerFocus } = this.state;
 

@@ -1,4 +1,4 @@
-import globals from '../../Globals';
+import globals from '../../../Globals';
 
 const defaultHeader = [
   {

@@ -1,7 +1,7 @@
 import React from 'react';
 import TextAreaWithCopy from '../../../Common/TextAreaWithCopy/TextAreaWithCopy';
-import RemoteSchemaContent from '../../CommonLanding/RemoteSchemaContent';
-import EventTriggerContent from '../../CommonLanding/EventTriggerContent';
+import RemoteSchemaContent from './RemoteSchemaContent';
+import EventTriggerContent from './EventTriggerContent';
 
 const styles = require('./Popup.scss');
 
@@ -13,7 +13,7 @@ const ContentMap = {
 };
 class PopUp extends React.Component {
   render() {
-    const close = require('./cancel.svg');
+    const close = require('./images/cancel.svg');
     const { onClose, title, queryDefinition, footerDescription } = this.props;
     // const queryDefinition = 'query { hello }';
     return (

@@ -1,5 +1,5 @@
-@import "../../../Common/Common.scss";
-@import "../../../Common/TextAreaWithCopy/TextAreaWithCopy.scss";
+@import "../../../Common/Common";
+@import "../../../Common/TextAreaWithCopy/TextAreaWithCopy";
 
 .wd100 {
   width: 100%;

@@ -3,8 +3,8 @@ import PropTypes from 'prop-types';
 
 class TopicDescription extends React.Component {
   render() {
-    const Rectangle = require('../CustomResolver/Landing/Rectangle.svg');
-    const styles = require('../CustomResolver/CustomResolver.scss');
+    const Rectangle = require('./images/Rectangle.svg');
+    const styles = require('../../CustomResolver/CustomResolver.scss');
     const { title, imgUrl, imgAlt, description } = this.props;
     return (
       <div>

@@ -1,6 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import PopUp from '../CustomResolver/Landing/PopUp';
+import PopUp from './PopUp';
 
 class TryItOut extends React.Component {
   constructor() {
@@ -13,13 +13,13 @@ class TryItOut extends React.Component {
     this.setState({ isPopUp: !this.state.isPopUp });
   }
   render() {
-    const Rectangle = require('../CustomResolver/Landing/Rectangle.svg');
-    const styles = require('../CustomResolver/CustomResolver.scss');
-    const glitch = require('../CustomResolver/Landing/glitch.png');
-    const googleCloud = require('../CustomResolver/Landing/google_cloud.svg');
-    const MicrosoftAzure = require('../CustomResolver/Landing/Microsoft_Azure_Logo.svg');
-    const AWS = require('../CustomResolver/Landing/AWS.png');
-    const externalLink = require('../CustomResolver/Landing/external-link.svg');
+    const Rectangle = require('./images/Rectangle.svg');
+    const styles = require('../../CustomResolver/CustomResolver.scss');
+    const glitch = require('./images/glitch.png');
+    const googleCloud = require('./images/google_cloud.svg');
+    const MicrosoftAzure = require('./images/Microsoft_Azure_Logo.svg');
+    const AWS = require('./images/AWS.png');
+    const externalLink = require('./images/external-link.svg');
     // const { title, imgUrl, imgAlt,  description} = this.props;
     return (
       <div>

@@ -9,7 +9,7 @@ import { push } from 'react-router-redux';
 import { fetchResolver, RESET } from '../Add/addResolverReducer';
 
 import { VIEW_RESOLVER } from '../customActions';
-import ReloadMetadata from '../../Data/Metadata/ReloadMetadata';
+import ReloadMetadata from '../../Metadata/ReloadMetadata';
 
 import { appPrefix } from '../constants';
 

@@ -5,14 +5,12 @@ import { push } from 'react-router-redux';
 import { appPrefix, pageTitle } from '../constants';
 import globals from '../../../../Globals';
 import Button from '../../../Common/Button/Button';
-import TopicDescription from '../../CommonLanding/TopicDescription';
-import TryItOut from '../../CommonLanding/TryItOut';
+import TopicDescription from '../../Common/Landing/TopicDescription';
+import TryItOut from '../../Common/Landing/TryItOut';
 
 class CustomResolver extends React.Component {
   render() {
     const styles = require('../CustomResolver.scss');
-    // const node = require('./Node.svg');
-    // const Rectangle = require('./Rectangle.svg');
 
     const { dispatch, migrationMode, customResolverList } = this.props;