educoreapp2 1.0.59 → 1.0.60

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 (2) hide show
  1. package/dist/spxbasecode/cmps/Menu.js +26 -44
  2. package/package.json +1 -1
package/dist/spxbasecode/cmps/Menu.js CHANGED
@@ -6,9 +6,8 @@ Object.defineProperty(exports, "__esModule", {
6
6
  exports.default = void 0;
7
7
  var _react = _interopRequireWildcard(require("react"));
8
8
  var _reactBootstrap = require("react-bootstrap");
9
- var _BaseLang = _interopRequireDefault(require("./BaseLang"));
10
9
  var _educoreapp = require("educoreapp2");
11
- var _logo = _interopRequireDefault(require("../../../../../src/img/logo.png"));
10
+ var _ProfileMenu = _interopRequireDefault(require("./ProfileMenu"));
12
11
  function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
13
12
  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); }
14
13
  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; }
@@ -19,6 +18,8 @@ class Menu extends _react.Component {
19
18
  this.clicker = 0;
20
19
  this.isMenuWideShow = !_educoreapp.Tools.empty(props.isMenuWideShow) ? props.isMenuWideShow : "true";
21
20
  this.isMenuWideShow = this.isMenuWideShow == "true" || typeof this.isMenuWideShow == "boolean" && this.isMenuWideShow;
21
+ this.isMenuShow = !_educoreapp.Tools.empty(props.isShow) ? props.isShow : "true";
22
+ this.isMenuShow = this.isMenuShow == "true" || typeof this.isMenuShow == "boolean" && this.isMenuShow;
22
23
  window.App.Config.isMenuLeave = !this.props.isShow; // && !window.App.Config.isMenuLeave;
23
24
  }
24
25
  handleMouseMove() {
@@ -38,6 +39,7 @@ class Menu extends _react.Component {
38
39
  }
39
40
  }
40
41
  renderNormal() {
42
+ console.log("NORMAL");
41
43
  let TT = _educoreapp.Translate.getT(window.App.lang, "Edupanel", "alts");
42
44
  const posNormal = "relative";
43
45
  const displayNormal = "flex";
@@ -78,7 +80,7 @@ class Menu extends _react.Component {
78
80
  onClick: event => this.goAdmin(),
79
81
  width: "60",
80
82
  height: "60",
81
- src: _logo.default,
83
+ src: window.App.Config.logo,
82
84
  alt: TT["/imgs/logo.png"]
83
85
  })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Collapse, {
84
86
  id: "responsive-navbar-nav"
@@ -92,7 +94,7 @@ class Menu extends _react.Component {
92
94
  marginLeft: "auto",
93
95
  marginRight: "5px"
94
96
  }
95
- }, /*#__PURE__*/_react.default.createElement(_BaseLang.default, null)), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
97
+ }, /*#__PURE__*/_react.default.createElement(_educoreapp.BaseLang, null)), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
96
98
  "aria-controls": "responsive-navbar-nav",
97
99
  style: {
98
100
  backgrandColor: "red"
@@ -100,6 +102,7 @@ class Menu extends _react.Component {
100
102
  }));
101
103
  }
102
104
  renderShort() {
105
+ console.log('AAAAAA sHORT');
103
106
  let TT = _educoreapp.Translate.getT(window.App.lang, "Edupanel", "alts");
104
107
  const posNormal = "relative";
105
108
  const displayNormal = "flex";
@@ -136,56 +139,35 @@ class Menu extends _react.Component {
136
139
  bg: "light",
137
140
  variant: "light"
138
141
  }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Brand, null, /*#__PURE__*/_react.default.createElement("img", {
139
- onClick: event => this.goAdmin(),
142
+ onClick: event => this.goHome(),
140
143
  width: "60",
141
144
  height: "60",
142
- src: _logo.default,
145
+ src: window.App.Config.logo,
143
146
  alt: TT["/imgs/logo.png"]
144
147
  })), /*#__PURE__*/_react.default.createElement("div", {
145
148
  style: {
146
149
  marginLeft: "auto",
147
- marginRight: "5px"
150
+ marginRight: "5px",
151
+ display: "inline-flex"
152
+ }
153
+ }, /*#__PURE__*/_react.default.createElement("div", {
154
+ className: "col-4",
155
+ style: {
156
+ display: "inline-flex"
148
157
  }
149
- }, /*#__PURE__*/_react.default.createElement(_BaseLang.default, null)));
158
+ }, /*#__PURE__*/_react.default.createElement(_educoreapp.BaseLang, {
159
+ className: "col-5"
160
+ }), /*#__PURE__*/_react.default.createElement("div", {
161
+ className: "col-2"
162
+ }), /*#__PURE__*/_react.default.createElement(_ProfileMenu.default, {
163
+ className: "col-5"
164
+ }))));
150
165
  }
151
166
  render() {
167
+ if (!this.isMenuShow) {
168
+ return /*#__PURE__*/_react.default.createElement("div", null);
169
+ }
152
170
  return this.isMenuWideShow ? this.renderNormal() : this.renderShort();
153
171
  }
154
- render2() {
155
- return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar, {
156
- collapseOnSelect: true,
157
- expand: "lg",
158
- bg: "dark",
159
- variant: "dark"
160
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Brand, {
161
- href: "/"
162
- }, "Edupanel.pl"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
163
- "aria-controls": "responsive-navbar-nav"
164
- }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Collapse, {
165
- id: "responsive-navbar-nav"
166
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, {
167
- className: "mr-auto"
168
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
169
- href: "#features"
170
- }, "Features"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
171
- href: "#pricing"
172
- }, "Pricing"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown, {
173
- title: "Dropdown",
174
- id: "collasible-nav-dropdown"
175
- }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
176
- href: "#action/3.1"
177
- }, "Action"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
178
- href: "#action/3.2"
179
- }, "Another action"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
180
- href: "#action/3.3"
181
- }, "Something"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Divider, null), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
182
- href: "#action/3.4"
183
- }, "Separated link"))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
184
- href: "#deets"
185
- }, "More deets"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
186
- eventKey: 2,
187
- href: "#memes"
188
- }, "Dank memes"))));
189
- }
190
172
  }
191
173
  var _default = exports.default = Menu;
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "educoreapp2",
3
3
  "private": false,
4
- "version": "1.0.59",
4
+ "version": "1.0.60",
5
5
  "description": "",
6
6
  "main": "dist/index.js",
7
7
  "files": [