educoreapp2 1.0.59 → 1.0.61

package/dist/index.js

@@ -141,6 +141,12 @@ Object.defineProperty(exports, "PageWithMenu", {
     return _PageWithMenu.default;
   }
 });
+Object.defineProperty(exports, "ProfileMenu", {
+  enumerable: true,
+  get: function () {
+    return _ProfileMenu.default;
+  }
+});
 Object.defineProperty(exports, "TextToCommand", {
   enumerable: true,
   get: function () {
@@ -192,4 +198,5 @@ var _BaseSlimPage = _interopRequireDefault(require("./spxbasecode/cmps/BaseSlimP
 var _TextToCommand = _interopRequireDefault(require("./spxbasecode/cmps/TextToCommand"));
 var _API = _interopRequireDefault(require("./lib/API"));
 var _BaseLabel = _interopRequireDefault(require("./spxbasecode/cmps/BaseLabel"));
+var _ProfileMenu = _interopRequireDefault(require("./spxbasecode/cmps/ProfileMenu"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }

package/dist/spxbasecode/cmps/Menu.js

@@ -6,10 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactBootstrap = require("react-bootstrap");
-var _BaseLang = _interopRequireDefault(require("./BaseLang"));
 var _educoreapp = require("educoreapp2");
-var _logo = _interopRequireDefault(require("../../../../../src/img/logo.png"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 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); }
 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; }
 class Menu extends _react.Component {
@@ -19,6 +16,8 @@ class Menu extends _react.Component {
     this.clicker = 0;
     this.isMenuWideShow = !_educoreapp.Tools.empty(props.isMenuWideShow) ? props.isMenuWideShow : "true";
     this.isMenuWideShow = this.isMenuWideShow == "true" || typeof this.isMenuWideShow == "boolean" && this.isMenuWideShow;
+    this.isMenuShow = !_educoreapp.Tools.empty(props.isShow) ? props.isShow : "true";
+    this.isMenuShow = this.isMenuShow == "true" || typeof this.isMenuShow == "boolean" && this.isMenuShow;
     window.App.Config.isMenuLeave = !this.props.isShow; // && !window.App.Config.isMenuLeave;
   }
   handleMouseMove() {
@@ -38,6 +37,7 @@ class Menu extends _react.Component {
     }
   }
   renderNormal() {
+    console.log("NORMAL");
     let TT = _educoreapp.Translate.getT(window.App.lang, "Edupanel", "alts");
     const posNormal = "relative";
     const displayNormal = "flex";
@@ -78,7 +78,7 @@ class Menu extends _react.Component {
       onClick: event => this.goAdmin(),
       width: "60",
       height: "60",
-      src: _logo.default,
+      src: window.App.Config.logo,
       alt: TT["/imgs/logo.png"]
     })), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Collapse, {
       id: "responsive-navbar-nav"
@@ -92,7 +92,7 @@ class Menu extends _react.Component {
         marginLeft: "auto",
         marginRight: "5px"
       }
-    }, /*#__PURE__*/_react.default.createElement(_BaseLang.default, null)), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
+    }, /*#__PURE__*/_react.default.createElement(_educoreapp.BaseLang, null)), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
       "aria-controls": "responsive-navbar-nav",
       style: {
         backgrandColor: "red"
@@ -100,6 +100,7 @@ class Menu extends _react.Component {
     }));
   }
   renderShort() {
+    console.log('AAAAAA sHORT');
     let TT = _educoreapp.Translate.getT(window.App.lang, "Edupanel", "alts");
     const posNormal = "relative";
     const displayNormal = "flex";
@@ -136,56 +137,35 @@ class Menu extends _react.Component {
       bg: "light",
       variant: "light"
     }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Brand, null, /*#__PURE__*/_react.default.createElement("img", {
-      onClick: event => this.goAdmin(),
+      onClick: event => this.goHome(),
       width: "60",
       height: "60",
-      src: _logo.default,
+      src: window.App.Config.logo,
       alt: TT["/imgs/logo.png"]
     })), /*#__PURE__*/_react.default.createElement("div", {
       style: {
         marginLeft: "auto",
-        marginRight: "5px"
+        marginRight: "5px",
+        display: "inline-flex"
+      }
+    }, /*#__PURE__*/_react.default.createElement("div", {
+      className: "col-4",
+      style: {
+        display: "inline-flex"
       }
-    }, /*#__PURE__*/_react.default.createElement(_BaseLang.default, null)));
+    }, /*#__PURE__*/_react.default.createElement(_educoreapp.BaseLang, {
+      className: "col-5"
+    }), /*#__PURE__*/_react.default.createElement("div", {
+      className: "col-2"
+    }), /*#__PURE__*/_react.default.createElement(_educoreapp.ProfileMenu, {
+      className: "col-5"
+    }))));
   }
   render() {
+    if (!this.isMenuShow) {
+      return /*#__PURE__*/_react.default.createElement("div", null);
+    }
     return this.isMenuWideShow ? this.renderNormal() : this.renderShort();
   }
-  render2() {
-    return /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar, {
-      collapseOnSelect: true,
-      expand: "lg",
-      bg: "dark",
-      variant: "dark"
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Brand, {
-      href: "/"
-    }, "Edupanel.pl"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Toggle, {
-      "aria-controls": "responsive-navbar-nav"
-    }), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Navbar.Collapse, {
-      id: "responsive-navbar-nav"
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, {
-      className: "mr-auto"
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-      href: "#features"
-    }, "Features"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-      href: "#pricing"
-    }, "Pricing"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown, {
-      title: "Dropdown",
-      id: "collasible-nav-dropdown"
-    }, /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
-      href: "#action/3.1"
-    }, "Action"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
-      href: "#action/3.2"
-    }, "Another action"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
-      href: "#action/3.3"
-    }, "Something"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Divider, null), /*#__PURE__*/_react.default.createElement(_reactBootstrap.NavDropdown.Item, {
-      href: "#action/3.4"
-    }, "Separated link"))), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav, null, /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-      href: "#deets"
-    }, "More deets"), /*#__PURE__*/_react.default.createElement(_reactBootstrap.Nav.Link, {
-      eventKey: 2,
-      href: "#memes"
-    }, "Dank memes"))));
-  }
 }
 var _default = exports.default = Menu;

package/dist/spxbasecode/cmps/ProfileMenu.js

@@ -0,0 +1,25 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireWildcard(require("react"));
+var _reactAvatar = _interopRequireDefault(require("react-avatar"));
+var _ = _interopRequireDefault(require("./8.jpg"));
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+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); }
+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; }
+class ProfileMenu extends _react.Component {
+  constructor() {
+    super();
+  }
+  render() {
+    return /*#__PURE__*/_react.default.createElement(_reactAvatar.default, {
+      src: _.default,
+      size: "50px",
+      round: true
+    });
+  }
+}
+var _default = exports.default = ProfileMenu;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "educoreapp2",
   "private": false,
-  "version": "1.0.59",
+  "version": "1.0.61",
   "description": "",
   "main": "dist/index.js",
   "files": [