From 505b2ef6aff0083cc18694e7fa9c6473d8361da4 Mon Sep 17 00:00:00 2001
From: Francesco Esposito <33671357+frsposito@users.noreply.github.com>
Date: Sat, 9 Nov 2019 17:36:16 +0100
Subject: [PATCH] fix: components import

---
 src/containers/Administration/Login.js         |  5 +++--
 src/containers/Administration/Settings.js      |  4 ++--
 src/containers/Administration/TicketList.js    | 10 ++++++----
 src/containers/Administration/TicketManager.js | 10 +++++-----
 src/containers/CreateTicket/CreateTicket.js    |  6 +++---
 src/containers/HomePage/CreateTicketCard.js    |  6 +++---
 src/containers/HomePage/SearchTicketCard.js    |  4 ++--
 src/containers/Logout.js                       |  8 ++------
 src/containers/NavBar.js                       |  5 +----
 src/containers/PageNotFound.js                 |  2 +-
 src/containers/ViewTicket/ViewTicket.js        | 11 ++++-------
 11 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/src/containers/Administration/Login.js b/src/containers/Administration/Login.js
index 06b7ae6..5219109 100644
--- a/src/containers/Administration/Login.js
+++ b/src/containers/Administration/Login.js
@@ -11,8 +11,8 @@ import {
   Input
 } from 'reactstrap';
 
-import Card from '../../components/Card';
-import Button from '../../components/Button';
+import Card from '../../components/UI/Card';
+import Button from '../../components/UI/Button';
 
 class Login extends Component {
   constructor(props) {
@@ -77,6 +77,7 @@ class Login extends Component {
       <Card
         align="left"
         title="Login"
+        footerLink={{ path: "/", name: "Back to home" }}
       >
         <Row>
           <Col
diff --git a/src/containers/Administration/Settings.js b/src/containers/Administration/Settings.js
index 12aa4dc..4a2db67 100644
--- a/src/containers/Administration/Settings.js
+++ b/src/containers/Administration/Settings.js
@@ -11,8 +11,8 @@ import {
   Input
 } from 'reactstrap';
 
-import Card from '../../components/Card';
-import Button from '../../components/Button';
+import Card from '../../components/UI/Card';
+import Button from '../../components/UI/Button';
 
 class Settings extends Component {
   constructor(props) {
diff --git a/src/containers/Administration/TicketList.js b/src/containers/Administration/TicketList.js
index 0816c6d..c89c45f 100644
--- a/src/containers/Administration/TicketList.js
+++ b/src/containers/Administration/TicketList.js
@@ -10,12 +10,12 @@ import {
 import PaginationComponent from "react-reactstrap-pagination";
 
 import { formatDate, formatStatus } from '../../utils/helper';
-import { getTickets, viewTicket, findTicket} from '../../api/tickets';
+import { getTickets, findTicket} from '../../api/tickets';
 import { getAllTicketStatus } from '../../api/categories';
 
-import Card from '../../components/Card';
+import Card from '../../components/UI/Card';
 import SearchForm from '../../components/SearchForm';
-import DropDown from '../../components/DropDown';
+import DropDown from '../../components/UI/DropDown';
 
 
 const paginationStyle = {
@@ -152,7 +152,9 @@ class TicketList extends Component {
     }
 
     return (
-      <Card title="Ticket List">
+      <Card 
+        title="Ticket List"
+        footerLink={{ path: "/", name: "Back to home" }} >
         <Row>
           <Col md={{ size: 4 }}>
             <SearchForm
diff --git a/src/containers/Administration/TicketManager.js b/src/containers/Administration/TicketManager.js
index 8dac962..bb20ca6 100644
--- a/src/containers/Administration/TicketManager.js
+++ b/src/containers/Administration/TicketManager.js
@@ -13,10 +13,10 @@ import {
 import { getAllTicketStatus } from '../../api/categories';
 import { viewTicket, updateTicket } from '../../api/tickets';
 
-import Card from '../../components/Card';
-import Table from '../../components/Table';
-import DropDown from '../../components/DropDown';
-import Button from '../../components/Button';
+import Card from '../../components/UI/Card';
+import TicketTable from '../../components/TicketTable';
+import DropDown from '../../components/UI/DropDown';
+import Button from '../../components/UI/Button';
 
 
 class TicketManager extends Component {
@@ -113,7 +113,7 @@ class TicketManager extends Component {
         >
           <Row>
             <Col>
-              <Table data={data} />
+              <TicketTable data={data} />
               <Link to="/admin/">Back to Ticket List</Link>
             </Col>
           </Row>
diff --git a/src/containers/CreateTicket/CreateTicket.js b/src/containers/CreateTicket/CreateTicket.js
index f76a1ce..89cb522 100644
--- a/src/containers/CreateTicket/CreateTicket.js
+++ b/src/containers/CreateTicket/CreateTicket.js
@@ -11,9 +11,9 @@ import {
 import { createTicket } from '../../api/tickets';
 import { getAllTicketType } from '../../api/categories';
 
-import Card from '../../components/Card';
-import DropDown from '../../components/DropDown';
-import Button from '../../components/Button';
+import Card from '../../components/UI/Card';
+import DropDown from '../../components/UI/DropDown';
+import Button from '../../components/UI/Button';
 
 // TODO: improve form validation
 class CreateTicket extends Component {
diff --git a/src/containers/HomePage/CreateTicketCard.js b/src/containers/HomePage/CreateTicketCard.js
index 97dab52..d222d09 100644
--- a/src/containers/HomePage/CreateTicketCard.js
+++ b/src/containers/HomePage/CreateTicketCard.js
@@ -1,9 +1,9 @@
 import React from 'react';
 import { Link } from 'react-router-dom';
 
-import Card from '../../components/Card';
-import Logo from '../../components/Logo';
-import Button from '../../components/Button';
+import Card from '../../components/UI/Card';
+import Logo from '../../components/UI/Logo';
+import Button from '../../components/UI/Button';
 
 import logoCreateTicket from '../../assets/create_ticket.svg';
 
diff --git a/src/containers/HomePage/SearchTicketCard.js b/src/containers/HomePage/SearchTicketCard.js
index 0c33626..40e2ee3 100644
--- a/src/containers/HomePage/SearchTicketCard.js
+++ b/src/containers/HomePage/SearchTicketCard.js
@@ -1,9 +1,9 @@
 import React, { Component } from 'react';
 import { Redirect } from 'react-router-dom';
 
-import Card from '../../components/Card';
+import Card from '../../components/UI/Card';
 import SearchForm from '../../components/SearchForm';
-import Logo from '../../components/Logo';
+import Logo from '../../components/UI/Logo';
 import logoSearchTicket from '../../assets/search_ticket.svg';
 
 
diff --git a/src/containers/Logout.js b/src/containers/Logout.js
index f0428ee..f47c938 100644
--- a/src/containers/Logout.js
+++ b/src/containers/Logout.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 
 import { userActions } from './../_actions';
-import Card from '../components/Card';
+import Card from '../components/UI/Card';
 
 
 const Logout = (props) => {
@@ -20,10 +20,6 @@ const Logout = (props) => {
   );
 };
 
-const mapStateToProps = (state) => {
-  return {};
-};
-
 const mapDispatchToProps = (dispatch) => {
   return {
     logout: () => dispatch(userActions.logout()),
@@ -31,4 +27,4 @@ const mapDispatchToProps = (dispatch) => {
 };
 
 
-export default connect(mapStateToProps, mapDispatchToProps)(Logout);
\ No newline at end of file
+export default connect(null, mapDispatchToProps)(Logout);
\ No newline at end of file
diff --git a/src/containers/NavBar.js b/src/containers/NavBar.js
index 68bbc72..a1023d0 100644
--- a/src/containers/NavBar.js
+++ b/src/containers/NavBar.js
@@ -14,7 +14,7 @@ import {
   NavItem
 } from 'reactstrap';
 
-import Button from '../components/Button';
+import Button from '../components/UI/Button';
 import './NavBar.css';
 import logo from '../assets/admin.svg';
 
@@ -55,10 +55,7 @@ class NavBar extends Component {
       >
         <Container>
           <NavbarBrand
-            onClick={this.closeNavbar}
             className="title"
-            tag={Link}
-            to="/"
           >
             tick3t
           </NavbarBrand>
diff --git a/src/containers/PageNotFound.js b/src/containers/PageNotFound.js
index c42a5c9..59d4821 100644
--- a/src/containers/PageNotFound.js
+++ b/src/containers/PageNotFound.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import Card from '../components/Card';
+import Card from '../components/UI/Card';
 
 
 const PageNotFound = (props) => {
diff --git a/src/containers/ViewTicket/ViewTicket.js b/src/containers/ViewTicket/ViewTicket.js
index 7baba5b..e909463 100644
--- a/src/containers/ViewTicket/ViewTicket.js
+++ b/src/containers/ViewTicket/ViewTicket.js
@@ -1,10 +1,9 @@
 import React, { Component } from 'react';
-import { Link } from 'react-router-dom';
 
 import { viewTicket } from '../../api/tickets';
 
-import Card from '../../components/Card';
-import Table from '../../components/Table';
+import Card from '../../components/UI/Card';
+import TicketTable from '../../components/TicketTable';
 
 class ViewTicket extends Component {
   constructor(props) {
@@ -43,11 +42,9 @@ class ViewTicket extends Component {
         title="View Ticket"
         headAlign="left"
         bodyAlign="center"
+        footerLink={{ path: "/", name: "Go to home" }}
       >
-        <Table data={data} />
-        <Link to="/">
-          Back to home
-        </Link>
+        <TicketTable data={data} />
       </Card>
     );
   }