Skip to content
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

Update to V5.0.0 #10

Merged
merged 87 commits into from
Feb 16, 2024
Merged

Update to V5.0.0 #10

merged 87 commits into from
Feb 16, 2024

Conversation

wduckitt
Copy link
Member

This pull request brings in the changes for V5.0.0 from the master repo.

@wduckitt
Add Vite configuration file
1d0fe60
@wduckitt
Update dependencies and scripts in package.json
9061f19
@wduckitt
Add index.html for ReactApp
d00bffe
@wduckitt
rename
7d52c15
@wduckitt
rename
5f63755
@wduckitt
removed
f1f36cd
@wduckitt
Update CALC version to R3-7-5
7a78237
@wduckitt
Add new routes to AppRoutes.jsx
bdbb338
@wduckitt
Add new components and remove unused code
a436cc1
@wduckitt
add vite main
7cfdcb3
@wduckitt
Update Dockerfile to use Ubuntu 22.04 and newer EPICS versions
4c63967
@wduckitt
Update Node version and modify npm start command
b3a9223
@wduckitt
Update EPICS base version and environment variables
07362c6
@wduckitt
Update file paths and versions in docker-compose-dev-styleguide-dev.yml
c608a05
@wduckitt
Update Dockerfile to use Ubuntu 22.04 and newer EPICS versions
3c4aff9
@wduckitt
Remove base href from index.html
78a87d0
@wduckitt
Update docker-compose file for frontend server development environment
8065c88
@wduckitt
Update React-Automation-Studio alias path
cd58cdd
@wduckitt
Update jsconfig.json with new paths
af4744e
@wduckitt
Update React Automation Studio version to V5.0.0
f530410
@wduckitt
Update environment variables
79dcff0
@wduckitt
Update environment variable names for login options
1ed2266
@wduckitt
Update environment variables in Dockerfile
b5acda3
@wduckitt
Update nginx and mongo versions
6e3eecc
@wduckitt
Update nginx and mongo versions
cd325aa
@wduckitt
Update docker-compose-dev.yml file
c42af53
@wduckitt
Update Dockerfile for frontend
6f0cebd
@wduckitt
Update docker-compose-dev-styleguide-dev.yml
ab42fca
@wduckitt
Add Dockerfile for storybook server and update Node version
c90e3df
@wduckitt
Add ReactApp .storybook files
8cb9714
@wduckitt
Add areaDetectorSim service to docker-compose file
1aef9e4
@wduckitt
Add AreaDetectorSimExample route to AppRoutes.jsx
f770ebb
@wduckitt
Add areadetectorsim service to docker-compose file
5cc8c2b
@wduckitt
Add areadetectorsim service to docker-compose-dev.yml
7872976
@wduckitt
Add EPICS_CA_ADDR_LIST entry for port 8005
b899f4d
@wduckitt
Merge branch 'V5WithStoryBook' of github.com:React-Automation-Studio/…
3b1af1d 
…React-Automation-Studio-Example-Project-1 into V5WithStoryBook
@wduckitt
Refactor routes in AppRoutes.jsx
8472809
@wduckitt
Fix import paths in AppMain.jsx
4e744a3
@wduckitt
Update import paths in AppRoutes.jsx
ea336ef
@wduckitt
Fix enableDemos condition in AppRoutes.jsx
faf20c6
@wduckitt
Update to version 5.0.0 with package updates, Epics 7 and Python 3.12…
f1ef9ea 
….1, and migration guide from V4.0.3 to V5.0.0.
@wduckitt
Update migration instructions and dependencies
b06d442
@wduckitt
Update React-Automation-Studio submodule commit reference
8ee7e07
@wduckitt
update to V5.0.0
39d4ce9
hanak
hanak approved these changes Feb 14, 2024
View reviewed changes
Copy link

@hanak hanak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the changes look good. I have added a few comments. Would it be possible to look at those, please? Then, approved.

ReactApp/src/AppRoutes.jsx Show resolved Hide resolved
ReactApp/src/AppRoutes.jsx Outdated Show resolved Hide resolved
ReactApp/src/components/staging/Example/Example2.jsx Show resolved Hide resolved
ReactApp/jsconfig.json Outdated Show resolved Hide resolved
ReactApp/vite.config.js Outdated Show resolved Hide resolved
docker/epicsBase/Dockerfile Outdated Show resolved Hide resolved
docker/epicsBase/Dockerfile Outdated Show resolved Hide resolved
@wduckitt wduckitt merged commit c889980 into master Feb 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hanak hanak hanak approved these changes

@justinabraham justinabraham Awaiting requested review from justinabraham

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@wduckitt @hanak