educoreapp2 1.0.84 → 1.0.86

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/dist/index.js CHANGED
@@ -165,6 +165,12 @@ Object.defineProperty(exports, "Menu", {
165
165
  return _Menu.default;
166
166
  }
167
167
  });
168
+ Object.defineProperty(exports, "MenuBottom", {
169
+ enumerable: true,
170
+ get: function () {
171
+ return _MenuBottom.default;
172
+ }
173
+ });
168
174
  Object.defineProperty(exports, "PageWithMenu", {
169
175
  enumerable: true,
170
176
  get: function () {
@@ -225,6 +231,7 @@ var _BaseImg = _interopRequireDefault(require("./spxbasecode/cmps/BaseImg"));
225
231
  var _BaseLang = _interopRequireDefault(require("./spxbasecode/cmps/BaseLang"));
226
232
  var _BaseInputString = _interopRequireDefault(require("./spxbasecode/cmps/BaseInputString"));
227
233
  var _Menu = _interopRequireDefault(require("./spxbasecode/cmps/Menu"));
234
+ var _MenuBottom = _interopRequireDefault(require("./spxbasecode/cmps/MenuBottom"));
228
235
  var _PageWithMenu = _interopRequireDefault(require("./spxbasecode/cmps/PageWithMenu"));
229
236
  var _BaseList = _interopRequireDefault(require("./spxbasecode/cmps/BaseList"));
230
237
  var _BaseListFile = _interopRequireDefault(require("./spxbasecode/cmps/BaseListFile"));
@@ -7,8 +7,6 @@ exports.default = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
8
  var _reactBootstrap = require("react-bootstrap");
9
9
  var _educoreapp = require("educoreapp2");
10
- var _BaseImg = _interopRequireDefault(require("./BaseImg"));
11
- function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
12
10
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
13
11
  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 && {}.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; }
14
12
  class BaseButtonIcon extends _react.Component {
@@ -28,6 +26,8 @@ class BaseButtonIcon extends _react.Component {
28
26
  this.states.width = !_educoreapp.Tools.empty(props) && !_educoreapp.Tools.empty(props.width) ? props.width : "250px";
29
27
  this.states.height = !_educoreapp.Tools.empty(props) && !_educoreapp.Tools.empty(props.height) ? props.height : "50px";
30
28
  this.states.photo = !_educoreapp.Tools.empty(props) && !_educoreapp.Tools.empty(props.photo) ? props.photo : null;
29
+ this.states.color = !_educoreapp.Tools.empty(props) && !_educoreapp.Tools.empty(props.color) ? props.color : "black";
30
+ this.states.borderColor = !_educoreapp.Tools.empty(props) && !_educoreapp.Tools.empty(props.borderColor) ? props.borderColor : "black";
31
31
  }
32
32
  render() {
33
33
  this.initFromProps(this.props);
@@ -42,7 +42,9 @@ class BaseButtonIcon extends _react.Component {
42
42
  style: {
43
43
  margin: "5px",
44
44
  borderStyle: "solid",
45
- borderColor: "black",
45
+ borderColor: props.borderColor,
46
+ position: "relative",
47
+ display: "block",
46
48
  width: props.width,
47
49
  height: props.height,
48
50
  backgroundColor: props.backgroundColor
@@ -56,21 +58,20 @@ class BaseButtonIcon extends _react.Component {
56
58
  }
57
59
  }, /*#__PURE__*/_react.default.createElement("div", {
58
60
  style: {
59
- width: w4
61
+ width: w4 + "px"
60
62
  }
61
- }, " "), /*#__PURE__*/_react.default.createElement(_BaseImg.default, {
63
+ }, " "), /*#__PURE__*/_react.default.createElement(_educoreapp.BaseImg, {
62
64
  photo: props.photo,
63
- width: w2,
65
+ width: w2 + "px",
64
66
  height: "100%"
65
67
  }), /*#__PURE__*/_react.default.createElement("div", {
66
68
  style: {
67
- width: w4
69
+ width: w4 + "px"
68
70
  }
69
71
  }, " ")), /*#__PURE__*/_react.default.createElement("div", {
70
- className: "row",
72
+ className: "baseButtonIconLabel",
71
73
  style: {
72
- height: h25,
73
- color: "white"
74
+ color: props.color
74
75
  }
75
76
  }, props.label));
76
77
  }
@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.default = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
- var _Menu = _interopRequireDefault(require("./Menu"));
9
- function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
10
8
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
11
9
  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 && {}.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; }
12
10
  class BasePage extends _react.Component {
@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
8
  var _BasePage = _interopRequireDefault(require("./BasePage"));
9
- var _BaseImg = _interopRequireDefault(require("./BaseImg"));
10
- var _Menu = _interopRequireDefault(require("./Menu"));
11
9
  var _educoreapp = require("educoreapp2");
12
10
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
13
11
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
@@ -27,9 +25,7 @@ class BaseSlimPage extends _react.Component {
27
25
  backgroundColor: bgColor,
28
26
  height: "auto"
29
27
  }
30
- }, /*#__PURE__*/_react.default.createElement(_Menu.default, {
31
- isShow: isMenuShow
32
- }), /*#__PURE__*/_react.default.createElement("div", {
28
+ }, /*#__PURE__*/_react.default.createElement("div", {
33
29
  className: "col-sm-1 col-md-2 col-lg-3"
34
30
  }), /*#__PURE__*/_react.default.createElement(_BasePage.default, {
35
31
  className: "col-12 col-sm-10 col-md-8 col-lg-6",
@@ -44,38 +40,12 @@ class BaseSlimPage extends _react.Component {
44
40
  }
45
41
  }, this.props.children)), /*#__PURE__*/_react.default.createElement("div", {
46
42
  className: "col-sm-1 col-md-2 col-lg-3"
47
- }));
48
- return /*#__PURE__*/_react.default.createElement("div", {
49
- className: "row g-0",
43
+ }), /*#__PURE__*/_react.default.createElement(_educoreapp.MenuBottom, {
50
44
  style: {
51
- backgroundColor: bgColor,
52
- height: "auto"
53
- }
54
- }, /*#__PURE__*/_react.default.createElement(_Menu.default, {
45
+ position: "absolute",
46
+ top: "90%"
47
+ },
55
48
  isShow: isMenuShow
56
- }), /*#__PURE__*/_react.default.createElement("div", {
57
- className: "col-sm-1 col-md-2 col-lg-3"
58
- }), /*#__PURE__*/_react.default.createElement(_BasePage.default, {
59
- className: "col-12 col-sm-10 col-md-8 col-lg-6",
60
- style: {
61
- paddingLeft: "5px",
62
- paddingLeft: "5px"
63
- }
64
- }, /*#__PURE__*/_react.default.createElement("div", {
65
- className: "row",
66
- style: {
67
- height: "50px",
68
- width: "300px"
69
- }
70
- }, /*#__PURE__*/_react.default.createElement(_BaseImg.default, {
71
- photo: logo
72
- })), /*#__PURE__*/_react.default.createElement("div", {
73
- className: "row",
74
- style: {
75
- height: "80%"
76
- }
77
- }, this.props.children)), /*#__PURE__*/_react.default.createElement("div", {
78
- className: "col-sm-1 col-md-2 col-lg-3"
79
49
  }));
80
50
  }
81
51
  }
@@ -0,0 +1,22 @@
1
+ .menu-bottom {
2
+ display: inline-flex;
3
+ bottom: 0;
4
+ height: 100px;
5
+ background-color:azure;
6
+ position:absolute;
7
+ justify-content: space-between;
8
+ /*padding: 16px;*/
9
+ }
10
+ .baseButtonIconLabel{
11
+ --bs-gutter-x: 0;
12
+ background-color: transparent;
13
+ text-align: center;
14
+ --bs-gutter-y: 0;
15
+ display: block;
16
+ margin-bottom: calc(-1* var(--bs-gutter-y));
17
+ flex-wrap: wrap;
18
+ margin-top: calc(-1* var(--bs-gutter-y));
19
+ margin-right: calc(-.5* var(--bs-gutter-x));
20
+ margin-left: calc(-.5* var(--bs-gutter-x));
21
+ }
22
+
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports.default = void 0;
7
+ var _react = _interopRequireWildcard(require("react"));
8
+ require("./MenuBottom.css");
9
+ var _BaseButtonIcon = _interopRequireDefault(require("./BaseButtonIcon"));
10
+ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
11
+ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
12
+ 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 && {}.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; }
13
+ class MenuBottom extends _react.Component {
14
+ constructor(props) {
15
+ super(props);
16
+ this.state = {
17
+ menuItems: window.App.Config.menu
18
+ };
19
+ }
20
+ render() {
21
+ return /*#__PURE__*/_react.default.createElement("div", {
22
+ className: "menu-bottom"
23
+ }, this.state.menuItems.map(item => /*#__PURE__*/_react.default.createElement(_BaseButtonIcon.default, {
24
+ key: item.title + item.icon,
25
+ photo: item.icon,
26
+ label: item.title,
27
+ onClick: item.click,
28
+ width: "100px",
29
+ height: "75px",
30
+ borderColor: "transparent",
31
+ backgroundColor: "transparent"
32
+ })));
33
+ }
34
+ }
35
+ var _default = exports.default = MenuBottom;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "educoreapp2",
3
3
  "private": false,
4
- "version": "1.0.84",
4
+ "version": "1.0.86",
5
5
  "description": "",
6
6
  "main": "dist/index.js",
7
7
  "files": [