Merge 4220f87 into 6c69f41

openmrs · Jul 18, 2018 · 55e7c75 · 55e7c75
2 parents 6c69f41 + 4220f87
commit 55e7c75
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 58 deletions.
diff --git a/src/App.css b/src/App.css
@@ -3,6 +3,7 @@
 }
 .nav {
   background-color: rgba(0, 0, 0, 0.856) !important;
+  position: inherit;
 }
 .navbar-brand {
   color: white !important;

diff --git a/src/components/dashboard/components/SideNavigation.jsx b/src/components/dashboard/components/SideNavigation.jsx
diff --git a/src/components/dashboard/components/dictionary/DictionaryContainer.jsx b/src/components/dashboard/components/dictionary/DictionaryContainer.jsx
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 import '../../styles/index.css';
 import './styles/dictionary-modal.css';
 import DictionaryDetailCard from './DictionaryDetailCard';
-import SideBar from '../SideNavigation';
 import Loader from '../../../Loader';
 import { fetchDictionary } from '../../../../redux/actions/dictionaries/dictionaryActionCreators';
 
@@ -36,7 +35,6 @@ export class DictionaryOverview extends Component {
     const { loader } = this.props;
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         {loader ? (
           <div className="text-center mt-3" id="loader">
             <Loader />

diff --git a/src/components/dashboard/components/dictionary/ListDictionaries.jsx b/src/components/dashboard/components/dictionary/ListDictionaries.jsx
@@ -8,7 +8,7 @@ const ListDictionaries = ({
 }) => {
   if (fetching) {
     return (
-      <div className="text-center mt-3">
+      <div className="text-center mt-3" id="load">
         <Loader />
       </div>
     );
@@ -27,13 +27,6 @@ const ListDictionaries = ({
 
     );
   }
-  if (fetching) {
-    return (
-      <div className="text-center mt-3">
-        <Loader />
-      </div>
-    );
-  }
   return (
     <div className="text-center mt-3">
       <h5>No Dictionaries Found <span aria-label="sad-emoji" role="img"> 😞 </span> </h5>

diff --git a/src/components/dashboard/components/dictionary/styles/dictionary-modal.css b/src/components/dashboard/components/dictionary/styles/dictionary-modal.css
@@ -15,7 +15,7 @@
     padding-top: 3%;
     padding-left: 4%;
     padding-right: 8%;
-    margin-left: 13%;
+    margin-left: 4%;
 }
 .paragraph{
     color: black;

diff --git a/src/components/dashboard/components/dictionary/user/UserDashboard.jsx b/src/components/dashboard/components/dictionary/user/UserDashboard.jsx
@@ -6,7 +6,7 @@ const UserDashboard = ({ viewState, organizations }) => {
     <div className="container-fluid">
       <div className="row justify-content-center">
         <div className="col-1" />
-        <div className="col-sm-12 col-md-10  mt-2 col-12">
+        <div className="col-sm-12 col-md-10  mt-2 col-12" id="userInfo">
           <Alert className="dashboard-alert">
             <h6>
               Hello {localStorage.getItem('username')} 👋, you belong to{' '}

diff --git a/src/components/dashboard/container/Concepts.jsx b/src/components/dashboard/container/Concepts.jsx
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import fetchConceptsAction from '../../../redux/actions/concepts/index';
 import '../styles/index.css';
 
-import SideBar from '../components/SideNavigation';
 import SearchConcept from '../components/concepts/Search';
 import ConceptList from '../components/concepts/ConceptList';
 
@@ -52,7 +51,6 @@ export class ConceptSearch extends Component {
     } = this.state;
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         <SearchConcept
           onSearch={this.onSearch}
           onSubmit={this.onSubmit}

diff --git a/src/components/dashboard/container/DictionariesDisplay.jsx b/src/components/dashboard/container/DictionariesDisplay.jsx
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import '../styles/index.css';
 import { fetchDictionaries, searchDictionaries } from '../../../redux/actions/dictionaries/dictionaryActionCreators';
 import { clearDictionaries } from '../../../redux/actions/dictionaries/dictionaryActions';
-import SideBar from '../components/SideNavigation';
 import ListDictionaries from '../components/dictionary/ListDictionaries';
 import SearchDictionaries from '../components/dictionary/DictionariesSearch';
 
@@ -52,7 +51,6 @@ export class DictionaryDisplay extends Component {
     const { searchInput } = this.state;
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         <div className="dashboard-head">
           <div className="public-dictionaries">
             <p> Public Dictionaries </p>
@@ -67,7 +65,7 @@ export class DictionaryDisplay extends Component {
           </div>
 
 
-          <div className="row justify-content-center public-search">
+          <div className="row justify-content-center public-search" id="container">
             <div className="offset-sm-1 col-10">
               <ListDictionaries
                 dictionaries={dictionaries}

diff --git a/src/components/dashboard/container/OwnerDictionary.jsx b/src/components/dashboard/container/OwnerDictionary.jsx
@@ -5,7 +5,6 @@ import { connect } from 'react-redux';
 import '../styles/index.css';
 import { fetchDictionaries, searchDictionaries } from '../../../redux/actions/dictionaries/dictionaryActionCreators';
 import { clearDictionaries } from '../../../redux/actions/dictionaries/dictionaryActions';
-import SideBar from '../components/SideNavigation';
 import OwnerListDictionaries from '../components/dictionary/OwnerListDictionaries';
 import SearchDictionaries from '../components/dictionary/DictionariesSearch';
 import UserDashboard from '../components/dictionary/user/UserDashboard';
@@ -59,7 +58,6 @@ export class OwnerDictionary extends Component {
     const { searchInput } = this.state;
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         <UserDashboard
           dictionaries={dictionaries}
           organizations={organizations}

diff --git a/src/components/dashboard/container/SourceSearch.jsx b/src/components/dashboard/container/SourceSearch.jsx
@@ -9,7 +9,7 @@ import { clearSources } from '../../../redux/actions/sources/sourcesActionCreato
 import { fetchingOrganizations } from '../../../redux/actions/dictionaries/dictionaryActionCreators';
 import '../styles/index.css';
 
-import SideBar from '../components/SideNavigation';
+
 import SearchBar from '../components/SearchBar';
 import ListWrapper from '../components/ListWrapper';
 
@@ -102,7 +102,6 @@ export class SourceSearch extends Component {
     const { hasMore, sources, isFetching } = this.props;
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         <SearchBar onSearch={this.onSearch} onSubmit={this.onSubmit} searchValue={searchInput} />
         <div className="container-fluid">
           <div className="row justify-content-center">

diff --git a/src/components/dashboard/container/SpecificConcept.jsx b/src/components/dashboard/container/SpecificConcept.jsx
@@ -7,7 +7,6 @@ import InfiniteScroll from 'react-infinite-scroll-component';
 import fetchConceptsActionTypes from '../../../redux/actions/concepts/specificConceptAction';
 import '../styles/index.css';
 
-import SideBar from '../components/SideNavigation';
 import { clearConcepts } from '../../../redux/actions/concepts/ConceptActionCreators';
 import SearchConcept from '../components/concepts/Search';
 import SpecificConceptList from '../components/concepts/SpecificConceptList';
@@ -92,7 +91,6 @@ export class SpecificConcept extends Component {
     const userType = localStorage.getItem('type');
     return (
       <div className="dashboard-wrapper">
-        <SideBar />
         <SearchConcept
           onSearch={this.onSearch}
           onSubmit={this.onSubmit}

diff --git a/src/components/dashboard/styles/index.css b/src/components/dashboard/styles/index.css
@@ -49,7 +49,6 @@ nav {
   height: 2rem;
   outline: none;
   box-shadow: none;
-  margin-right: 30%;
 }
 
 .search-bar-wrapper:hover {
@@ -62,8 +61,9 @@ nav {
   border-radius: 10rem;
   padding: 0.3rem;
   margin-right: 54%;
-  width: 110%;
+  width: 100%;
   margin-left: 2%;
+  margin-left: -6%;
 
 }
 
@@ -192,7 +192,7 @@ nav {
 }
 
 .dashboard-wrapper {
-  margin-top: 2rem;
+  margin-top: 0.5rem;
 }
 .title-wrapper {
   text-align: center;
@@ -420,7 +420,7 @@ nav {
   background-color: whitesmoke;
   margin-top: 10px;
   float: right;
-  margin-right: 80px; 
+  margin-right: 37%;
   border-radius: 20px;
 
 }
@@ -495,7 +495,7 @@ p{
   margin-top: 0.8rem;
   margin-right: -4%;
   float: left;
-  margin-left: 186px;
+  margin-left: 103px;
 }
 .public-search{
   float:left;
@@ -513,3 +513,30 @@ p{
 #generalSearch::placeholder{
   color: #f5f5f594;
 }
+
+#container{
+  margin-left: -42px;
+  margin-right: -42px;
+}
+
+@media (min-width: 576px){
+.offset-sm-1 {
+  margin-left: 0.333333%;
+}
+}
+@media (min-width: 992px){
+.col-lg-7 {
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 58.333333%;
+    flex: 0 0 58.333333%;
+    max-width: 89.333333%;
+}}
+
+#userInfo{
+  margin-left: -9%;
+}
+
+#load {
+  width: 600px;
+  padding-left: 55%;
+}