Skip to content

Commit

Permalink
Fix Module Imports
Browse files Browse the repository at this point in the history
__Issue__: After restructing application, things began to break due to
incorrect module/file imports.

__Fix__: Moved down and across application filesystem and added in the
necessary relative module/file imports to resolve issue.
  • Loading branch information
Dev-Dominic committed Sep 26, 2020
1 parent 1ca31b7 commit b187cf1
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 15 deletions.
2 changes: 1 addition & 1 deletion src/components/Base.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import React from "react";

/* Components Imports */
import Sidebar from "./Sidebar";
import Sidebar from "./sidebar";

/* Styles and Assets Imports */
import "../styles/main.css";
Expand Down
2 changes: 2 additions & 0 deletions src/components/sidebar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import Sidebar from "./sidebar";
export default Sidebar;
4 changes: 2 additions & 2 deletions src/components/sidebar/sidebar.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import query from "../../utils/query";
import { createChart, createFavorite, createDatapoint } from "../../utils/api";

/* Tailwind css build */
import "../styles/main.css";
import "../../styles/main.css";

/* Fontawesome Icons */
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
Expand All @@ -22,7 +22,7 @@ import {
} from "@fortawesome/free-solid-svg-icons";

/* Assets Imports */
import PattooLogo from "../assets/pattoo-light 1.png";
import PattooLogo from "../../assets/pattoo-light 1.png";

// Binding React Modal to public/index.html 'modal' element
Modal.setAppElement("#modal");
Expand Down
2 changes: 1 addition & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { BrowserRouter } from "react-router-dom";
import "./styles/main.css";

/* Routes Imports */
import RouteClient from "./RouteClient";
import RouteClient from "./routes/routeClient";

function App() {
return <RouteClient />;
Expand Down
10 changes: 5 additions & 5 deletions src/routes/dashboard/dashboard.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
import React, { useState, useEffect } from "react";

/* Components Import */
import DashboardComponent from "../components/Dashboard";
import DashboardComponent from "../../components/Dashboard";

/* Querying */
import queryResource from "../graphql_client";
import { userFavorite } from "../api";
import query from "../../utils/query";
import { userFavorite } from "../../utils/api";

/* Tailwind css build */
import "../styles/main.css";
import "../../styles/main.css";

function parseFavoriteCharts(response) {
return response.data.data.allFavorite.edges
Expand Down Expand Up @@ -50,7 +50,7 @@ function Dashboard() {
const userID = localStorage.getItem("userID");

useEffect(() => {
queryResource(userFavorite(userID, token))
query(userFavorite(userID, token))
.then((response) => setChartData(parseFavoriteCharts(response)))
.catch(console.log);
}, []);
Expand Down
4 changes: 2 additions & 2 deletions src/routes/login/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ import React, { useState } from "react";
import { useHistory } from "react-router-dom";

/* Authentication method imports */
import { authenticate } from "../graphql_client";
import { authenticate } from "../../utils/query";

/* Components */
import LoginComponent from "../components/Login";
import LoginComponent from "../../components/Login";

function Login() {
const history = useHistory();
Expand Down
4 changes: 2 additions & 2 deletions src/routes/routeClient/routesClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import React from "react";
import { Route, Switch, Redirect } from "react-router-dom";

/* Route components */
import Login from "../Login";
import Dashboard from "../Dashboard";
import Login from "../login";
import Dashboard from "../dashboard";

function ProtectedRoute({ component: Component, ...props }) {
return (
Expand Down
4 changes: 2 additions & 2 deletions src/utils/query/query.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/* Authentication query */
import { userAuth } from "./api";
import { userAuth } from "../api";

/* Imports */
const axios = require("axios").default;

const serverUrl = "http://localhost:20202/pattoo/api/v1/web/graphql";

async function queryResource(data) {
async function query(data) {
return await axios({
method: "post",
url: serverUrl,
Expand Down

0 comments on commit b187cf1

Please sign in to comment.