@blaze-cms/plugin-admin-core-ui 0.146.0-alpha.40 → 0.146.0-alpha.49
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [0.146.0-alpha.49](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.48...v0.146.0-alpha.49) (2025-05-16)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* show login modal when user is logged out ([#4755](https://github.com/thebyte9/blaze/issues/4755)) ([507e274](https://github.com/thebyte9/blaze/commit/507e2742ade7a2416c6e46782f3b33a97e7e8396))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
# [0.146.0-alpha.42](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.41...v0.146.0-alpha.42) (2025-05-06)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @blaze-cms/plugin-admin-core-ui
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
# [0.146.0-alpha.40](https://github.com/thebyte9/blaze/compare/v0.146.0-alpha.39...v0.146.0-alpha.40) (2025-04-15)
|
|
7
26
|
|
|
8
27
|
**Note:** Version bump only for package @blaze-cms/plugin-admin-core-ui
|
|
@@ -19,9 +19,10 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
19
19
|
var _components = require("@apollo/client/react/components");
|
|
20
20
|
var _adminUiUtils = require("@blaze-cms/admin-ui-utils");
|
|
21
21
|
var _pluginAuthUi = require("@blaze-cms/plugin-auth-ui");
|
|
22
|
+
var _coreAuthUi = require("@blaze-cms/core-auth-ui");
|
|
23
|
+
require("@blaze-cms/admin-ui-styles/main.scss");
|
|
22
24
|
var _components2 = require("./components");
|
|
23
25
|
var _Background = _interopRequireDefault(require("./Background"));
|
|
24
|
-
require("@blaze-cms/admin-ui-styles/main.scss");
|
|
25
26
|
var _Header = _interopRequireDefault(require("../Header"));
|
|
26
27
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
|
|
27
28
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
|
|
@@ -53,7 +54,7 @@ var Layout = function Layout(_ref) {
|
|
|
53
54
|
isLoggedIn: isLoggedIn,
|
|
54
55
|
onMenuClick: onMenuClick,
|
|
55
56
|
isOpenMenu: isOpenMenu
|
|
56
|
-
}), isLoggedIn ? /*#__PURE__*/_react["default"].createElement(_react["default"].
|
|
57
|
+
}), isLoggedIn ? /*#__PURE__*/_react["default"].createElement(_coreAuthUi.BlazeAuthContextWrapper, null, /*#__PURE__*/_react["default"].createElement(_pluginAuthUi.LoginModal, null), /*#__PURE__*/_react["default"].createElement(_components2.Grid, {
|
|
57
58
|
isOpenMenu: isOpenMenu,
|
|
58
59
|
onMenuClick: onMenuClick,
|
|
59
60
|
userData: userData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Layout.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_components","_adminUiUtils","_pluginAuthUi","_components2","_Background","_Header","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Layout","_ref","children","_useState","useState","_useState2","_slicedToArray2","isOpenMenu","setOpenMenu","onMenuClick","simpleLayout","window","location","parent","wrapperClass","createElement","className","concat","Query","query","getQuery","errorPolicy","_ref2","_ref2$data","data","_data$session","session","_data$session2","isLoggedIn","_data$session2$userDa","userData","Fragment","Grid","Login","propTypes","PropTypes","oneOfType","arrayOf","node","isRequired","_default","exports"],"sources":["../../../src/components/Layout/Layout.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { Query } from '@apollo/client/react/components';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\nimport { Login } from '@blaze-cms/plugin-auth-ui';\nimport {
|
|
1
|
+
{"version":3,"file":"Layout.js","names":["_react","_interopRequireWildcard","require","_propTypes","_interopRequireDefault","_components","_adminUiUtils","_pluginAuthUi","_coreAuthUi","_components2","_Background","_Header","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","Layout","_ref","children","_useState","useState","_useState2","_slicedToArray2","isOpenMenu","setOpenMenu","onMenuClick","simpleLayout","window","location","parent","wrapperClass","createElement","className","concat","Query","query","getQuery","errorPolicy","_ref2","_ref2$data","data","_data$session","session","_data$session2","isLoggedIn","_data$session2$userDa","userData","Fragment","BlazeAuthContextWrapper","LoginModal","Grid","Login","propTypes","PropTypes","oneOfType","arrayOf","node","isRequired","_default","exports"],"sources":["../../../src/components/Layout/Layout.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { Query } from '@apollo/client/react/components';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\nimport { Login, LoginModal } from '@blaze-cms/plugin-auth-ui';\nimport { BlazeAuthContextWrapper } from '@blaze-cms/core-auth-ui';\nimport '@blaze-cms/admin-ui-styles/main.scss';\nimport { Grid } from './components';\nimport Background from './Background';\n\nimport Header from '../Header';\n\nconst Layout = ({ children }) => {\n const [isOpenMenu, setOpenMenu] = useState(true);\n\n const onMenuClick = () => setOpenMenu(!isOpenMenu);\n\n const simpleLayout = window.location !== window.parent.location;\n const wrapperClass = simpleLayout ? ' grid--site-container--simle-layout' : '';\n\n return (\n <div className={`site-container grid--site-container${wrapperClass}`}>\n <Query query={getQuery('GET_USER_AUTH_DATA')} errorPolicy=\"all\">\n {({ data = {} }) => {\n const { session: { isLoggedIn, userData = {} } = {} } = data;\n\n return (\n <>\n {!simpleLayout && (\n <Header isLoggedIn={isLoggedIn} onMenuClick={onMenuClick} isOpenMenu={isOpenMenu} />\n )}\n {isLoggedIn ? (\n <BlazeAuthContextWrapper>\n <LoginModal />\n <Grid\n isOpenMenu={isOpenMenu}\n onMenuClick={onMenuClick}\n userData={userData}\n simpleLayout={simpleLayout}>\n {children}\n </Grid>\n </BlazeAuthContextWrapper>\n ) : (\n <Background>\n <Login />\n </Background>\n )}\n </>\n );\n }}\n </Query>\n </div>\n );\n};\n\nLayout.propTypes = {\n children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired\n};\n\nexport default Layout;\n"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,10 +2,11 @@ import React, { useState } from 'react';
|
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { Query } from '@apollo/client/react/components';
|
|
4
4
|
import { getQuery } from '@blaze-cms/admin-ui-utils';
|
|
5
|
-
import { Login } from '@blaze-cms/plugin-auth-ui';
|
|
5
|
+
import { Login, LoginModal } from '@blaze-cms/plugin-auth-ui';
|
|
6
|
+
import { BlazeAuthContextWrapper } from '@blaze-cms/core-auth-ui';
|
|
7
|
+
import '@blaze-cms/admin-ui-styles/main.scss';
|
|
6
8
|
import { Grid } from './components';
|
|
7
9
|
import Background from './Background';
|
|
8
|
-
import '@blaze-cms/admin-ui-styles/main.scss';
|
|
9
10
|
import Header from '../Header';
|
|
10
11
|
const Layout = ({
|
|
11
12
|
children
|
|
@@ -32,7 +33,7 @@ const Layout = ({
|
|
|
32
33
|
isLoggedIn: isLoggedIn,
|
|
33
34
|
onMenuClick: onMenuClick,
|
|
34
35
|
isOpenMenu: isOpenMenu
|
|
35
|
-
}), isLoggedIn ? /*#__PURE__*/React.createElement(React.
|
|
36
|
+
}), isLoggedIn ? /*#__PURE__*/React.createElement(BlazeAuthContextWrapper, null, /*#__PURE__*/React.createElement(LoginModal, null), /*#__PURE__*/React.createElement(Grid, {
|
|
36
37
|
isOpenMenu: isOpenMenu,
|
|
37
38
|
onMenuClick: onMenuClick,
|
|
38
39
|
userData: userData,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Layout.js","names":["React","useState","PropTypes","Query","getQuery","Login","Grid","Background","Header","Layout","children","isOpenMenu","setOpenMenu","onMenuClick","simpleLayout","window","location","parent","wrapperClass","createElement","className","query","errorPolicy","data","session","isLoggedIn","userData","Fragment","propTypes","oneOfType","arrayOf","node","isRequired"],"sources":["../../../src/components/Layout/Layout.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { Query } from '@apollo/client/react/components';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\nimport { Login } from '@blaze-cms/plugin-auth-ui';\nimport {
|
|
1
|
+
{"version":3,"file":"Layout.js","names":["React","useState","PropTypes","Query","getQuery","Login","LoginModal","BlazeAuthContextWrapper","Grid","Background","Header","Layout","children","isOpenMenu","setOpenMenu","onMenuClick","simpleLayout","window","location","parent","wrapperClass","createElement","className","query","errorPolicy","data","session","isLoggedIn","userData","Fragment","propTypes","oneOfType","arrayOf","node","isRequired"],"sources":["../../../src/components/Layout/Layout.js"],"sourcesContent":["import React, { useState } from 'react';\nimport PropTypes from 'prop-types';\nimport { Query } from '@apollo/client/react/components';\nimport { getQuery } from '@blaze-cms/admin-ui-utils';\nimport { Login, LoginModal } from '@blaze-cms/plugin-auth-ui';\nimport { BlazeAuthContextWrapper } from '@blaze-cms/core-auth-ui';\nimport '@blaze-cms/admin-ui-styles/main.scss';\nimport { Grid } from './components';\nimport Background from './Background';\n\nimport Header from '../Header';\n\nconst Layout = ({ children }) => {\n const [isOpenMenu, setOpenMenu] = useState(true);\n\n const onMenuClick = () => setOpenMenu(!isOpenMenu);\n\n const simpleLayout = window.location !== window.parent.location;\n const wrapperClass = simpleLayout ? ' grid--site-container--simle-layout' : '';\n\n return (\n <div className={`site-container grid--site-container${wrapperClass}`}>\n <Query query={getQuery('GET_USER_AUTH_DATA')} errorPolicy=\"all\">\n {({ data = {} }) => {\n const { session: { isLoggedIn, userData = {} } = {} } = data;\n\n return (\n <>\n {!simpleLayout && (\n <Header isLoggedIn={isLoggedIn} onMenuClick={onMenuClick} isOpenMenu={isOpenMenu} />\n )}\n {isLoggedIn ? (\n <BlazeAuthContextWrapper>\n <LoginModal />\n <Grid\n isOpenMenu={isOpenMenu}\n onMenuClick={onMenuClick}\n userData={userData}\n simpleLayout={simpleLayout}>\n {children}\n </Grid>\n </BlazeAuthContextWrapper>\n ) : (\n <Background>\n <Login />\n </Background>\n )}\n </>\n );\n }}\n </Query>\n </div>\n );\n};\n\nLayout.propTypes = {\n children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]).isRequired\n};\n\nexport default Layout;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,QAAQ,QAAQ,OAAO;AACvC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,KAAK,QAAQ,iCAAiC;AACvD,SAASC,QAAQ,QAAQ,2BAA2B;AACpD,SAASC,KAAK,EAAEC,UAAU,QAAQ,2BAA2B;AAC7D,SAASC,uBAAuB,QAAQ,yBAAyB;AACjE,OAAO,sCAAsC;AAC7C,SAASC,IAAI,QAAQ,cAAc;AACnC,OAAOC,UAAU,MAAM,cAAc;AAErC,OAAOC,MAAM,MAAM,WAAW;AAE9B,MAAMC,MAAM,GAAGA,CAAC;EAAEC;AAAS,CAAC,KAAK;EAC/B,MAAM,CAACC,UAAU,EAAEC,WAAW,CAAC,GAAGb,QAAQ,CAAC,IAAI,CAAC;EAEhD,MAAMc,WAAW,GAAGA,CAAA,KAAMD,WAAW,CAAC,CAACD,UAAU,CAAC;EAElD,MAAMG,YAAY,GAAGC,MAAM,CAACC,QAAQ,KAAKD,MAAM,CAACE,MAAM,CAACD,QAAQ;EAC/D,MAAME,YAAY,GAAGJ,YAAY,GAAG,qCAAqC,GAAG,EAAE;EAE9E,oBACEhB,KAAA,CAAAqB,aAAA;IAAKC,SAAS,EAAG,sCAAqCF,YAAa;EAAE,gBACnEpB,KAAA,CAAAqB,aAAA,CAAClB,KAAK;IAACoB,KAAK,EAAEnB,QAAQ,CAAC,oBAAoB,CAAE;IAACoB,WAAW,EAAC;EAAK,GAC5D,CAAC;IAAEC,IAAI,GAAG,CAAC;EAAE,CAAC,KAAK;IAClB,MAAM;MAAEC,OAAO,EAAE;QAAEC,UAAU;QAAEC,QAAQ,GAAG,CAAC;MAAE,CAAC,GAAG,CAAC;IAAE,CAAC,GAAGH,IAAI;IAE5D,oBACEzB,KAAA,CAAAqB,aAAA,CAAArB,KAAA,CAAA6B,QAAA,QACG,CAACb,YAAY,iBACZhB,KAAA,CAAAqB,aAAA,CAACX,MAAM;MAACiB,UAAU,EAAEA,UAAW;MAACZ,WAAW,EAAEA,WAAY;MAACF,UAAU,EAAEA;IAAW,CAAE,CACpF,EACAc,UAAU,gBACT3B,KAAA,CAAAqB,aAAA,CAACd,uBAAuB,qBACtBP,KAAA,CAAAqB,aAAA,CAACf,UAAU,MAAE,CAAC,eACdN,KAAA,CAAAqB,aAAA,CAACb,IAAI;MACHK,UAAU,EAAEA,UAAW;MACvBE,WAAW,EAAEA,WAAY;MACzBa,QAAQ,EAAEA,QAAS;MACnBZ,YAAY,EAAEA;IAAa,GAC1BJ,QACG,CACiB,CAAC,gBAE1BZ,KAAA,CAAAqB,aAAA,CAACZ,UAAU,qBACTT,KAAA,CAAAqB,aAAA,CAAChB,KAAK,MAAE,CACE,CAEd,CAAC;EAEP,CACK,CACJ,CAAC;AAEV,CAAC;AAEDM,MAAM,CAACmB,SAAS,GAAG;EACjBlB,QAAQ,EAAEV,SAAS,CAAC6B,SAAS,CAAC,CAAC7B,SAAS,CAAC8B,OAAO,CAAC9B,SAAS,CAAC+B,IAAI,CAAC,EAAE/B,SAAS,CAAC+B,IAAI,CAAC,CAAC,CAACC;AACrF,CAAC;AAED,eAAevB,MAAM","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/plugin-admin-core-ui",
|
|
3
|
-
"version": "0.146.0-alpha.
|
|
3
|
+
"version": "0.146.0-alpha.49",
|
|
4
4
|
"description": "Blaze plugin admin core ui",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,10 +27,10 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/admin-ui-styles": "0.146.0-alpha.
|
|
31
|
-
"@blaze-cms/admin-ui-utils": "0.146.0-alpha.
|
|
32
|
-
"@blaze-cms/core-ui": "0.146.0-alpha.
|
|
33
|
-
"@blaze-cms/plugin-search-ui": "0.146.0-alpha.
|
|
30
|
+
"@blaze-cms/admin-ui-styles": "0.146.0-alpha.49",
|
|
31
|
+
"@blaze-cms/admin-ui-utils": "0.146.0-alpha.42",
|
|
32
|
+
"@blaze-cms/core-ui": "0.146.0-alpha.42",
|
|
33
|
+
"@blaze-cms/plugin-search-ui": "0.146.0-alpha.42",
|
|
34
34
|
"@blaze-cms/setup-ui": "^0.140.3",
|
|
35
35
|
"@blaze-react/avatar": "0.5.19",
|
|
36
36
|
"@blaze-react/button": "0.8.0-alpha.82",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"react-router-dom": "^5.0.1"
|
|
48
48
|
},
|
|
49
49
|
"devDependencies": {
|
|
50
|
-
"@blaze-cms/plugin-auth-ui": "0.146.0-alpha.
|
|
50
|
+
"@blaze-cms/plugin-auth-ui": "0.146.0-alpha.49",
|
|
51
51
|
"lodash.merge": "^4.6.2",
|
|
52
52
|
"waait": "1.0.5"
|
|
53
53
|
},
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"lib/*",
|
|
56
56
|
"lib-es/*"
|
|
57
57
|
],
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "31e622e9811563552419f1167435935afd544585"
|
|
59
59
|
}
|
|
@@ -2,18 +2,20 @@ import React, { useState } from 'react';
|
|
|
2
2
|
import PropTypes from 'prop-types';
|
|
3
3
|
import { Query } from '@apollo/client/react/components';
|
|
4
4
|
import { getQuery } from '@blaze-cms/admin-ui-utils';
|
|
5
|
-
import { Login } from '@blaze-cms/plugin-auth-ui';
|
|
5
|
+
import { Login, LoginModal } from '@blaze-cms/plugin-auth-ui';
|
|
6
|
+
import { BlazeAuthContextWrapper } from '@blaze-cms/core-auth-ui';
|
|
7
|
+
import '@blaze-cms/admin-ui-styles/main.scss';
|
|
6
8
|
import { Grid } from './components';
|
|
7
9
|
import Background from './Background';
|
|
8
|
-
|
|
10
|
+
|
|
9
11
|
import Header from '../Header';
|
|
10
12
|
|
|
11
13
|
const Layout = ({ children }) => {
|
|
12
14
|
const [isOpenMenu, setOpenMenu] = useState(true);
|
|
15
|
+
|
|
13
16
|
const onMenuClick = () => setOpenMenu(!isOpenMenu);
|
|
14
17
|
|
|
15
18
|
const simpleLayout = window.location !== window.parent.location;
|
|
16
|
-
|
|
17
19
|
const wrapperClass = simpleLayout ? ' grid--site-container--simle-layout' : '';
|
|
18
20
|
|
|
19
21
|
return (
|
|
@@ -28,7 +30,8 @@ const Layout = ({ children }) => {
|
|
|
28
30
|
<Header isLoggedIn={isLoggedIn} onMenuClick={onMenuClick} isOpenMenu={isOpenMenu} />
|
|
29
31
|
)}
|
|
30
32
|
{isLoggedIn ? (
|
|
31
|
-
|
|
33
|
+
<BlazeAuthContextWrapper>
|
|
34
|
+
<LoginModal />
|
|
32
35
|
<Grid
|
|
33
36
|
isOpenMenu={isOpenMenu}
|
|
34
37
|
onMenuClick={onMenuClick}
|
|
@@ -36,7 +39,7 @@ const Layout = ({ children }) => {
|
|
|
36
39
|
simpleLayout={simpleLayout}>
|
|
37
40
|
{children}
|
|
38
41
|
</Grid>
|
|
39
|
-
|
|
42
|
+
</BlazeAuthContextWrapper>
|
|
40
43
|
) : (
|
|
41
44
|
<Background>
|
|
42
45
|
<Login />
|