Merge pull request #28 from nomad-nmr/vite

Vite + AntD 5

Author: tomlebl

Dockerfile.serv

@@ -4,30 +4,29 @@ WORKDIR /app
 
 COPY ./nomad-front-end/package.json .
 
-RUN npm install --legacy-peer-deps
+RUN npm install 
 
 COPY ./nomad-front-end .
 
-ENV SKIP_PREFLIGHT_CHECK=true
-ENV PORT=3000
+# ENV SKIP_PREFLIGHT_CHECK=true
+# ENV PORT=3000
 #following setting should work for hosting of whole NOMAD app on one machine using nginx reverse proxy 
-ENV REACT_APP_API_URL=/api
-ENV REACT_APP_NMRIUM_URL=/nmrium
+ENV VITE_API_URL=/api
+ENV VITE_NMRIUM_URL=/nmrium
 
 #Set true if NOMAD submission is used
-ENV REACT_APP_SUBMIT_ON=true
-ENV REACT_APP_BATCH_SUBMIT_ON=true
-ENV REACT_APP_DATASTORE_ON=true 
+ENV VITE_SUBMIT_ON=true
+ENV VITE_BATCH_SUBMIT_ON=true
+ENV VITE_DATASTORE_ON=true 
 
-RUN npm run build-docker
+RUN npm run build
 
 
 FROM node:16 as nmrium
 
 WORKDIR /app
 
 COPY ./nomad-nmrium/package.json .
-COPY ./nomad-nmrium/package-lock.json .
 
 RUN npm install 
 
@@ -38,7 +37,7 @@ RUN npm run build
 
 FROM nginx:stable-alpine
 
-COPY --from=frontend /app/build /react-builds/frontend
+COPY --from=frontend /app/dist /react-builds/frontend
 
 COPY --from=nmrium /app/dist /react-builds/nmrium
 

Dockerfile.serv-tls

@@ -4,30 +4,29 @@ WORKDIR /app
 
 COPY ./nomad-front-end/package.json .
 
-RUN npm install --legacy-peer-deps
+RUN npm install 
 
 COPY ./nomad-front-end .
 
-ENV SKIP_PREFLIGHT_CHECK=true
-ENV PORT=3000
+# ENV SKIP_PREFLIGHT_CHECK=true
+# ENV PORT=3000
 #following setting should work for hosting of whole NOMAD app on one machine using nginx reverse proxy 
-ENV REACT_APP_API_URL=/api
-ENV REACT_APP_NMRIUM_URL=/nmrium
+ENV VITE_API_URL=/api
+ENV VITE_NMRIUM_URL=/nmrium
 
 #Set true if NOMAD submission is used
-ENV REACT_APP_SUBMIT_ON=true
-ENV REACT_APP_BATCH_SUBMIT_ON=true
-ENV REACT_APP_DATASTORE_ON=true 
+ENV VITE_SUBMIT_ON=true
+ENV VITE_BATCH_SUBMIT_ON=true
+ENV VITE_DATASTORE_ON=true 
 
-RUN npm run build-docker
+RUN npm run build
 
 
 FROM node:16 as nmrium
 
 WORKDIR /app
 
 COPY ./nomad-nmrium/package.json .
-COPY ./nomad-nmrium/package-lock.json .
 
 RUN npm install 
 
@@ -38,7 +37,7 @@ RUN npm run build
 
 FROM nginx:stable-alpine
 
-COPY --from=frontend /app/build /react-builds/frontend
+COPY --from=frontend /app/dist /react-builds/frontend
 
 COPY --from=nmrium /app/dist /react-builds/nmrium
 

README.md

@@ -6,7 +6,7 @@ Server side code for [NOMAD system](https://www.nomad-nmr.uk/) made out of three
 
 ### nomad-front-end
 
-React front-end bootstrapped with **[Create React App](https://github.com/facebook/create-react-app)**.
+React front-end bootstrapped with **[Vite JS](https://vitejs.dev/)**.
 
 ### nomad-rest-api
 

env-example/frontend.env

@@ -1,9 +1,7 @@
-SKIP_PREFLIGHT_CHECK=true
-PORT=3003
-REACT_APP_API_URL=http://localhost:8080
-REACT_APP_NMRIUM_URL=http://localhost:3000
+VITE_API_URL=http://localhost:8080
+VITE_NMRIUM_URL=http://localhost:3000
 
 #Set true if corresponding NOMAD modules are used
-REACT_APP_SUBMIT_ON=true
-REACT_APP_BATCH_SUBMIT_ON=true
-REACT_APP_DATASTORE_ON=true
+VITE_SUBMIT_ON=true
+VITE_BATCH_SUBMIT_ON=true
+VITE_DATASTORE_ON=true

nomad-front-end/.dockerignore

@@ -1,5 +1,5 @@
 node_modules
-build
+dist
 Dockerfile
 README.md
 .git

nomad-front-end/.gitignore

@@ -1,24 +1,24 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# misc
-/config
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
+# Logs
+logs
+*.log
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

nomad-front-end/Dockerfile

@@ -4,11 +4,10 @@ WORKDIR /app
 
 COPY package.json /app/
 
-#--legacy-peer-deps for CRACO being able to use react-scripts@4.0.0 as dev dependency 
-RUN npm install --legacy-peer-deps
+RUN npm install 
 
 ## next line allows to avoid overwriting node_modules using anonymous volume
-RUN mkdir node_modules/.cache && chmod -R 777 node_modules/.cache
+RUN chown -R node.node /app/node_modules
 
 COPY . .
 

nomad-front-end/README.md

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="/favicon.ico" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>NOMAD 3</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/index.jsx"></script>
+  </body>
+</html>