Skip to content

Update main with latest staging #77

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

Jump to bottom
Merged
elainefan331 merged 281 commits into from
Jul 24, 2025
Merged

Update main with latest staging #77

elainefan331 merged 281 commits into from
Jul 24, 2025

Conversation

@elainefan331
Copy link
Collaborator

@elainefan331 elainefan331 commented Jul 24, 2025

No description provided.

Hari Kiran and others added 30 commits March 12, 2025 12:43
Resolved conflits and pushing the changes
8715361
Fix: Added missing craco.config.js file
aede3ac
Fix: Added missing preview.js
725420b
Fix: Added missing PreviewModal.tsx
3116be8
Fix: Added missing DatasetFlashcards.tsx
5082fdd
Fix: Prevent Webpack from parsing displayed require() code
f0e8407
Fix:Prevent Webpack from parsing displayed require() code
45ebc47
Fix: Adjust Webpack config to handle dynamic dependencies
bc826d2
Fix: Suppressed Webpack critical dependency warning
2a32dcb
Fix: Disabled strict CI mode to allow warnings
8f8178a
Fix: Disabled strict CI mode to allow warnings
dcca5ec
Fix: Use CommonJS syntax in craco.config.js to avoid syntax errors
18dcd63
@elainefan331
change the background of landing page
5e27720
@elainefan331
style: updated backgrounk and theme colors for landing page and slide…
e3912b7 
…-in panel
@elainefan331
Add Raleway and Ubuntu fonts, and update typography settings
d59e18c
@elainefan331
Assign distinct colors to different datatypes and update node color r…
f9fc708 
…endering
@elainefan331
Revise the circle nodes layout to a constellation-style graph
881dd0d
@elainefan331
Update node sizing: replace fixed sizes with dataset-based dynamic sc…
0caca39 
…aling
@elainefan331
Update node links: refactored link logic to prioritize connections be…
948e99f 
…tween similar-colored nodes, ensuring links reflect shared datatypes and form tighter clusters.
@elainefan331
Update home page background
0644260
@elainefan331
modify build-deploy-zodiac.yml for deploy on zodiac
8b3ac8c
@elainefan331
Update GitHub Actions: Set PUBLIC_URL dynamically for branch-based de…
d5f8fc7 
…ployment
@elainefan331
Update GitHub Actions: Set PUBLIC_URL for dev-fan branch deployment
14f7e9b
Fix: Zodiac error
cdc9d63
Fix: Use the url as in old code instead of Proxy url
8449eb2
Fix: Github action and Handle Preview
e72fa26
@elainefan331
Update GitHub Actions: Set PUBLIC_URL dynamically for branch-based de…
fc6ceb8 
…ployment
@elainefan331
Fix validation workflow to include PUBLIC_URL
c010fe5
@elainefan331
Add lint script to package.json
08a646a
@elainefan331
Temporarily disable lint step to test the workflow
2678363
fangq and others added 29 commits July 10, 2025 12:35
@fangq
Merge branch 'dev-fan' into fangq
9c740c9
@elainefan331
feat: redesign About page intro section with side by side layout; refs …
52116be 
…#66
@elainefan331
Merge pull request #69 from NeuroJSON/dev-fan
ff26d4a 
test: deploy to neurojson.io
@elainefan331
fix: reduce the resolution of section3 png file
9712c98
@fangq
[nav] add V1 link for the old website
32aa911
@fangq
Merge pull request #70 from NeuroJSON/fangq
5131fe8 
Add V1 link to home page nav bar
@elainefan331
feat: add search icon in about page; refs #66
d6aeb48
@elainefan331
feat: add and position icons in about page; refs #66
3ee18cd
@fangq
[ci] update deployment branch names, main to production
6fd269f
@fangq
[css] update nav bar item css
7eb4a37
@fangq
Merge pull request #71 from NeuroJSON/fangq
9e9a225 
Adjust deployment branch mapping - main to production
@fangq
[video] remove video files from git, use external links
00d4481
@fangq
Merge branch 'fangq' into staging
53db753
@elainefan331
replace source of video with external video URL in about page
dc3146f
@elainefan331
fix: resolved incorrect code content in download tabs and added exter…
2bb796c 
…nal links for better reference
@elainefan331
fix: fix total file size calculation from external link URLs
16fb821
@elainefan331
clean DatasetDetailPage code
c9a8e2e
@elainefan331
feat: add a mp4 demo for section3; #50
019d4a7
@elainefan331
feat: redesign About page intro section with side by side layout; refs …
55d5196 
…#66
@elainefan331
fix: reduce the resolution of section3 png file
9a8f4b7
@elainefan331
Resolve merge conflicts from CSS/aboutPag
5b4629c
@elainefan331
add docId to useEffect array to force rerendering when dataset switch
5dabd84
@elainefan331
text: change externalLinks to links to calculate and set script size
a993b27
@elainefan331
feat: update the Download Dataset button to Download Matadata
2c3bd3e
@elainefan331
update the video url in home page and about page
684cd67
@elainefan331
update the htaccess file rewrite rules
ebc1195
@elainefan331
feat: add download metadata button to python and matlab local tabs
23e9d21
@elainefan331
Merge branch 'staging' into dev-fan
b76b7dc
@elainefan331
Merge pull request #75 from NeuroJSON/dev-fan
14f653f 
Add .htaccess for routing, fix file size display, and enable download button in API tabs
@elainefan331 elainefan331 merged commit 2b5a8d5 into main Jul 24, 2025
4 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elainefan331 @fangq @harikiranrommala