@proteinjs/user-ui 1.1.5 → 1.1.7
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/generated/index.d.ts +1 -0
- package/dist/generated/index.d.ts.map +1 -1
- package/dist/generated/index.js +2 -1
- package/dist/generated/index.js.map +1 -1
- package/dist/src/pages/Login.d.ts.map +1 -1
- package/dist/src/pages/Login.js +6 -2
- package/dist/src/pages/Login.js.map +1 -1
- package/dist/src/pages/Signup.d.ts.map +1 -1
- package/dist/src/pages/Signup.js +23 -19
- package/dist/src/pages/Signup.js.map +1 -1
- package/generated/index.ts +2 -1
- package/package.json +8 -6
- package/src/pages/Login.tsx +15 -9
- package/src/pages/Signup.tsx +44 -38
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,qBAAqB,CAAC;AAC7B,OAAO,eAAe,CAAC;AACvB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,uBAAuB,CAAC;AAC/B,OAAO,eAAe,CAAC;AACvB,OAAO,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,CAAC;AACzB,OAAO,QAAQ,CAAC;AAChB,OAAO,OAAO,CAAC;AACf,OAAO,WAAW,CAAC;AA+
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":"AAAA,oCAAoC;AAEpC,OAAO,qBAAqB,CAAC;AAC7B,OAAO,eAAe,CAAC;AACvB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,uBAAuB,CAAC;AAC/B,OAAO,eAAe,CAAC;AACvB,OAAO,iBAAiB,CAAC;AACzB,OAAO,iBAAiB,CAAC;AACzB,OAAO,QAAQ,CAAC;AAChB,OAAO,OAAO,CAAC;AACf,OAAO,WAAW,CAAC;AACnB,OAAO,cAAc,CAAC;AA+BtB,cAAc,UAAU,CAAC"}
|
package/dist/generated/index.js
CHANGED
|
@@ -25,8 +25,9 @@ require("@proteinjs/util");
|
|
|
25
25
|
require("moment");
|
|
26
26
|
require("react");
|
|
27
27
|
require("react-dom");
|
|
28
|
+
require("react-helmet");
|
|
28
29
|
/** Generate Source Graph */
|
|
29
|
-
var sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"/Omit\"},{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"forgotPasswordPage\",\"filePath\":\"/Users/
|
|
30
|
+
var sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"/Omit\"},{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"forgotPasswordPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/ForgotPassword.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/forgotPasswordPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/ui/Page\"},{\"v\":\"@proteinjs/user-ui/loginPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"loginPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/Login.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/loginPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/passwordResetPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"passwordResetPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/PasswordReset.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/passwordResetPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/invitePage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"invitePage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/SendInvite.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/invitePage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/signupPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"signupPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/Signup.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/signupPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}}],\"edges\":[{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/loginPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/passwordResetPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/invitePage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/signupPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"}]}";
|
|
30
31
|
/** Generate Source Links */
|
|
31
32
|
var ForgotPassword_1 = require("../src/pages/ForgotPassword");
|
|
32
33
|
var Login_1 = require("../src/pages/Login");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,+BAA6B;AAC7B,yBAAuB;AACvB,iCAA+B;AAC/B,iCAA+B;AAC/B,yBAAuB;AACvB,2BAAyB;AACzB,2BAAyB;AACzB,kBAAgB;AAChB,iBAAe;AACf,qBAAmB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../generated/index.ts"],"names":[],"mappings":";AAAA,oCAAoC;;;;;;;;;;;;;;;;AAEpC,+BAA6B;AAC7B,yBAAuB;AACvB,iCAA+B;AAC/B,iCAA+B;AAC/B,yBAAuB;AACvB,2BAAyB;AACzB,2BAAyB;AACzB,kBAAgB;AAChB,iBAAe;AACf,qBAAmB;AACnB,wBAAsB;AAGtB,4BAA4B;AAE5B,IAAM,WAAW,GAAG,o9HAAo9H,CAAC;AAGz+H,4BAA4B;AAE5B,8DAAiE;AACjE,4CAA+C;AAC/C,4DAA+D;AAC/D,sDAAqD;AACrD,8CAAiD;AAEjD,IAAM,WAAW,GAAG;IACnB,uCAAuC,EAAE,mCAAkB;IAC3D,8BAA8B,EAAE,iBAAS;IACzC,sCAAsC,EAAE,iCAAiB;IACzD,+BAA+B,EAAE,uBAAU;IAC3C,+BAA+B,EAAE,mBAAU;CAC3C,CAAC;AAGF,kCAAkC;AAElC,oDAAyD;AACzD,6BAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAGjD,2CAAyB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../src/pages/Login.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA+D,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Login.d.ts","sourceRoot":"","sources":["../../../src/pages/Login.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA+D,MAAM,eAAe,CAAC;AAIlG,eAAO,MAAM,SAAS,EAAE,IAsBvB,CAAC"}
|
package/dist/src/pages/Login.js
CHANGED
|
@@ -58,14 +58,18 @@ exports.loginPage = void 0;
|
|
|
58
58
|
var react_1 = __importDefault(require("react"));
|
|
59
59
|
var ui_1 = require("@proteinjs/ui");
|
|
60
60
|
var user_1 = require("@proteinjs/user");
|
|
61
|
+
var react_helmet_1 = require("react-helmet");
|
|
61
62
|
exports.loginPage = {
|
|
62
63
|
name: 'Login',
|
|
63
64
|
path: user_1.uiRoutes.auth.login,
|
|
64
65
|
auth: {
|
|
65
66
|
public: true,
|
|
66
67
|
},
|
|
67
|
-
component: function () { return (react_1.default.createElement(
|
|
68
|
-
react_1.default.createElement(
|
|
68
|
+
component: function () { return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
69
|
+
react_1.default.createElement(react_helmet_1.Helmet, null,
|
|
70
|
+
react_1.default.createElement("title", null, "Login")),
|
|
71
|
+
react_1.default.createElement(ui_1.FormPage, null,
|
|
72
|
+
react_1.default.createElement(ui_1.Form, { name: 'Login', createFields: function () { return new LoginFields(); }, fieldLayout: ['email', 'password'], buttons: buttons, maxWidth: 'xs' })))); },
|
|
69
73
|
};
|
|
70
74
|
var LoginFields = /** @class */ (function (_super) {
|
|
71
75
|
__extends(LoginFields, _super);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../../src/pages/Login.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,oCAAkG;AAClG,wCAAmD;
|
|
1
|
+
{"version":3,"file":"Login.js","sourceRoot":"","sources":["../../../src/pages/Login.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,oCAAkG;AAClG,wCAAmD;AACnD,6CAAsC;AAEzB,QAAA,SAAS,GAAS;IAC7B,IAAI,EAAE,OAAO;IACb,IAAI,EAAE,eAAQ,CAAC,IAAI,CAAC,KAAK;IACzB,IAAI,EAAE;QACJ,MAAM,EAAE,IAAI;KACb;IACD,SAAS,EAAE,cAAM,OAAA,CACf;QACE,8BAAC,qBAAM;YACL,qDAAoB,CACb;QACT,8BAAC,aAAQ;YACP,8BAAC,SAAI,IACH,IAAI,EAAC,OAAO,EACZ,YAAY,EAAE,cAAM,OAAA,IAAI,WAAW,EAAE,EAAjB,CAAiB,EACrC,WAAW,EAAE,CAAC,OAAO,EAAE,UAAU,CAAC,EAClC,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,IAAI,GACd,CACO,CACV,CACJ,EAfgB,CAehB;CACF,CAAC;AAEF;IAA0B,+BAAM;IAAhC;QAAA,qEAaC;QARC,WAAK,GAAG,IAAA,cAAS,EAAc;YAC7B,IAAI,EAAE,OAAO;SACd,CAAC,CAAC;QAEH,cAAQ,GAAG,IAAA,cAAS,EAAc;YAChC,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;;IACL,CAAC;IAZQ,kBAAM,GAAb;QACE,OAAO,IAAI,WAAW,EAAE,CAAC;IAC3B,CAAC;IAUH,kBAAC;AAAD,CAAC,AAbD,CAA0B,WAAM,GAa/B;AAED,IAAM,OAAO,GAA6B;IACxC,cAAc,EAAE;QACd,IAAI,EAAE,iBAAiB;QACvB,KAAK,EAAE;YACL,OAAO,EAAE,MAAM;YACf,KAAK,EAAE,MAAM;SACd;QACD,QAAQ,EAAE;;gBACR,sBAAO,EAAE,IAAI,EAAE,WAAI,eAAQ,CAAC,IAAI,CAAC,cAAc,CAAE,EAAE,EAAC;;aACrD;KACF;IACD,KAAK,EAAE,gBAAW;IAClB,KAAK,EAAE;QACL,IAAI,EAAE,OAAO;QACb,KAAK,EAAE;YACL,KAAK,EAAE,SAAS;YAChB,OAAO,EAAE,WAAW;SACrB;QACD,OAAO,EAAE,UAAO,MAAmB,EAAE,OAAiC;;;;4BACnD,qBAAM,KAAK,CAAC,aAAM,CAAC,KAAK,CAAC,IAAI,EAAE;4BAC9C,MAAM,EAAE,aAAM,CAAC,KAAK,CAAC,MAAM;4BAC3B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gCACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK;gCAC/B,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK;6BACtC,CAAC;4BACF,QAAQ,EAAE,QAAQ;4BAClB,WAAW,EAAE,aAAa;4BAC1B,OAAO,EAAE;gCACP,cAAc,EAAE,kBAAkB;6BACnC;yBACF,CAAC,EAAA;;wBAXI,QAAQ,GAAG,SAWf;wBACF,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE;4BAC1B,MAAM,IAAI,KAAK,CAAC,kCAA2B,QAAQ,CAAC,UAAU,CAAE,CAAC,CAAC;yBACnE;wBAEY,qBAAM,QAAQ,CAAC,IAAI,EAAE,EAAA;;wBAA5B,IAAI,GAAG,SAAqB;wBAClC,IAAI,IAAI,CAAC,KAAK,EAAE;4BACd,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;yBAC7B;wBAED,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAC;;;;aAC5B;KACF;CACF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signup.d.ts","sourceRoot":"","sources":["../../../src/pages/Signup.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA+D,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"Signup.d.ts","sourceRoot":"","sources":["../../../src/pages/Signup.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAA+D,MAAM,eAAe,CAAC;AAoIlG,eAAO,MAAM,UAAU,EAAE,IAOxB,CAAC"}
|
package/dist/src/pages/Signup.js
CHANGED
|
@@ -80,6 +80,7 @@ var ui_1 = require("@proteinjs/ui");
|
|
|
80
80
|
var user_1 = require("@proteinjs/user");
|
|
81
81
|
var material_1 = require("@mui/material");
|
|
82
82
|
var util_1 = require("@proteinjs/util");
|
|
83
|
+
var react_helmet_1 = require("react-helmet");
|
|
83
84
|
var SignupComponent = function () {
|
|
84
85
|
var _a = (0, react_1.useState)(''), token = _a[0], setToken = _a[1];
|
|
85
86
|
var _b = (0, react_1.useState)(false), isInviteOnly = _b[0], setIsInviteOnly = _b[1];
|
|
@@ -170,25 +171,28 @@ var SignupComponent = function () {
|
|
|
170
171
|
}
|
|
171
172
|
});
|
|
172
173
|
}); };
|
|
173
|
-
return (react_1.default.createElement(
|
|
174
|
-
react_1.default.createElement(
|
|
175
|
-
|
|
176
|
-
react_1.default.createElement(material_1.
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '
|
|
180
|
-
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
174
|
+
return (react_1.default.createElement(react_1.default.Fragment, null,
|
|
175
|
+
react_1.default.createElement(react_helmet_1.Helmet, null,
|
|
176
|
+
react_1.default.createElement("title", null, "Sign up")),
|
|
177
|
+
react_1.default.createElement(ui_1.FormPage, null, isInitializing ? (react_1.default.createElement(material_1.Stack, { direction: 'column', spacing: 2, sx: { px: 2, py: 1 } },
|
|
178
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '500px', height: '60px' }),
|
|
179
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '500px', height: '60px' }),
|
|
180
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '500px', height: '60px' }),
|
|
181
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '500px', height: '60px' }),
|
|
182
|
+
react_1.default.createElement(material_1.Stack, { direction: 'row', spacing: 2, justifyContent: 'flex-end' },
|
|
183
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '100px', height: '60px' }),
|
|
184
|
+
react_1.default.createElement(material_1.Skeleton, { variant: 'text', width: '100px', height: '60px' })))) : initializationError ? (react_1.default.createElement(material_1.Stack, { alignItems: 'center', spacing: 3, sx: { p: 4 } },
|
|
185
|
+
react_1.default.createElement(material_1.Typography, { variant: 'h1', gutterBottom: true }, "Sign up is not available"),
|
|
186
|
+
react_1.default.createElement(material_1.Typography, { variant: 'body1', gutterBottom: true }, initializationError),
|
|
187
|
+
react_1.default.createElement(material_1.Button, { variant: 'contained', color: 'primary', href: "/".concat(user_1.uiRoutes.auth.login) }, "Go to login page"))) : (react_1.default.createElement(ui_1.Form, { name: 'Sign Up', createFields: function () { return new SignupFields(); }, fieldLayout: ['name', 'email', 'password', 'confirmPassword'], buttons: buttons, onLoad: function (fields) { return __awaiter(void 0, void 0, void 0, function () {
|
|
188
|
+
return __generator(this, function (_a) {
|
|
189
|
+
fields.token.field.value = token;
|
|
190
|
+
if (token) {
|
|
191
|
+
fields.email.field.accessibility = { hidden: true };
|
|
192
|
+
}
|
|
193
|
+
return [2 /*return*/];
|
|
194
|
+
});
|
|
195
|
+
}); } })))));
|
|
192
196
|
};
|
|
193
197
|
exports.signupPage = {
|
|
194
198
|
name: 'Sign Up',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signup.js","sourceRoot":"","sources":["../../../src/pages/Signup.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmD;AACnD,oCAAkG;AAClG,wCAA6D;AAC7D,0CAAoE;AACpE,wCAA6C;
|
|
1
|
+
{"version":3,"file":"Signup.js","sourceRoot":"","sources":["../../../src/pages/Signup.tsx"],"names":[],"mappings":"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"}
|
package/generated/index.ts
CHANGED
|
@@ -10,11 +10,12 @@ import '@proteinjs/util';
|
|
|
10
10
|
import 'moment';
|
|
11
11
|
import 'react';
|
|
12
12
|
import 'react-dom';
|
|
13
|
+
import 'react-helmet';
|
|
13
14
|
|
|
14
15
|
|
|
15
16
|
/** Generate Source Graph */
|
|
16
17
|
|
|
17
|
-
const sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"/Omit\"},{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"forgotPasswordPage\",\"filePath\":\"/Users/
|
|
18
|
+
const sourceGraph = "{\"options\":{\"directed\":true,\"multigraph\":false,\"compound\":false},\"nodes\":[{\"v\":\"/Omit\"},{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"forgotPasswordPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/ForgotPassword.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/forgotPasswordPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/ui/Page\"},{\"v\":\"@proteinjs/user-ui/loginPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"loginPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/Login.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/loginPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/passwordResetPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"passwordResetPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/PasswordReset.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/passwordResetPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/invitePage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"invitePage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/SendInvite.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/invitePage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}},{\"v\":\"@proteinjs/user-ui/signupPage\",\"value\":{\"packageName\":\"@proteinjs/user-ui\",\"name\":\"signupPage\",\"filePath\":\"/Users/veronica/Repositories/n3xa-meta-repo/packages/proteinjs/packages/user/packages/ui/src/pages/Signup.tsx\",\"qualifiedName\":\"@proteinjs/user-ui/signupPage\",\"type\":{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":[{\"packageName\":\"@proteinjs/ui\",\"name\":\"Page\",\"filePath\":null,\"qualifiedName\":\"@proteinjs/ui/Page\",\"typeParameters\":[],\"directParents\":null}]},\"isExported\":true,\"isConst\":true,\"sourceType\":0}}],\"edges\":[{\"v\":\"@proteinjs/user-ui/forgotPasswordPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/loginPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/passwordResetPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/invitePage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"},{\"v\":\"@proteinjs/user-ui/signupPage\",\"w\":\"@proteinjs/ui/Page\",\"value\":\"has type\"}]}";
|
|
18
19
|
|
|
19
20
|
|
|
20
21
|
/** Generate Source Links */
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@proteinjs/user-ui",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.7",
|
|
4
4
|
"description": "User ui components",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
@@ -24,19 +24,21 @@
|
|
|
24
24
|
"@mui/icons-material": "5.14.11",
|
|
25
25
|
"@mui/material": "5.14.11",
|
|
26
26
|
"@proteinjs/reflection": "1.1.9",
|
|
27
|
-
"@proteinjs/server-api": "1.
|
|
28
|
-
"@proteinjs/ui": "3.0
|
|
29
|
-
"@proteinjs/user": "^1.1.
|
|
27
|
+
"@proteinjs/server-api": "1.5.0",
|
|
28
|
+
"@proteinjs/ui": "3.1.0",
|
|
29
|
+
"@proteinjs/user": "^1.1.6",
|
|
30
30
|
"@proteinjs/util": "1.4.1",
|
|
31
31
|
"moment": "2.29.4",
|
|
32
32
|
"react": "18.2.0",
|
|
33
|
-
"react-dom": "18.2.0"
|
|
33
|
+
"react-dom": "18.2.0",
|
|
34
|
+
"react-helmet": "6.1.0"
|
|
34
35
|
},
|
|
35
36
|
"devDependencies": {
|
|
36
37
|
"@proteinjs/reflection-build": "1.0.24",
|
|
37
38
|
"@types/node": "14.0.13",
|
|
38
39
|
"@types/react": "18.2.23",
|
|
39
40
|
"@types/react-dom": "18.2.8",
|
|
41
|
+
"@types/react-helmet": "6.1.11",
|
|
40
42
|
"@typescript-eslint/eslint-plugin": "7.8.0",
|
|
41
43
|
"@typescript-eslint/parser": "7.8.0",
|
|
42
44
|
"eslint": "8.57.0",
|
|
@@ -46,4 +48,4 @@
|
|
|
46
48
|
},
|
|
47
49
|
"main": "./dist/generated/index.js",
|
|
48
50
|
"types": "./dist/generated/index.d.ts"
|
|
49
|
-
}
|
|
51
|
+
}
|
package/src/pages/Login.tsx
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Page, Form, Fields, textField, FormButtons, clearButton, FormPage } from '@proteinjs/ui';
|
|
3
3
|
import { routes, uiRoutes } from '@proteinjs/user';
|
|
4
|
+
import { Helmet } from 'react-helmet';
|
|
4
5
|
|
|
5
6
|
export const loginPage: Page = {
|
|
6
7
|
name: 'Login',
|
|
@@ -9,15 +10,20 @@ export const loginPage: Page = {
|
|
|
9
10
|
public: true,
|
|
10
11
|
},
|
|
11
12
|
component: () => (
|
|
12
|
-
|
|
13
|
-
<
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
buttons
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
<>
|
|
14
|
+
<Helmet>
|
|
15
|
+
<title>Login</title>
|
|
16
|
+
</Helmet>
|
|
17
|
+
<FormPage>
|
|
18
|
+
<Form<LoginFields, typeof buttons>
|
|
19
|
+
name='Login'
|
|
20
|
+
createFields={() => new LoginFields()}
|
|
21
|
+
fieldLayout={['email', 'password']}
|
|
22
|
+
buttons={buttons}
|
|
23
|
+
maxWidth={'xs'}
|
|
24
|
+
/>
|
|
25
|
+
</FormPage>
|
|
26
|
+
</>
|
|
21
27
|
),
|
|
22
28
|
};
|
|
23
29
|
|
package/src/pages/Signup.tsx
CHANGED
|
@@ -3,6 +3,7 @@ import { Page, Form, Fields, textField, FormButtons, clearButton, FormPage } fro
|
|
|
3
3
|
import { getSignupService, uiRoutes } from '@proteinjs/user';
|
|
4
4
|
import { Button, Skeleton, Stack, Typography } from '@mui/material';
|
|
5
5
|
import { emailRegex } from '@proteinjs/util';
|
|
6
|
+
import { Helmet } from 'react-helmet';
|
|
6
7
|
|
|
7
8
|
const SignupComponent: React.FC = () => {
|
|
8
9
|
const [token, setToken] = useState('');
|
|
@@ -83,45 +84,50 @@ const SignupComponent: React.FC = () => {
|
|
|
83
84
|
};
|
|
84
85
|
|
|
85
86
|
return (
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
<
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
<
|
|
93
|
-
|
|
94
|
-
<Skeleton variant='text' width='
|
|
95
|
-
<Skeleton variant='text' width='
|
|
87
|
+
<>
|
|
88
|
+
<Helmet>
|
|
89
|
+
<title>Sign up</title>
|
|
90
|
+
</Helmet>
|
|
91
|
+
<FormPage>
|
|
92
|
+
{isInitializing ? (
|
|
93
|
+
<Stack direction='column' spacing={2} sx={{ px: 2, py: 1 }}>
|
|
94
|
+
<Skeleton variant='text' width='500px' height='60px' />
|
|
95
|
+
<Skeleton variant='text' width='500px' height='60px' />
|
|
96
|
+
<Skeleton variant='text' width='500px' height='60px' />
|
|
97
|
+
<Skeleton variant='text' width='500px' height='60px' />
|
|
98
|
+
<Stack direction='row' spacing={2} justifyContent='flex-end'>
|
|
99
|
+
<Skeleton variant='text' width='100px' height='60px' />
|
|
100
|
+
<Skeleton variant='text' width='100px' height='60px' />
|
|
101
|
+
</Stack>
|
|
96
102
|
</Stack>
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
</
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
103
|
+
) : initializationError ? (
|
|
104
|
+
<Stack alignItems='center' spacing={3} sx={{ p: 4 }}>
|
|
105
|
+
<Typography variant='h1' gutterBottom>
|
|
106
|
+
Sign up is not available
|
|
107
|
+
</Typography>
|
|
108
|
+
<Typography variant='body1' gutterBottom>
|
|
109
|
+
{initializationError}
|
|
110
|
+
</Typography>
|
|
111
|
+
<Button variant='contained' color='primary' href={`/${uiRoutes.auth.login}`}>
|
|
112
|
+
Go to login page
|
|
113
|
+
</Button>
|
|
114
|
+
</Stack>
|
|
115
|
+
) : (
|
|
116
|
+
<Form<SignupFields, typeof buttons>
|
|
117
|
+
name='Sign Up'
|
|
118
|
+
createFields={() => new SignupFields()}
|
|
119
|
+
fieldLayout={['name', 'email', 'password', 'confirmPassword']}
|
|
120
|
+
buttons={buttons}
|
|
121
|
+
onLoad={async (fields) => {
|
|
122
|
+
fields.token.field.value = token;
|
|
123
|
+
if (token) {
|
|
124
|
+
fields.email.field.accessibility = { hidden: true };
|
|
125
|
+
}
|
|
126
|
+
}}
|
|
127
|
+
/>
|
|
128
|
+
)}
|
|
129
|
+
</FormPage>
|
|
130
|
+
</>
|
|
125
131
|
);
|
|
126
132
|
};
|
|
127
133
|
|