Skip to content

Commit c0007f0

Browse files
committed
Merge branch 'staging' into dev_fang
2 parents e2df2ed + 171454f commit c0007f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+8536
-3958
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Deploy to Production
2+
3+
on:
4+
push:
5+
branches:
6+
- staging
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-22.04
11+
env:
12+
CI: false
13+
14+
steps:
15+
- name: Check out the repository
16+
uses: actions/checkout@v3
17+
18+
- name: Install dependencies
19+
run: yarn install --frozen-lockfile
20+
21+
- name: Build React App for production
22+
run: |
23+
echo "Building for production at root /"
24+
PUBLIC_URL="/" yarn build
25+
26+
- name: Copy JS libraries
27+
run: |
28+
mkdir -p build/js
29+
cp -r public/js/* build/js/
30+
31+
- name: Deploy to neurojson.io
32+
uses: NeuroJSON/[email protected]
33+
with:
34+
server: ${{ secrets.NEUROJ_IO_SERVER }}
35+
username: ${{ secrets.NEUROJ_SERVER_USER }}
36+
ssh_private_key: ${{ secrets.NEUROJ_SERVER_SSH_KEY }}
37+
local_path: "./build/*"
38+
remote_path: "${{ secrets.NEUROJ_CI_PATH }}"

.github/workflows/build-deploy-zodiac.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,16 @@ jobs:
2626
id: get_branch
2727
run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
2828

29+
- name: Print GitHub Runner Public IP
30+
run: |
31+
echo "GitHub runner public IP:"
32+
curl https://api.ipify.org
33+
2934
- name: Build React App with Dynamic PUBLIC_URL
3035
run: |
3136
echo "Building for /dev/${{ env.BRANCH_NAME }}/"
3237
PUBLIC_URL="/dev/${{ env.BRANCH_NAME }}/" yarn build
33-
38+
3439
- name: Copy JS libraries (jdata, bjdata etc.)
3540
run: |
3641
mkdir -p build/js

.github/workflows/validate.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ on:
88
jobs:
99
validate:
1010
runs-on: ubuntu-latest
11-
env:
12-
CI: false
1311

1412
steps:
1513
- name: Check out the repository
@@ -31,4 +29,4 @@ jobs:
3129
PUBLIC_URL="/dev/${{ github.head_ref }}/" yarn build
3230
3331
- name: Run Security Audit (non-blocking)
34-
run: yarn audit --level moderate || echo "Ignoring audit failure for now"
32+
run: yarn audit --level moderate || echo "Audit failed with moderate issues, continuing anyway."

package.json

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,31 @@
1212
"@mui/icons-material": "^5.14.3",
1313
"@mui/material": "^5.14.4",
1414
"@reduxjs/toolkit": "^1.9.5",
15+
"@rjsf/core": "^5.24.8",
16+
"@rjsf/mui": "^5.24.8",
17+
"@rjsf/utils": "^5.24.8",
18+
"@rjsf/validator-ajv8": "^5.24.8",
1519
"@testing-library/jest-dom": "^5.14.1",
1620
"@testing-library/react": "^13.0.0",
1721
"@testing-library/user-event": "^13.2.1",
1822
"@types/jest": "^27.0.1",
23+
"@types/numjs": "^0.16.8",
1924
"@types/react": "^18.0.0",
2025
"@types/react-dom": "^18.0.0",
21-
"@types/three": "^0.174.0",
26+
"@types/three": "^0.176.0",
2227
"ajv": "^8",
2328
"ajv-keywords": "^5",
2429
"axios": "^1.4.0",
2530
"bda": "^1.0.0",
2631
"bjd": "^0.3.2",
27-
"buffer": "^6.0.3",
32+
"buffer": "6.0.3",
2833
"dayjs": "^1.11.10",
29-
"jda": "^0.4.0",
3034
"jquery": "^3.7.1",
3135
"json-stringify-safe": "^5.0.1",
3236
"jwt-decode": "^3.1.2",
37+
"lzma": "^2.3.2",
38+
"numjs": "^0.16.1",
39+
"pako": "1.0.11",
3340
"path-browserify": "^1.0.1",
3441
"query-string": "^8.1.0",
3542
"react": "^18.2.0",
@@ -38,16 +45,20 @@
3845
"react-redux": "^8.1.2",
3946
"react-router-dom": "^6.15.0",
4047
"react-scripts": "^5.0.1",
48+
"react-syntax-highlighter": "^15.6.1",
4149
"sharp": "^0.33.5",
4250
"stats-js": "^1.0.1",
51+
"stats.js": "0.17.0",
52+
"three": "0.145.0",
4353
"typescript": "^5.1.6",
44-
"uplot": "^1.6.31",
54+
"uplot": "1.6.17",
4555
"web-vitals": "^2.1.0"
4656
},
4757
"devDependencies": {
4858
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
4959
"@trivago/prettier-plugin-sort-imports": "^4.2.0",
5060
"@types/node": "^20.5.7",
61+
"@types/pako": "^2.0.3",
5162
"@typescript-eslint/eslint-plugin": "^5.31.0",
5263
"@typescript-eslint/parser": "^5.31.0",
5364
"eslint": "^8.21.0",
@@ -83,6 +94,6 @@
8394
"postcss": "^8.4.31",
8495
"nth-check": "^2.0.1",
8596
"@babel/runtime": "7.26.10",
86-
"@babel/helpers": "7.26.10"
97+
"3d-force-graph": "1.74.6"
8798
}
8899
}

public/img/3d_graph_logo.png

88.5 KB
Loading

public/img/logo_updated.png

27.3 KB
Loading

public/img/logo_yellow.png

27.5 KB
Loading
27.6 KB
Loading

public/img/section3_cards.png

28.9 MB
Loading

public/img/section4/click_icon.png

33.5 KB
Loading

0 commit comments

Comments
 (0)