diff --git a/web-app/src/containers/Overview/OverviewPage.tsx b/web-app/src/containers/Overview/OverviewPage.tsx index 519a571e..004034a0 100644 --- a/web-app/src/containers/Overview/OverviewPage.tsx +++ b/web-app/src/containers/Overview/OverviewPage.tsx @@ -1,9 +1,9 @@ import * as React from 'react' import * as G from 'typings/graphql' +import moment from 'moment' import Button from '../../components/Button' -import Icon from '../../components/Icon' -import { Divider } from '@alifd/next' import Markdown from '../../components/Markdown' +import { Breadcrumb } from '@alifd/next' const footerHeight = '3rem' @@ -14,11 +14,25 @@ const styles = { flexDirection: 'column' as 'column', width: '100%', }, + nav: { + display: 'flex', + height: '2rem', + fontSize: '1rem', + lineHeight: '1rem', + alignItems: 'center', + }, + navLink: { + fontSize: '14px', + color: 'white', + cursor: 'pointer', + }, content: { paddingBottom: '3rem', }, - summary: { - padding: '0rem 1rem 1rem 1rem', + header: { + color: 'white', + backgroundColor: '#0066B8', + padding: '1rem 1rem 1.5rem 1rem', }, title: { fontWeight: 'bold' as 'bold', @@ -26,15 +40,6 @@ const styles = { description: { fontSize: '1rem', }, - header: { - display: 'flex', - height: '2rem', - backgroundColor: '#EBEBEB', - fontSize: '1rem', - lineHeight: '1rem', - padding: '10px 1rem', - alignItems: 'center', - }, levelList: { padding: '0rem 1rem', }, @@ -61,46 +66,55 @@ const styles = { interface Props { title: string description: string + createdBy: G.User + updatedAt: string levels: G.Level[] onNext(): void onBack(): void } -const Summary = ({ title, description, levels, onNext, onBack }: Props) => ( +const Summary = (props: Props) => (
- -    - CodeRoad -
-
-

{title}

- {description} +
+ + +
+ < Back to Tutorials +
+
+
+
+

{props.title}

+

{props.description}

+

+ Created by {props.createdBy.name} + Last updated {moment(props.updatedAt).format('M/YYYY')} +

-
- Levels -
- {levels.map((level: G.Level, index: number) => ( +

Content

+ {props.levels.map((level: G.Level, index: number) => (
-

+

{index + 1}. {level.title} -

-
{level.summary}
- + +
+ {level.summary} +
))}
+
+
{/* TODO Add back button */} -
diff --git a/web-app/src/containers/Overview/index.tsx b/web-app/src/containers/Overview/index.tsx index aada9a6b..503e345b 100644 --- a/web-app/src/containers/Overview/index.tsx +++ b/web-app/src/containers/Overview/index.tsx @@ -58,9 +58,20 @@ const Overview = (props: PageProps) => { const onBack = () => props.send({ type: 'BACK' }) const { title, description } = data.tutorial.summary - const { levels } = data.tutorial.version.data + const { createdBy, updatedAt, data: tutorialData } = data.tutorial.version + const { levels } = tutorialData - return + return ( + + ) } export default Overview diff --git a/web-app/src/containers/SelectTutorial/SelectTutorial.tsx b/web-app/src/containers/SelectTutorial/SelectTutorial.tsx index d24435af..adc57c97 100644 --- a/web-app/src/containers/SelectTutorial/SelectTutorial.tsx +++ b/web-app/src/containers/SelectTutorial/SelectTutorial.tsx @@ -9,13 +9,6 @@ const styles = { position: 'relative' as 'relative', width: '100%', }, - header: { - height: '2rem', - backgroundColor: '#EBEBEB', - fontSize: '1rem', - lineHeight: '1rem', - padding: '10px 1rem', - }, banner: { minHeight: '3rem', fontSize: '1rem', @@ -39,9 +32,6 @@ const SelectTutorial = (props: Props) => { } return (
-
- CodeRoad -
Select a tutorial to launch in this workspace:
diff --git a/web-app/stories/Overview.stories.tsx b/web-app/stories/Overview.stories.tsx index 15002c5e..3573554c 100644 --- a/web-app/stories/Overview.stories.tsx +++ b/web-app/stories/Overview.stories.tsx @@ -42,8 +42,10 @@ storiesOf('Overview', module) ] return (