feat(repo): add label to show watch status #227

SammyIsra · 2017-08-11T05:19:18Z

Resolves #185
Shows a label to indicate that the logged in user is currently watching/subscribed to a repository. It looks like this:

I think I made a mistake when getting updated with master, which is why so many commits show up. However the changes are accurate to what I changed and is necessary for the issue.

Getting the latest Master with Android support

…their own functions.

…scriptive

…and VSCode yelling at me is easier than on the Github editor.

…rov.

…l. Profile Screen, Repo, and Auth User screen have pull to refresh.

…g when we _have_ a profile

Temporal fix, I still want to figure out why isPendingComments and isPendingIssue are undefined.

…ady.

lex111 · 2017-08-11T05:26:45Z

Can I add an icon instead of an text, for example this next to the name of the repository? For greater clarity, you can display it in green, eg. Because now it does not seem to me that it looks good.

P.S. Better to do git rebase, that was not such a large number of commits. And I'll just notice that we use the Angular git commit convention, do git hooks exactly works for you?

UPD: The variant shown in this comment I like more, looks better, although I would still try to show the icon instead text.

lex111 · 2017-08-11T05:31:04Z

src/components/repository-profile.component.js

@@ -141,6 +143,10 @@ export const RepositoryProfile = ({
        {emojifyText(repository.description) || ' '}
      </Text>

+      <Text style={styles.languageInfoTitle}>
+        {subscribed ? '(watching)' : undefined}


watching needs to be moved to the local file (src/locale/languages/en.js) and display it via translate helper.

Not sure, but in my opinion, you need to use your own styles for this label, and do not use languageInfoTitle.

And yet, can it be better to return null instead of undefined?

I agree regarding the languages, I will update that.

Since the style did not need to change much, I decided to use a style that was already created. In any case, I can copy the contents into its own and call it watchingLabel.

How would null be better than undefined in this situation? Both end up rendering nothing to the DOM (And I think the same goes for false)

andrewda

Not sure if there's been discussion on this, but I think it would be a lot nicer to display the number of watchers, and show that it's being watched in the same way that we show it's starred.

SammyIsra · 2017-08-11T17:17:41Z

@lex111 The reason I went for the text instead of the icon is that I want to avoid a "what does this mean?" situation. I think there was a talk about this and the Followers number been green when you are following someone already. I've never had to do git rebase before, I will try to do that to avoid this situation again in the future. Latest commit did not work for me (the hooks were removed?) I saw on gitter that it was recommended to remove ./git/hooks and then run yarn, so that's what I did. Apparently that did not work out well, will take a look tonight at that. I'll be more careful witht he commit naming int he future!

@andrewda The way to show if a user has starred a repo right now is making the text green, same as when youa re following a user. Personally, I think this is not clear and it leads to people trying to find out what the green means. If you disagree I can of course add the number of subscribers and make it green also when a user is watching the repo

andrewda · 2017-08-11T17:23:29Z

@SammyIsra I agree that it's confusing, but keeping it the way it is maintains consistency. Adding this might make the green star count even more confusing because we're using two different status indications for the repo.

I'd say just copy the star component, change it to watchers and put it between "Stars" and "Forks". Or you could also change the way the star status is displayed. Either way I think they need to be done together to avoid more confusion.

lex111 · 2017-08-11T17:56:37Z

I'd say just copy the star component, change it to watchers and put it between "Stars" and "Forks". Or you could also change the way the star status is displayed. Either way I think they need to be done together to avoid more confusion.

In my opinion the best option 👍

SammyIsra · 2017-08-11T18:28:36Z

Perfect, I'll submit the changes to this branch tonight! Thank you

housseindjirdeh · 2017-08-11T20:33:56Z

Thanks so much for this @SammyIsra

Agreed with @lex111 and @andrewda's suggestion: I think that would be absolutely perfect. Appreciate it and let us know once those changes are in my friend :)

SammyIsra · 2017-08-12T04:50:36Z

Do you all think this looks ok?

When a user is not watching:

When a user is watching:

Quick note: the labels Forks, Watchers and Stars are right now hardcoded (unlike labels in other parts of the app). I can take the time to make sure these three strings are translated, I just need to see how that's done.

lex111 · 2017-08-12T05:12:53Z

@SammyIsra great! About localization: we have an open PR #193, can better make these fixes in it?

andrewda

LGTM

housseindjirdeh · 2017-08-14T00:33:07Z

This looks awesome @SammyIsra 🎉

Are you still adding some changes to this PR? WIP label is still attached so just wanted to make sure. It looks good to me, so if not could you fix the conflicting files when you get the chance and I'll merge this in :)

SammyIsra · 2017-08-14T17:31:08Z

@housseindjirdeh As soon as I resolve the conflicting files the PR will be ready for merge!

andrewda · 2017-08-14T21:31:35Z

src/repository/screens/repository.screen.js

@@ -252,6 +255,7 @@ class Repository extends Component {
                }
                loading={isPendingRepository}
                navigation={navigation}
+                subscribed={isPendingSubscribe ? false : subscribed}


Just a tiny thing: Could you move this up right below starred and follow the same format as starred?

i.e.

subscribed={ isPendingRepository || isPendingSubscribe ? false : subscribed }

Addressed! Also did the same fix for another line of code.

…e repo

* docs(README.md): add translation instruction (gitpoint#255) * chore(commit): Make the repo Commitizen-friendly (gitpoint#240) * chore(commit): Make the repo Commitizen-friendly * docs(contributors): change my profile url * docs(CONTRIBUTING.md): add information about Commitizen * docs(CONTRIBUTING.md): move translations snippet * docs(CONTRIBUTING.md): update commitzen snipper grammar * fix(comment-input): add new lines when writing issue comments on Android (gitpoint#207) * feat(repo): add label to show watch status (gitpoint#227) * Added react-native-cli to avoid onboarding issues in the future * Pull down to refresh implemented in profile page * Pull down to refresh implemented in Repository page. Closes gitpoint#103. * Fixed some merge issues * Fixing some more merging issues * Forgot to add myself as a contributor. * Fetching user data and fetching repository data have been moved into their own functions. * Fixed some merge issues. * Renamed the function that fetches the information to be a bit more descriptive * Again, fixing my own merge issues. Doing it here with code highlight and VSCode yelling at me is easier than on the Github editor. * Fixed some merge issues, _again_ * Added pull to refresh to the non auth profile screen. Other minor improv. * Fixing indentation inside of `<ScrollView />` * Removing extra newline * Adding a newline between our components and vendor components. * Added myself as a contributor. Code and Bug Reports * Valid NPM versions need to include three parts (x.y.z) * Removed the double ScrollView. Parallax can now take in refreshControl. Profile Screen, Repo, and Auth User screen have pull to refresh. * Pull down to refresh now in Issue/PR page (comment list) * Fixed some merging issues and yarn lockfile * Organizations are now refreshable * Better behavior on the AuthUser pull to refresh * Even better experience when refreshing AuthProfile. Now we have a flag when we _have_ a profile * Refreshing on Issues (specifically) works again * Used '!!' instead of '|| false' as per suggestion Temporal fix, I still want to figure out why isPendingComments and isPendingIssue are undefined. * Add a (watching) label that shows when a user is watching a repo already. * Fixed to look like gitpoint/master * feat(repository): fixed location of Watchers label * Minor code change to keep consistent with the style of the rest of the repo * docs: improve word choice (gitpoint#244) * Improved CONTRIBUTING.md * Improved contributing.md * docs(README.md): add contributor * fix(repo): Show repo prefix for search repo result (gitpoint#254) * fix(repo): hide issues section in forked repo (gitpoint#257)

SammyIsra and others added 30 commits July 17, 2017 16:31

Merge pull request #1 from gitpoint/master

f455e30

Getting the latest Master with Android support

Added react-native-cli to avoid onboarding issues in the future

9e091a8

Pull down to refresh implemented in profile page

f52e2f6

Pull down to refresh implemented in Repository page. Closes #103.

90c8d76

Merge branch 'master' into master

8e285b4

Fixed some merge issues

5eb2b51

Fixing some more merging issues

870ea3c

Forgot to add myself as a contributor.

9a86228

Fetching user data and fetching repository data have been moved into …

08548e5

…their own functions.

Merge branch 'master' into master

e02fe90

Fixed some merge issues.

f308a7b

Renamed the function that fetches the information to be a bit more de…

36d8cf7

…scriptive

Merge branch 'master' into master

5d7736b

Again, fixing my own merge issues. Doing it here with code highlight …

088dc12

…and VSCode yelling at me is easier than on the Github editor.

Merge branch 'master' into master

9d97a3a

Fixed some merge issues, _again_

7c11120

Added pull to refresh to the non auth profile screen. Other minor imp…

f8506e7

…rov.

Fixing indentation inside of <ScrollView />

438a87f

Removing extra newline

f7da7a5

Adding a newline between our components and vendor components.

899d028

Added myself as a contributor. Code and Bug Reports

a17a572

Valid NPM versions need to include three parts (x.y.z)

88eee32

Removed the double ScrollView. Parallax can now take in refreshContro…

15d685b

…l. Profile Screen, Repo, and Auth User screen have pull to refresh.

Pull down to refresh now in Issue/PR page (comment list)

ec7c9ef

Merge branch 'master' into master

f484cd8

Fixed some merging issues and yarn lockfile

442690c

Organizations are now refreshable

203cc2b

Better behavior on the AuthUser pull to refresh

f6ed3ba

Even better experience when refreshing AuthProfile. Now we have a fla…

02c5e67

…g when we _have_ a profile

Refreshing on Issues (specifically) works again

3e907f9

SammyIsra and others added 5 commits July 27, 2017 23:33

Merge branch 'master' into master

5d639c1

Used '!!' instead of '|| false' as per suggestion

66ad3e3

Temporal fix, I still want to figure out why isPendingComments and isPendingIssue are undefined.

Merge remote-tracking branch 'gitpoint/master'

301ee1d

Add a (watching) label that shows when a user is watching a repo alre…

e14deaa

…ady.

Fixed to look like gitpoint/master

274829b

lex111 reviewed Aug 11, 2017

View reviewed changes

andrewda reviewed Aug 11, 2017

View reviewed changes

andrewda changed the title ~~Add a label to show a user is watching a repo~~ feat(repo): add label to show watch status Aug 11, 2017

lex111 added the 🏗️ work in progress label Aug 12, 2017

feat(repository): fixed location of Watchers label

327d5c1

andrewda approved these changes Aug 13, 2017

View reviewed changes

Merge branch 'master' into issue185

964a0b2

andrewda requested changes Aug 14, 2017

View reviewed changes

Minor code change to keep consistent with the style of the rest of th…

f6f6821

…e repo

andrewda approved these changes Aug 15, 2017

View reviewed changes

housseindjirdeh added ready for review and removed 🏗️ work in progress labels Aug 16, 2017

housseindjirdeh approved these changes Aug 16, 2017

View reviewed changes

housseindjirdeh merged commit e2e993e into gitpoint:master Aug 16, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(repo): add label to show watch status #227

feat(repo): add label to show watch status #227

SammyIsra commented Aug 11, 2017

lex111 commented Aug 11, 2017 •

edited

Loading

lex111 Aug 11, 2017 •

edited

Loading

SammyIsra Aug 11, 2017

andrewda left a comment

SammyIsra commented Aug 11, 2017

andrewda commented Aug 11, 2017

lex111 commented Aug 11, 2017

SammyIsra commented Aug 11, 2017

housseindjirdeh commented Aug 11, 2017

SammyIsra commented Aug 12, 2017 •

edited

Loading

lex111 commented Aug 12, 2017

andrewda left a comment

housseindjirdeh commented Aug 14, 2017 •

edited

Loading

SammyIsra commented Aug 14, 2017

andrewda Aug 14, 2017

SammyIsra Aug 15, 2017

feat(repo): add label to show watch status #227

feat(repo): add label to show watch status #227

Conversation

SammyIsra commented Aug 11, 2017

lex111 commented Aug 11, 2017 • edited Loading

lex111 Aug 11, 2017 • edited Loading

Choose a reason for hiding this comment

SammyIsra Aug 11, 2017

Choose a reason for hiding this comment

andrewda left a comment

Choose a reason for hiding this comment

SammyIsra commented Aug 11, 2017

andrewda commented Aug 11, 2017

lex111 commented Aug 11, 2017

SammyIsra commented Aug 11, 2017

housseindjirdeh commented Aug 11, 2017

SammyIsra commented Aug 12, 2017 • edited Loading

lex111 commented Aug 12, 2017

andrewda left a comment

Choose a reason for hiding this comment

housseindjirdeh commented Aug 14, 2017 • edited Loading

SammyIsra commented Aug 14, 2017

andrewda Aug 14, 2017

Choose a reason for hiding this comment

SammyIsra Aug 15, 2017

Choose a reason for hiding this comment

lex111 commented Aug 11, 2017 •

edited

Loading

lex111 Aug 11, 2017 •

edited

Loading

SammyIsra commented Aug 12, 2017 •

edited

Loading

housseindjirdeh commented Aug 14, 2017 •

edited

Loading