Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/updatesYel'
Browse files Browse the repository at this point in the history
  • Loading branch information
Blari committed Sep 13, 2021
2 parents b61cb90 + 78af0ea commit 7404bdc
Show file tree
Hide file tree
Showing 472 changed files with 17,292 additions and 9,237 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NODE_PATH=src/
GENERATE_SOURCEMAP=false
45 changes: 45 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,49 @@
# Changelog
## [1.1.6]
Added User Management Component
Added Route Components
Added Auth Pages(forgot password, login page, register page, reset password)

## [1.1.5]
updated work with backend on page Auth, Analytics, Products
updated following dependencies and devDependencies:
`"dependencies": {
"@amcharts/amcharts4": "^4.10.18" - "^4.10.21"
"@amcharts/amcharts4-geodata": "^4.1.20" - "^4.1.21"
"@fullcalendar/core": "5.7.0" - "5.9.0",
"@fullcalendar/daygrid": "5.7.0" - "5.9.0",
"@fullcalendar/interaction": "5.7.0" - "5.9.0",
"@fullcalendar/list": "5.7.0" - "5.9.0",
"@fullcalendar/react": "5.7.0" - "5.9.0",
"@fullcalendar/timegrid": "5.7.0" - "5.9.0",
"@nivo/bar": "^0.70.1" - "^0.73.1",
"@nivo/calendar": "^0.70.1" - "^0.73.1",
"@nivo/chord": "^0.70.1" - "^0.73.0",
"@nivo/circle-packing": "^0.70.1" - "^0.73.0",
"@nivo/core": "^0.70.1" - "^0.73.0" ,
"@nivo/pie": "^0.70.1" - "^0.73.0" ,
"@nivo/stream": "^0.70.1" - "^0.73.0",
"@nivo/radar": "^0.70.1" - "^0.73.0",
"@nivo/sunburst": "^0.70.1" - "^0.73.0",
"@nivo/swarmplot": "^0.70.1" - "^0.73.0",
"@nivo/waffle": "^0.70.1" - "^0.73.0",
"apexcharts": "^3.27.1" - "^3.27.3",
"formik": "^2.2.8" - "^2.2.9",
"prettier": "^2.3.0" - "^2.3.2",
"redux": "^4.1.0" - "^4.1.1",
"sortablejs": "1.13.0" - "1.14.0"
}
"devDependencies": {
"@babel/core": "7.14.3" - "7.15.0",
"@babel/plugin-proposal-class-properties": "7.13.0" - "7.14.5",
"@babel/plugin-proposal-optional-chaining": "^7.14.2" - "^7.14.5",
"babel-plugin-named-asset-import": "1.0.0-next.103" - "1.0.0-next.75",
"eslint-plugin-import": "2.23.2" - "2.24.0",
"eslint-plugin-react": "7.23.2" - "7.24.0",
"pnp-webpack-plugin": "1.6.4" - "1.7.0",
"react-responsive-carousel": "^3.2.18" - "^3.2.20"
}`

## [1.1.4]
- updated position icon on page Grid,
- customized vector map circles
Expand Down
332 changes: 167 additions & 165 deletions docs/asset-manifest.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
@@ -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/3.04af20ef.chunk.css" rel="stylesheet"><link href="./tables/css/main.e59ef86b.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(c){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],i=0,a=[];i<n.length;i++)t=n[i],f[t]&&a.push(f[t][0]),f[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(c[r]=o[r]);for(d&&d(e);a.length;)a.shift()();return p.push.apply(p,u||[]),l()}function l(){for(var e,r=0;r<p.length;r++){for(var t=p[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==f[u]&&(n=!1)}n&&(p.splice(r--,1),e=s(s.s=t[0]))}return e}var t={},f={1:0},p=[];function s(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return c[e].call(r.exports,r,r.exports,s),r.l=!0,r.exports}s.e=function(u){var e=[],t=f[u];if(0!==t)if(t)e.push(t[2]);else{var r=new Promise(function(e,r){t=f[u]=[e,r]});e.push(t[2]=r);var n,i=document.createElement("script");i.charset="utf-8",i.timeout=120,s.nc&&i.setAttribute("nonce",s.nc),i.src=s.p+"tables/js/"+({2:"xlsx"}[u]||u)+"."+{2:"f7c8ed73",4:"bcd8bd7c",5:"6479814a",6:"639f7754"}[u]+".chunk.js",n=function(e){i.onerror=i.onload=null,clearTimeout(a);var r=f[u];if(0!==r){if(r){var t=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,o=new Error("Loading chunk "+u+" failed.\n("+t+": "+n+")");o.type=t,o.request=n,r[1](o)}f[u]=void 0}};var a=setTimeout(function(){n({type:"timeout",target:i})},12e4);i.onerror=i.onload=n,document.head.appendChild(i)}return Promise.all(e)},s.m=c,s.c=t,s.d=function(e,r,t){s.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},s.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.t=function(r,e){if(1&e&&(r=s(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(s.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)s.d(t,n,function(e){return r[e]}.bind(null,n));return t},s.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return s.d(r,"a",r),r},s.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},s.p="./",s.oe=function(e){throw console.error(e),e};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 d=n;l()}([])</script><script src="./tables/js/3.7522cae5.chunk.js"></script><script src="./tables/js/main.1ea60bec.chunk.js"></script></body></html>
<!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/3.2bef38fe.chunk.css" rel="stylesheet"><link href="/./tables/css/main.16b82a83.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(e){function r(r){for(var n,a,i=r[0],c=r[1],l=r[2],p=0,s=[];p<i.length;p++)a=i[p],Object.prototype.hasOwnProperty.call(o,a)&&o[a]&&s.push(o[a][0]),o[a]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);for(f&&f(r);s.length;)s.shift()();return u.push.apply(u,l||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,i=1;i<t.length;i++){var c=t[i];0!==o[c]&&(n=!1)}n&&(u.splice(r--,1),e=a(a.s=t[0]))}return e}var n={},o={1:0},u=[];function a(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,a),t.l=!0,t.exports}a.e=function(e){var r=[],t=o[e];if(0!==t)if(t)r.push(t[2]);else{var n=new Promise((function(r,n){t=o[e]=[r,n]}));r.push(t[2]=n);var u,i=document.createElement("script");i.charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.src=function(e){return a.p+"tables/js/"+({2:"xlsx"}[e]||e)+"."+{2:"487d1d10",4:"774c8f54",5:"c8544285",6:"0a807a7d"}[e]+".chunk.js"}(e);var c=new Error;u=function(r){i.onerror=i.onload=null,clearTimeout(l);var t=o[e];if(0!==t){if(t){var n=r&&("load"===r.type?"missing":r.type),u=r&&r.target&&r.target.src;c.message="Loading chunk "+e+" failed.\n("+n+": "+u+")",c.name="ChunkLoadError",c.type=n,c.request=u,t[1](c)}o[e]=void 0}};var l=setTimeout((function(){u({type:"timeout",target:i})}),12e4);i.onerror=i.onload=u,document.head.appendChild(i)}return Promise.all(r)},a.m=e,a.c=n,a.d=function(e,r,t){a.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},a.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.t=function(e,r){if(1&r&&(e=a(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(a.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)a.d(t,n,function(r){return e[r]}.bind(null,n));return t},a.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return a.d(r,"a",r),r},a.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},a.p="/./",a.oe=function(e){throw console.error(e),e};var i=window.webpackJsonp=window.webpackJsonp||[],c=i.push.bind(i);i.push=r,i=i.slice();for(var l=0;l<i.length;l++)r(i[l]);var f=c;t()}([])</script><script src="/./tables/js/3.1fde697d.chunk.js"></script><script src="/./tables/js/main.cd08fb45.chunk.js"></script></body></html>
Loading

0 comments on commit 7404bdc

Please sign in to comment.