Skip to content
This repository has been archived by the owner on Feb 13, 2023. It is now read-only.

chore: Fixes feed cards #42

Merged
merged 9 commits into from
Feb 4, 2020
Merged

chore: Fixes feed cards #42

merged 9 commits into from
Feb 4, 2020

Conversation

richarddubay
Copy link
Member

DESCRIPTION

What does this PR do, or why is it needed?

This PR fixes the home and search feeds so the cards display correctly.

I PR'd this to the upgrade-1.3.0 branch (instead of just pushing) because I wanted it to be looked over before it was merged in. I know we're doing some other work with cards that could potentially make this whole thing moot, but I wanted to fix it if I could just in case that took a while.

How do I test this PR?

Make sure the feeds look like they did before we upgraded.

TODO

  • I am affirming this is my best work (Ecclesiastes 9:10)
  • PR has a relevant title that will be understandable in a public changelog (ie...non developers)
  • No new warnings
  • Upload GIF(s) of iOS and Android if applicable
  • Set a relevant reviewer

REVIEW

  • Review updates to test coverage and snapshots
  • Review code through the lens of being concise, simple, and well-documented

Manual QA

  • Manual QA on iOS and ensure it looks/behaves as expected
  • Manual QA on Android and ensure it looks/behaves as expected

The purpose of PR Review is to improve the quality of the software.

@redreceipt
Copy link
Contributor

this is very clever. if they don't like mine, this works perfectly

@codecov
Copy link

codecov bot commented Feb 4, 2020

Codecov Report

Merging #42 into upgrade-1.3.0 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@              Coverage Diff              @@
##           upgrade-1.3.0     #42   +/-   ##
=============================================
  Coverage           54.1%   54.1%           
=============================================
  Files                110     110           
  Lines               1048    1048           
  Branches             121     121           
=============================================
  Hits                 567     567           
  Misses               409     409           
  Partials              72      72

@richarddubay richarddubay added ready for review This one is ready to review and removed ready for review This one is ready to review labels Feb 4, 2020
@richarddubay richarddubay added the ready for review This one is ready to review label Feb 4, 2020
@redreceipt redreceipt merged commit df72c2c into upgrade-1.3.0 Feb 4, 2020
@redreceipt redreceipt deleted the feed-fixes branch February 4, 2020 20:19
mergify bot added a commit that referenced this pull request Feb 4, 2020
* conflicts

* conflicts and linter errors

* adds polyfill file

* put live button baack

* fixes live button

* fixed some tests

* snaps

* stripped off Newspring from labels

* Get the search feed working

* Schema changes

* Fix SearchFeed tests

* hides nav bar in browser

* changes testing link

* Updated theme to include 'ui' font-family and updated tests

* Okay, used the right font-family this time

* Fixed the discover feed tests - mocking data is hard

* fixes sermon content

* new lockfiles

* chore: Fixes feed cards (#42)

* Fix the search and home feeds so the cards display correctly.

* Added a bit more data so that we could get the pill to be correct

* Show the right card type based on type and add the label text correctly.

* Made sure we were using the right id

* Updated snapshots

* Get the data the right way

* Fixes discover feed tiles

* updated lock files

Co-authored-by: Michael Neeley <micneeley14@gmail.com>

Co-authored-by: Richard Dubay <richardtdubayjr@gmail.com>
Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
ready for review This one is ready to review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants