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.

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

Update UI layout #55

Merged
merged 31 commits into from
Nov 6, 2020
Merged

Update UI layout #55

merged 31 commits into from
Nov 6, 2020

Conversation

ashfahan
Copy link
Contributor

@ashfahan ashfahan commented Oct 6, 2020

this PR closes #46

image

@ashfahan ashfahan added the WIP Work In Progress label Oct 6, 2020
@ashfahan ashfahan self-assigned this Oct 6, 2020
@ashfahan ashfahan marked this pull request as ready for review October 6, 2020 12:43
@ashfahan ashfahan added Deployment Help Wanted Extra attention is needed and removed WIP Work In Progress labels Oct 6, 2020
@ashfahan ashfahan removed the Help Wanted Extra attention is needed label Oct 7, 2020
@ashfahan ashfahan changed the base branch from master to user-management-modularization October 7, 2020 06:49
Base automatically changed from user-management-modularization to master October 8, 2020 17:31
@ashfahan
Copy link
Contributor Author

tests are failing. we need to fix #69 first

@ashfahan ashfahan requested a review from HaseemUlHaq October 19, 2020 14:16
@kelvin-muchiri kelvin-muchiri reopened this Nov 5, 2020
@ashfahan
Copy link
Contributor Author

ashfahan commented Nov 5, 2020

i dont know why you are having that crashing issue but over in my local i am not facing anything like that when i try to open user module however on teams and location it goes to 404 as they are not added inside project yet

@ashfahan Have you updated the branch with latest changes on master?

it is up to date from master and maybe @p-netm need to rebuild before starting the code ?

@kelvin-muchiri
Copy link
Contributor

kelvin-muchiri commented Nov 5, 2020

@ashfahan The client package.json is not up to date

@dubdabasoduba
Copy link
Member

@ashfahan lets not add ui elements with broken or not working functionality, for instance the extra 2 menu items, we should not want that in master.

i dont know why you are having that crashing issue but over in my local i am not facing anything like that when i try to open user module however on teams and location it goes to 404 as they are not added inside project yet

should i keep them or remove them ?

Please remove the last two items menu item

@ashfahan
Copy link
Contributor Author

ashfahan commented Nov 5, 2020

@ashfahan lets not add ui elements with broken or not working functionality, for instance the extra 2 menu items, we should not want that in master.

i dont know why you are having that crashing issue but over in my local i am not facing anything like that when i try to open user module however on teams and location it goes to 404 as they are not added inside project yet
should i keep them or remove them ?

Please remove the last two items menu item

already done 😊

@kelvin-muchiri kelvin-muchiri self-requested a review November 5, 2020 12:11
kelvin-muchiri
kelvin-muchiri previously approved these changes Nov 5, 2020
@peterMuriuki
Copy link
Collaborator

@ashfahan I modified my package.json as shown:

    "@opensrp/keycloak-service": "^0.0.7",
    "@opensrp/server-logout": "^0.0.1",
    "@opensrp/server-service": "^0.0.11",
    "@opensrp/store": "^0.0.6",
    "@opensrp/user-management": "^0.1.8",
```.
the error stopped showing up.

peterMuriuki
peterMuriuki previously approved these changes Nov 6, 2020
@kelvin-muchiri kelvin-muchiri merged commit ddd30b9 into master Nov 6, 2020
@kelvin-muchiri kelvin-muchiri deleted the update-ui-layout branch November 6, 2020 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update the UI template to match the templates in the mock ups
4 participants