Skip to content

Commit

Permalink
Merge pull request #15 from Samagra-Anamaya/ui-enhancements
Browse files Browse the repository at this point in the history
Missing Tabs fix
  • Loading branch information
amit-s19 authored Dec 13, 2023
2 parents 51d6df4 + 22a948a commit 90328ef
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
27 changes: 14 additions & 13 deletions src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,27 @@
import { Admin, ListGuesser, localStorageStore, nanoDarkTheme, nanoLightTheme, Resource, StoreContextProvider, useStore } from "react-admin";
import { Admin, localStorageStore, nanoLightTheme, Resource, StoreContextProvider } from "react-admin";
import { customDataProvider } from "./dataProvider";
import { authProvider } from "./authProvider";
import Dashboard from "./pages/dashboard";

import { EnumeratorDetails } from "./components/enumerator/enumerator-details";
import { EnumeratorList } from "./components/enumerator/enumerator-list";
import gps from "./pages/gps";
import villages from "./pages/villages";
import submissions from "./pages/submissions";
import { themes, ThemeName } from './themes/themes';
import Layout from './layout/Layout';
import Login from "./pages/login";
import { MenuItemsWithPermissionResolver } from "./components/MenuOptions";


const store = localStorageStore(undefined, 'stride');
export const store = localStorageStore(undefined, 'stride');

const App = () => {

const ri = setInterval(() => {
if (location.href.includes('gps') || location.href.includes('transactions')) {
let reloaded = store.getItem("reload");
if (!reloaded) {
store.setItem('reload', true)
clearInterval(ri);
window.location.reload();
}
}
}, 500)


return <Admin
store={store}
dataProvider={customDataProvider}
Expand All @@ -27,9 +31,6 @@ const App = () => {
layout={Layout}
loginPage={Login}
>
{/* <Resource name="gps" {...gps} />
<Resource name="villages" {...villages} />
<Resource name="submissions" {...submissions} /> */}

{(permissions) =>
MenuItemsWithPermissionResolver(permissions).map((option, index) => {
Expand Down
2 changes: 2 additions & 0 deletions src/authProvider.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { AuthProvider } from "react-admin";
import { jwtDecode } from "jwt-decode";
import { store } from "./App";

/**
* This authProvider is only for test purposes. Don't use it in production.
Expand Down Expand Up @@ -38,6 +39,7 @@ export const authProvider: AuthProvider = {
},
logout: () => {
localStorage.removeItem("user");
store.removeItem('reload')
return Promise.resolve();
},
checkError: () => Promise.resolve(),
Expand Down

0 comments on commit 90328ef

Please sign in to comment.