mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-16 22:27:26 +01:00
commit16d8b87e90Merge:07387faf486bea232d47Author: negue <eugen.bolz@gmail.com> Date: Thu Sep 14 22:30:00 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit07387faf48Author: negue <eugen.bolz@gmail.com> Date: Wed Sep 13 23:38:37 2023 +0200 remove generate promoCode from ui commit6bea232d47Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Sep 11 12:55:31 2023 -0400 build(deps): bump core-js from 3.32.1 to 3.32.2 in /website/client (#14867) Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.32.1 to 3.32.2. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.32.2/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commitcebb3f0f25Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Sep 11 12:43:49 2023 -0400 build(deps): bump webpack from 4.46.0 to 4.47.0 in /website/client (#14868) Bumps [webpack](https://github.com/webpack/webpack) from 4.46.0 to 4.47.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.46.0...v4.47.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> commitea8563cd17Merge:3e16584dcf6259955891Author: negue <eugen.bolz@gmail.com> Date: Tue Aug 29 21:23:02 2023 +0200 Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting commit3e16584dcfAuthor: negue <eugen.bolz@gmail.com> Date: Tue Aug 29 21:22:06 2023 +0200 fix PR comments commit84ba44fb19Author: negue <eugen.bolz@gmail.com> Date: Tue Aug 29 20:38:54 2023 +0200 fix PR comments commit6259955891Author: CuriousMagpie <eilatan@gmail.com> Date: Fri Aug 25 11:20:26 2023 -0400 update form.scss commitda82bd8e68Author: negue <eugen.bolz@gmail.com> Date: Thu Aug 24 21:40:02 2023 +0200 remove ending commit82e5fd2a83Author: negue <eugen.bolz@gmail.com> Date: Mon Aug 21 22:25:41 2023 +0200 fix spacing commit9ad06ea88bAuthor: negue <eugen.bolz@gmail.com> Date: Mon Aug 21 22:09:22 2023 +0200 clean up debug row for login methods commit41cde37675Merge:8c568060f982ebe71eb4Author: negue <eugen.bolz@gmail.com> Date: Mon Aug 21 21:51:22 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit8c568060f9Author: negue <eugen.bolz@gmail.com> Date: Mon Aug 21 21:49:31 2023 +0200 fix PR comments commit36f7a4711dMerge:d279af7897647b27c55fAuthor: negue <eugen.bolz@gmail.com> Date: Fri Aug 11 20:04:15 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitd279af7897Merge:ffbed3e044b20ea44d49Author: negue <eugen.bolz@gmail.com> Date: Wed Aug 9 21:13:37 2023 +0200 Merge branch 'negue/refactor/routes' into negue/ui/setting commitb20ea44d49Author: negue <eugen.bolz@gmail.com> Date: Wed Aug 9 21:04:12 2023 +0200 Split Vue.Router routes commitffbed3e044Author: negue <eugen.bolz@gmail.com> Date: Sun Jul 23 00:00:24 2023 +0200 remove console commit4c350b0180Author: negue <eugen.bolz@gmail.com> Date: Sat Jul 22 23:34:20 2023 +0200 update Bailey Notification Text + fix popover commitc105b9ecf9Author: negue <eugen.bolz@gmail.com> Date: Sat Jul 22 23:21:53 2023 +0200 fix change password setting commit06410b4807Author: negue <eugen.bolz@gmail.com> Date: Sat Jul 22 22:50:00 2023 +0200 fix reset account texts commitccfdd9bb9cMerge:35c75304f18558dcc3a8Author: negue <eugen.bolz@gmail.com> Date: Sat Jul 22 22:48:13 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit35c75304f1Author: negue <eugen.bolz@gmail.com> Date: Sun Jul 2 20:16:06 2023 +0200 more fixes commit203e961464Author: negue <eugen.bolz@gmail.com> Date: Sun Jul 2 19:45:17 2023 +0200 fix notification settings commitec94604791Author: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 22:00:45 2023 +0200 applied same styling to promoCode.vue commit0177b3a76bAuthor: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 21:41:05 2023 +0200 move promoCode.vue to pages/settings commit8fbb600273Author: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 21:40:35 2023 +0200 saveCancelButtons.vue allow to hide the cancel part commit4915f2a3fbAuthor: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 21:09:07 2023 +0200 Hide Transactions Page again commit8b5ae17f02Author: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 20:52:03 2023 +0200 also check for invalid arguments in the password settings commitaa97ed5299Author: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 20:25:53 2023 +0200 fix localhost externalLinks check commit87a4e4931bAuthor: negue <eugen.bolz@gmail.com> Date: Sun Jun 25 20:01:31 2023 +0200 show notification on username change + fix userEmail checks commit6a6f55f6fcMerge:f9ff5e5c55e49d26eacdAuthor: negue <eugen.bolz@gmail.com> Date: Sat Jun 24 22:54:00 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitf9ff5e5c55Author: negue <eugen.bolz@gmail.com> Date: Tue May 30 22:41:42 2023 +0200 check password inputs and mark invalid for "password change" setting commit4497514eebAuthor: negue <eugen.bolz@gmail.com> Date: Tue May 30 21:59:21 2023 +0200 show notification when chaning display name commit3232f12f0dAuthor: negue <eugen.bolz@gmail.com> Date: Tue May 30 21:55:25 2023 +0200 check current password valid style in "delete account" and "reset account" commit582a2f1304Author: negue <eugen.bolz@gmail.com> Date: Tue May 30 21:27:20 2023 +0200 mark password field of email setting as invalid on wrong password commit8e3b8a962aAuthor: negue <eugen.bolz@gmail.com> Date: Tue May 30 21:24:46 2023 +0200 refactor currentPasswordInput.vue to use validatedTextInput.vue commit61521507a4Author: negue <eugen.bolz@gmail.com> Date: Tue May 30 20:20:56 2023 +0200 fix username setting: - unsaved values check - @ char must be first in input, otherwise not remove it for checks commitf74c29a065Merge:c4b6f0c39cd4a5823916Author: negue <eugen.bolz@gmail.com> Date: Tue May 30 19:54:06 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitc4b6f0c39cMerge:37eee140ad6e3a367832Author: negue <eugen.bolz@gmail.com> Date: Fri May 12 22:08:08 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit37eee140adAuthor: negue <eugen.bolz@gmail.com> Date: Fri May 12 21:57:27 2023 +0200 delete account without password commit48a6801f4eAuthor: negue <eugen.bolz@gmail.com> Date: Mon May 8 22:06:29 2023 +0200 fix duplicate json entry commit47a2189f49Merge:a56b4a445749f45d27e3Author: negue <eugen.bolz@gmail.com> Date: Mon May 8 21:48:21 2023 +0200 Merge remote-tracking branch 'origin/release' into negue/ui/setting commita56b4a4457Author: negue <eugen.bolz@gmail.com> Date: Mon May 8 21:37:31 2023 +0200 show current class on setting panel commit9c973cca2aAuthor: negue <eugen.bolz@gmail.com> Date: Mon May 8 21:15:46 2023 +0200 fix selectDifficulty.vue - refactor selectList.vue commit95b37b3ba3Author: negue <eugen.bolz@gmail.com> Date: Mon May 8 20:45:09 2023 +0200 migrate restoreValues fix to new setting component commit7947b1c67dMerge:ad3e4d604a71e165433aAuthor: negue <eugen.bolz@gmail.com> Date: Mon May 8 20:41:31 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitad3e4d604aAuthor: negue <eugen.bolz@gmail.com> Date: Sat Apr 29 01:18:25 2023 +0200 style fixes commitcea13d5bc3Merge:73a5e5fcabb159182188Author: negue <eugen.bolz@gmail.com> Date: Fri Apr 28 23:58:09 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit73a5e5fcabAuthor: negue <eugen.bolz@gmail.com> Date: Tue Apr 25 20:51:14 2023 +0200 style / padding issues commit0a10eb32ccAuthor: negue <eugen.bolz@gmail.com> Date: Sat Apr 15 20:54:08 2023 +0200 fix "setting new password" invalid check commita79bec3fa5Author: negue <eugen.bolz@gmail.com> Date: Tue Apr 11 23:15:15 2023 +0200 add password for other logins commit9ff17fd6ddAuthor: negue <eugen.bolz@gmail.com> Date: Tue Apr 11 23:05:19 2023 +0200 "fix values" use keydown event to mark as change commit1f470942a9Author: negue <eugen.bolz@gmail.com> Date: Thu Apr 6 00:19:18 2023 +0200 delete old api.vue commitb4904a8b84Merge:b5da7ccc70c8b98678d0Author: negue <eugen.bolz@gmail.com> Date: Thu Apr 6 00:18:07 2023 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitb5da7ccc70Author: negue <eugen.bolz@gmail.com> Date: Thu Apr 6 00:11:36 2023 +0200 refactor webhook ui to use save/cancel buttons commitf49f67ff5cAuthor: negue <eugen.bolz@gmail.com> Date: Wed Apr 5 22:56:37 2023 +0200 remove unused settings commitcc73b44b25Author: negue <eugen.bolz@gmail.com> Date: Wed Mar 29 23:40:30 2023 +0200 remove advancedCollapsed settings to start it opened commite0300e8710Author: negue <eugen.bolz@gmail.com> Date: Wed Mar 29 22:58:09 2023 +0200 remove displayInviteToPartyWhenPartyIs1 setting commit1741ddfc64Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 20 23:00:17 2023 +0100 webhook margins commit24a43d027cAuthor: negue <eugen.bolz@gmail.com> Date: Mon Mar 20 22:40:19 2023 +0100 userid tooltip commit42fcb20bc4Author: negue <eugen.bolz@gmail.com> Date: Thu Mar 16 00:51:10 2023 +0100 remove balance for choosing class commit160848473dAuthor: negue <eugen.bolz@gmail.com> Date: Thu Mar 16 00:20:56 2023 +0100 show real class setting modal if enough gems available commitf74ba9738dAuthor: negue <eugen.bolz@gmail.com> Date: Thu Mar 16 00:10:53 2023 +0100 update apple icon and size commitbf961bc728Author: negue <eugen.bolz@gmail.com> Date: Wed Mar 15 23:59:42 2023 +0100 Copied API Token Notification commit28f0220b4eAuthor: negue <eugen.bolz@gmail.com> Date: Wed Mar 15 23:53:33 2023 +0100 remove blue color of setting links commitb53ccace95Author: negue <eugen.bolz@gmail.com> Date: Wed Mar 15 23:43:06 2023 +0100 fix username/email setting input width commit1dfa5b275dAuthor: negue <eugen.bolz@gmail.com> Date: Wed Mar 15 23:11:32 2023 +0100 developer mode commit776618d2dbAuthor: negue <eugen.bolz@gmail.com> Date: Tue Mar 14 21:11:52 2023 +0100 Add new Pause Dailies Setting commit576c80af7eMerge:dec1a1159d377b152ffdAuthor: negue <eugen.bolz@gmail.com> Date: Tue Mar 14 21:04:05 2023 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitdec1a1159dAuthor: negue <eugen.bolz@gmail.com> Date: Tue Mar 14 21:00:52 2023 +0100 developer mode dummy row commit1e80a7d145Author: negue <eugen.bolz@gmail.com> Date: Sat Mar 11 00:03:33 2023 +0100 WIP webhook row commitcc4bedbe2dAuthor: negue <eugen.bolz@gmail.com> Date: Fri Mar 10 20:28:57 2023 +0100 add spritely login creds message to the new api-row / redirect old url to the new one commitf9833aa78aAuthor: negue <eugen.bolz@gmail.com> Date: Thu Mar 9 02:23:39 2023 +0100 API Token Row commit123c9b9bb1Author: negue <eugen.bolz@gmail.com> Date: Mon Mar 6 22:46:50 2023 +0100 "Your User Data" Row instead of Page commit0ade5663aeAuthor: negue <eugen.bolz@gmail.com> Date: Fri Mar 3 22:43:03 2023 +0100 userid row commitb4f2236ab8Author: negue <eugen.bolz@gmail.com> Date: Fri Mar 3 22:22:32 2023 +0100 rename folder of setting rows commit3b050861c4Author: negue <eugen.bolz@gmail.com> Date: Tue Feb 21 21:11:48 2023 +0100 move remaining setting to generalSettings.vue - delete site.vue - start with siteData.vue commitb09298fb01Author: negue <eugen.bolz@gmail.com> Date: Tue Feb 21 20:56:03 2023 +0100 move taskSettings.vue and add it to the settings list commit5ed25066ecAuthor: negue <eugen.bolz@gmail.com> Date: Tue Feb 21 20:06:13 2023 +0100 size/margin for transactions commit25e77cbd95Author: negue <eugen.bolz@gmail.com> Date: Tue Feb 21 19:52:12 2023 +0100 move purchaseHistory.vue commit8e4e1bcb0fMerge:bb14d09aa485c50d50e9Author: negue <eugen.bolz@gmail.com> Date: Tue Feb 21 19:04:31 2023 +0100 Merge remote-tracking branch 'origin/negue/ui/setting' into negue/ui/setting commit85c50d50e9Author: SabreCat <sabe@habitica.com> Date: Thu Feb 16 14:23:27 2023 -0600 fix(css): remove redundant formatting for a elements commitbb14d09aa4Author: negue <eugen.bolz@gmail.com> Date: Thu Feb 16 01:34:09 2023 +0100 remove console commit8c5e722c72Author: negue <eugen.bolz@gmail.com> Date: Thu Feb 16 01:26:43 2023 +0100 first try with the refactored UI of Login Methods commit9c8770051dAuthor: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 19:13:16 2023 +0100 fix dayStartAdjustmentSetting.vue for 0 value commitee2ff3881bAuthor: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 18:37:46 2023 +0100 fix color after refactor commit121e7485caAuthor: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 18:29:00 2023 +0100 mark audioThemeSetting as changed commit98c6570003Author: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 18:05:55 2023 +0100 fix ul/li style in resetAccount.vue commitfed824f705Author: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 17:49:36 2023 +0100 fix color of gem price commit80365e537dAuthor: negue <eugen.bolz@gmail.com> Date: Sat Feb 11 17:44:55 2023 +0100 fix "fixValuesSetting.vue" commitd3e15c5413Author: negue <eugen.bolz@gmail.com> Date: Wed Feb 8 01:06:27 2023 +0100 open forgot password in new tab commit31edec9ec5Author: negue <eugen.bolz@gmail.com> Date: Wed Feb 8 01:03:19 2023 +0100 move validatedTextInput.vue to shared components + fix check pos/size + input-error cleanup commit2adfd8c259Author: negue <eugen.bolz@gmail.com> Date: Sun Feb 5 20:19:30 2023 +0100 hide class setting until level 10 commit64fb4c0cf9Author: negue <eugen.bolz@gmail.com> Date: Sun Feb 5 19:32:40 2023 +0100 delete old modals (refactored into new settings ui) commitb5be137a8dAuthor: negue <eugen.bolz@gmail.com> Date: Sun Feb 5 19:27:26 2023 +0100 enable forgot password link in settings commitbec75c6e12Author: negue <eugen.bolz@gmail.com> Date: Sun Feb 5 18:52:54 2023 +0100 reset account + password required in api commit64f7e7a1d9Author: negue <eugen.bolz@gmail.com> Date: Mon Jan 30 23:22:55 2023 +0100 fix compile commit7ffb5101beMerge:2bfb130b929f64633a57Author: negue <eugen.bolz@gmail.com> Date: Mon Jan 30 22:47:05 2023 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit2bfb130b92Author: negue <eugen.bolz@gmail.com> Date: Mon Jan 30 22:44:23 2023 +0100 remove restore-modal and replace it with the finished fix values setting commit89530a133cAuthor: negue <eugen.bolz@gmail.com> Date: Wed Jan 18 19:22:36 2023 +0100 wip fix values commit428647fc71Author: negue <eugen.bolz@gmail.com> Date: Sat Jan 14 21:50:22 2023 +0100 refactor change class to design update + clean up old site.vue settings commit1f16819bc1Author: negue <eugen.bolz@gmail.com> Date: Wed Jan 11 22:41:05 2023 +0100 WIP fix values commit6fef3d0579Author: negue <eugen.bolz@gmail.com> Date: Sat Jan 7 22:51:30 2023 +0100 check for unsaved changes when pressing cancel commitbef8a4cdfcMerge:494f32c3e3c7aadede4dAuthor: negue <eugen.bolz@gmail.com> Date: Sat Jan 7 22:10:53 2023 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit494f32c3e3Author: negue <eugen.bolz@gmail.com> Date: Wed Dec 21 00:55:31 2022 +0100 Class Setting commitbda210cfbbAuthor: negue <eugen.bolz@gmail.com> Date: Tue Dec 20 23:01:41 2022 +0100 removes username, email and display name from site.vue commit38198d7df6Author: negue <eugen.bolz@gmail.com> Date: Tue Dec 20 22:36:27 2022 +0100 WIP class setting commitdddcfa637fAuthor: negue <eugen.bolz@gmail.com> Date: Tue Dec 20 22:31:36 2022 +0100 fix styles commitce0a5cf974Author: negue <eugen.bolz@gmail.com> Date: Sun Dec 11 23:57:07 2022 +0100 Scroll into opened Setting commit7e0a95ddffAuthor: negue <eugen.bolz@gmail.com> Date: Sun Dec 11 23:43:44 2022 +0100 Audio Theme Setting commit9c556662feAuthor: negue <eugen.bolz@gmail.com> Date: Sun Dec 11 00:25:30 2022 +0100 prepare header settings but still hidden commit30d8b27534Merge:a1d1a788b2580139ff69Author: negue <eugen.bolz@gmail.com> Date: Sat Dec 10 23:36:36 2022 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commita1d1a788b2Author: negue <eugen.bolz@gmail.com> Date: Sat Dec 10 23:34:33 2022 +0100 DayStartAdjustmentSetting commitddee94a393Author: negue <eugen.bolz@gmail.com> Date: Sat Dec 10 20:00:12 2022 +0100 disable reset account button when password empty commit30a6db4c2dAuthor: negue <eugen.bolz@gmail.com> Date: Sat Dec 10 19:54:21 2022 +0100 hide & reset previous setting when switching to a different one commit78093848d7Author: negue <eugen.bolz@gmail.com> Date: Wed Dec 7 22:19:15 2022 +0100 validated text input (in/valid border color + icon) commite1b444ea63Author: negue <eugen.bolz@gmail.com> Date: Tue Dec 6 22:09:54 2022 +0100 re-enable box-shadow on hover commit96dc4e47aeAuthor: negue <negue@users.noreply.github.com> Date: Mon Nov 28 01:13:47 2022 +0100 remove console log commit69ad07daadAuthor: negue <negue@users.noreply.github.com> Date: Mon Nov 28 01:01:17 2022 +0100 dateFormatSetting commitbc11c0cf75Author: negue <negue@users.noreply.github.com> Date: Mon Nov 28 00:49:24 2022 +0100 move shared components / mixins commit0d1a189c64Author: negue <negue@users.noreply.github.com> Date: Mon Nov 28 00:44:21 2022 +0100 language Setting + imports cleanup commit29ebd89030Author: negue <negue@users.noreply.github.com> Date: Sun Nov 27 23:23:02 2022 +0100 fix icon size + fix display name valid checks commit5c7747517bMerge:fd5cbc302690b34c4dacAuthor: negue <negue@users.noreply.github.com> Date: Sun Nov 27 23:08:35 2022 +0100 Merge remote-tracking branch 'origin/release' into negue/ui/setting commitfd5cbc3026Author: negue <negue@users.noreply.github.com> Date: Wed Nov 23 00:14:21 2022 +0100 fix conflicts commit49361217b0Merge:edb427158f04e2a39a9fAuthor: negue <negue@users.noreply.github.com> Date: Wed Nov 23 00:12:38 2022 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitedb427158fAuthor: negue <negue@users.noreply.github.com> Date: Wed Nov 23 00:03:19 2022 +0100 disable save button if nothing was changed commitc7e40e9446Author: negue <negue@users.noreply.github.com> Date: Tue Nov 22 23:36:37 2022 +0100 delete account row commit4bf740c531Author: negue <negue@users.noreply.github.com> Date: Tue Nov 22 23:14:24 2022 +0100 Shared Modal Visible State commitd718153717Author: negue <negue@users.noreply.github.com> Date: Sun Nov 20 18:06:20 2022 +0100 resetAccount commite25922f8b3Author: negue <negue@users.noreply.github.com> Date: Wed Nov 16 23:39:26 2022 +0100 rename functional components for compiler commitfdbc2c0eeeAuthor: negue <negue@users.noreply.github.com> Date: Wed Nov 16 01:44:50 2022 +0100 password setting row commit5fd5e6275aAuthor: negue <negue@users.noreply.github.com> Date: Tue Nov 15 17:35:44 2022 +0100 update package-lock.json again commit9d742fd9a1Author: negue <negue@users.noreply.github.com> Date: Tue Nov 15 17:24:15 2022 +0100 update package-lock.json commitcd588e74d5Author: negue <negue@users.noreply.github.com> Date: Mon Nov 14 02:12:39 2022 +0100 displayNameSetting.vue commit265970c5efAuthor: negue <negue@users.noreply.github.com> Date: Mon Nov 14 02:09:47 2022 +0100 fix lint commita2b510cacaMerge:0bae5fbe024dca69f14bAuthor: negue <negue@users.noreply.github.com> Date: Mon Nov 14 01:15:02 2022 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit0bae5fbe02Author: negue <negue@users.noreply.github.com> Date: Sun Nov 13 22:00:34 2022 +0100 userEmailSetting commit23da70fa2eAuthor: negue <negue@users.noreply.github.com> Date: Sun Nov 13 20:38:14 2022 +0100 extract save / cancel buttons and the shared inlineSetting "logic" commit82047380f3Author: negue <negue@users.noreply.github.com> Date: Sun Nov 13 20:18:21 2022 +0100 first setting (username) in the new layout commit39150349c7Author: negue <negue@users.noreply.github.com> Date: Wed Nov 2 21:42:12 2022 +0100 Working on M1 - will be reverted on full merge commitf7787b318cMerge:4c0ecc993853fb28cc48Author: negue <negue@users.noreply.github.com> Date: Tue Nov 1 14:20:24 2022 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit4c0ecc9938Merge:2f53613a4562b4315b3dAuthor: negue <negue@users.noreply.github.com> Date: Sun Oct 30 12:49:34 2022 +0100 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commit2f53613a45Author: negue <eugen.bolz@gmail.com> Date: Mon Oct 10 22:54:41 2022 +0200 split routes for ease of dev commit390f0fc69dMerge:cf222ee63a137f7d53dcAuthor: negue <eugen.bolz@gmail.com> Date: Mon Oct 10 22:50:43 2022 +0200 Merge remote-tracking branch 'origin/develop' into negue/ui/setting commitcf222ee63aAuthor: negue <eugen.bolz@gmail.com> Date: Sun Oct 2 23:15:35 2022 +0200 Update remaining Notification labels commitf837cce125Author: negue <eugen.bolz@gmail.com> Date: Sun Oct 2 22:45:12 2022 +0200 move site popup settings to notifications commitfc5181c3a7Author: negue <eugen.bolz@gmail.com> Date: Sun Oct 2 21:12:24 2022 +0200 fix styling in notification settings commit7b5568ed23Author: negue <eugen.bolz@gmail.com> Date: Sat Sep 10 16:00:56 2022 +0200 wip notification settings
911 lines
22 KiB
Vue
911 lines
22 KiB
Vue
<template>
|
|
<div class="form-wrapper">
|
|
<div id="top-background">
|
|
<div class="seamless_stars_varied_opacity_repeat"></div>
|
|
</div>
|
|
<form
|
|
v-if="!forgotPassword && !resetPasswordSetNewOne"
|
|
id="login-form"
|
|
@submit.prevent.stop="handleSubmit"
|
|
>
|
|
<div class="text-center">
|
|
<div>
|
|
<div class="svg-icon gryphon"></div>
|
|
</div>
|
|
<div>
|
|
<div
|
|
class="svg-icon habitica-logo"
|
|
v-html="icons.habiticaIcon"
|
|
></div>
|
|
</div>
|
|
</div>
|
|
<div class="form-group row text-center">
|
|
<div class="col-12 col-md-12">
|
|
<div
|
|
class="btn btn-secondary social-button"
|
|
@click="socialAuth('google')"
|
|
>
|
|
<div
|
|
class="svg-icon social-icon"
|
|
v-html="icons.googleIcon"
|
|
></div>
|
|
<div
|
|
class="text"
|
|
>
|
|
{{ registering
|
|
? $t('signUpWithSocial', {social: 'Google'})
|
|
: $t('loginWithSocial', {social: 'Google'}) }}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="form-group row text-center">
|
|
<div class="col-12 col-md-12">
|
|
<div
|
|
class="btn btn-secondary social-button"
|
|
@click="socialAuth('apple')"
|
|
>
|
|
<div
|
|
class="svg-icon social-icon"
|
|
v-html="icons.appleIcon"
|
|
></div>
|
|
<div
|
|
class="text"
|
|
>
|
|
{{ registering
|
|
? $t('signUpWithSocial', {social: 'Apple'})
|
|
: $t('loginWithSocial', {social: 'Apple'}) }}
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="strike">
|
|
<span>{{ $t('or') }}</span>
|
|
</div>
|
|
<div
|
|
v-if="registering"
|
|
class="form-group"
|
|
>
|
|
<label
|
|
v-once
|
|
for="usernameInput"
|
|
>{{ $t('username') }}</label>
|
|
<input
|
|
id="usernameInput"
|
|
v-model="username"
|
|
class="form-control input-with-error"
|
|
type="text"
|
|
:placeholder="$t('usernamePlaceholder')"
|
|
:class="{'input-valid': usernameValid, 'input-invalid': usernameInvalid}"
|
|
>
|
|
<div
|
|
v-for="issue in usernameIssues"
|
|
:key="issue"
|
|
class="input-error"
|
|
>
|
|
{{ issue }}
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-if="!registering"
|
|
class="form-group"
|
|
>
|
|
<label
|
|
v-once
|
|
for="usernameInput"
|
|
>{{ $t('emailOrUsername') }}</label>
|
|
<input
|
|
id="usernameInput"
|
|
v-model="username"
|
|
class="form-control"
|
|
type="text"
|
|
:placeholder="$t('emailOrUsername')"
|
|
>
|
|
</div>
|
|
<div
|
|
v-if="registering"
|
|
class="form-group"
|
|
>
|
|
<label
|
|
v-once
|
|
for="emailInput"
|
|
>{{ $t('email') }}</label>
|
|
<input
|
|
id="emailInput"
|
|
v-model="email"
|
|
class="form-control"
|
|
type="email"
|
|
:placeholder="$t('emailPlaceholder')"
|
|
:class="{'input-invalid': emailInvalid, 'input-valid': emailValid}"
|
|
>
|
|
</div>
|
|
<div class="form-group">
|
|
<label
|
|
v-once
|
|
for="passwordInput"
|
|
>{{ $t('password') }}</label>
|
|
<a
|
|
v-if="!registering"
|
|
v-once
|
|
class="float-right forgot-password"
|
|
@click="forgotPassword = true"
|
|
>{{ $t('forgotPassword') }}</a>
|
|
<input
|
|
id="passwordInput"
|
|
v-model="password"
|
|
class="form-control"
|
|
type="password"
|
|
:placeholder="$t(registering ? 'passwordPlaceholder' : 'password')"
|
|
:class="{
|
|
'input-invalid input-with-error': registering && passwordInvalid,
|
|
'input-valid': registering && passwordValid
|
|
}"
|
|
>
|
|
<div
|
|
v-if="passwordInvalid && registering"
|
|
class="input-error"
|
|
>
|
|
{{ $t('minPasswordLength') }}
|
|
</div>
|
|
</div>
|
|
<div
|
|
v-if="registering"
|
|
class="form-group"
|
|
>
|
|
<label
|
|
v-once
|
|
for="confirmPasswordInput"
|
|
>{{ $t('confirmPassword') }}</label>
|
|
<input
|
|
id="confirmPasswordInput"
|
|
v-model="passwordConfirm"
|
|
class="form-control input-with-error"
|
|
type="password"
|
|
:placeholder="$t('confirmPasswordPlaceholder')"
|
|
:class="{'input-invalid': passwordConfirmInvalid, 'input-valid': passwordConfirmValid}"
|
|
>
|
|
<div
|
|
v-if="passwordConfirmInvalid"
|
|
class="input-error"
|
|
>
|
|
{{ $t('passwordConfirmationMatch') }}
|
|
</div>
|
|
<small
|
|
v-once
|
|
class="form-text"
|
|
v-html="$t('termsAndAgreement')"
|
|
></small>
|
|
</div>
|
|
<div class="text-center">
|
|
<button
|
|
v-if="registering"
|
|
type="submit"
|
|
class="btn btn-info"
|
|
:disabled="signupFormInvalid"
|
|
>
|
|
{{ $t('joinHabitica') }}
|
|
</button>
|
|
<button
|
|
v-if="!registering"
|
|
v-once
|
|
type="submit"
|
|
class="btn btn-info"
|
|
>
|
|
{{ $t('login') }}
|
|
</button>
|
|
<div class="toggle-links">
|
|
<router-link
|
|
v-if="registering"
|
|
:to="{name: 'login'}"
|
|
exact="exact"
|
|
>
|
|
<a
|
|
v-once
|
|
class="toggle-link"
|
|
v-html="$t('alreadyHaveAccountLogin')"
|
|
></a>
|
|
</router-link>
|
|
<router-link
|
|
v-if="!registering"
|
|
:to="{name: 'register'}"
|
|
exact="exact"
|
|
>
|
|
<a
|
|
v-once
|
|
class="toggle-link"
|
|
v-html="$t('dontHaveAccountSignup')"
|
|
></a>
|
|
</router-link>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
<form
|
|
v-if="forgotPassword"
|
|
id="forgot-form"
|
|
@submit.prevent="handleSubmit"
|
|
@keyup.enter="handleSubmit"
|
|
>
|
|
<div class="text-center">
|
|
<div>
|
|
<div class="svg-icon gryphon"></div>
|
|
</div>
|
|
<div>
|
|
<div
|
|
class="svg-icon habitica-logo"
|
|
v-html="icons.habiticaIcon"
|
|
></div>
|
|
</div>
|
|
<div class="header">
|
|
<h2 v-once>
|
|
{{ $t('emailNewPass') }}
|
|
</h2>
|
|
<p v-once>
|
|
{{ $t('forgotPasswordSteps') }}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<div class="form-group row text-center">
|
|
<label
|
|
v-once
|
|
for="usernameInput"
|
|
>{{ $t('emailOrUsername') }}</label>
|
|
<input
|
|
id="usernameInput"
|
|
v-model="username"
|
|
class="form-control"
|
|
type="text"
|
|
:placeholder="$t('emailUsernamePlaceholder')"
|
|
>
|
|
</div>
|
|
<div class="text-center">
|
|
<div
|
|
v-once
|
|
class="btn btn-info"
|
|
@click="forgotPasswordLink()"
|
|
>
|
|
{{ $t('sendLink') }}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
<form
|
|
v-if="resetPasswordSetNewOne"
|
|
id="reset-password-set-new-one-form"
|
|
@submit.prevent="handleSubmit"
|
|
@keyup.enter="handleSubmit"
|
|
>
|
|
<div class="text-center">
|
|
<div>
|
|
<div class="svg-icon gryphon"></div>
|
|
</div>
|
|
<div>
|
|
<div
|
|
class="svg-icon habitica-logo"
|
|
v-html="icons.habiticaIcon"
|
|
></div>
|
|
</div>
|
|
<div class="header">
|
|
<h2>{{ $t('passwordResetPage') }}</h2>
|
|
</div>
|
|
</div>
|
|
<div class="form-group">
|
|
<label
|
|
v-once
|
|
for="passwordInput"
|
|
>{{ $t('newPass') }}</label>
|
|
<input
|
|
id="passwordInput"
|
|
v-model="password"
|
|
class="form-control input-with-error"
|
|
type="password"
|
|
:placeholder="$t('password')"
|
|
:class="{'input-invalid': passwordInvalid, 'input-valid': passwordValid}"
|
|
>
|
|
<div
|
|
v-if="passwordInvalid"
|
|
class="input-error"
|
|
>
|
|
{{ $t('minPasswordLength') }}
|
|
</div>
|
|
</div>
|
|
<div class="form-group">
|
|
<label
|
|
v-once
|
|
for="confirmPasswordInput"
|
|
>{{ $t('confirmPass') }}</label>
|
|
<input
|
|
id="confirmPasswordInput"
|
|
v-model="passwordConfirm"
|
|
class="form-control input-with-error"
|
|
type="password"
|
|
:placeholder="$t('confirmPasswordPlaceholder')"
|
|
:class="{'input-invalid': passwordConfirmInvalid, 'input-valid': passwordConfirmValid}"
|
|
>
|
|
<div
|
|
v-if="passwordConfirmInvalid"
|
|
class="input-error"
|
|
>
|
|
{{ $t('passwordConfirmationMatch') }}
|
|
</div>
|
|
</div>
|
|
<div class="text-center">
|
|
<div
|
|
class="btn btn-info"
|
|
:enabled="!resetPasswordSetNewOneData.hasError"
|
|
@click="resetPasswordSetNewOneLink()"
|
|
>
|
|
{{ $t('setNewPass') }}
|
|
</div>
|
|
</div>
|
|
</form>
|
|
<div
|
|
id="bottom-wrap"
|
|
:class="`bottom-wrap-${!registering ? 'login' : 'register'}`"
|
|
>
|
|
<div id="bottom-background">
|
|
<div class="seamless_mountains_demo_repeat"></div>
|
|
<div class="midground_foreground_extended2"></div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
|
|
<style>
|
|
html, body, #app {
|
|
min-height: 100%;
|
|
}
|
|
|
|
small a, small a:hover {
|
|
color: #fff;
|
|
text-decoration: underline;
|
|
}
|
|
</style>
|
|
|
|
<style lang="scss" scoped>
|
|
@import '~@/assets/scss/colors.scss';
|
|
|
|
@media only screen and (min-height: 1080px) {
|
|
.bottom-wrap-register {
|
|
margin-top: 6em;
|
|
position: fixed !important;
|
|
width: 100%;
|
|
bottom: 0;
|
|
}
|
|
}
|
|
|
|
@media only screen and (min-height: 862px) {
|
|
.bottom-wrap-login {
|
|
margin-top: 6em;
|
|
position: fixed !important;
|
|
width: 100%;
|
|
bottom: 0;
|
|
}
|
|
}
|
|
|
|
@media only screen and (max-width: 768px) {
|
|
#login-form {
|
|
width: 100% !important;
|
|
}
|
|
|
|
.form-group {
|
|
padding-left: .5em;
|
|
padding-right: .5em;
|
|
}
|
|
}
|
|
|
|
.form-wrapper {
|
|
background-color: $purple-200;
|
|
background: $purple-200; /* For browsers that do not support gradients */
|
|
background: linear-gradient(to bottom, #4f2a93, #6133b4); /* Standard syntax */
|
|
min-height: 100vh;
|
|
}
|
|
|
|
::-webkit-input-placeholder { /* Chrome/Opera/Safari */
|
|
color: $purple-400;
|
|
}
|
|
::-moz-placeholder { /* Firefox 19+ */
|
|
color: $purple-400;
|
|
}
|
|
:-ms-input-placeholder { /* IE 10+ */
|
|
color: $purple-400;
|
|
}
|
|
:-moz-placeholder { /* Firefox 18- */
|
|
color: $purple-400;
|
|
}
|
|
::placeholder { // Standard browsers
|
|
color: $purple-400;
|
|
}
|
|
|
|
#login-form, #forgot-form, #reset-password-set-new-one-form {
|
|
margin: 0 auto;
|
|
width: 40em;
|
|
padding-top: 5em;
|
|
padding-bottom: 4em;
|
|
position: relative;
|
|
z-index: 1;
|
|
|
|
.header {
|
|
h2 {
|
|
color: $white;
|
|
}
|
|
|
|
color: $white;
|
|
}
|
|
|
|
.gryphon {
|
|
background-image: url('~@/assets/images/melior@3x.png');
|
|
width: 63.2px;
|
|
height: 69.4px;
|
|
background-size: cover;
|
|
color: $white;
|
|
margin: 0 auto;
|
|
}
|
|
|
|
.habitica-logo {
|
|
width: 144px;
|
|
height: 31px;
|
|
margin: 2em auto;
|
|
}
|
|
|
|
label {
|
|
color: $white;
|
|
font-weight: bold;
|
|
}
|
|
|
|
input {
|
|
margin-bottom: 2em;
|
|
border-radius: 2px;
|
|
background-color: #432874;
|
|
border-color: transparent;
|
|
height: 50px;
|
|
color: $white;
|
|
}
|
|
|
|
.input-with-error.input-invalid {
|
|
margin-bottom: 0.5em;
|
|
}
|
|
|
|
#confirmPasswordInput + .input-error {
|
|
margin-bottom: 2em;
|
|
}
|
|
|
|
.form-text {
|
|
font-size: 14px;
|
|
color: $white;
|
|
}
|
|
|
|
.social-button {
|
|
width: 100%;
|
|
height: 100%;
|
|
white-space: inherit;
|
|
text-align: center;
|
|
|
|
.text {
|
|
display: inline-block;
|
|
}
|
|
}
|
|
|
|
.social-icon {
|
|
margin-left: 1em;
|
|
margin-right: 1em;
|
|
width: 18px;
|
|
height: 18px;
|
|
display: inline-block;
|
|
vertical-align: top;
|
|
margin-top: .1em;
|
|
}
|
|
}
|
|
|
|
#top-background {
|
|
.seamless_stars_varied_opacity_repeat {
|
|
background-image: url('~@/assets/images/auth/seamless_stars_varied_opacity.png');
|
|
background-repeat: repeat-x;
|
|
position: absolute;
|
|
height: 500px;
|
|
width: 100%;
|
|
}
|
|
}
|
|
|
|
#bottom-wrap {
|
|
margin-top: 6em;
|
|
position: static;
|
|
width: 100%;
|
|
bottom: 0;
|
|
}
|
|
|
|
#bottom-background {
|
|
position: relative;
|
|
|
|
.seamless_mountains_demo_repeat {
|
|
background-image: url('~@/assets/images/auth/seamless_mountains_demo.png');
|
|
background-repeat: repeat-x;
|
|
width: 100%;
|
|
height: 300px;
|
|
position: absolute;
|
|
z-index: 0;
|
|
bottom: 0;
|
|
}
|
|
|
|
.midground_foreground_extended2 {
|
|
background-image: url('~@/assets/images/auth/midground_foreground_extended2.png');
|
|
position: relative;
|
|
width: 1500px;
|
|
max-width: 100%;
|
|
height: 150px;
|
|
margin: 0 auto;
|
|
}
|
|
}
|
|
|
|
.toggle-links {
|
|
margin-top: 1em;
|
|
}
|
|
|
|
.toggle-link {
|
|
color: $white !important;
|
|
}
|
|
|
|
.forgot-password {
|
|
color: #bda8ff !important;
|
|
}
|
|
|
|
.input-error {
|
|
color: #fff;
|
|
font-size: 90%;
|
|
width: 100%;
|
|
}
|
|
|
|
.warning-banner {
|
|
color: $white;
|
|
background-color: $maroon-100;
|
|
height: 2.5rem;
|
|
width: 100%;
|
|
}
|
|
|
|
.warning-box {
|
|
font-weight: bold;
|
|
width: 1rem;
|
|
height: 1rem;
|
|
border: 2px solid;
|
|
border-radius: 2px;
|
|
}
|
|
|
|
.exclamation {
|
|
width: 2px;
|
|
}
|
|
|
|
.strike {
|
|
display: block;
|
|
text-align: center;
|
|
overflow: hidden;
|
|
white-space: nowrap;
|
|
margin-top: 1.5em;
|
|
margin-bottom: 1.5em;
|
|
}
|
|
|
|
.strike > span {
|
|
position: relative;
|
|
display: inline-block;
|
|
line-height: 1.14;
|
|
color: #fff;
|
|
}
|
|
|
|
.strike > span:before,
|
|
.strike > span:after {
|
|
content: "";
|
|
position: absolute;
|
|
top: 50%;
|
|
width: 9999px;
|
|
height: 1px;
|
|
background: #fff;
|
|
}
|
|
|
|
.strike > span:before {
|
|
right: 100%;
|
|
margin-right: 15px;
|
|
}
|
|
|
|
.strike > span:after {
|
|
left: 100%;
|
|
margin-left: 15px;
|
|
}
|
|
</style>
|
|
|
|
<script>
|
|
import axios from 'axios';
|
|
import hello from 'hellojs';
|
|
import debounce from 'lodash/debounce';
|
|
import isEmail from 'validator/lib/isEmail';
|
|
import DOMPurify from 'dompurify';
|
|
import { buildAppleAuthUrl } from '../../libs/auth';
|
|
|
|
import { MINIMUM_PASSWORD_LENGTH } from '@/../../common/script/constants';
|
|
import exclamation from '@/assets/svg/exclamation.svg';
|
|
import gryphon from '@/assets/svg/gryphon.svg';
|
|
import habiticaIcon from '@/assets/svg/habitica-logo.svg';
|
|
import googleIcon from '@/assets/svg/google.svg';
|
|
import appleIcon from '@/assets/svg/apple_black.svg';
|
|
|
|
export default {
|
|
data () {
|
|
const data = {
|
|
username: '',
|
|
email: '',
|
|
password: '',
|
|
passwordConfirm: '',
|
|
forgotPassword: false,
|
|
resetPasswordSetNewOneData: {
|
|
hasError: null,
|
|
code: null,
|
|
},
|
|
usernameIssues: [],
|
|
};
|
|
|
|
data.icons = Object.freeze({
|
|
exclamation,
|
|
gryphon,
|
|
habiticaIcon,
|
|
googleIcon,
|
|
appleIcon,
|
|
});
|
|
|
|
return data;
|
|
},
|
|
computed: {
|
|
registering () {
|
|
if (this.$route.path.startsWith('/register')) {
|
|
return true;
|
|
}
|
|
return false;
|
|
},
|
|
resetPasswordSetNewOne () {
|
|
if (this.$route.path.startsWith('/reset-password')) {
|
|
return true;
|
|
}
|
|
return false;
|
|
},
|
|
emailValid () {
|
|
if (this.email.length < 1) return false;
|
|
return isEmail(this.email);
|
|
},
|
|
emailInvalid () {
|
|
if (this.email.length < 1) return false;
|
|
return !this.emailValid;
|
|
},
|
|
usernameValid () {
|
|
if (this.username.length < 1) return false;
|
|
return this.usernameIssues.length === 0;
|
|
},
|
|
usernameInvalid () {
|
|
if (this.username.length < 1) return false;
|
|
return !this.usernameValid;
|
|
},
|
|
passwordValid () {
|
|
if (this.password.length <= 0) return false;
|
|
return this.password.length >= MINIMUM_PASSWORD_LENGTH;
|
|
},
|
|
passwordInvalid () {
|
|
if (this.password.length <= 0) return false;
|
|
return this.password.length < MINIMUM_PASSWORD_LENGTH;
|
|
},
|
|
passwordConfirmValid () {
|
|
if (this.passwordConfirm.length <= 3) return false;
|
|
return this.passwordConfirm === this.password;
|
|
},
|
|
passwordConfirmInvalid () {
|
|
if (this.passwordConfirm.length <= 3) return false;
|
|
return !this.passwordConfirmValid;
|
|
},
|
|
signupFormInvalid () {
|
|
return this.usernameInvalid
|
|
|| this.emailInvalid
|
|
|| this.passwordInvalid
|
|
|| this.passwordConfirmInvalid;
|
|
},
|
|
},
|
|
watch: {
|
|
$route: {
|
|
handler () {
|
|
this.setTitle();
|
|
if (this.resetPasswordSetNewOne) {
|
|
const { query } = this.$route;
|
|
const { code } = query;
|
|
const hasError = query.hasError === 'true';
|
|
if (hasError) {
|
|
window.alert(query.message); // eslint-disable-line no-alert
|
|
this.$router.push({ name: 'login' });
|
|
return;
|
|
}
|
|
|
|
if (!code) {
|
|
window.alert(this.$t('invalidPasswordResetCode')); // eslint-disable-line no-alert
|
|
this.$router.push({ name: 'login' });
|
|
return;
|
|
}
|
|
this.resetPasswordSetNewOneData.code = query.code;
|
|
this.resetPasswordSetNewOneData.hasError = hasError;
|
|
}
|
|
},
|
|
immediate: true,
|
|
},
|
|
username () {
|
|
this.validateUsername(this.username);
|
|
},
|
|
},
|
|
mounted () {
|
|
this.forgotPassword = this.$route.path.startsWith('/forgot-password');
|
|
|
|
hello.init({
|
|
google: process.env.GOOGLE_CLIENT_ID, // eslint-disable-line
|
|
});
|
|
},
|
|
methods: {
|
|
// eslint-disable-next-line func-names
|
|
validateUsername: debounce(function (username) {
|
|
if (username.length <= 3 || !this.registering) {
|
|
return;
|
|
}
|
|
this.$store.dispatch('auth:verifyUsername', {
|
|
username: this.username,
|
|
}).then(res => {
|
|
if (res.issues !== undefined) {
|
|
this.usernameIssues = res.issues;
|
|
} else {
|
|
this.usernameIssues = [];
|
|
}
|
|
});
|
|
}, 500),
|
|
sanitizeRedirect (redirect) {
|
|
if (!redirect) return '/';
|
|
const sanitizedString = DOMPurify.sanitize(redirect).replace(/\\|\/\/|\./g, '');
|
|
return sanitizedString;
|
|
},
|
|
async register () {
|
|
// @TODO do not use alert
|
|
if (!this.email) {
|
|
window.alert(this.$t('missingEmail')); // eslint-disable-line no-alert
|
|
return;
|
|
}
|
|
|
|
if (this.password !== this.passwordConfirm) {
|
|
window.alert(this.$t('passwordConfirmationMatch')); // eslint-disable-line no-alert
|
|
return;
|
|
}
|
|
|
|
// @TODO: implement language and invite accepting
|
|
// var url = ApiUrl.get() + "/api/v4/user/auth/local/register";
|
|
// if (location.search && location.search.indexOf('Invite=') !== -1)
|
|
// { // matches groupInvite and partyInvite
|
|
// url += location.search;
|
|
// }
|
|
//
|
|
// if($rootScope.selectedLanguage) {
|
|
// var toAppend = url.indexOf('?') !== -1 ? '&' : '?';
|
|
// url = url + toAppend + 'lang=' + $rootScope.selectedLanguage.code;
|
|
// }
|
|
|
|
await this.$store.dispatch('auth:register', {
|
|
username: this.username,
|
|
email: this.email,
|
|
password: this.password,
|
|
passwordConfirm: this.passwordConfirm,
|
|
});
|
|
|
|
const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
|
|
|
|
// @TODO do not reload entire page
|
|
// problem is that app.vue created hook should be called again
|
|
// after user is logged in / just signed up
|
|
// ALSO it's the only way to make sure language data
|
|
// is reloaded and correct for the logged in user
|
|
// Same situation in login and socialAuth functions
|
|
window.location.href = redirectTo;
|
|
},
|
|
async login () {
|
|
await this.$store.dispatch('auth:login', {
|
|
username: this.username,
|
|
// email: this.email,
|
|
password: this.password,
|
|
});
|
|
|
|
const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
|
|
|
|
window.location.href = redirectTo;
|
|
},
|
|
// @TODO: Abstract hello in to action or lib
|
|
async socialAuth (network) {
|
|
if (network === 'apple') {
|
|
window.location.href = buildAppleAuthUrl();
|
|
} else {
|
|
try {
|
|
await hello(network).logout();
|
|
} catch (e) {} // eslint-disable-line
|
|
|
|
const redirectUrl = `${window.location.protocol}//${window.location.host}`;
|
|
const auth = await hello(network).login({
|
|
scope: 'email',
|
|
// explicitly pass the redirect url or it might redirect to /home
|
|
redirect_uri: redirectUrl, // eslint-disable-line camelcase
|
|
});
|
|
|
|
await this.$store.dispatch('auth:socialAuth', {
|
|
auth,
|
|
});
|
|
|
|
const redirectTo = this.sanitizeRedirect(this.$route.query.redirectTo);
|
|
|
|
window.location.href = redirectTo;
|
|
}
|
|
},
|
|
setTitle () {
|
|
if (this.resetPasswordSetNewOne) {
|
|
return;
|
|
}
|
|
let title = 'login';
|
|
if (this.registering) {
|
|
title = 'register';
|
|
}
|
|
this.$store.dispatch('common:setTitle', {
|
|
section: this.$t(title),
|
|
});
|
|
},
|
|
handleSubmit () {
|
|
if (this.registering) {
|
|
this.register();
|
|
return;
|
|
}
|
|
|
|
if (this.forgotPassword) {
|
|
this.forgotPasswordLink();
|
|
return;
|
|
}
|
|
|
|
if (this.resetPasswordSetNewOne) {
|
|
this.resetPasswordSetNewOneLink();
|
|
return;
|
|
}
|
|
|
|
this.login();
|
|
},
|
|
async forgotPasswordLink () {
|
|
if (!this.username) {
|
|
window.alert(this.$t('missingEmail')); // eslint-disable-line no-alert
|
|
return;
|
|
}
|
|
|
|
await axios.post('/api/v4/user/reset-password', {
|
|
email: this.username,
|
|
});
|
|
|
|
window.alert(this.$t('newPassSent')); // eslint-disable-line no-alert
|
|
},
|
|
async resetPasswordSetNewOneLink () {
|
|
if (!this.password) {
|
|
window.alert(this.$t('missingNewPassword')); // eslint-disable-line no-alert
|
|
return;
|
|
}
|
|
|
|
if (this.password !== this.passwordConfirm) {
|
|
// @TODO i18n and don't use alerts
|
|
window.alert(this.$t('passwordConfirmationMatch')); // eslint-disable-line no-alert
|
|
return;
|
|
}
|
|
|
|
const res = await axios.post('/api/v4/user/auth/reset-password-set-new-one', {
|
|
newPassword: this.password,
|
|
confirmPassword: this.passwordConfirm,
|
|
code: this.resetPasswordSetNewOneData.code,
|
|
});
|
|
|
|
if (res.data.message) {
|
|
window.alert(res.data.message); // eslint-disable-line no-alert
|
|
}
|
|
|
|
this.password = '';
|
|
this.passwordConfirm = '';
|
|
this.resetPasswordSetNewOneData.code = '';
|
|
this.resetPasswordSetNewOneData.hasError = false;
|
|
this.$router.push({ name: 'login' });
|
|
},
|
|
},
|
|
};
|
|
</script>
|