Skip to content

Commit 2bd712b

Browse files
Hari KiranHari Kiran
Hari Kiran
authored and
Hari Kiran
committed
Resolved merge conflicts after applying stash
2 parents 0658e77 + 2949c49 commit 2bd712b

File tree

17 files changed

+1765
-1056
lines changed

17 files changed

+1765
-1056
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- dev-fan
88
- dev_mario
99
- dev_fang
10+
- staging
1011

1112
jobs:
1213
deploy:
@@ -37,4 +38,4 @@ jobs:
3738
username: ${{ secrets.NEUROJ_SERVER_USER }}
3839
ssh_private_key: ${{ secrets.NEUROJ_SERVER_SSH_KEY }}
3940
local_path: "./build/*"
40-
remote_path: "${{ secrets.NEUROJ_CI_PATH }}/${{ env.BRANCH_NAME }}"
41+
remote_path: "${{ secrets.NEUROJ_CI_PATH }}/${{ env.BRANCH_NAME }}"

‎.github/workflows/validate.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,12 @@ jobs:
2323
- name: Install dependencies
2424
run: yarn install
2525

26-
- name: Run Linter (Report Issues)
27-
run: yarn lint
26+
# - name: Run Linter (Report Issues)
27+
# run: yarn lint
2828

2929
- name: Compile TypeScript
30-
run: yarn build
30+
run: |
31+
PUBLIC_URL="/dev/${{ github.head_ref }}/" yarn build
3132
3233
- name: Run Security Audit
3334
run: yarn audit --level moderate

‎package.json‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@craco/craco": "^7.1.0",
6+
"3d-force-graph": "^1.73.4",
7+
"@babel/helpers": "7.26.10",
8+
"@babel/runtime": "7.26.10",
79
"@emotion/react": "^11.11.1",
810
"@emotion/styled": "^11.11.0",
911
"@mui/icons-material": "^5.14.3",
@@ -16,7 +18,6 @@
1618
"@types/react": "^18.0.0",
1719
"@types/react-dom": "^18.0.0",
1820
"@types/three": "^0.174.0",
19-
"3d-force-graph": "^1.73.4",
2021
"ajv": "^8",
2122
"ajv-keywords": "^5",
2223
"axios": "^1.4.0",
@@ -59,11 +60,12 @@
5960
"prettier": "^2.3.1"
6061
},
6162
"scripts": {
62-
"start": "craco start",
63-
"build": "craco build",
64-
"test": "craco test",
65-
"eject": "craco eject"
66-
},
63+
"start": "craco start || react-scripts start",
64+
"build": "craco build || react-scripts build",
65+
"test": "craco test || react-scripts test",
66+
"eject": "craco eject || react-scripts eject",
67+
"lint": "eslint 'src/**/*.{js,jsx,ts,tsx}' --ext .js,.jsx,.ts,.tsx"
68+
},
6769
"browserslist": {
6870
"production": [
6971
">0.2%",
@@ -79,6 +81,7 @@
7981
"resolutions": {
8082
"postcss": "^8.4.31",
8183
"nth-check": "^2.0.1",
82-
"three": "0.174.0"
84+
"@babel/runtime": "7.26.10",
85+
"@babel/helpers": "7.26.10"
8386
}
8487
}

‎public/index.html‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,14 @@
22
<html lang="es">
33
<head>
44
<meta charset="utf-8" />
5-
<link
6-
rel="icon"
7-
href="io_fav.png"
8-
/>
5+
<link rel="icon" href="io_fav.png" />
96
<meta name="viewport" content="width=device-width, initial-scale=1" />
107
<meta name="theme-color" content="#000000" />
118
<meta
129
name="description"
1310
content="Web site created using create-react-app"
1411
/>
15-
12+
1613
<!--
1714
manifest.json provides metadata used when your web app is installed on a
1815
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
@@ -27,6 +24,8 @@
2724
work correctly both with client-side routing and a non-root public URL.
2825
Learn how to configure a non-root public URL by running `npm run build`.
2926
-->
27+
<link rel="preconnect" href="https://fonts.googleapis.com" />
28+
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
3029
<link
3130
rel="stylesheet"
3231
href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap"
@@ -35,8 +34,15 @@
3534
rel="stylesheet"
3635
href="https://fonts.googleapis.com/css?family=Poppins:300,400,500,700&display=swap"
3736
/>
38-
<link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap" rel="stylesheet">
3937

38+
<link
39+
href="https://fonts.googleapis.com/css2?family=IBM+Plex+Sans:wght@400;500;700&display=swap"
40+
rel="stylesheet"
41+
/>
42+
<link
43+
href="https://fonts.googleapis.com/css2?family=Raleway:[email protected]&family=Ubuntu:wght@300;400;500;700&display=swap"
44+
rel="stylesheet"
45+
/>
4046

4147
<title>NeuroJSON.io - Free Data Worth Sharing</title>
4248
</head>

‎src/App.tsx‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import theme from "design/theme";
44
import { BrowserRouter } from "react-router-dom";
55

66
const App = () => {
7-
return (
8-
<ThemeProvider theme={theme}>
9-
<BrowserRouter basename={process.env.PUBLIC_URL}>
10-
<Routes />
11-
</BrowserRouter>
12-
</ThemeProvider>
13-
);
7+
return (
8+
<ThemeProvider theme={theme}>
9+
<BrowserRouter basename={process.env.PUBLIC_URL}>
10+
<Routes />
11+
</BrowserRouter>
12+
</ThemeProvider>
13+
);
1414
};
1515

1616
export default App;

0 commit comments

Comments
 (0)