Skip to content

Commit 1a4ac94

Browse files
authored
Merge pull request #200 from ctrlaltaf/video
updated home page
2 parents acd67c1 + 14f5c78 commit 1a4ac94

File tree

7 files changed

+165
-136
lines changed

7 files changed

+165
-136
lines changed

.github/dependabot.yml

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,12 @@ updates:
88
- package-ecosystem: "npm"
99
directory: "/client"
1010
schedule:
11-
interval: "daily"
12-
ignore:
13-
- dependency-type: "all"
14-
allow:
15-
- dependency-type: "security"
16-
11+
interval: "weekly"
1712
- package-ecosystem: "npm"
1813
directory: "/server"
1914
schedule:
20-
interval: "daily"
21-
ignore:
22-
- dependency-type: "all"
23-
allow:
24-
- dependency-type: "security"
25-
15+
interval: "weekly"
2616
- package-ecosystem: "pip"
2717
directory: "/python_api"
2818
schedule:
29-
interval: "daily"
30-
ignore:
31-
- dependency-type: "all"
32-
allow:
33-
- dependency-type: "security"
34-
35-
19+
interval: "weekly"

.github/workflows/node.js.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- dev
8+
pull_request:
9+
branches:
10+
- main
11+
- dev
12+
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
17+
steps:
18+
- name: Checkout repository
19+
uses: actions/checkout@v2
20+
21+
- name: Set up Node.js
22+
uses: actions/setup-node@v2
23+
with:
24+
node-version: "20.5.1"
25+
26+
- name: Install dependencies
27+
run: npm install
28+
working-directory: client
29+
30+
- name: Build the project
31+
run: npm run build
32+
working-directory: client

client/src/App.jsx

Lines changed: 64 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -4,76 +4,77 @@ import { PiHandTap } from "react-icons/pi";
44
import { GiFly } from "react-icons/gi";
55
import QueryImage from "./assets/query-img.png";
66
import { IconContext } from "react-icons";
7-
7+
import HomeVideo from "./components/HomeVideo";
88
import "./index.css";
99
import { Link } from "react-router-dom";
1010
import MainLayout from "./layout/MainLayout";
1111

1212
function App() {
13-
14-
return (
15-
<div>
16-
<MainLayout>
17-
<div className="main-layout-body">
18-
<div className="home-body">
19-
<h2 className="home-title">Welcome to ProteinWeaver</h2>
20-
<h4>
21-
A tool for protein network exploration in the context of The Gene Ontology (GO).
22-
<br></br>
23-
Free and open to all users with no login requirement.
24-
<br></br>
25-
Learn more about ProteinWeaver <Link className="home-link-about" to={"/about"}>here.</Link>
26-
</h4>
27-
<br></br>
28-
<Link to={`/query`}>
29-
<button className="home-button">
30-
Start exploring networks!
31-
</button>
32-
</Link>
33-
<div className="home-body-container">
34-
<div>
35-
<div className="home-feature-container">
36-
<IconContext.Provider
37-
value={{ className: "home-icon", size: 70 }}
38-
>
39-
<TbEyeCode />
40-
</IconContext.Provider>
41-
<h4 className="home-feature-text">
42-
Visualize networks with Cytoscape.js
43-
</h4>
44-
</div>
45-
<div className="home-feature-container">
46-
<IconContext.Provider
47-
value={{ className: "home-icon", size: 70 }}
48-
>
49-
<PiHandTap />
50-
</IconContext.Provider>
51-
<h4 className="home-feature-text">
52-
Explore interactive graphs
53-
</h4>
54-
</div>
55-
<div className="home-feature-container">
56-
<IconContext.Provider
57-
value={{ className: "home-icon", size: 70 }}
58-
>
59-
<GiFly />
60-
</IconContext.Provider>
61-
<h4 className="home-feature-text">
62-
Hosts multiple non-human model organisms
63-
</h4>
13+
return (
14+
<div>
15+
<MainLayout>
16+
<div className="main-layout-body">
17+
<div className="home-body">
18+
<h2 className="home-title">Welcome to ProteinWeaver</h2>
19+
<h4>
20+
A tool for protein network exploration in the
21+
context of The Gene Ontology (GO).
22+
<br></br>
23+
Free and open to all users with no login
24+
requirement.
25+
<br></br>
26+
Learn more about ProteinWeaver{" "}
27+
<Link className="home-link-about" to={"/about"}>
28+
here.
29+
</Link>
30+
</h4>
31+
<br></br>
32+
<Link to={`/query`}>
33+
<div className="button-align">
34+
{" "}
35+
<button className="home-button">
36+
Start exploring networks!
37+
</button>
38+
</div>
39+
</Link>
40+
<div className="home-body-container">
41+
<div className="home-feature-container">
42+
<IconContext.Provider
43+
value={{ className: "home-icon", size: 70 }}
44+
>
45+
<TbEyeCode />
46+
</IconContext.Provider>
47+
<h4 className="home-feature-text">
48+
Visualize networks with Cytoscape.js
49+
</h4>
50+
</div>
51+
<div className="home-feature-container">
52+
<IconContext.Provider
53+
value={{ className: "home-icon", size: 70 }}
54+
>
55+
<PiHandTap />
56+
</IconContext.Provider>
57+
<h4 className="home-feature-text">
58+
Explore interactive graphs
59+
</h4>
60+
</div>
61+
<div className="home-feature-container">
62+
<IconContext.Provider
63+
value={{ className: "home-icon", size: 70 }}
64+
>
65+
<GiFly />
66+
</IconContext.Provider>
67+
<h4 className="home-feature-text">
68+
Hosts multiple non-human model organisms
69+
</h4>
70+
</div>
71+
</div>
72+
<HomeVideo></HomeVideo>
73+
</div>
6474
</div>
65-
</div>
66-
<img
67-
className="home-query-img"
68-
src={QueryImage}
69-
alt="Query-Image"
70-
/>
71-
</div>
72-
</div>
75+
</MainLayout>
7376
</div>
74-
</MainLayout>
75-
</div>
76-
);
77+
);
7778
}
7879

7980
export default App;

client/src/assets/demo_video.mp4

1.32 MB
Binary file not shown.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import React from "react";
2+
import videoFile from "../assets/demo_video.mp4"; // Adjust path as needed
3+
4+
const HomeVideo = () => {
5+
return (
6+
<div>
7+
<video autoPlay muted loop width="100%" className="home-query-video">
8+
<source src={videoFile} type="video/mp4" />
9+
Your browser does not support the video tag.
10+
</video>
11+
</div>
12+
);
13+
};
14+
15+
export default HomeVideo;

0 commit comments

Comments
 (0)