Skip to content

Commit 60ef0b7

Browse files
committed
All test, unit, integration and E2E working
2 parents f0a4dd4 + ffe1f6a commit 60ef0b7

File tree

14 files changed

+1567
-190
lines changed

14 files changed

+1567
-190
lines changed

package-lock.json

Lines changed: 917 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/App.module.less

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
.root{
1+
.App {
2+
text-align: center;
3+
display: flex;
4+
flex-direction: column;
5+
align-items: center;
26
position: absolute;
37
top: 0;
48
left: 0;
59
right: 0;
610
bottom: 0;
711
background-color: #ffffff;
8-
9-
}
10-
.App {
11-
text-align: center;
12-
display: flex;
13-
flex-direction: column;
14-
align-items: center;
15-
justify-content: center;
16-
1712
}
18-

src/Styles/index.module.less

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,16 @@
44
*/
55
display: inline-block;
66
justify-content: space-around;
7-
width: 30%;
87
padding: 20px;
98
}
109

1110
.buttonBox {
11+
padding: 20px;
12+
display: flex;
13+
justify-content: center;
14+
}
15+
16+
.btnBoxVFG {
1217
padding: 20px;
1318
display: flex;
1419
justify-content: space-around;
@@ -18,20 +23,24 @@
1823
/*
1924
background: #fff;
2025
*/
26+
position: relative;
2127
display: flex;
28+
flex-direction: column;
29+
align-content: space-around;
2230
justify-content: space-around;
23-
}
2431

32+
}
2533
.container {
2634
width: 100%;
27-
height: 100%,;
35+
height: calc(100% - 65px);
2836
background-color: #FFFFFF;
37+
overflow: auto;
2938
}
3039

3140
.header {
3241
width: 100%;
3342
height: 50px;
34-
background-color: "#20477A";
43+
background-color: #20477A;
3544
}
3645

3746
.subtitle {
@@ -48,14 +57,12 @@ background: #fff;
4857

4958
.text {
5059
text-align: left;
51-
margin-top: 2%;
52-
margin-left: 25%;
53-
margin-right: 25%;
60+
margin: 10px 25%;
5461
}
5562

5663
.wrapper {
5764
position: relative;
58-
65+
margin-left: 10%;
5966
}
6067
.loading {
6168
position: absolute;
@@ -69,4 +76,16 @@ background: #fff;
6976
right: 0;
7077
bottom: 0;
7178
z-index: 999;
79+
}
80+
.dropzoneAreaBox {
81+
width: 320px;
82+
height: 200px;
83+
background-color: red;
84+
}
85+
.fileTitle {
86+
font-size: 22px;
87+
}
88+
.fileDesc {
89+
font-size: 20px;
90+
line-height: 30px;
7291
}

src/components/navigationBar/navigationBar.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ const nav = {
3939
problem: '/problem',
4040
vfg: '/vfg',
4141
manual: 'https://planimation.github.io/documentation/ ',
42-
demo: '/demo',
42+
demo: 'https://www.youtube.com/watch?v=Cj2rWdt1YQU',
4343
home: '/'
4444
};
4545

@@ -51,8 +51,11 @@ function NavigationBar() {
5151
const handleClick = (url) => {
5252
setUrl(url);
5353
if(url==='manual'){
54-
window.location.href(nav[url])
55-
}else{
54+
// window.location.href(nav[url])
55+
}else if(url==='demo'){
56+
// window.location.href(nav[url])
57+
}
58+
else{
5659
history.push(nav[url]);
5760

5861
}
@@ -75,7 +78,7 @@ function NavigationBar() {
7578
<a href={'https://planimation.github.io/documentation/'} target='_blank' rel="noreferrer" className={classes.alink}>User Manual</a>
7679
</Link>
7780
<Link variant="button" color="inherit" onClick={()=>handleClick('demo')} className={classes.link}>
78-
Demo
81+
<a href={'https://www.youtube.com/watch?v=Cj2rWdt1YQU'} target='_blank' rel="noreferrer" className={classes.alink}>Demo</a>
7982
</Link>
8083
</nav>
8184
<Button color="inherit" variant="outlined"onClick={()=>handleClick('home')} className={classes.link} >

src/pages/HomePage/home.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ const tiers = [
9393
{
9494
title: 'VFG',
9595
pageNo: 2,
96-
description: ['Build visualisation from \nVFG'],
96+
description: ['Build visualisation from VFG'],
9797
buttonText: 'Sign up for free',
9898
buttonVariant: 'outlined',
9999
},
@@ -150,7 +150,7 @@ export default function Home() {
150150
window.open('https://planimation.github.io/documentation/')
151151
break;
152152
case 4:
153-
history.push('/demo');
153+
window.open('https://www.youtube.com/watch?v=Cj2rWdt1YQU')
154154
break;
155155
default: return;
156156
}
@@ -199,7 +199,7 @@ export default function Home() {
199199
</div> */}
200200
<ul className={classes.itemTitle}>
201201
{tier.description.map((line) => (
202-
<Typography component="li" variant="subtitle1" align="center" key={line}>
202+
<Typography variant="subtitle1" align="center" key={line}>
203203
{line}
204204
</Typography>
205205
))}

src/pages/PageFour/dataUtils.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,24 @@ if(content) {
55
contentObject = JSON.parse(content);
66
}
77

8-
function getAllStages() {
8+
export function getAllStages() {
99
const visualStages = contentObject.visualStages || [];
1010
const stages = visualStages.map(stage => {
1111
return stage.visualSprites;
1212
})
1313
return stages;
1414
}
1515

16-
function getSteps() {
16+
export function getSteps() {
1717
return contentObject.visualStages ? contentObject.visualStages.map((s =>s.stageName)) : [];
1818
}
1919

20-
function getStepInfo() {
20+
export function getStepInfo() {
2121
return contentObject.visualStages ? contentObject.visualStages.map((s =>s.stageInfo)) : [];
2222
}
2323

2424

25-
function getSubGoal() {
25+
export function getSubGoal() {
2626
if( !contentObject.subgoalMap) {
2727
return {};
2828
}
@@ -46,7 +46,7 @@ function getSubGoal() {
4646
return map;
4747
}
4848

49-
function getStepSubgoalMap() {
49+
export function getStepSubgoalMap() {
5050
if( !contentObject.subgoalMap) {
5151
return {};
5252
}

0 commit comments

Comments
 (0)