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

ADAPT-581: Clean up cards #44

Merged
merged 55 commits into from
Oct 2, 2020
Merged

ADAPT-581: Clean up cards #44

merged 55 commits into from
Oct 2, 2020

Conversation

yvonnetangsu
Copy link
Member

NOT READY FOR REVIEW

  • (Edit the above to reflect status)

Summary

  • TL;DR - what's this PR for?

Review By (Date)

  • When does this need to be reviewed by?

Criticality

  • How critical is this PR on a 1-10 scale? Also see Severity Assessment.
  • E.g., it affects one site, or every site and product?

Review Tasks

Setup tasks and/or behavior to test

  1. Check out this branch
  2. Navigate to...
  3. Verify...

Front End Validation

  • Is the markup using the appropriate semantic tags and passes HTML validation?
  • Cross-browser testing has been performed?
  • Automated accessibility scans performed?
  • Manual accessibility tests performed?
  • Design is approved by @ user?

Backend / Functional Validation

Code

  • Are the naming conventions following our standards?
  • Does the code have sufficient inline comments?
  • Is there anything in this code that would be hidden or hard to discover through the UI?
  • Are there any code smells?
  • Are tests provided? eg (unit, behat, or codeception)

Code security

General

  • Is there anything included in this PR that is not related to the problem it is trying to solve?
  • Is the approach to the problem appropriate?

Affected Projects or Products

  • Does this PR impact any particular projects, products, or modules?

Associated Issues and/or People

  • JIRA ticket(s)
  • Other PRs
  • Any other contextual information that might be helpful (e.g., description of a bug that this PR fixes, new functionality that it adds, etc.)
  • Anyone who should be notified? (@mention them here)

Resources

sherakama and others added 30 commits September 24, 2020 22:47
… card view; improve image display logic for stories
* plugins:
  fixup! nope.
  fixup! try variables...
  fixup! settings
  fixup! settings
  fixup! swap out canonical url plugin.
  fixup! syntax.
  Added canonical url plugin.
  Added robots.txt plugins.
  Added xml sitemap plugin.
  Env vars set correct.
yvonnetangsu and others added 23 commits September 29, 2020 13:24
…atured-stories

* ADAPT-795-content-font-size-and-misc:
  Fixup
  fixup
  More font size adjustments
  Caption font size finetune
  Add mixins ood-big-paragraph and ood-card-text; finetune content and card font sizes/line-height
  Bump up content font size per Kerri's request

# Conflicts:
#	src/components/page-types/oodStory.js
…-cards

* ADAPT-733-quote-card-fields:
  Use sass loop for before element colors
  More quote style refinement
  cleanup styles
  Add font size option for Quote Card body text
  Combines all the bio stuff into 1 single field quoteSource; make both quoteText and quoteSource richtext
* master:
  ADAPT-729: Featured Stories, Story Picker, improve image display logic, use Storyblok image (#40)

# Conflicts:
#	src/components/composite/oodHomepageHero.js
#	src/components/page-types/oodStory.js
#	src/scss/components/cards/_story-card.scss
#	src/scss/components/cards/_tile-card.scss
@@ -3,28 +3,32 @@ import { Link } from "gatsby"
import SbEditable from 'storyblok-react'

const OodTileCard = (props) => {
const Heading = props.blok.headingLevel;
Copy link
Member

Choose a reason for hiding this comment

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

@yvonnetangsu This is showing up as undefined and causing a render error on line 22.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sherakama Try my test page:
http://app.storyblok.com/#!/me/spaces/78141/stories/0/0/20109634

Sometimes that happens when new schema is added or changed. Also try deleting the whole section with the tile cards in your test page, and re-add using the whole section as a preset (Example masonry I want to card section) - I updated the section preset with the latest version.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sherakama I went into your test story page and jiggle things a bit. The page should load now.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sherakama Fixed the homepage too - should be ok now.

Copy link
Member

Choose a reason for hiding this comment

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

hmmm. Were going to have to practice handling these kinds of content type upgrades. If we do change the scheme of existing content how does storyblok propagate the changes? Things for us to learn.

Copy link
Member

Choose a reason for hiding this comment

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

Still getting and error on a page.

9:35:45 PM: failed Building static HTML for pages - 7.305s
9:35:45 PM: error Building static HTML failed for path "/test-items/yvonne/yvonne-test-landing-page/"

Copy link
Member Author

Choose a reason for hiding this comment

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

I might not have published my changes so I just hit published. Let me see if I can build now 🤔

Copy link
Member

Choose a reason for hiding this comment

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

Working now. Thanks.

Copy link
Member Author

Choose a reason for hiding this comment

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

Great! Glad it worked. Sorry about that.

Copy link
Member Author

Choose a reason for hiding this comment

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

@sherakama I think I know what I need to do. I'm going to add a Heading component as a partial, and it will return a h3 to the tag when props.blok.headingLevel isn't specified. That way it wouldn't return an error when components hasn't been updated with the new option. Usually when adding schema it won't break existing pages, but in this case, the variable is in the HTML tag itself 😬

Copy link
Member

@sherakama sherakama left a comment

Choose a reason for hiding this comment

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

GTG

@sherakama sherakama changed the title ADAPT-581-clean up cards ADAPT-581: Clean up cards Oct 2, 2020
@sherakama sherakama merged commit 43c8ba3 into master Oct 2, 2020
@sherakama sherakama deleted the ADAPT-581-cleanup-all-cards branch October 2, 2020 05:20
@yvonnetangsu
Copy link
Member Author

GTG

Thanks for merging - I probably still got some work left to do but I won't touch things tonight. Will open another PR tomorrow after the demo 😂

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.

2 participants