diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..e69de29 diff --git a/.gitignore b/.gitignore index a93a63a..87df3b4 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ package-lock.json package.json yarn.lock package-lock.json +package-lock.json diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..be0280b --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,46 @@ +steps: + - name: setup + image: node:22-alpine + commands: + - apk update && apk add git + - npm i typescript -g + - npm install + - echo '✅ success setup project' + when: + branch: + - main + + - name: build-swagger + image: node:22-alpine + environment: + NODE_ENV: prod + commands: + - npm run swagger + when: + branch: + - main + + - name: build-src + image: node:22-alpine + environment: + NODE_ENV: prod + commands: + - npm i typescript -g + - npm run build:production + - echo '✅ success compile typescript and ready to deploy' + when: + branch: + - main + + - name: deploy + image: docker + commands: + - docker builder prune -f + - docker container prune -f + - docker-compose build + - docker-compose up -d --no-deps --build --remove-orphans + volumes: + - /var/run/docker.sock:/var/run/docker.sock + when: + branch: + - main diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..8fbc672 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,39 @@ +FROM node:22-alpine AS base + +RUN apk update && apk add git + +COPY package.json ./ + +RUN npm install +RUN npm install typescript -g + +# add folder if needs more +COPY src ./src +COPY public ./public + +COPY tsconfig.json ./tsconfig.json +COPY tsconfig.node.json ./tsconfig.node.json +COPY vite.config.ts ./vite.config.ts +COPY tailwind.config.js ./tailwind.config.js +COPY postcss.config.js ./postcss.config.js +COPY eslint.config.mjs ./eslint.config.mjs +COPY .env.production ./.env.production +COPY .prettierrc ./.prettierrc +COPY index.html ./index.html + +RUN npm run build:production + +FROM node:22-alpine + +# Copy node modules and build directory from base image to new image +COPY --from=base ./node_modules ./node_modules +COPY --from=base ./package.json ./package.json +COPY --from=base /dist /dist +COPY --from=base /src /src +COPY --from=base /public /public + +# Expose required port +FROM nginx:alpine +COPY --from=base /dist /usr/share/nginx/html + +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..4d02655 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.9' + +services: + api: + image: app-dashboard:1.0.1 + restart: always + container_name: app-dashboard + build: . + ports: + - '4040:80' # Specify the exposed port, we will need this to access the app from local machine + diff --git a/package.json b/package.json index 09bf451..43c45d3 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "styled-components": "^6.1.13", "stylis": "^4.3.4", "stylis-plugin-rtl": "^2.1.1", - "sweetalert2": "^11.19.1", + "sweetalert2": "^11.21.0", "tabs": "^0.2.0", "tailwind-merge": "^2.5.4", "tailwindcss-animate": "^1.0.7", diff --git a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx index 6a9dd4f..34e6b81 100644 --- a/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx +++ b/src/pages/transaction/history-transaction/blocks/DetailTransaction.tsx @@ -501,6 +501,11 @@ const DetailTransaction = () => {

Phone Number

{transactionDetails?.origin_msisdn}

+

{transactionDetails?.origin_customer?.fullname ?? transactionDetails?.origin_customer?.origin_name}

+
+
+

Phone Number

+

{transactionDetails?.origin_customer?.msisdn ?? transactionDetails?.origin_msisdn}

Email

diff --git a/src/pages/wallet/wallet-history/hooks/ManageWalletHistoryContext.tsx b/src/pages/wallet/wallet-history/hooks/ManageWalletHistoryContext.tsx index b1ad5b5..1431e45 100644 --- a/src/pages/wallet/wallet-history/hooks/ManageWalletHistoryContext.tsx +++ b/src/pages/wallet/wallet-history/hooks/ManageWalletHistoryContext.tsx @@ -182,16 +182,16 @@ const ManageWalletContextProvider = ({ children }: { children: React.ReactNode } headerClassName: 'w-[200px]' } }, - { - accessorFn: (row) => row.group?.is_bank, - id: 'is_bank', - header: ({ column }) => , - enableSorting: false, - enableHiding: false, - meta: { - headerClassName: 'w-[200px]' - } - } + // { + // accessorFn: (row) => row.group?.is_bank, + // id: 'is_bank', + // header: ({ column }) => , + // enableSorting: false, + // enableHiding: false, + // meta: { + // headerClassName: 'w-[200px]' + // } + // } ], [] );