Skip to content

Improve UI/UX with Enhanced Visualization & GitHub Actions Update (Closes #15, Closes #20) #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fangq merged 22 commits into from
Mar 14, 2025
Merged

Improve UI/UX with Enhanced Visualization & GitHub Actions Update (Closes #15, Closes #20) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
288b1b4
Update branch Fan
MarSH-Up Feb 27, 2025
0bf292c
Merge remote-tracking branch 'origin/dev' into dev-fan
MarSH-Up Feb 27, 2025
c82a624
Manual deployment
MarSH-Up Feb 27, 2025
0574487
Merge remote-tracking branch 'origin/dev' into dev-fan
MarSH-Up Feb 27, 2025
ff3dd40
Manual deployment
MarSH-Up Feb 27, 2025
eee772a
change the background of landing page
elainefan331 Mar 3, 2025
0148dbd
style: updated backgrounk and theme colors for landing page and slide…
elainefan331 Mar 3, 2025
4bd315b
Add Raleway and Ubuntu fonts, and update typography settings
elainefan331 Mar 4, 2025
cbc3f01
Assign distinct colors to different datatypes and update node color r…
elainefan331 Mar 5, 2025
548b645
Revise the circle nodes layout to a constellation-style graph
elainefan331 Mar 11, 2025
9e0ca6d
Update node sizing: replace fixed sizes with dataset-based dynamic sc…
elainefan331 Mar 11, 2025
57b6640
Update node links: refactored link logic to prioritize connections be…
elainefan331 Mar 12, 2025
acfa672
Update home page background
elainefan331 Mar 12, 2025
29ff1f9
modify build-deploy-zodiac.yml for deploy on zodiac
elainefan331 Mar 13, 2025
d7d05a1
Update GitHub Actions: Set PUBLIC_URL dynamically for branch-based de…
elainefan331 Mar 13, 2025
bb2e0cf
Update GitHub Actions: Set PUBLIC_URL for dev-fan branch deployment
elainefan331 Mar 13, 2025
f8bc6c2
Update GitHub Actions: Set PUBLIC_URL dynamically for branch-based de…
elainefan331 Mar 13, 2025
9887d3f
Fix validation workflow to include PUBLIC_URL
elainefan331 Mar 13, 2025
46d12ed
Add lint script to package.json
elainefan331 Mar 13, 2025
2a79b36
Temporarily disable lint step to test the workflow
elainefan331 Mar 13, 2025
343d164
Upgrade axios to 1.8.2 to fix high-severity vulnerability
elainefan331 Mar 14, 2025
f01065a
Upgrade @babel/runtime and @babel/helpers to 7.26.10
elainefan331 Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .github/workflows/build-deploy-zodiac.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
deploy:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Check out the repository
Expand All @@ -19,18 +19,20 @@ jobs:
- name: Install dependencies
run: yarn install --frozen-lockfile

- name: Build React App
run: yarn build

- name: Determine Branch Name
id: get_branch
run: echo "branch_name=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
run: echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV

- name: Build React App with Dynamic PUBLIC_URL
run: |
echo "Building for /dev/${{ env.BRANCH_NAME }}/"
PUBLIC_URL="/dev/${{ env.BRANCH_NAME }}/" yarn build

- name: Copy files to the server via SFTP
uses: wlixcc/SFTP-Deploy-Action@v1.2.4
- name: Copy package to server
uses: NeuroJSON/SFTP-Deploy-Action@v1.2.5
with:
server: ${{ secrets.NEUROJ_SERVER }}
username: ${{ secrets.NEUROJ_SERVER_USER }}
ssh_private_key: ${{ secrets.NEUROJ_SERVER_SSH_KEY }}
local_path: "./build/*"
remote_path: "/var/www/html/dev/${{ env.branch_name }}/"
remote_path: "${{ secrets.NEUROJ_CI_PATH }}/${{ env.BRANCH_NAME }}"
32 changes: 0 additions & 32 deletions .github/workflows/netlify-deploy.yml
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ jobs:
- name: Install dependencies
run: yarn install

- name: Run Linter (Report Issues)
run: yarn lint
# - name: Run Linter (Report Issues)
# run: yarn lint

- name: Compile TypeScript
run: yarn build
run: |
PUBLIC_URL="/dev/${{ github.head_ref }}/" yarn build

- name: Run Security Audit
run: yarn audit --level moderate
11 changes: 8 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
"private": true,
"dependencies": {
"3d-force-graph": "^1.73.4",
"@babel/helpers": "7.26.10",
"@babel/runtime": "7.26.10",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.14.3",
Expand All @@ -16,7 +18,7 @@
"@types/react": "^18.0.0",
"@types/react-dom": "^18.0.0",
"@types/three": "^0.169.0",
"axios": "^1.4.0",
"axios": "1.8.2",
"dayjs": "^1.11.10",
"jwt-decode": "^3.1.2",
"query-string": "^8.1.0",
Expand Down Expand Up @@ -50,7 +52,8 @@
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
"eject": "react-scripts eject",
"lint": "eslint 'src/**/*.{js,jsx,ts,tsx}' --ext .js,.jsx,.ts,.tsx"
},
"browserslist": {
"production": [
Expand All @@ -66,6 +69,8 @@
},
"resolutions": {
"postcss": "^8.4.31",
"nth-check": "^2.0.1"
"nth-check": "^2.0.1",
"@babel/runtime": "7.26.10",
"@babel/helpers": "7.26.10"
}
}
18 changes: 12 additions & 6 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,14 @@
<html lang="es">
<head>
<meta charset="utf-8" />
<link
rel="icon"
href="io_fav.png"
/>
<link rel="icon" href="io_fav.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>

<!--
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
Expand All @@ -27,6 +24,8 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
Expand All @@ -35,8 +34,15 @@
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,700&display=swap"
/>
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap" rel="stylesheet">

<link
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Raleway:wght@100..900&family=Ubuntu:wght@300;400;500;700&display=swap"
rel="stylesheet"
/>

<title>NeuroJSON.io - Free Data Worth Sharing</title>
</head>
Expand Down
14 changes: 7 additions & 7 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import theme from "design/theme";
import { BrowserRouter } from "react-router-dom";

const App = () => {
return (
<ThemeProvider theme={theme}>
<BrowserRouter>
<Routes />
</BrowserRouter>
</ThemeProvider>
);
return (
<ThemeProvider theme={theme}>
<BrowserRouter basename={process.env.PUBLIC_URL}>
<Routes />
</BrowserRouter>
</ThemeProvider>
);
};

export default App;
Loading