Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Settings Pages UI - New Design #14262

Closed
wants to merge 146 commits into from
Closed

Settings Pages UI - New Design #14262

wants to merge 146 commits into from

Conversation

negue
Copy link
Member

@negue negue commented Oct 2, 2022 •
edited
Loading

Tabs updated:

Additional Changes:

  • Task Overview Save last selected sub tab of each Task-Type

negue and others added 25 commits October 10, 2022 22:50
@negue
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
390f0fc
@negue
split routes for ease of dev
2f53613
@negue
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
4c0ecc9
@negue
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
f7787b3
@negue
Working on M1 - will be reverted on full merge
3915034
@negue
first setting (username) in the new layout
8204738
@negue
extract save / cancel buttons and the shared inlineSetting "logic"
23da70f
@negue
userEmailSetting
0bae5fb
@negue
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
a2b510c 
# Conflicts:
#	website/client/package-lock.json
@negue
fix lint
265970c
@negue
displayNameSetting.vue
cd588e7
@negue
update package-lock.json
9d742fd
@negue
update package-lock.json again
5fd5e62
@negue
password setting row
fdbc2c0
@negue
rename functional components for compiler
e25922f
@negue
resetAccount
d718153
@negue
Shared Modal Visible State
4bf740c
@negue
delete account row
c7e40e9
@negue
disable save button if nothing was changed
edb4271
@negue
Merge remote-tracking branch 'origin/develop' into negue/ui/setting
4936121 
# Conflicts:
#	website/client/package-lock.json
@negue
fix conflicts
fd5cbc3
@negue
Merge remote-tracking branch 'origin/release' into negue/ui/setting
5c77475
@negue
fix icon size + fix display name valid checks
29ebd89
@negue
language Setting + imports cleanup
0d1a189
@negue
move shared components / mixins
bc11c0c
@negue negue mentioned this pull request Aug 9, 2023
Merged
@negue
Merge branch 'negue/refactor/routes' into negue/ui/setting
d279af7 
# Conflicts:
#	config.json.example
#	website/client/src/router/index.js
#	website/client/src/router/static-routes.js
#	website/client/src/router/user-routes.js
#	website/common/locales/en/settings.json
@SabreCat SabreCat force-pushed the negue/ui/setting branch 2 times, most recently from 0e4af14 to 76408f8 Compare August 10, 2023 21:38
SabreCat
SabreCat requested changes Aug 28, 2023
View reviewed changes
Copy link
Member

@SabreCat SabreCat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relatively minor cleanup left to do. What a lot of hard work! Well done!

website/client/src/components/ui/informationIcon.vue Outdated Show resolved Hide resolved
website/client/src/pages/settings/components/inlineSettingMixin.js Outdated Show resolved Hide resolved
website/client/src/pages/settings/components/saveCancelButtons.vue Outdated Show resolved Hide resolved
website/client/src/pages/settings/promoCode.vue Outdated Show resolved Hide resolved
website/client/src/pages/settings/promoCode.vue Outdated
},
methods: {
generateCodes () {
// $http.post(ApiUrl.get() + '/api/v2/coupons/generate/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this is a null function?

If we want this to be functional, it should be an action in the client store that invokes axios to send the API request.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or at least an axios call here, if we don't care about putting it in the store.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The question rather is do we still have / want to create codes? since this was already commented out 4-6 years ago 😬 https://github.com/HabitRPG/habitica/blame/develop/website/client/src/components/settings/promoCode.vue#L98

I'll probably remove it fully and re-add once we need something like that again? what you think?

also cc @Tressley

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's okay to remove it for now?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed it for now - once we need it we can just redo it in a better way

website/client/src/pages/settings/settingRows/passwordSetting.vue Outdated Show resolved Hide resolved
website/client/src/pages/settings/settingRows/userNameSetting.vue
import ValidatedTextInput from '@/components/ui/validatedTextInput.vue';
import { NotificationMixins } from '@/mixins/notifications';

// TODO extract usernameIssues/checks to a mixin to share between this and the authForm
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

later todo or now todo?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thats a later one - easier to do in isolation pr instead of this huge change 😬

website/client/src/pages/settings/settingRows/userNameSetting.vue Outdated Show resolved Hide resolved
website/client/src/pages/settings/siteDataRows/userDataRow.vue Outdated Show resolved Hide resolved
website/common/script/content/constants/index.js Outdated Show resolved Hide resolved
@negue negue marked this pull request as ready for review September 13, 2023 21:43
@negue negue changed the title WIP - Improving the Settings Pages UI Settings Pages UI - New Design Sep 14, 2023
@SabreCat
Copy link
Member

This got merged a while ago, not sure why GitHub didn't pick it up!

@SabreCat SabreCat closed this Oct 17, 2023
@SabreCat SabreCat deleted the negue/ui/setting branch October 17, 2023 22:10
@Tressley Tressley mentioned this pull request Jul 1, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Tressley Tressley Tressley left review comments

@SabreCat SabreCat SabreCat requested changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

add Task Alias field to all four task types
4 participants
@negue @SabreCat @Tressley @CuriousMagpie