Merge remote-tracking branch 'origin/main' into efril

.idea/.gitignore

@@ -0,0 +1,5 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="Stylelint" enabled="true" level="ERROR" enabled_by_default="true" />
+  </profile>
+</component>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/pos-dashboard-v2.iml" filepath="$PROJECT_DIR$/.idea/pos-dashboard-v2.iml" />
+    </modules>
+  </component>
+</project>

.idea/pos-dashboard-v2.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

Dockerfile

@@ -0,0 +1,52 @@
+# Build stage
+FROM node:18-alpine AS builder
+WORKDIR /app
+
+# Build arguments for environment variables
+ARG NEXT_PUBLIC_APP_URL
+ARG NEXT_PUBLIC_DOCS_URL
+ARG NEXT_PUBLIC_API_URL
+ARG API_URL
+ARG BASEPATH
+ARG MAPBOX_ACCESS_TOKEN
+
+# Set environment variables for build
+ENV API_URL=$API_URL
+ENV BASEPATH=$BASEPATH
+ENV MAPBOX_ACCESS_TOKEN=$MAPBOX_ACCESS_TOKEN
+ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL
+ENV NEXT_PUBLIC_DOCS_URL=$NEXT_PUBLIC_DOCS_URL
+ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
+
+# Copy all files first
+COPY . .
+
+# Install dependencies
+RUN npm ci
+
+# Build icons
+RUN npm run build:icons
+
+# Build the application without linting
+RUN npm run build:no-lint
+
+# Production stage
+FROM node:18-alpine AS runner
+WORKDIR /app
+
+ENV NODE_ENV=production
+
+RUN addgroup -g 1001 -S nodejs
+RUN adduser -S nextjs -u 1001
+
+COPY --from=builder /app/public ./public
+COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+
+USER nextjs
+
+EXPOSE 8080
+
+ENV PORT=8080
+
+CMD ["node", "server.js"]

deployment.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+APP_NAME="apskel-frontend"
+PORT="8080"
+
+echo "🔄 Pulling latest code..."
+git pull
+
+echo "🐳 Building Docker image..."
+docker build -t apskel-frontend .
+
+docker stop $APP_NAME 2>/dev/null
+docker rm $APP_NAME 2>/dev/null
+
+docker run -d --name $APP_NAME \
+  -p 8080:$PORT \
+  $APP_NAME:latest
+
+echo "✅ Deployment complete."

next.config.ts

@@ -1,29 +1,34 @@
 import type { NextConfig } from 'next'
 
 const nextConfig: NextConfig = {
+  output: 'standalone',
   basePath: process.env.BASEPATH,
-  redirects: async () => {
+  eslint: {
-    return [
+    ignoreDuringBuilds: true,
-      {
+  },
-        source: '/',
+  typescript: {
-        destination: '/en/dashboards/overview',
+    ignoreBuildErrors: true,
-        permanent: true,
+  },
-        locale: false
+  redirects: async () => [
-      },
+    {
-      {
+      source: '/',
-        source: '/:lang(en|fr|ar)',
+      destination: '/en/dashboards/overview',
-        destination: '/:lang/dashboards/overview',
+      permanent: true,
-        permanent: true,
+      locale: false,
-        locale: false
+    },
-      },
+    {
-      {
+      source: '/:lang(en|fr|ar)',
-        source: '/((?!(?:en|fr|ar|front-pages|favicon.ico)\\b)):path',
+      destination: '/:lang/dashboards/overview',
-        destination: '/en/:path',
+      permanent: true,
-        permanent: true,
+      locale: false,
-        locale: false
+    },
-      }
+    {
-    ]
+      source: '/((?!(?:en|fr|ar|front-pages|favicon.ico)\\b)):path',
-  }
+      destination: '/en/:path',
+      permanent: true,
+      locale: false,
+    }
+  ],
 }
 
 export default nextConfig

package-lock.json

@@ -25,6 +25,7 @@
         "@fullcalendar/react": "6.1.15",
         "@fullcalendar/timegrid": "6.1.15",
         "@hookform/resolvers": "3.9.1",
+        "@iconify/react": "^6.0.1",
         "@mui/lab": "6.0.0-beta.19",
         "@mui/material": "6.2.1",
         "@mui/material-nextjs": "6.2.1",
@@ -1308,6 +1309,21 @@
         "pathe": "^1.1.2"
       }
     },
+    "node_modules/@iconify/react": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@iconify/react/-/react-6.0.1.tgz",
+      "integrity": "sha512-fCocnAfiGXjrA0u7KkS3W/OQHNp9LRFICudvOtxmS3Mf7U92aDhP50wyzRbobZli51zYt9ksZ9g0J7H586XvOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@iconify/types": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/cyberalien"
+      },
+      "peerDependencies": {
+        "react": ">=16"
+      }
+    },
     "node_modules/@iconify/tools": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/@iconify/tools/-/tools-4.1.1.tgz",
@@ -1332,7 +1348,6 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
       "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@iconify/utils": {

package.json

@@ -11,7 +11,8 @@
     "lint:fix": "next lint --fix",
     "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
     "build:icons": "tsx src/assets/iconify-icons/bundle-icons-css.ts",
-    "removeI18n": "tsx src/remove-translation-scripts/index.ts"
+    "removeI18n": "tsx src/remove-translation-scripts/index.ts",
+    "build:no-lint": "NEXT_DISABLE_ESLINT=true NEXT_DISABLE_TYPECHECK=true next build"
   },
   "dependencies": {
     "@emoji-mart/data": "1.2.1",
@@ -30,6 +31,7 @@
     "@fullcalendar/react": "6.1.15",
     "@fullcalendar/timegrid": "6.1.15",
     "@hookform/resolvers": "3.9.1",
+    "@iconify/react": "^6.0.1",
     "@mui/lab": "6.0.0-beta.19",
     "@mui/material": "6.2.1",
     "@mui/material-nextjs": "6.2.1",

src/components/layout/horizontal/HorizontalMenu.tsx

@@ -97,8 +97,8 @@ const HorizontalMenu = ({ dictionary }: { dictionary: Awaited<ReturnType<typeof
           <MenuItem href={`/${locale}/dashboards/analytics`} icon={<i className='tabler-trending-up' />}>
             {dictionary['navigation'].analytics}
           </MenuItem>
-          <MenuItem href={`/${locale}/dashboards/ecommerce`} icon={<i className='tabler-shopping-cart' />}>
+          <MenuItem href={`/${locale}/dashboards/inventory`} icon={<i className='tabler-shopping-cart' />}>
-            {dictionary['navigation'].eCommerce}
+            {dictionary['navigation'].inventory}
           </MenuItem>
           <MenuItem href={`/${locale}/dashboards/academy`} icon={<i className='tabler-school' />}>
             {dictionary['navigation'].academy}

src/services/api.ts

@@ -6,7 +6,7 @@ const getToken = () => {
 }
 
 export const api = axios.create({
-  baseURL: process.env.NEXT_PUBLIC_API_URL,
+  baseURL: 'https://api-pos.apskel.id/api/v1',
   headers: {
     'Content-Type': 'application/json'
   },

src/views/apps/ecommerce/stock/adjustment/AdjustmentStockDrawer.tsx

@@ -151,7 +151,7 @@ const AdjustmentStockDrawer = (props: Props) => {
             onChange={e => setFormData({ ...formData, items: [{ ...formData.items[0], item_type: e.target.value }] })}
           >
             <MenuItem value='PRODUCT'>Product</MenuItem>
-            <MenuItem value='IGREDIENT'>Ingredient</MenuItem>
+            {/* <MenuItem value='IGREDIENT'>Ingredient</MenuItem> */}
           </CustomTextField>
           <Autocomplete
             options={options}

src/views/dashboards/daily-report/report-generator.tsx

@@ -485,7 +485,7 @@ const ReportGeneratorComponent: React.FC<ReportGeneratorProps> = ({
         </Box>
 
         <InfoBox>
-          <Typography variant='body2' sx={{ color: textSecondary }}>
+          <Typography variant='body2' component='div' sx={{ color: textSecondary }}>
             {labels.periodLabel || 'Periode:'}{' '}
             <Chip
               label={getPeriodText()}