fix: components import

src/containers/Administration/Login.js

@@ -11,8 +11,8 @@ import {
   Input
 } from 'reactstrap';
 
-import Card from '../../components/Card';
+import Card from '../../components/UI/Card';
-import Button from '../../components/Button';
+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

src/containers/Administration/Settings.js

@@ -11,8 +11,8 @@ import {
   Input
 } from 'reactstrap';
 
-import Card from '../../components/Card';
+import Card from '../../components/UI/Card';
-import Button from '../../components/Button';
+import Button from '../../components/UI/Button';
 
 class Settings extends Component {
   constructor(props) {

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

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 Card from '../../components/UI/Card';
-import Table from '../../components/Table';
+import TicketTable from '../../components/TicketTable';
-import DropDown from '../../components/DropDown';
+import DropDown from '../../components/UI/DropDown';
-import Button from '../../components/Button';
+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>

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 Card from '../../components/UI/Card';
-import DropDown from '../../components/DropDown';
+import DropDown from '../../components/UI/DropDown';
-import Button from '../../components/Button';
+import Button from '../../components/UI/Button';
 
 // TODO: improve form validation
 class CreateTicket extends Component {

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 Card from '../../components/UI/Card';
-import Logo from '../../components/Logo';
+import Logo from '../../components/UI/Logo';
-import Button from '../../components/Button';
+import Button from '../../components/UI/Button';
 
 import logoCreateTicket from '../../assets/create_ticket.svg';
 

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';
 
 

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);
+export default connect(null, mapDispatchToProps)(Logout);

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>

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) => {

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 Card from '../../components/UI/Card';
-import Table from '../../components/Table';
+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} />
+        <TicketTable data={data} />
-        <Link to="/">
-          Back to home
-        </Link>
       </Card>
     );
   }