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

feat(welcomeScreen): add custom story markers to globe #448

Merged
merged 14 commits into from
Aug 13, 2020

Conversation

KatvonRivia
Copy link
Member

@KatvonRivia KatvonRivia commented Aug 6, 2020

closes #95

Kapture 2020-08-10 at 16 24 34

@KatvonRivia KatvonRivia marked this pull request as ready for review August 10, 2020 14:14
src/scripts/components/app/app.tsx Outdated Show resolved Hide resolved
src/scripts/components/app/app.tsx Outdated Show resolved Hide resolved
src/scripts/hooks/use-markers.ts Outdated Show resolved Hide resolved
src/scripts/libs/create-markers.ts Outdated Show resolved Hide resolved
src/scripts/libs/create-markers.ts Outdated Show resolved Hide resolved
src/scripts/libs/create-markers.ts Outdated Show resolved Hide resolved
src/scripts/libs/create-markers.ts Outdated Show resolved Hide resolved
src/scripts/components/globe/globe.tsx Outdated Show resolved Hide resolved
@@ -5,6 +5,11 @@
font-family: NotesEsa
src: url('../../../../assets/fonts/NotesEsaReg.otf')

@font-face
Copy link
Contributor

Choose a reason for hiding this comment

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

do we still need this here? we only use the bold font in the markers which load the font by themselves, right?

Copy link
Member Author

Choose a reason for hiding this comment

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

Isn't this the global font import for all components? We use both fonts in other components.

Copy link
Member Author

Choose a reason for hiding this comment

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

Sorry i mean: you're right we don't use is yet 😄 But we need it at least for the splash screen title. I have used the regular one before, but that's not correct.

Copy link
Contributor

Choose a reason for hiding this comment

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

ah I see 👍

@@ -36,6 +38,19 @@ const App: FunctionComponent = () => (

const TranslatedApp: FunctionComponent = () => {
const language = useSelector(languageSelector);
const selectedLayers = useSelector(selectedLayerIdsSelector);
Copy link
Contributor

Choose a reason for hiding this comment

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

we could put this stuff in a custom hook 'const markers = useStoryMarkers()' so that we keep the app.tsx clean

Copy link
Contributor

Choose a reason for hiding this comment

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

also only map over the stories if hideMarkers is false to save some work if we don't show the markers

selectedLayers.mainId || selectedLayers.compareId
);

if (!hideMarkers) {
Copy link
Contributor

Choose a reason for hiding this comment

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

could you turn this around. we usually always use the positiv case:

if (hideMarkers) {
  return []
}

return ... storyMarkers

@KatvonRivia KatvonRivia merged commit ea297f4 into develop Aug 13, 2020
@KatvonRivia KatvonRivia deleted the feat/welcomeScreen branch August 13, 2020 09:05
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.

welcome screen
2 participants