mario-teacher-student-client 2.1.103-admin → 2.1.105-admin
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 +13 -7
- package/dist/index.js.map +1 -1
- package/dist/index.modern.js +13 -7
- package/dist/index.modern.js.map +1 -1
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -1594,8 +1594,6 @@ var MainLayout = function MainLayout(_ref) {
|
|
|
1594
1594
|
try {
|
|
1595
1595
|
var _temp6 = _catch(function () {
|
|
1596
1596
|
return Promise.resolve(marioCore.getInfo()).then(function (info) {
|
|
1597
|
-
var _roles, _roles2, _roles3, _roles4, _roles5, _roles6;
|
|
1598
|
-
|
|
1599
1597
|
function _temp4() {
|
|
1600
1598
|
dispatch(marioCore.setUser(_extends({}, user, userData, {
|
|
1601
1599
|
email: userData.email,
|
|
@@ -1610,29 +1608,37 @@ var MainLayout = function MainLayout(_ref) {
|
|
|
1610
1608
|
|
|
1611
1609
|
var roles = [];
|
|
1612
1610
|
var userData = info.data;
|
|
1611
|
+
console.log({
|
|
1612
|
+
userData: userData
|
|
1613
|
+
});
|
|
1613
1614
|
|
|
1614
1615
|
for (var _iterator = _createForOfIteratorHelperLoose(prioritizedRoles), _step; !(_step = _iterator()).done;) {
|
|
1615
1616
|
var _userData$roles;
|
|
1616
1617
|
|
|
1617
1618
|
var r = _step.value;
|
|
1619
|
+
console.log("1 " + r);
|
|
1618
1620
|
|
|
1619
1621
|
if (userData !== null && userData !== void 0 && (_userData$roles = userData.roles) !== null && _userData$roles !== void 0 && _userData$roles.includes(r)) {
|
|
1620
1622
|
var _userData$roles2;
|
|
1621
1623
|
|
|
1622
1624
|
if (r === "Teacher" && userData !== null && userData !== void 0 && (_userData$roles2 = userData.roles) !== null && _userData$roles2 !== void 0 && _userData$roles2.includes("Assistant")) {
|
|
1623
|
-
roles
|
|
1625
|
+
roles.push("Teacher");
|
|
1626
|
+
roles.push("Assistant");
|
|
1624
1627
|
} else {
|
|
1625
|
-
roles
|
|
1628
|
+
roles.push(r);
|
|
1626
1629
|
}
|
|
1627
1630
|
|
|
1628
1631
|
return;
|
|
1629
1632
|
}
|
|
1630
1633
|
}
|
|
1631
1634
|
|
|
1632
|
-
|
|
1635
|
+
console.log({
|
|
1636
|
+
roles: roles
|
|
1637
|
+
});
|
|
1638
|
+
var isTeacher = (roles === null || roles === void 0 ? void 0 : roles.includes("Teacher")) || (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
|
|
1633
1639
|
var isStudent = roles.includes("Student");
|
|
1634
|
-
var isAssistant = !(
|
|
1635
|
-
var isTeacherAssistant = (
|
|
1640
|
+
var isAssistant = !(roles !== null && roles !== void 0 && roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
|
|
1641
|
+
var isTeacherAssistant = (roles === null || roles === void 0 ? void 0 : roles.includes("Teacher")) && (roles === null || roles === void 0 ? void 0 : roles.includes("Assistant"));
|
|
1636
1642
|
|
|
1637
1643
|
var _temp3 = function () {
|
|
1638
1644
|
if (isTeacher || isStudent || isTeacherAssistant) {
|