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

Migrate Tribe to React #1134

Merged
merged 3 commits into from
Dec 16, 2019
Merged

Migrate Tribe to React #1134

merged 3 commits into from
Dec 16, 2019

Conversation

mrkvon
Copy link
Contributor

@mrkvon mrkvon commented Nov 27, 2019 •
edited
Loading

Proposed Changes

Make tribe into a react component.

image

Testing Instructions

  • See that design and functionality survived the migration
  • See that the tests and lint pass

Part of #1133
Depends on #1123, should be reviewed after that one is merged to the feature branch tribes-react

@mrkvon mrkvon changed the title Migrate Tribe to React [WIP] Migrate Tribe to React Nov 27, 2019
@mrkvon mrkvon changed the base branch from master to tribes-react November 27, 2019 16:45
@mrkvon mrkvon changed the title [WIP] Migrate Tribe to React Migrate Tribe to React Nov 27, 2019
@mrkvon mrkvon force-pushed the tribes-react-tribe branch from f50b9f9 to c3822fb Compare December 4, 2019 20:06
@mrkvon mrkvon removed the i18n label Dec 10, 2019
@mrkvon mrkvon force-pushed the tribes-react-tribe branch 3 times, most recently from c42509d to d785e31 Compare December 13, 2019 17:29
@mrkvon mrkvon force-pushed the tribes-react-tribe branch from d785e31 to 76ad437 Compare December 13, 2019 20:07
fixes
15049c0 
- translate forgotten string in TribeItem
- move JoinButton.component to JoinButton (not used directly in angularjs anymore)
@mrkvon mrkvon requested a review from nicksellen December 13, 2019 21:02
@mrkvon
Copy link
Contributor Author

mrkvon commented Dec 13, 2019 •
edited
Loading

The number of members doesn't update, when you click Join or Leave button. It's being taken cared of in #1145. So please bear with that... 🙂

nicksellen
nicksellen reviewed Dec 14, 2019
View reviewed changes
Copy link
Contributor

@nicksellen nicksellen left a comment

Choose a reason for hiding this comment

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

Looks good! Just a minor nitpicky comment...

modules/tribes/client/components/helpers/getTribeBackground.js Outdated Show resolved Hide resolved
modules/tribes/client/less/tribes-grid.less Show resolved Hide resolved
@mrkvon
Copy link
Contributor Author

mrkvon commented Dec 14, 2019 •
edited
Loading

There is still a failing propType on JoinButtonPresentational. It gets fixed in a further PR, I promise! 🙂

This is ready for another review round.

Ok, the promised fix happens here: 846b176. It would be possible to move the change to the merged #1123, but IMO it's not worth the effort...

@mrkvon mrkvon requested a review from nicksellen December 14, 2019 18:15
nicksellen
nicksellen approved these changes Dec 16, 2019
View reviewed changes
Copy link
Contributor

@nicksellen nicksellen left a comment

Choose a reason for hiding this comment

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

Great, nearly there with the tribes migrations to react 😸

@mrkvon mrkvon merged commit 312a88e into tribes-react Dec 16, 2019
@mrkvon mrkvon deleted the tribes-react-tribe branch December 16, 2019 23:29
mrkvon added a commit that referenced this pull request Jan 1, 2020
Migrate Tribe to React (#1134)
ba50aa6 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 3, 2020
Migrate Tribe to React (#1134)
8e9975a 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 3, 2020
Migrate Tribe to React (#1134)
1c00aa6 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 5, 2020
Migrate Tribe to React (#1134)
63e2c37 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 5, 2020
Migrate Tribe to React (#1134)
612ba30 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 19, 2020
Migrate Tribe to React (#1134)
e9ba351 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 20, 2020
Migrate Tribe to React (#1134)
0cb6153 
A tribe panel on /tribes page.
mrkvon added a commit that referenced this pull request Jan 20, 2020
Migrate Tribe to React (#1134)
58ff5f9 
A tribe panel on /tribes page.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicksellen nicksellen nicksellen approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@mrkvon @nicksellen