@mjhls/mjh-framework 1.0.302 → 1.0.304

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.
Files changed (8) hide show
  1. package/README.md +1 -1
  2. package/dist/cjs/{Normal-c531b426.js → Normal-7350b9c3.js} +28 -28
  3. package/dist/cjs/TemplateNormal.js +1 -1
  4. package/dist/cjs/index.js +9 -11
  5. package/dist/esm/{Normal-b00784c9.js → Normal-15b456e2.js} +28 -28
  6. package/dist/esm/TemplateNormal.js +1 -1
  7. package/dist/esm/index.js +10 -12
  8. package/package.json +1 -1
package/README.md CHANGED
@@ -1,5 +1,5 @@
1
1
 
2
- # mjh-framework v. 1.0.301
2
+ # mjh-framework v. 1.0.304
3
3
 
4
4
  > Foundation Framework
5
5
 
package/dist/cjs/{Normal-c531b426.js → Normal-7350b9c3.js} RENAMED
@@ -867,6 +867,34 @@ var NavMagazine = function NavMagazine(props) {
867
867
  React__default.createElement(
868
868
  Nav,
869
869
  { className: 'mr-auto' },
870
+ showLogin && userChecked && userLoggedIn && React__default.createElement(
871
+ React__default.Fragment,
872
+ null,
873
+ React__default.createElement(
874
+ 'a',
875
+ { key: 'mobile-profile', href: '/auth/profile', className: 'nav-link' },
876
+ 'Profile'
877
+ ),
878
+ React__default.createElement(
879
+ 'a',
880
+ { key: 'mobile-logout', href: '/api/auth/logout', className: 'nav-link' },
881
+ 'Log Out'
882
+ )
883
+ ),
884
+ showLogin && userChecked && !userLoggedIn && React__default.createElement(
885
+ React__default.Fragment,
886
+ null,
887
+ React__default.createElement(
888
+ 'a',
889
+ { key: 'mobile-signup', href: '/auth/signup', className: 'nav-link' },
890
+ 'Sign Up'
891
+ ),
892
+ React__default.createElement(
893
+ 'a',
894
+ { key: 'mobile-login', href: '/auth/login', className: 'nav-link' },
895
+ 'Log In'
896
+ )
897
+ ),
870
898
  subNav && subNav.map(function (row, index) {
871
899
  if (row.subQuery && row.subQuery.length > 0) {
872
900
  return row.name ? React__default.createElement(
@@ -907,34 +935,6 @@ var NavMagazine = function NavMagazine(props) {
907
935
  React__default.createElement(
908
936
  Nav,
909
937
  { className: 'mr-auto' },
910
- showLogin && userChecked && userLoggedIn && React__default.createElement(
911
- React__default.Fragment,
912
- null,
913
- React__default.createElement(
914
- 'a',
915
- { key: 'mobile-profile', href: '/auth/profile', className: 'nav-link' },
916
- 'Profile'
917
- ),
918
- React__default.createElement(
919
- 'a',
920
- { key: 'mobile-logout', href: '/api/auth/logout', className: 'nav-link' },
921
- 'Log Out'
922
- )
923
- ),
924
- showLogin && userChecked && !userLoggedIn && React__default.createElement(
925
- React__default.Fragment,
926
- null,
927
- React__default.createElement(
928
- 'a',
929
- { key: 'mobile-signup', href: '/auth/signup', className: 'nav-link' },
930
- 'Sign Up'
931
- ),
932
- React__default.createElement(
933
- 'a',
934
- { key: 'mobile-login', href: '/auth/login', className: 'nav-link' },
935
- 'Log In'
936
- )
937
- ),
938
938
  dataObject && dataObject.map(function (row, index) {
939
939
  if (row.subQuery && row.subQuery.length > 0) {
940
940
  return row.name ? React__default.createElement(
package/dist/cjs/TemplateNormal.js CHANGED
@@ -20,7 +20,7 @@ require('./react-social-icons-cd0d9d3b.js');
20
20
  require('react-bootstrap');
21
21
  require('./index.esm-340d3792.js');
22
22
  require('react-bootstrap/Button');
23
- var TemplateNormal = require('./Normal-c531b426.js');
23
+ var TemplateNormal = require('./Normal-7350b9c3.js');
24
24
  require('react-bootstrap/ListGroup');
25
25
  require('next/head');
26
26
  require('react-bootstrap/Nav');
package/dist/cjs/index.js CHANGED
@@ -53,7 +53,7 @@ var IssueDeck = require('./IssueDeck.js');
53
53
  require('react-bootstrap/Badge');
54
54
  var IssueContentDeck = require('./IssueContentDeck.js');
55
55
  var Spinner = _interopDefault(require('react-bootstrap/Spinner'));
56
- var TemplateNormal = require('./Normal-c531b426.js');
56
+ var TemplateNormal = require('./Normal-7350b9c3.js');
57
57
  require('react-bootstrap/ListGroup');
58
58
  var Head = _interopDefault(require('next/head'));
59
59
  var Accordion = _interopDefault(require('react-bootstrap/Accordion'));
@@ -16948,9 +16948,9 @@ var LoginForm = function LoginForm(props) {
16948
16948
  break;
16949
16949
  }
16950
16950
 
16951
- // here, Router.push() does not carry new cookie value.
16951
+ // here, Router.push() does not carry new cookie value.
16952
16952
  // so need hard redirect
16953
- window.location.href = '/';
16953
+ window.location.href = callbackUrl;
16954
16954
  _context.next = 18;
16955
16955
  break;
16956
16956
 
@@ -16986,6 +16986,10 @@ var LoginForm = function LoginForm(props) {
16986
16986
  };
16987
16987
  }();
16988
16988
 
16989
+ var _props$callbackUrl = props.callbackUrl,
16990
+ callbackUrl = _props$callbackUrl === undefined ? '/' : _props$callbackUrl;
16991
+
16992
+
16989
16993
  React.useEffect(function () {
16990
16994
  if (props.user) {
16991
16995
  window.location.href = '/auth/profile';
@@ -17038,13 +17042,7 @@ var LoginForm = function LoginForm(props) {
17038
17042
  loading && React__default.createElement(
17039
17043
  reactBootstrap.Button,
17040
17044
  { variant: 'primary', disabled: true },
17041
- React__default.createElement(reactBootstrap.Spinner, {
17042
- as: 'span',
17043
- animation: 'border',
17044
- role: 'status',
17045
- 'aria-hidden': 'true',
17046
- size: 'sm'
17047
- }),
17045
+ React__default.createElement(reactBootstrap.Spinner, { as: 'span', animation: 'border', role: 'status', 'aria-hidden': 'true', size: 'sm' }),
17048
17046
  React__default.createElement(
17049
17047
  'span',
17050
17048
  { className: 'sr-only' },
@@ -17061,7 +17059,7 @@ var LoginForm = function LoginForm(props) {
17061
17059
  React__default.createElement(
17062
17060
  'style',
17063
17061
  { jsx: 'true'.toString() },
17064
- ' \n .login {\n margin: 0 auto;\n padding: 1rem;\n border: 1px solid #ccc;\n border-radius: 4px;\n }\n .error {\n color: red;\n margin: 1rem 0 0;\n }\n '
17062
+ '\n .login {\n margin: 0 auto;\n padding: 1rem;\n border: 1px solid #ccc;\n border-radius: 4px;\n }\n .error {\n color: red;\n margin: 1rem 0 0;\n }\n '
17065
17063
  )
17066
17064
  );
17067
17065
  };
package/dist/esm/{Normal-b00784c9.js → Normal-15b456e2.js} RENAMED
@@ -862,6 +862,34 @@ var NavMagazine = function NavMagazine(props) {
862
862
  React__default.createElement(
863
863
  Nav,
864
864
  { className: 'mr-auto' },
865
+ showLogin && userChecked && userLoggedIn && React__default.createElement(
866
+ React__default.Fragment,
867
+ null,
868
+ React__default.createElement(
869
+ 'a',
870
+ { key: 'mobile-profile', href: '/auth/profile', className: 'nav-link' },
871
+ 'Profile'
872
+ ),
873
+ React__default.createElement(
874
+ 'a',
875
+ { key: 'mobile-logout', href: '/api/auth/logout', className: 'nav-link' },
876
+ 'Log Out'
877
+ )
878
+ ),
879
+ showLogin && userChecked && !userLoggedIn && React__default.createElement(
880
+ React__default.Fragment,
881
+ null,
882
+ React__default.createElement(
883
+ 'a',
884
+ { key: 'mobile-signup', href: '/auth/signup', className: 'nav-link' },
885
+ 'Sign Up'
886
+ ),
887
+ React__default.createElement(
888
+ 'a',
889
+ { key: 'mobile-login', href: '/auth/login', className: 'nav-link' },
890
+ 'Log In'
891
+ )
892
+ ),
865
893
  subNav && subNav.map(function (row, index) {
866
894
  if (row.subQuery && row.subQuery.length > 0) {
867
895
  return row.name ? React__default.createElement(
@@ -902,34 +930,6 @@ var NavMagazine = function NavMagazine(props) {
902
930
  React__default.createElement(
903
931
  Nav,
904
932
  { className: 'mr-auto' },
905
- showLogin && userChecked && userLoggedIn && React__default.createElement(
906
- React__default.Fragment,
907
- null,
908
- React__default.createElement(
909
- 'a',
910
- { key: 'mobile-profile', href: '/auth/profile', className: 'nav-link' },
911
- 'Profile'
912
- ),
913
- React__default.createElement(
914
- 'a',
915
- { key: 'mobile-logout', href: '/api/auth/logout', className: 'nav-link' },
916
- 'Log Out'
917
- )
918
- ),
919
- showLogin && userChecked && !userLoggedIn && React__default.createElement(
920
- React__default.Fragment,
921
- null,
922
- React__default.createElement(
923
- 'a',
924
- { key: 'mobile-signup', href: '/auth/signup', className: 'nav-link' },
925
- 'Sign Up'
926
- ),
927
- React__default.createElement(
928
- 'a',
929
- { key: 'mobile-login', href: '/auth/login', className: 'nav-link' },
930
- 'Log In'
931
- )
932
- ),
933
933
  dataObject && dataObject.map(function (row, index) {
934
934
  if (row.subQuery && row.subQuery.length > 0) {
935
935
  return row.name ? React__default.createElement(
package/dist/esm/TemplateNormal.js CHANGED
@@ -18,7 +18,7 @@ import './react-social-icons-a7d5c5c7.js';
18
18
  import 'react-bootstrap';
19
19
  import './index.esm-536609db.js';
20
20
  import 'react-bootstrap/Button';
21
- export { T as default } from './Normal-b00784c9.js';
21
+ export { T as default } from './Normal-15b456e2.js';
22
22
  import 'react-bootstrap/ListGroup';
23
23
  import 'next/head';
24
24
  import 'react-bootstrap/Nav';
package/dist/esm/index.js CHANGED
@@ -49,8 +49,8 @@ export { default as IssueDeck } from './IssueDeck.js';
49
49
  import 'react-bootstrap/Badge';
50
50
  export { default as IssueContentDeck } from './IssueContentDeck.js';
51
51
  import Spinner from 'react-bootstrap/Spinner';
52
- import { M as MdPictureAsPdf } from './Normal-b00784c9.js';
53
- export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-b00784c9.js';
52
+ import { M as MdPictureAsPdf } from './Normal-15b456e2.js';
53
+ export { A as AD728x90, C as Column1, a as Column2, b as Column3, f as HamMagazine, H as Header, L as LeftNav, e as NavDvm, c as NavMagazine, N as NavNative, d as NavNormal, P as PageFilter, S as Search, g as SideFooter, T as TemplateNormal } from './Normal-15b456e2.js';
54
54
  import 'react-bootstrap/ListGroup';
55
55
  import Head from 'next/head';
56
56
  import Accordion from 'react-bootstrap/Accordion';
@@ -16946,9 +16946,9 @@ var LoginForm = function LoginForm(props) {
16946
16946
  break;
16947
16947
  }
16948
16948
 
16949
- // here, Router.push() does not carry new cookie value.
16949
+ // here, Router.push() does not carry new cookie value.
16950
16950
  // so need hard redirect
16951
- window.location.href = '/';
16951
+ window.location.href = callbackUrl;
16952
16952
  _context.next = 18;
16953
16953
  break;
16954
16954
 
@@ -16984,6 +16984,10 @@ var LoginForm = function LoginForm(props) {
16984
16984
  };
16985
16985
  }();
16986
16986
 
16987
+ var _props$callbackUrl = props.callbackUrl,
16988
+ callbackUrl = _props$callbackUrl === undefined ? '/' : _props$callbackUrl;
16989
+
16990
+
16987
16991
  useEffect(function () {
16988
16992
  if (props.user) {
16989
16993
  window.location.href = '/auth/profile';
@@ -17036,13 +17040,7 @@ var LoginForm = function LoginForm(props) {
17036
17040
  loading && React__default.createElement(
17037
17041
  Button$1,
17038
17042
  { variant: 'primary', disabled: true },
17039
- React__default.createElement(Spinner$1, {
17040
- as: 'span',
17041
- animation: 'border',
17042
- role: 'status',
17043
- 'aria-hidden': 'true',
17044
- size: 'sm'
17045
- }),
17043
+ React__default.createElement(Spinner$1, { as: 'span', animation: 'border', role: 'status', 'aria-hidden': 'true', size: 'sm' }),
17046
17044
  React__default.createElement(
17047
17045
  'span',
17048
17046
  { className: 'sr-only' },
@@ -17059,7 +17057,7 @@ var LoginForm = function LoginForm(props) {
17059
17057
  React__default.createElement(
17060
17058
  'style',
17061
17059
  { jsx: 'true'.toString() },
17062
- ' \n .login {\n margin: 0 auto;\n padding: 1rem;\n border: 1px solid #ccc;\n border-radius: 4px;\n }\n .error {\n color: red;\n margin: 1rem 0 0;\n }\n '
17060
+ '\n .login {\n margin: 0 auto;\n padding: 1rem;\n border: 1px solid #ccc;\n border-radius: 4px;\n }\n .error {\n color: red;\n margin: 1rem 0 0;\n }\n '
17063
17061
  )
17064
17062
  );
17065
17063
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mjhls/mjh-framework",
3
- "version": "1.0.302",
3
+ "version": "1.0.304",
4
4
  "description": "Foundation Framework",
5
5
  "author": "mjh-framework",
6
6
  "license": "MIT",