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

Load PT data into stories #25

Merged
merged 5 commits into from
Jul 31, 2019
Merged

Load PT data into stories #25

merged 5 commits into from
Jul 31, 2019

Conversation

sracca
Copy link
Contributor

@sracca sracca commented Jul 29, 2019

  • maps each story to story.tsx
  • add labels for each story to end
  • shows types based on icon (not finished, waiting for chapman)

@sracca sracca added the do not merge Reviewable, but some condition must be met before merging label Jul 29, 2019
@sracca sracca force-pushed the sr/load_stories branch 2 times, most recently from 1546ac7 to 7bcf46c Compare July 29, 2019 15:42
Copy link
Contributor

@mariana0pachon mariana0pachon left a comment

Choose a reason for hiding this comment

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

This looks awesome! Just a few nits but nothing significant. The base branch mpp/display_stories was already merged to master so maybe rebase to master with this. Also, were we holding off on implementing the arrows to change between stories and just displaying all of them at once for now?

@@ -12,7 +12,7 @@ const Project = ({ data }: Props) => {
<>
<h1>Project {data.id}</h1>
{data.stories.map(story => (
<Story key={story.id} data={story} />
<Story data={story} />
Copy link
Contributor

Choose a reason for hiding this comment

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

Unless we don't care about the Each child in an array should have a unique "key" prop React warning then I think we should keep the key={story.id}

Copy link
Collaborator

Choose a reason for hiding this comment

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

@sracca this was marked as resolved -- not sure if that was a mistake or if there's a reason to not want unique keys?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

no i did add it? That's weird

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@gerald are you looking at the most recent commits I've pushed up?

@@ -1,6 +1,7 @@
import React from 'react';
import styled from 'styled-components';
import { fonts, colors, fontSizes, spacing } from '~lib/theme';
import { Label as LabelType } from '~components/projects/types';
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: I think @geraldalewis suggested it was better to do something like import * as Types from '~components/projects/types' and then do Types.Label instead of LabelType, but this was only in the case when we were importing a bunch of types.

@sracca
Copy link
Contributor Author

sracca commented Jul 30, 2019

This looks awesome! Just a few nits but nothing significant. The base branch mpp/display_stories was already merged to master so maybe rebase to master with this. Also, were we holding off on implementing the arrows to change between stories and just displaying all of them at once for now?

@mariana The arrows were taken out of the zepplin designs

</DescripTitle>
<DescripBody>{text}</DescripBody>
<DescripTitle>{title}</DescripTitle>
{text !== null && text !== '' ? (
Copy link
Collaborator

@geraldalewis geraldalewis Jul 30, 2019

Choose a reason for hiding this comment

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

Oh crud -- we need --strictNullChecks -- my bad :(

Updated in #27

Copy link
Contributor

Choose a reason for hiding this comment

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

@geraldalewis how would this change once #27 gets merged?

@sracca sracca force-pushed the sr/load_stories branch from 7bcf46c to edbc38a Compare July 30, 2019 14:36
@mariana0pachon
Copy link
Contributor

I think it looks good to merge. All is left is to edit the base branch to be master instead of mpp/display_stories and rebase.

@sracca sracca force-pushed the sr/load_stories branch from edbc38a to 1d139a4 Compare July 30, 2019 15:12
@sracca sracca changed the base branch from mpp/display_stories to master July 30, 2019 15:48
@sracca sracca force-pushed the sr/load_stories branch 2 times, most recently from 2d0d81e to 1246407 Compare July 30, 2019 19:17
@sracca sracca force-pushed the sr/load_stories branch from 1246407 to c8a3aa5 Compare July 31, 2019 17:37
@sracca sracca force-pushed the sr/load_stories branch 3 times, most recently from e04352a to 6788f32 Compare July 31, 2019 20:00
@sracca sracca force-pushed the sr/load_stories branch from 6788f32 to e8864a9 Compare July 31, 2019 20:06
@mariana0pachon mariana0pachon removed the do not merge Reviewable, but some condition must be met before merging label Jul 31, 2019
@mariana0pachon mariana0pachon merged commit f4e08a5 into master Jul 31, 2019
@sracca sracca deleted the sr/load_stories branch July 31, 2019 20:11
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.

4 participants