Skip to content

Commit db534c0

Browse files
authored
Merge pull request #85 from NeuroJSON/staging
About Page: Add feature sections, add convert icon and video, add four preview videos
2 parents c79b870 + 186d8f0 commit db534c0

File tree

2 files changed

+111
-9
lines changed

2 files changed

+111
-9
lines changed

public/img/about_page/convert.png

15 KB
Loading

src/pages/AboutPage.tsx

Lines changed: 111 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@ import {
66
Button,
77
Grid,
88
Tooltip,
9+
Divider,
910
} from "@mui/material";
1011
import { Colors } from "design/theme";
1112
import React, { useRef } from "react";
13+
import { Color } from "three";
1214

1315
const AboutPage: React.FC = () => {
1416
const searchVideoRef = useRef<HTMLDivElement | null>(null);
1517
const previewVideoRef = useRef<HTMLDivElement | null>(null);
1618
const downloadVideoRef = useRef<HTMLDivElement | null>(null);
1719
const apiVideoRef = useRef<HTMLDivElement | null>(null);
20+
const convertVideoRef = useRef<HTMLDivElement | null>(null);
1821

1922
const videoData = [
2023
{
@@ -45,6 +48,13 @@ const AboutPage: React.FC = () => {
4548
video: "download_video.mp4",
4649
ref: downloadVideoRef,
4750
},
51+
{
52+
src: "convert.png",
53+
alt: "convert icon",
54+
tip: "Convert tutotial video",
55+
video: "convert.mp4",
56+
ref: convertVideoRef,
57+
},
4858
];
4959

5060
const TutorialVideoItem = ({
@@ -261,21 +271,97 @@ const AboutPage: React.FC = () => {
261271
>
262272
Getting Started with NeuroJSON
263273
</Typography>
264-
<Grid container spacing={5} sx={{ mt: 3 }}>
265-
<Grid item xs={12} sm={6} ref={searchVideoRef}>
274+
275+
<Grid container spacing={5} sx={{ mt: 3 }} ref={searchVideoRef}>
276+
<Grid item xs={12}>
277+
<Divider
278+
sx={{
279+
opacity: 1,
280+
mb: 2,
281+
"&::before, &::after": {
282+
// borderTopWidth: 2, // make the line more thicker
283+
// borderColor: Colors.secondaryPurple, // change the default line color
284+
},
285+
}}
286+
>
287+
<Typography
288+
variant="h6"
289+
sx={{ color: Colors.darkPurple, fontWeight: 600 }}
290+
>
291+
Search
292+
</Typography>
293+
</Divider>
294+
</Grid>
295+
<Grid item xs={12} sm={6}>
266296
<TutorialVideoItem
267297
title="Search tutorial"
268298
videoUrl="https://neurojson.io/io/download/static/videos/search_video.mp4"
269299
/>
270300
</Grid>
271-
272-
<Grid item xs={12} sm={6} ref={previewVideoRef}>
301+
</Grid>
302+
<Grid container spacing={5} sx={{ mt: 3 }} ref={previewVideoRef}>
303+
<Grid item xs={12}>
304+
<Divider
305+
sx={{ borderColor: Colors.darkPurple, opacity: 1, mb: 2 }}
306+
>
307+
<Typography
308+
variant="h6"
309+
sx={{ color: Colors.darkPurple, fontWeight: 600 }}
310+
>
311+
Preview
312+
</Typography>
313+
</Divider>
314+
</Grid>
315+
<Grid item xs={12} sm={6}>
273316
<TutorialVideoItem
274317
title="Preview tutorial"
275318
videoUrl="https://neurojson.io/io/download/static/videos/preview.mp4"
276319
/>
277320
</Grid>
278-
321+
<Grid item xs={12} sm={6}>
322+
<TutorialVideoItem
323+
title="mesh preview tutorial"
324+
videoUrl="https://neurojson.io/io/download/static/videos/preview_mesh.mp4"
325+
/>
326+
</Grid>
327+
<Grid item xs={12} sm={6}>
328+
<TutorialVideoItem
329+
title="fnirs preview tutorial"
330+
videoUrl="https://neurojson.io/io/download/static/videos/preview_fnirs.mp4"
331+
/>
332+
</Grid>
333+
<Grid item xs={12} sm={6}>
334+
<TutorialVideoItem
335+
title="atlas preview tutorial"
336+
videoUrl="https://neurojson.io/io/download/static/videos/preview_atlas.mp4"
337+
/>
338+
</Grid>
339+
<Grid item xs={12} sm={6}>
340+
<TutorialVideoItem
341+
title="mri preview tutorial"
342+
videoUrl="https://neurojson.io/io/download/static/videos/preview_mri.mp4"
343+
/>
344+
</Grid>
345+
</Grid>
346+
<Grid container spacing={5} sx={{ mt: 3 }} ref={downloadVideoRef}>
347+
<Grid item xs={12}>
348+
<Divider
349+
sx={{ borderColor: Colors.darkPurple, opacity: 1, mb: 2 }}
350+
>
351+
<Typography
352+
variant="h6"
353+
sx={{ color: Colors.darkPurple, fontWeight: 600 }}
354+
>
355+
Download
356+
</Typography>
357+
</Divider>
358+
</Grid>
359+
<Grid item xs={12} sm={6}>
360+
<TutorialVideoItem
361+
title="Download tutorial"
362+
videoUrl="https://neurojson.io/io/download/static/videos/download.mp4"
363+
/>
364+
</Grid>
279365
<Grid item xs={12} sm={6} ref={apiVideoRef}>
280366
<TutorialVideoItem
281367
title="Rest API - Python tutorial"
@@ -289,11 +375,27 @@ const AboutPage: React.FC = () => {
289375
videoUrl="https://neurojson.io/io/download/static/videos/matlab_api.mp4"
290376
/>
291377
</Grid>
292-
293-
<Grid item xs={12} sm={6} ref={downloadVideoRef}>
378+
</Grid>
379+
<Grid container spacing={5} sx={{ mt: 3 }}>
380+
<Grid item xs={12}>
381+
<Divider
382+
sx={{
383+
opacity: 1,
384+
mb: 2,
385+
}}
386+
>
387+
<Typography
388+
variant="h6"
389+
sx={{ color: Colors.darkPurple, fontWeight: 600 }}
390+
>
391+
Convert And Upload
392+
</Typography>
393+
</Divider>
394+
</Grid>
395+
<Grid item xs={12} sm={6} ref={convertVideoRef}>
294396
<TutorialVideoItem
295-
title="Download tutorial"
296-
videoUrl="https://neurojson.io/io/download/static/videos/download.mp4"
397+
title="Convert tutorial"
398+
videoUrl="https://neurojson.io/io/download/static/videos/convert.mp4"
297399
/>
298400
</Grid>
299401
</Grid>

0 commit comments

Comments
 (0)