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

Added four preview images #535

Closed
wants to merge 3 commits into from

Conversation

okonek
Copy link

@okonek okonek commented Dec 6, 2018

Fixes #247 [Add issue number here.]

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

  • tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR -- or run tests locally with rake test
  • code is in uniquely-named feature branch and has no merge conflicts
  • PR is descriptively titled
  • ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

thumbnails

@okonek
Copy link
Author

okonek commented Dec 6, 2018

@jywarren Is everything ok in here?

@okonek
Copy link
Author

okonek commented Dec 6, 2018

@publiclab/reviewers

@kevinzluo
Copy link

Hi @okonek . Your implementation looks pretty cool!

Just as a suggestion, could we maybe display each image preview under its respective button and maybe allow them to click it?

image

@okonek
Copy link
Author

okonek commented Dec 6, 2018

Sure, that's a great idea. I'll do it.

@jywarren
Copy link
Member

jywarren commented Dec 6, 2018 via email

@jywarren
Copy link
Member

jywarren commented Dec 6, 2018

Hi @okonek -- it looks like @JonathanXu1 was working on this already in #504 -- did you have a chance to coordinate with Jonathan? Perhaps there is some collaboration that could happen?

@jywarren
Copy link
Member

jywarren commented Dec 6, 2018

For example i know @JonathanXu1 developed some nice mockups for different projects and maybe could contribute some design ideas or even CSS code?

@jonxuxu
Copy link
Member

jonxuxu commented Dec 6, 2018

I'd love to collaborate on this :)

@okonek
Copy link
Author

okonek commented Dec 6, 2018

@JonathanXu1 Well, thank you very much, but I don't know if there is anything more to do in there. However if you have any idea of how it could be done better, let me know. I'd be very happy to collaborate with someone.

@okonek
Copy link
Author

okonek commented Dec 6, 2018

@jywarren What do you think about this solution? Is it acceptable for you?

@jywarren
Copy link
Member

jywarren commented Dec 6, 2018

How about something like this? (i've used stand-in icons and images but you get the idea)

image

@JonathanXu1 if you have suggestions that's awesome. @okonek in the future please just ask in a comment on the original issue to be sure someone's not already started -- even if they have, perhaps you can help them solve it!

Thanks everyone!

@jonxuxu
Copy link
Member

jonxuxu commented Dec 7, 2018

@jywarren @okonek I can help design the preview like that. Since I've been working on this issue over the past week, I'd really appreciate the opportunity to finish it.

@jywarren
Copy link
Member

jywarren commented Dec 7, 2018

How about this: @JonathanXu1 can do some html/css design of the interface, but building on the code in this PR -- and then we merge the joint work. How does that sound? Also, just a shout out to @kevinzluo for the great design input as well! Good collaboration, folks! 🙌

@jonxuxu
Copy link
Member

jonxuxu commented Dec 7, 2018

Great idea. Is there a way to clone code from a pull request?

@okonek
Copy link
Author

okonek commented Dec 7, 2018

I'm very sorry for taking your task, but I really didn't know. Maybe if someone has took the task like that it should be removed from GCI tasks list?

@okonek
Copy link
Author

okonek commented Dec 7, 2018

@JonathanXu1 This could be helpful in creating a fork from a fork https://help.github.com/articles/creating-a-pull-request-from-a-fork/ Also remember that the code is on the branch add-grid-of-thumbnails
Good luck!

@jywarren
Copy link
Member

jywarren commented Dec 7, 2018

@okonek is right about PR from a fork - the cool part about that will be that once @JonathanXu1's code is ready, we can merge it and it'll then appear in this PR and the tests will be re-run. Very meta! 🐢🐢🐢

@okonek no worries, it happens pretty often that folks don't see one another, as we're spread all over the world and the code is spread all over different parts of GitHub 😄 it's a lot to keep track of!

I'm going to approve @okonek's portion of the task but make a new task instance for the UI part if @JonathanXu1 wants to take that up. It's your option!

Thanks, all!

@tech4GT
Copy link
Member

tech4GT commented Dec 7, 2018

This UI works looks really good!! Nice work @okonek 👏

@jonxuxu
Copy link
Member

jonxuxu commented Dec 7, 2018

How's this for the preview styling?
image
I don't think I can push these changes directly to this branch as I don't have access to @okonek 's fork. Should I make a new pull request for that?

@jywarren
Copy link
Member

jywarren commented Dec 7, 2018 via email

@okonek
Copy link
Author

okonek commented Dec 7, 2018

@jywarren Thank you!

@kevinzluo
Copy link

Hello! This is looking great!

I think this task might have just been duplicated though. Look here: https://codein.withgoogle.com/tasks/6720201132343296/?sp-organization=6519545549291520&sp-is_beginner=False.

@jonxuxu
Copy link
Member

jonxuxu commented Dec 8, 2018

How is this?
image

I'd like to push directly to @okonek 's fork, but I don't think I have permissions.
image
@jywarren do you think I should make my own branch and link to this one in my PR?

Also I believe there are two instances of the task because Okonek and I are collaborating on this issue.

@tech4GT
Copy link
Member

tech4GT commented Dec 9, 2018

This looks amazing!! Thanks a lot @JonathanXu1 😄

Copy link
Member

@tech4GT tech4GT left a comment

Choose a reason for hiding this comment

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

I just tried this out and this looks phenomenal!! Very good work, both of you!! 👍
Let's wait for one final look from @jywarren and then we merge yay!

@tech4GT
Copy link
Member

tech4GT commented Dec 9, 2018

Could you also update the dist files here, just run grunt build and commit the new dist files. 😄

@jonxuxu
Copy link
Member

jonxuxu commented Dec 9, 2018

Thanks! I'd like to do that but I don't have permissions to modify files
image

@jonxuxu
Copy link
Member

jonxuxu commented Dec 9, 2018

I've made pull request jywarren#11 that applies my changes on top of @okonek 's. @jywarren can merge both our forks, or @okonek can apply my changes to his fork.

@jonxuxu jonxuxu mentioned this pull request Dec 9, 2018
@jywarren
Copy link
Member

It looked great and I merged it. Great work folks!

@jywarren
Copy link
Member

So then we can close this one, right? Thanks!!!!

@jywarren
Copy link
Member

Hi, could you rebase the remaining conflicts and then we'll merge this in? Thanks so much!!!

@kevinzluo
Copy link

I believe these changes were copied into #539 so there is no need to merge this one.

@jywarren
Copy link
Member

I think you're correct. Thanks!!!!

@jywarren jywarren closed this Dec 16, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants