Skip to content

Feature/show command running #58

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.

Sign up for GitHub

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

Merged
merged 15 commits into from
Nov 18, 2019
Merged

Feature/show command running #58

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
12962fa
update linter
ShMcK Nov 17, 2019
121d5cb
create indeterminate loading checkbox
ShMcK Nov 17, 2019
3888e8b
add relative positioning to pages for storybook
ShMcK Nov 17, 2019
d0b8ee6
setup processes component
ShMcK Nov 17, 2019
70119ed
refactor level & step file structure
ShMcK Nov 17, 2019
0ee8b05
style without absolute positioning
ShMcK Nov 17, 2019
5133dad
fix level index
ShMcK Nov 17, 2019
3599137
setup tutorial level process events viewer
ShMcK Nov 17, 2019
aa978af
define processes
ShMcK Nov 17, 2019
6113648
setup command actions
ShMcK Nov 17, 2019
9999668
setup git actions to send command feedback
ShMcK Nov 17, 2019
7f8789c
fix typo bug
ShMcK Nov 18, 2019
b35f6b1
update debugger
ShMcK Nov 18, 2019
8e8fa50
working command tracker
ShMcK Nov 18, 2019
b148fa5
fix ui issue
ShMcK Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
style without absolute positioning
  • Loading branch information
@ShMcK
ShMcK committed Nov 17, 2019
commit 0ee8b05ca9b0e33f91d1046a869ab81ee86bf2fb
42 changes: 23 additions & 19 deletions web-app/src/containers/Overview/OverviewPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@ import Markdown from '../../components/Markdown'
const styles = {
page: {
position: 'relative' as 'relative',
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
justifyContent: 'space-between',
width: '100%',
height: '100%',
},
summary: {
padding: '0rem 1rem 1rem 1rem',
Expand All @@ -33,8 +37,6 @@ const styles = {
flexDirection: 'row' as 'row',
alignItems: 'center' as 'center',
justifyContent: 'flex-end' as 'flex-end',
position: 'absolute' as 'absolute',
bottom: 0,
height: '50px',
padding: '1rem',
paddingRight: '2rem',
Expand All @@ -52,26 +54,28 @@ interface Props {

const Summary = ({ title, description, levels, onNext }: Props) => (
<div style={styles.page}>
<div style={styles.header}>
<span>CodeRoad</span>
</div>
<div style={styles.summary}>
<h2 style={styles.title}>{title}</h2>
<Markdown>{description}</Markdown>
</div>
<div>
<div style={styles.header}>
<span>Levels</span>
<span>CodeRoad</span>
</div>
<div style={styles.summary}>
<h2 style={styles.title}>{title}</h2>
<Markdown>{description}</Markdown>
</div>
<div style={styles.levelList}>
{levels.map((level: G.Level, index: number) => (
<div key={index}>
<h4>
{index + 1}. {level.title}
</h4>
<div>{level.description}</div>
</div>
))}
<div>
<div style={styles.header}>
<span>Levels</span>
</div>
<div style={styles.levelList}>
{levels.map((level: G.Level, index: number) => (
<div key={index}>
<h4>
{index + 1}. {level.title}
</h4>
<div>{level.description}</div>
</div>
))}
</div>
</div>
</div>

Expand Down
10 changes: 6 additions & 4 deletions web-app/src/containers/Tutorial/LevelPage/Level.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,14 @@ import Button from '../../../components/Button'
import Markdown from '../../../components/Markdown'

const styles = {
card: {
page: {
position: 'relative' as 'relative',
display: 'flex' as 'flex',
flexDirection: 'column' as 'column',
justifyContent: 'space-between',
padding: 0,
width: '100%',
height: '100%',
},
header: {
height: '36px',
Expand Down Expand Up @@ -41,8 +45,6 @@ const styles = {
lineHeight: '16px',
padding: '10px 1rem',
color: 'white',
position: 'absolute' as 'absolute',
bottom: 0,
width: '100%',
},
}
Expand All @@ -59,7 +61,7 @@ const Level = ({ level, onContinue, onLoadSolution }: Props) => {
}

return (
<div style={styles.card}>
<div style={styles.page}>
<div>
<div style={styles.header}>
<span>Learn</span>
Expand Down