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

Fix important issues and start updating code base #49

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

TheLukaszNs
Copy link

@TheLukaszNs TheLukaszNs commented Feb 19, 2018

Fast summary

This PR resolves #45, resolves #47, closes #48 and finally resolves #51.

Code base update:

  • <ResponsiveImage /> -> <Image />
  • Moved images from img to assets/images
  • Updated React.PropTypes with prop-types (this was actually done - we didn't use old PropTypes from React) Deleted all instances React.PropTypes
  • Moved all styles to assets (I don't know if we should move all styles from its' components to separated files and create index file to store them all?)
  • Made additional styles update which is not actually code base update 🤔

* Patch & Improvement

Fixed a problem with non-displayed items and added some improvements

* Start updating code base & update styles
@vibhavagarwal5
Copy link

vibhavagarwal5 commented Feb 19, 2018

I was already on it dude.
That was my issue. I'd suggest that it would have been better if u would have commented on that issue if you were on it, I would not have worked on it. 😄

@TheLukaszNs
Copy link
Author

Oh, I saw You were working on caching images, weren't you? I didn't touch this issue.

@TheLukaszNs
Copy link
Author

I see You done much more work than me. I'll close my PR 😃

@vibhavagarwal5
Copy link

vibhavagarwal5 commented Feb 19, 2018

Yeah i am working on it. But still that if u would have commented on it that u were taking it, i would not have spent time on it. Since that issue was opened was me, it was my duty to close it asap. 😄 Thats why i worked on it. I hope u dont mind. 😄

@vibhavagarwal5
Copy link

Thanks @TheLukaszNs

@agentmilindu
Copy link
Member

@TheLukaszNs @vibhavagarwal5 Hope you two can work jointly on this. Use https://gitter.im/CodeLanka/ez-net-app for fast discussions, I too will be there.

@vibhavagarwal5
Copy link

@agentmilindu I think this is resolved.

@TheLukaszNs
Copy link
Author

I am reopening this PR as of additional issues have been opened - I had to fix them and I had my code base already updated by me.
I'll push patches to develop in the next minutes.

@TheLukaszNs TheLukaszNs reopened this Feb 21, 2018
* Patch & Improvement

Fixed a problem with non-displayed items and added some improvements

* Start updating code base & update styles

* Finished code base update

* Update loaderStyle.js
@vibhavagarwal5
Copy link

vibhavagarwal5 commented Feb 21, 2018

Aren't these exactly the changes i have done?
Looks duplicate to me.

@TheLukaszNs
Copy link
Author

Yeah it's very similar as of it couldn't be done more differently. But if you make a closer look you will notice that it's made in the other way.


It also fixes #51

import detailScreen from './detailScreen';
import * as loaderStyle from './loaderStyle';

export {

Choose a reason for hiding this comment

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

Actually u don't need to do this again.
Since in each of your individual style.js u have exported the function, this is a repetition.

Copy link
Author

Choose a reason for hiding this comment

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

I know, I could just use ../styles/... import but I wanted the code to be available like this (for example):

import { loaderStyle } from '../assets/styles'

and not like this (which you can still use 😄):

import loaderStyle from '../assets/styles/loaderStyle'

It's up to you which one you want to use.

Copy link

@vibhavagarwal5 vibhavagarwal5 Feb 21, 2018

Choose a reason for hiding this comment

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

for import { loaderStyle } from '../assets/styles' to be used, you do export loaderStyle instead of export default loaderStyle.
Plus to me, the code looks a complete duplicate except the boxItem.js styling 😄

Copy link
Author

Choose a reason for hiding this comment

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

Oh, I know what you mean (I'll fix it now)! For the duplication - styles were already done, the point was just to move them to separate files - that's why it all looks so similar.

@agentmilindu
Copy link
Member

Ummm, I'm bit confused here. I see three PRs which kinda looks similar. Can you two please guide me through?

@vibhavagarwal5
Copy link

@agentmilindu PR #52 is very much different from the other two. Its regarding the caching issue.
Whereas PR #49 and #50 is about the code updation ie. issue #47 . Since I submitted it first with major changes, and then shortly after @TheLukaszNs submitted a similar PR, its looks duplicate to mine.

@TheLukaszNs
Copy link
Author

@vibhavagarwal5 I've submitted this PR first (10 mins before you). Then I decided to close it, because You did nearly the same work as me, but - you are right here - you've created issue #47 (however you did not inform that you'll do it). Yesterday I reopened this issue, merged changes in mine fork and updated this PR.


@agentmilindu those PRs are nearly the same because we were working on the same problem, but I've also fixed #51 and did some styles update.

@vibhavagarwal5
Copy link

Is issue #51 really an issue?

@agentmilindu
Copy link
Member

Let me go through the PRs and see.

@agentmilindu
Copy link
Member

@nushydude hey, I need your help here to get these two PRs merged.

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.

3 participants