소스 검색

Merge branch 'master' of http://git.hghweb.ir/ali.s/palizvani-front-vite into production

hgh 1 년 전
부모
커밋
4cd13ff4f1

+ 50 - 0
TempDockerfile

@@ -0,0 +1,50 @@
+FROM node:20.9-alpine AS prebuild
+
+# Set working directory
+WORKDIR /var/www/app
+
+COPY ./package*.json ./
+
+# Install dependencies
+RUN yarn install --production --frozen-lockfile
+
+ARG APP_API_SERVER=https://temp.shahidpalizvani.ir/api
+ARG VUEX_PERSISTED_STATE_KEY=vuex
+ARG GET_TIME_SERVER=/time
+ARG APP_API=/api
+ARG NGINX_PORT=80
+ARG SSR_PORT=3000
+ARG APP_ENV=production
+ARG GOOGLE_TAG_MANAGER_TOKEN=GTM-PNP1111
+ARG HEAP_MEMORY_ALLOCATION_INTERVAL=10000
+ARG MAX_HEAP_MEMORY_ALLOCATION_IN_PERCENT=70
+ARG LOG_REQUEST=true
+
+# Copy all files
+COPY ./ ./
+
+# Build app on SSR mode
+RUN yarn build:ssr
+
+
+##############################################
+
+
+FROM node:20.9-alpine
+
+
+COPY --from=prebuild /var/www/app/dist/ssr /var/www/app/dist/ssr
+
+WORKDIR /var/www/app/dist/ssr
+
+RUN yarn install
+
+# Expose the listening port
+#EXPOSE  ${PORT}
+
+# Run container as non-root (unprivileged) user
+# The "node" user is provided in the Node.js Alpine base image
+
+USER node
+
+CMD ["node", "/var/www/app/dist/ssr/index.js"]

+ 11 - 2
src/components/Widgets/Other/Shop/ShopApplyDiscount/ShopApplyDiscount.vue

@@ -60,7 +60,7 @@
           بازبینی
         </span>
       </div>
-      <div v-if="$route.query.type !== 'enrollment'"
+      <div v-if="showPayStage"
            class="apply-discount-step">
         <svg xmlns="http://www.w3.org/2000/svg"
              width="20.639"
@@ -127,7 +127,7 @@
             </div>
           </div>
         </div>
-        <discount v-if="$route.query.type !== 'enrollment' && classroom.price !== 0"
+        <discount v-if="showDiscountSection"
                   :target-id="classroom.id"
                   :target="getTarget"
                   @set-discount="setDiscount" />
@@ -205,6 +205,15 @@ export default {
       } else {
         return 'NAV'
       }
+    },
+    usageIcon () {
+      return 'inventory_2'
+    },
+    showDiscountSection () {
+      return this.$route.query.type !== 'enrollment' && this.classroom.price !== 0
+    },
+    showPayStage () {
+      return this.$route.query.type !== 'enrollment'
     }
   },
   watch: {

+ 4 - 1
src/components/Widgets/Other/Shop/ShopCompleteInfo/ShopCompleteInfo.vue

@@ -40,7 +40,7 @@
           بازبینی
         </span>
       </div>
-      <div v-if="$route.query.type !== 'enrollment'"
+      <div v-if="showPayStage"
            class="complete-info-step">
         <svg xmlns="http://www.w3.org/2000/svg"
              width="20.639"
@@ -308,6 +308,9 @@ export default {
     },
     selectedLivingProvince () {
       return FormBuilderAssist.getInputsByName(this.inputs, 'living_province').value
+    },
+    showPayStage () {
+      return this.$route.query.type !== 'enrollment'
     }
   },
   watch: {

+ 13 - 0
temp-docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.8"
+
+services:
+  palizvani-front-containter3100:
+    image: temp-palizvani-front-image:latest
+    environment:
+      - PORT=3100
+    ports:
+      - "3100:3100"
+    container_name: palizvani-front-containter3100_container
+    restart: always
+
+