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

Add Location unit #74

Merged
merged 300 commits into from
Dec 16, 2020
Merged

Add Location unit #74

merged 300 commits into from
Dec 16, 2020

Conversation

ashfahan
Copy link
Contributor

closes #48

@ashfahan ashfahan self-assigned this Oct 13, 2020
@ashfahan
Copy link
Contributor Author

tests are failing. we need to fix #69 first

@moshthepitt moshthepitt changed the title ➕ Add Location unit Add Location unit Oct 15, 2020
@ashfahan ashfahan linked an issue Oct 16, 2020 that may be closed by this pull request
4 tasks
client/src/App/App.tsx Outdated Show resolved Hide resolved
client/src/App/App.css Outdated Show resolved Hide resolved
@ashfahan ashfahan marked this pull request as draft October 23, 2020 10:09
@ashfahan
Copy link
Contributor Author

ashfahan commented Oct 23, 2020

@ashfahan can you post some screenshots please?

image
image

after #55 gets merged the View will be exactly like https://marvelapp.com/prototype/f3igd3h/screen/73173137 & https://marvelapp.com/prototype/f3igd3h/screen/73173136

@dubdabasoduba dubdabasoduba self-requested a review December 16, 2020 11:41
dubdabasoduba
dubdabasoduba previously approved these changes Dec 16, 2020
@ashfahan ashfahan dismissed stale reviews from dubdabasoduba and moshthepitt via 8ff1bcc December 16, 2020 11:41
kahummer
kahummer previously approved these changes Dec 16, 2020
Copy link
Contributor

@moshthepitt moshthepitt left a comment

Choose a reason for hiding this comment

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

Please fix tests

@ashfahan ashfahan requested a review from moshthepitt December 16, 2020 12:28
kahummer
kahummer previously approved these changes Dec 16, 2020
@dubdabasoduba dubdabasoduba self-requested a review December 16, 2020 12:30
dubdabasoduba
dubdabasoduba previously approved these changes Dec 16, 2020
@ashfahan ashfahan dismissed stale reviews from dubdabasoduba and kahummer via 17e8c5b December 16, 2020 12:43
@ashfahan ashfahan dismissed moshthepitt’s stale review December 16, 2020 12:44

Updates snapshot and conflicts in client

@dubdabasoduba dubdabasoduba self-requested a review December 16, 2020 14:11
@moshthepitt moshthepitt merged commit 99ba982 into master Dec 16, 2020
@moshthepitt moshthepitt deleted the #48-Page-locationUnit branch December 16, 2020 14:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
8 participants