Skip to content

Commit 7c5f2e0

Browse files
fix: redux store sidebarToggle
1 parent eb0b671 commit 7c5f2e0

12 files changed

+27
-29
lines changed

docs/asset-manifest.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"main.css": "./tables/css/main.97b9412d.chunk.css",
3-
"main.js": "./tables/js/main.55374990.chunk.js",
2+
"main.css": "./tables/css/main.53e8a30d.chunk.css",
3+
"main.js": "./tables/js/main.9b87a894.chunk.js",
44
"runtime~main.js": "./tables/js/runtime~main.2a54d9e9.js",
55
"tables/css/2.134a3e29.chunk.css": "./tables/css/2.134a3e29.chunk.css",
6-
"tables/js/2.b3f6eafa.chunk.js": "./tables/js/2.b3f6eafa.chunk.js",
6+
"tables/js/2.c8c070f1.chunk.js": "./tables/js/2.c8c070f1.chunk.js",
77
"index.html": "./index.html",
8-
"precache-manifest.29a20770fb6f72fc8cc1d1f89b1a5ee4.js": "./precache-manifest.29a20770fb6f72fc8cc1d1f89b1a5ee4.js",
8+
"precache-manifest.da2bcddd963c6ed31cf4daf881650213.js": "./precache-manifest.da2bcddd963c6ed31cf4daf881650213.js",
99
"service-worker.js": "./service-worker.js",
1010
"tables/css/2.134a3e29.chunk.css.map": "./tables/css/2.134a3e29.chunk.css.map",
11-
"tables/css/main.97b9412d.chunk.css.map": "./tables/css/main.97b9412d.chunk.css.map",
11+
"tables/css/main.53e8a30d.chunk.css.map": "./tables/css/main.53e8a30d.chunk.css.map",
1212
"tables/media/1.png": "./tables/media/1.png",
1313
"tables/media/2.png": "./tables/media/2.png",
1414
"tables/media/3.png": "./tables/media/3.png",

docs/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="./favicon.png"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><title>Flatlogic One React - Admin Template built with React</title><meta name="description" content="React Admin Dashboard Template built with Bootstrap, Redux and React Router by Flatlogic. Over 40 unique pages, hundreds of components and theme support."><meta name="keywords" content="react admin, react dashboard, react admin template, react theme, react dashboard template, react dashboard template"><meta name="author" content="Flatlogic LLC."><script async src="https://www.googletagmanager.com/gtag/js?id=UA-36759672-9"></script><script>function gtag(){dataLayer.push(arguments)}window.dataLayer=window.dataLayer||[],gtag("js",new Date),gtag("config","UA-36759672-9")</script><script type="text/javascript">!function(e,a,t,c,n,m,r){e.ym=e.ym||function(){(e.ym.a=e.ym.a||[]).push(arguments)},e.ym.l=1*new Date,m=a.createElement(t),r=a.getElementsByTagName(t)[0],m.async=1,m.src="https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js",r.parentNode.insertBefore(m,r)}(window,document,"script"),ym(48020168,"init",{id:48020168,clickmap:!0,trackLinks:!0,accurateTrackBounce:!0,webvisor:!0,trackHash:!0,ecommerce:"dataLayer"})</script><link href="./tables/css/2.134a3e29.chunk.css" rel="stylesheet"><link href="./tables/css/main.97b9412d.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./tables/js/2.b3f6eafa.chunk.js"></script><script src="./tables/js/main.55374990.chunk.js"></script></body></html>
1+
<!doctype html><html lang="en"><head><meta charset="utf-8"><link rel="shortcut icon" href="./favicon.png"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><link rel="manifest" href="./manifest.json"><title>Flatlogic One React - Admin Template built with React</title><meta name="description" content="React Admin Dashboard Template built with Bootstrap, Redux and React Router by Flatlogic. Over 40 unique pages, hundreds of components and theme support."><meta name="keywords" content="react admin, react dashboard, react admin template, react theme, react dashboard template, react dashboard template"><meta name="author" content="Flatlogic LLC."><script async src="https://www.googletagmanager.com/gtag/js?id=UA-36759672-9"></script><script>function gtag(){dataLayer.push(arguments)}window.dataLayer=window.dataLayer||[],gtag("js",new Date),gtag("config","UA-36759672-9")</script><script type="text/javascript">!function(e,a,t,c,n,m,r){e.ym=e.ym||function(){(e.ym.a=e.ym.a||[]).push(arguments)},e.ym.l=1*new Date,m=a.createElement(t),r=a.getElementsByTagName(t)[0],m.async=1,m.src="https://cdn.jsdelivr.net/npm/yandex-metrica-watch/tag.js",r.parentNode.insertBefore(m,r)}(window,document,"script"),ym(48020168,"init",{id:48020168,clickmap:!0,trackLinks:!0,accurateTrackBounce:!0,webvisor:!0,trackHash:!0,ecommerce:"dataLayer"})</script><link href="./tables/css/2.134a3e29.chunk.css" rel="stylesheet"><link href="./tables/css/main.53e8a30d.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="./";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="./tables/js/2.c8c070f1.chunk.js"></script><script src="./tables/js/main.9b87a894.chunk.js"></script></body></html>

docs/precache-manifest.29a20770fb6f72fc8cc1d1f89b1a5ee4.js renamed to docs/precache-manifest.da2bcddd963c6ed31cf4daf881650213.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
self.__precacheManifest = (self.__precacheManifest || []).concat([
22
{
3-
"revision": "b582f79f0b038e93156d8bccb8cdb156",
3+
"revision": "8b99a1b7a33ed9f0bb8dacb6ff6a0b0b",
44
"url": "./index.html"
55
},
66
{
7-
"revision": "b3f6eafa6986d85f456a",
7+
"revision": "c8c070f16d7b3247a9f7",
88
"url": "./tables/css/2.134a3e29.chunk.css"
99
},
1010
{
11-
"revision": "553749908e60f1ffbccb",
12-
"url": "./tables/css/main.97b9412d.chunk.css"
11+
"revision": "9b87a8944479e63cf17d",
12+
"url": "./tables/css/main.53e8a30d.chunk.css"
1313
},
1414
{
15-
"revision": "b3f6eafa6986d85f456a",
16-
"url": "./tables/js/2.b3f6eafa.chunk.js"
15+
"revision": "c8c070f16d7b3247a9f7",
16+
"url": "./tables/js/2.c8c070f1.chunk.js"
1717
},
1818
{
19-
"revision": "553749908e60f1ffbccb",
20-
"url": "./tables/js/main.55374990.chunk.js"
19+
"revision": "9b87a8944479e63cf17d",
20+
"url": "./tables/js/main.9b87a894.chunk.js"
2121
},
2222
{
2323
"revision": "2a54d9e93026e45eee9d",

docs/service-worker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
1515

1616
importScripts(
17-
"./precache-manifest.29a20770fb6f72fc8cc1d1f89b1a5ee4.js"
17+
"./precache-manifest.da2bcddd963c6ed31cf4daf881650213.js"
1818
);
1919

2020
self.addEventListener('message', (event) => {

docs/tables/css/main.97b9412d.chunk.css renamed to docs/tables/css/main.53e8a30d.chunk.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/tables/css/main.53e8a30d.chunk.css.map

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/tables/css/main.97b9412d.chunk.css.map

-1
This file was deleted.

docs/tables/js/2.b3f6eafa.chunk.js renamed to docs/tables/js/2.c8c070f1.chunk.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/tables/js/main.55374990.chunk.js renamed to docs/tables/js/main.9b87a894.chunk.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/Layout/Layout.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class Layout extends React.Component {
5757
}
5858

5959
handleResize() {
60-
if (window.innerWidth <= 768 && this.props.sidebarStatic) {
60+
if (window.innerWidth <= 768) {
6161
this.props.dispatch(toggleSidebar());
6262
} else if (window.innerWidth >= 768) {
6363
this.props.dispatch(openSidebar());
@@ -83,7 +83,6 @@ class Layout extends React.Component {
8383
<div
8484
className={[
8585
s.root,
86-
this.props.sidebarStatic ? `${s.sidebarStatic}` : "",
8786
!this.props.sidebarOpened ? s.sidebarClose : "",
8887
"flatlogic-one",
8988
`dashboard-${

src/components/Layout/Layout.module.scss

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@
1111
position: relative;
1212
min-height: 100vh;
1313
display: flex;
14-
margin-left: 284px;
14+
margin-left: $sidebar-width-open;
1515
flex-direction: column;
16-
//left: $sidebar-width-open - $sidebar-width-closed;
1716
right: 0;
1817
transition: left $sidebar-transition-time ease-in-out, margin-left $sidebar-transition-time ease-in-out;
1918

2019
@media (max-width: breakpoint-max(sm)) {
21-
margin-left: 0;
22-
//left: $sidebar-width-open;
20+
left: $sidebar-width-open;
21+
margin-left: 0px;
2322
}
2423
}
2524

src/reducers/navigation.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
} from '../actions/navigation';
77

88
const initialState = {
9-
sidebarOpened: false,
10-
sidebarStatic: true,
9+
sidebarOpened: true,
10+
sidebarStatic: false,
1111
activeItem: window.location.pathname,
1212
};
1313

@@ -16,7 +16,7 @@ export default function runtime(state = initialState, action) {
1616
case TOGGLE_SIDEBAR:
1717
return {
1818
...state,
19-
sidebarStatic: !state.sidebarStatic,
19+
sidebarOpened: !state.sidebarOpened,
2020
};
2121
case OPEN_SIDEBAR:
2222
return Object.assign({}, state, {

0 commit comments

Comments
 (0)