-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
refactor: remove ember-crumbly
#651
Conversation
static-pages.static-page.show doesn't work yet.
f0392b2
to
7e62b6d
Compare
a94b73c
to
0fa751e
Compare
…efactor/remove-ember-crumbly � Conflicts: � app/controllers/application.js � app/templates/activities/activity/print-enrolled.hbs
…efactor/remove-ember-crumbly � Conflicts: � app/controllers/activities/activity/edit.js
It seems that |
…s that belong to these routes, which was initially broken.
This was probably the case because it was merged into the main branch after this PR, I'll fix those things when the rest is reviewed |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like it! I haven't looked at every single file, but I have taken a relatively thorough look at most pages to ensure they still work. With PRs this size it is inevitable we will miss things, so we should expect bugs to occur, and we will pay some special attention to reports from users during the weeks after this is merged.
@guidojw since the bootstrap v5 migration has just been merged into staging
, there are a lot of merge conflicts with the templates in this branch. I'm willing to tackle them, but if you prefer to do that yourself let me know.
I think this PR is well executed, and I haven't found any over-complicated pieces of code. well done!
Thanks! I will go through the merged commits one by one and fix the conflicts, and hopefully don't miss anything 🙂 |
In light of the recent release of ember v5, I think we should like to get this merged relatively soon. Guido, will you manage to resolve the merge conflicts? If not, let me know and I will pick this up |
Agreed, I had a busy few months but managed to get my balance for personal projects back recently and can work on this soon. I think it's best to first get #758 merged because it will have a few conflicts with this, then I'll resolve all the conflicts here and we can merge this one. I can do that some evening this week. |
I'm not sure that #758 will be merged by then. We've asked for feedback from the promotion committee on the current version of #758 via email, and there are still more redesigned pages coming. I think merging the crumbly PR first might actually prevent conflicts over the coming month. @Ellen-Wittingen do you want to weigh in on this?
Good to hear, don't stress yourself too much since this project is very much long term focused and things don't need to move super quick |
I can also merge this and resolve the conflicts with #758 there since I know what has to be changed to keep it working without ember-crumbly, if you'd like that @Ellen-Wittingen |
Yeah, #758 won't be merged till next week, so go ahead with merging this one first |
That would be great! |
All right, I'll let you know when that's done! |
Summary
Replaces
ember-crumbly
with a custom implementation based on poteto/ember-crumbly#149.Had to restructure the routes in order to retain the parent route breadcrumbs. Due to this restructure, the
show
routes could be renamed toindex
routes, making more sense. Also after our conversation on Slack it looked like the forum routes were working correctly as is, but this wasn't the case so these routes needed some restructuring as well, overall unifying the route & controller structure.I noticed there was an unimplemented
profile
route being created in router.js, so I implemented this to redirect to your own user page.users/batch/confirm
route also was unimplemented so I removed it.Lastly, I restructured the tests to the new structure too and implemented all missing route unit tests.
Todo:
forgot_password
andactivate_account
in the activation mail are updated toforgot-password
andactivate-account
. refactor: update UI links amber-api#353