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

Add subtitle search SFC #6727

Merged
merged 25 commits into from
Jun 6, 2019
Merged

Add subtitle search SFC #6727

merged 25 commits into from
Jun 6, 2019

Conversation

p0psicles
Copy link
Contributor

@p0psicles p0psicles commented May 25, 2019 •
edited
Loading

  • PR is based on the DEVELOP branch
  • Don't send big changes all at once. Split up big PRs into multiple smaller PRs that are easier to manage and review
  • Read the contribution guide
  • Add jest snapshot test

Dependent on #6726

@ghost
Copy link

ghost commented May 25, 2019

DeepCode analyzed this pull request.
There are 3 new info reports.

Click to see more details.

@p0psicles
Merge remote-tracking branch 'remotes/origin/develop' into feature/ad…
754001e 
…d-subtitle-search-sfc

# Conflicts:
#	themes-default/slim/src/components/index.js
#	themes/dark/assets/js/medusa-runtime.js
#	themes/light/assets/js/medusa-runtime.js
@p0psicles p0psicles mentioned this pull request May 26, 2019
Merged
34 tasks
p0psicles added 2 commits May 27, 2019 21:14
@p0psicles
Add new fixtures for jest tests.
cd8c922 
* show detailed object
* show episodes (array of episodes for specific show)
* subtitle-search.js (result or manual searched subtitles for specific show)
@p0psicles
Added jest test for subtitle-search.vue component.
6740348 
* Added snapshot.
@ghost
Copy link

ghost commented May 27, 2019

DeepCode encountered a problem when analyzing this pull request. If you want to retry, create a comment: "Retry Deepcode".

@p0psicles
Copy link
Contributor Author

@sharkykh can you look at this one?

p0psicles added 2 commits May 29, 2019 21:07
@p0psicles
Merge remote-tracking branch 'remotes/origin/develop' into feature/ad…
e31e5f0 
…d-subtitle-search-sfc

# Conflicts:
#	themes/dark/assets/js/medusa-runtime.js
#	themes/light/assets/js/medusa-runtime.js
@p0psicles
Yarn dev after rebase.
a77a3b9
@sharkykh
Copy link
Contributor

Yes I will do that tomorrow.
One thing I can already say is that we probably have to update our own date-fns to the alpha version because if we don't we'll be bundling 2 versions until that version is out..

@OmgImAlexis OmgImAlexis mentioned this pull request May 29, 2019
Open
@ghost
Copy link

ghost commented May 29, 2019

DeepCode encountered a problem when analyzing this pull request. If you want to retry, create a comment: "Retry Deepcode".

1 similar comment
@ghost
Copy link

ghost commented May 29, 2019

DeepCode encountered a problem when analyzing this pull request. If you want to retry, create a comment: "Retry Deepcode".

sharkykh
sharkykh suggested changes May 30, 2019
View reviewed changes
Copy link
Contributor

@sharkykh sharkykh left a comment

Choose a reason for hiding this comment

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

I'll stick to the code this time (I didn't try to use the component)
I think it looks good for the most part.
I commented on the stuff that I felt were important, mostly because I didn't want you to drown in review comments.

themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
themes-default/slim/src/components/subtitle-search.vue Outdated Show resolved Hide resolved
@sharkykh sharkykh mentioned this pull request Jun 1, 2019
Merged
@p0psicles
Copy link
Contributor Author

@sharkykh can you give this another look?

@sharkykh sharkykh added this to the 0.3.3 milestone Jun 6, 2019
sharkykh
sharkykh approved these changes Jun 6, 2019
View reviewed changes
Copy link
Contributor

@sharkykh sharkykh left a comment

Choose a reason for hiding this comment

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

Felt like I had to split date-fns to a separate file. vendors.js is getting really big now...

@sharkykh sharkykh changed the title Feature/add subtitle search sfc Add subtitle search SFC Jun 6, 2019
@p0psicles p0psicles merged commit cfaa428 into develop Jun 6, 2019
@p0psicles p0psicles deleted the feature/add-subtitle-search-sfc branch June 6, 2019 15:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sharkykh sharkykh sharkykh approved these changes

Assignees
No one assigned
Labels
Concluded Frontend
Projects
None yet
Milestone
0.3.3
Development

Successfully merging this pull request may close these issues.
2 participants
@p0psicles @sharkykh