diff --git a/frontend/.env b/frontend/.env index a10f904..120c299 100644 --- a/frontend/.env +++ b/frontend/.env @@ -1,12 +1,12 @@ # ----------------------------- Local Environment ---------------------------- # NEXT_PUBLIC_WS_ENDPOINT="http://localhost:5000/" -NEXT_PUBLIC_ENTERPRISE_VERSION="false" +NEXT_PUBLIC_REST_ENDPOINT="http://localhost:8000" # ---------------------------------------------------------------------------- # # -------------------------- Production Environment -------------------------- # -#NEXT_PUBLIC_REST_ENDPOINT="https://demo.oktopus.app.br/api" +#NEXT_PUBLIC_REST_ENDPOINT="https://demo.oktopus.app.br/" #NEXT_PUBLIC_WS_ENDPOINT="https://demo.oktopus.app.br/" # ---------------------------------------------------------------------------- # diff --git a/frontend/build/Dockerfile.ce b/frontend/build/Dockerfile similarity index 86% rename from frontend/build/Dockerfile.ce rename to frontend/build/Dockerfile index 47d6f17..d50cb6b 100644 --- a/frontend/build/Dockerfile.ce +++ b/frontend/build/Dockerfile @@ -7,7 +7,7 @@ RUN rm .env && rm .env.local || true RUN npm install -RUN NEXT_PUBLIC_ENTERPRISE_VERSION="false" npm run build +RUN npm run build FROM node:18.18.0-alpine as runner diff --git a/frontend/build/Dockerfile.ee b/frontend/build/Dockerfile.ee deleted file mode 100644 index 403ebd5..0000000 --- a/frontend/build/Dockerfile.ee +++ /dev/null @@ -1,24 +0,0 @@ -FROM node:18.18.0-alpine as builder - -WORKDIR /app - -ARG GOOGLE_MAPS_API_KEY - -COPY ../ ./ -RUN rm .env && rm .env.local || true - -RUN npm install - -RUN NEXT_PUBLIC_ENTERPRISE_VERSION="true" NEXT_PUBLIC_GOOGLE_MAPS_KEY=${GOOGLE_MAPS_API_KEY} npm run build - -FROM node:18.18.0-alpine as runner - -WORKDIR /app - -COPY --from=builder /app/.next ./.next -COPY --from=builder /app/package.json ./package.json -COPY --from=builder /app/public ./public - -RUN npm install - -CMD [ "npm", "run", "start" ] \ No newline at end of file diff --git a/frontend/build/Makefile b/frontend/build/Makefile index b8ea587..38a87ad 100644 --- a/frontend/build/Makefile +++ b/frontend/build/Makefile @@ -21,13 +21,9 @@ help: @echo "release - tag image as latest and push to registry" build: - @docker build -t ${DOCKER_USER}/${DOCKER_APP}-ce:${DOCKER_TAG} -f Dockerfile.ce ../ - @docker build -t ${DOCKER_USER}/${DOCKER_APP}-ee:${DOCKER_TAG} -f Dockerfile.ee ../ + @docker build -t ${DOCKER_USER}/${DOCKER_APP}:${DOCKER_TAG} -f Dockerfile ../ release: build - @docker push ${DOCKER_USER}/${DOCKER_APP}-ce:${DOCKER_TAG} - @docker push ${DOCKER_USER}/${DOCKER_APP}-ee:${DOCKER_TAG} - @docker tag ${DOCKER_USER}/${DOCKER_APP}-ce:${DOCKER_TAG} ${DOCKER_USER}/${DOCKER_APP}-ce:latest - @docker tag ${DOCKER_USER}/${DOCKER_APP}-ee:${DOCKER_TAG} ${DOCKER_USER}/${DOCKER_APP}-ee:latest - @docker push ${DOCKER_USER}/${DOCKER_APP}-ce:latest - @docker push ${DOCKER_USER}/${DOCKER_APP}-ee:latest \ No newline at end of file + @docker push ${DOCKER_USER}/${DOCKER_APP}:${DOCKER_TAG} + @docker tag ${DOCKER_USER}/${DOCKER_APP}:${DOCKER_TAG} ${DOCKER_USER}/${DOCKER_APP}:latest + @docker push ${DOCKER_USER}/${DOCKER_APP}:latest \ No newline at end of file diff --git a/frontend/src/layouts/dashboard/side-nav.js b/frontend/src/layouts/dashboard/side-nav.js index 6209eee..dbde811 100644 --- a/frontend/src/layouts/dashboard/side-nav.js +++ b/frontend/src/layouts/dashboard/side-nav.js @@ -113,9 +113,6 @@ export const SideNav = (props) => { }} > {items.map((item) => { - if (item.title == "Map" && process.env.NEXT_PUBLIC_ENTERPRISE_VERSION != "true"){ - return - } const active = isItemActive(pathname, item.path); return ( diff --git a/frontend/src/pages/auth/login.js b/frontend/src/pages/auth/login.js index 41eb255..3b87ee7 100644 --- a/frontend/src/pages/auth/login.js +++ b/frontend/src/pages/auth/login.js @@ -131,12 +131,12 @@ const Page = () => { Login - {!(process.env.NEXT_PUBLIC_ENTERPRISE_VERSION == "true") && This project is open source, reach out at Github or Slack - } + {/*