diff --git a/docker-compose.yml b/docker-compose.yml index 22e8f95..a03af21 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,11 +3,12 @@ services: digifi-bko: build: context: . - dockerfile: Dockerfile - #dockerfile: docker/Dockerfile + # dockerfile: Dockerfile + dockerfile: docker/Dockerfile restart: unless-stopped ports: - 6032:4173 + - 6033:5173 working_dir: /usr/src/app volumes: - ./:/usr/src/app diff --git a/docker/Dockerfile b/docker/Dockerfile index 52ea100..f43014f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,23 +1,22 @@ -# pull official base image -#FROM node:13.12.0-alpine -FROM node:18.19.0-alpine -# set working directory -WORKDIR /usr/src/app +# FROM node:erbium +# pull the base image +# FROM node:alpine +FROM node:18-alpine -ENV PATH /usr/src/app/node_modules/.bin:$PATH +WORKDIR /app -# install app dependencies -COPY package.json ./ -#COPY package-lock.json ./ -RUN npm install --silent -# RUN npm install react-scripts@3.4.1 -g --silent +COPY package.json . -# add app -COPY . ./ -RUN npm run build +RUN npm install + +COPY . . + +RUN npm run build + +CMD [ "npm", "run", "dev" ,"--", "--host"] # start app #CMD ["npm","run", "start"] -CMD ["npm","run", "preview"] +#CMD ["npm","run", "preview"] diff --git a/package.json b/package.json index 1e85c88..3f0c59d 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "bootstrap-icons": "^1.11.3", "chart.js": "4.4.2", "clsx": "2.1.1", + "eslint": "^8.57.0", "formik": "2.4.5", "line-awesome": "1.3.0", "nouislider": "15.7.1", @@ -42,6 +43,7 @@ "react-table": "^7.8.0", "react-topbar-progress-indicator": "4.1.1", "socicon": "3.0.5", + "typescript-eslint": "^7.7.1", "yup": "^1.4.0" }, "devDependencies": { @@ -56,14 +58,9 @@ "@types/react-dom": "^18.2.25", "@types/react-table": "^7.7.20", "@types/sass-loader": "8.0.8", - "@typescript-eslint/eslint-plugin": "^18.18.0", - "@typescript-eslint/parser": "^18.18.0", "@vitejs/plugin-react-swc": "^3.6.0", "css-loader": "7.1.1", "del": "7.1.0", - "eslint": "^9.1.1", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.4.6", "mini-css-extract-plugin": "2.9.0", "remove-files-webpack-plugin": "^1.5.0", "rtlcss-webpack-plugin": "4.0.7", diff --git a/src/app/modules/wizards/components/Horizontal.tsx b/src/app/modules/wizards/components/Horizontal.tsx index 0411713..08fdf89 100644 --- a/src/app/modules/wizards/components/Horizontal.tsx +++ b/src/app/modules/wizards/components/Horizontal.tsx @@ -96,7 +96,7 @@ const Horizontal: FC = () => { {() => ( -
+
diff --git a/src/app/modules/wizards/components/Vertical.tsx b/src/app/modules/wizards/components/Vertical.tsx index 6d58c43..b46fb85 100644 --- a/src/app/modules/wizards/components/Vertical.tsx +++ b/src/app/modules/wizards/components/Vertical.tsx @@ -207,7 +207,7 @@ const Vertical = () => {
{() => ( - +