Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit7418c15

Browse files
committed
add task progress indicator
Signed-off-by: shmck <shawn.j.mckay@gmail.com>
1 parent7869186 commit7418c15

File tree

1 file changed

+35
-12
lines changed

1 file changed

+35
-12
lines changed

‎web-app/src/containers/Tutorial/index.tsx

Lines changed: 35 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import ReviewPage from './containers/Review'
1010
importButtonfrom'../../components/Button'
1111
importProcessMessagesfrom'../../components/ProcessMessages'
1212
importTestMessagefrom'../../components/TestMessage'
13+
import{Progress}from'@alifd/next'
1314
import{DISPLAY_RUN_TEST_BUTTON}from'../../environment'
1415

1516
conststyles={
@@ -39,16 +40,19 @@ const styles = {
3940
backgroundColor:'black',
4041
fontSize:'1rem',
4142
lineHeight:'1rem',
42-
padding:'10px1rem',
43+
padding:'10px0rem',
4344
position:'fixed'as'fixed',
4445
bottom:0,
4546
left:0,
4647
right:0,
4748
color:'white',
4849
},
49-
taskCount:{
50-
fontSize:'0.8rem',
51-
opacity:0.9,
50+
taskProgress:{
51+
display:'flex'as'flex',
52+
justifyContent:'flex-end'as'flex-end',
53+
alignItems:'center'as'center',
54+
width:'10rem',
55+
color:'white',
5256
},
5357
processes:{
5458
padding:'0 1rem',
@@ -147,23 +151,42 @@ const TutorialPage = (props: PageProps) => {
147151
<TestMessagemessage={testStatus.title}/>
148152
</div>
149153
)}
150-
154+
{/* Left */}
151155
{DISPLAY_RUN_TEST_BUTTON&&levelStatus!=='COMPLETE' ?(
152-
<Buttontype="primary"onClick={onRunTest}disabled={processes.length>0}>
156+
<Buttonstyle={{marginLeft:'1rem'}}type="primary"onClick={onRunTest}disabled={processes.length>0}>
153157
Run
154158
</Button>
155-
) :null}
156-
<span>
159+
) :(
160+
<div/>
161+
)}
162+
163+
{/* Center */}
164+
<div/>
165+
166+
{/* Right */}
167+
<div>
157168
{levelStatus==='COMPLETE'||!level.steps.length ?(
158169
<Buttontype="primary"onClick={onContinue}>
159170
Continue
160171
</Button>
161172
) :(
162-
<spancss={styles.taskCount}>
163-
{currentStep} of{level.steps.length} tasks
164-
</span>
173+
<Progress
174+
state="success"
175+
progressive
176+
percent={(currentStep/level.steps.length)*100}
177+
shape="line"
178+
color="rgb(85, 132, 255)"
179+
css={styles.taskProgress}
180+
textRender={(percent:number)=>{
181+
return(
182+
<spanstyle={{color:'white'}}>
183+
{currentStep} of{level.steps.length}
184+
</span>
185+
)
186+
}}
187+
/>
165188
)}
166-
</span>
189+
</div>
167190
</div>
168191
<SideMenuvisible={menuVisible}toggleVisible={setMenuVisible}page={page}setPage={setPage}/>
169192
</div>

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp