Merge branch 'staging' of itcorp.primaya.id:rajif/aso into staging

Modules/HospitalPortal/Helpers/ApiResponse.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Modules\HospitalPortal\Helpers;
+
+class ApiResponse
+{
+    public static function apiResponse(string $status, array|object $data = null, string|array|object $message = null, int $statusCode)
+    {
+        if ($message instanceof \Illuminate\Support\MessageBag) {
+            $message = $message->first();
+        }
+        return response()->json([
+                'meta'          => [
+                    'status' => $status,
+                    'code' => $statusCode,
+                    'message' => $message
+                ],
+                'data' => $data,
+            ], $statusCode);
+    }
+}

Modules/HospitalPortal/Http/Controllers/Api/AuthController.php

@@ -12,33 +12,48 @@ use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Mail;
 use Modules\Internal\Emails\SendVerifyEmail;
 use Modules\Internal\Events\ForgetPassword;
+use Illuminate\Support\Facades\Validator;
+use Modules\HospitalPortal\Helpers\ApiResponse;
 
 class AuthController extends Controller
 {
     public function login(Request $request)
     {
-        $request->validate([
+        $data = [
+            'email' => $request->email,
+            'password' => $request->password
+        ];
+        $validator = Validator::make($request->all(), [
             'email' => 'required|email',
             'password' => 'required'
+        ], [
+            'email.required' => trans('validation.required',['attribute' => 'Email']),
+            'email.email' => trans('validation.email'),
+            'password.required' => trans('validation.required',['attribute' => 'Password']),
         ]);
 
-        $user = User::query()
+        if ($validator->fails())
-            ->where('email', $request->email)
+        {
-            ->first();
+           return ApiResponse::apiResponse('Bad Request', $data, $validator->errors(), 400);
-
-        if (!$user) {
-            return response(['message' => 'User Tidak Ditemukan'], 404);
         }
+        else
+        {
+            $user = User::where('email', $request->email)->first();
+            if (!$user) {
+                return ApiResponse::apiResponse('Not Found', $data, trans('message.not_found'), 404);
+            }
 
-        if (!Hash::check($request->password, $user->password)) {
+            if (!Hash::check($request->password, $user->password)) {
-            return response(['message' => 'Password Salah'], 403);
+                return ApiResponse::apiResponse('Bad Request', $data, trans('message.password'), 400);
+            }
+
+            $res_data = [
+                'user' => $user,
+                'token' => $user->createToken('app')->plainTextToken
+            ];
+
+            return ApiResponse::apiResponse("Success", $res_data, trans('message.success'), 200);
         }
-
-        return response([
-            'message' => 'Selamat Datang',
-            'user' => $user,
-            'token' => $user->createToken('app')->plainTextToken
-        ]);
     }
 
     public function logout(Request $request)

Modules/HospitalPortal/Http/Controllers/Api/MemberController.php

@@ -7,6 +7,8 @@ use App\Models\Member;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\Validator;
+use Modules\HospitalPortal\Helpers\ApiResponse;
 
 class MemberController extends Controller
 {
@@ -16,26 +18,37 @@ class MemberController extends Controller
      */
     public function search(Request $request)
     {
-        $request->validate([
+        $data = [
+            'no_polis' => $request->no_polis,
+            'birth_date' => $request->birth_date
+        ];
+        $validator = Validator::make($request->all(), [
             'no_polis' => 'required',
             'birth_date' => 'required'
+        ], [
+            'no_polis.required' => trans('validation.required',['attribute' => 'Member ID']),
+            'birth_date.required' => trans('validation.required',['attribute' => 'Birth Date']),
         ]);
-
+        if ($validator->fails())
-        $member = Member::query()
+        {
-                        ->where('member_id', $request->no_polis)
+            return ApiResponse::apiResponse('Bad Request', $data, $validator->errors(), 400);
-                        ->where('birth_date', $request->birth_date)
+        }
-                        ->with(['person', 'currentCorporate', 
+        else
-                            // 'currentCorporate.corporateServices' => function ($corporateService) {
+        {
-                            //     $corporateService->where('status', 'active');
+            $res_data = Member::query()
-                            // }, 
+                            ->where('member_id', $request->no_polis)
-                            // 'currentCorporate.corporateServices.service'
+                            ->where('birth_date', $request->birth_date)
-                            // 'currentPlan.benefits',
+                            ->with(['person', 'currentCorporate', 
-                            // 'currentPlan.corporateBenefit.plan',
+                                // 'currentCorporate.corporateServices' => function ($corporateService) {
-                            'currentPlan.corporateBenefits.benefit'
+                                //     $corporateService->where('status', 'active');
-                        ])
+                                // }, 
-                        ->firstOrFail();
+                                // 'currentCorporate.corporateServices.service'
-
+                                // 'currentPlan.benefits',
-            
+                                // 'currentPlan.corporateBenefit.plan',
-        return Helper::responseJson($member);
+                                'currentPlan.corporateBenefits.benefit'
+                            ])
+                            ->firstOrFail();
+            return ApiResponse::apiResponse("Success", $res_data, trans('message.success'), 200);
+        }
     }
 }

Modules/HospitalPortal/Http/Middleware/Authentication.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Modules\HospitalPortal\Http\Middleware;
+use Modules\HospitalPortal\Helpers\ApiResponse;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Facades\App;
+
+class Authentication
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $acceptHeader = $request->header('Accept');
+        $contentType = $request->header('Content-Type');
+        $locale = $request->header('Accept-Language');
+
+        // Add language
+        if(!$locale)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept-Language']), 401);
+        }
+        if($locale !== 'en-US' && $locale !== 'id-ID')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept-Language']), 400);
+        }
+        if ($locale === 'en-US')
+        {
+            App::setLocale('en');
+        } elseif ($locale === 'id-ID')
+        {
+            App::setLocale('id');
+        } else
+        {
+            App::setLocale('en');
+        }
+        
+        // Validate type accept & content type
+        if (!$acceptHeader)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept']), 401);
+        }
+        if (!$contentType)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Content-Type']), 401);
+        }
+        if ($acceptHeader !== 'application/json')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept']), 400);
+        }
+        if($contentType !== 'application/json')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Content-Type']), 400);
+        }
+        return $next($request);
+    }
+}

Modules/HospitalPortal/Http/Middleware/Authorization.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Modules\HospitalPortal\Http\Middleware;
+use Modules\HospitalPortal\Helpers\ApiResponse;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Illuminate\Support\Facades\App;
+
+class Authorization
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure(\Illuminate\Http\Request): (\Illuminate\Http\Response|\Illuminate\Http\RedirectResponse)  $next
+     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
+     */
+    public function handle(Request $request, Closure $next)
+    {
+        $acceptHeader = $request->header('Accept');
+        $contentType = $request->header('Content-Type');
+        $locale = $request->header('Accept-Language');
+        $authorization = $request->header('Authorization');
+
+        // Add language
+        if(!$locale)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept-Language']), 401);
+        }
+        if($locale !== 'en-US' && $locale !== 'id-ID')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept-Language']), 400);
+        }
+        if ($locale === 'en-US')
+        {
+            App::setLocale('en');
+        } elseif ($locale === 'id-ID')
+        {
+            App::setLocale('id');
+        } else
+        {
+            App::setLocale('en');
+        }
+
+        // Validate authorization
+        if (empty($authorization) || strpos($authorization, 'Bearer ') !== 0) {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Authorization']), 401);
+        }
+        
+        // Validate type accept & content type
+        if (!$acceptHeader)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Accept']), 401);
+        }
+        if (!$contentType)
+        {
+            return ApiResponse::apiResponse('Unauthorized', null, trans('validation.required', ['attribute' => 'Content-Type']), 401);
+        }
+        if ($acceptHeader !== 'application/json')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Accept']), 400);
+        }
+        if($contentType !== 'application/json')
+        {
+            return ApiResponse::apiResponse('Bad Request', null, trans('validation.invalid', ['attribute' => 'Content-Type']), 400);
+        }
+        return $next($request);
+    }
+}

Modules/HospitalPortal/Routes/api.php

@@ -5,6 +5,8 @@ use Modules\HospitalPortal\Http\Controllers\Api\AuthController;
 use Modules\HospitalPortal\Http\Controllers\Api\ClaimRequestController;
 use Modules\HospitalPortal\Http\Controllers\Api\MemberController;
 use Modules\HospitalPortal\Http\Controllers\ClaimController;
+use Modules\HospitalPortal\Http\Middleware\Authentication;
+use Modules\HospitalPortal\Http\Middleware\Authorization;
 
 /*
 |--------------------------------------------------------------------------
@@ -16,29 +18,39 @@ use Modules\HospitalPortal\Http\Controllers\ClaimController;
 | is assigned the "api" middleware group. Enjoy building your API!
 |
 */
+Route::prefix('v1')->group(function() {
+    Route::prefix('hospitalportal')->group(function () {
 
-Route::prefix('hospitalportal')->group(function () {
+        Route::middleware(Authentication::class)->group(function () {
-
+            Route::controller(AuthController::class)->group(function () {
-    Route::post('login', [AuthController::class, 'login'])->name('login');
+                Route::post('login', 'login');
-    Route::post('forget-password', [AuthController::class, 'forgetPassword'])->name('forget-password');
+            });
-    Route::post('verify-email', [AuthController::class, 'verifyEmail'])->name('verify-email');
-
-
-    Route::middleware('auth:sanctum')->group(function () {
-
-        Route::post('logout', [AuthController::class, 'logout'])->name('logout');
-        Route::get('/user', function (Request $request) {
-            return $request->user();
         });
-        Route::put('reset-password', [AuthController::class, 'resetPassword'])->name('resetPassword');
         
-        Route::get('claims', [ClaimController::class, 'index']);
+        //Route::post('forget-password', [AuthController::class, 'forgetPassword'])->name('forget-password');
+        //Route::post('verify-email', [AuthController::class, 'verifyEmail'])->name('verify-email');
 
-        Route::post('search-member', [MemberController::class, 'search']);
 
-        Route::get('claim-requests', [ClaimRequestController::class, 'index'])->name('claim-requests.index');
+        Route::middleware('auth:sanctum')->group(function () {
-        Route::post('claim-requests', [ClaimRequestController::class, 'store'])->name('claim-requests.store');
+
-        Route::get('claim-requests/{claim_request_id}/log', [ClaimRequestController::class, 'generateLog'])->name('claim-requests.generate-log');
+            Route::post('logout', [AuthController::class, 'logout'])->name('logout');
-        Route::get('claim-requests/{id}', [ClaimRequestController::class, 'show'])->name('claim-requests.show');
+            Route::get('/user', function (Request $request) {
+                return $request->user();
+            });
+            Route::put('reset-password', [AuthController::class, 'resetPassword'])->name('resetPassword');
+
+            Route::get('claims', [ClaimController::class, 'index']);
+
+            Route::middleware(Authorization::class)->group(function () {
+                Route::controller(MemberController::class)->group(function () {
+                    Route::post('search-member', 'search');
+                });
+            });
+
+            Route::get('claim-requests', [ClaimRequestController::class, 'index'])->name('claim-requests.index');
+            Route::post('claim-requests', [ClaimRequestController::class, 'store'])->name('claim-requests.store');
+            Route::get('claim-requests/{claim_request_id}/log', [ClaimRequestController::class, 'generateLog'])->name('claim-requests.generate-log');
+            Route::get('claim-requests/{id}', [ClaimRequestController::class, 'show'])->name('claim-requests.show');
+        });
     });
 });

app/Http/Middleware/Authenticate.php

@@ -2,7 +2,9 @@
 
 namespace App\Http\Middleware;
 
+use Closure;
 use Illuminate\Auth\Middleware\Authenticate as Middleware;
+use Illuminate\Support\Facades\Auth;
 
 class Authenticate extends Middleware
 {
@@ -18,4 +20,13 @@ class Authenticate extends Middleware
             return route('login');
         }
     }
+
+    public function handle($request, Closure $next, ...$guards)
+    {
+        if (Auth::guard('sanctum')->guest()) {
+            return response()->json(['error' => 'Bearer Authorization is required'], 401);
+        }
+
+        return parent::handle($request, $next, ...$guards);
+    }
 }

frontend/hospital-portal/.env.development

@@ -1,4 +1,4 @@
 
 REACT_APP_HOST_API_URL="http://localhost:8000"
 
-VITE_API_URL="http://localhost:8000/api/hospitalportal"
+VITE_API_URL="http://localhost:8000/api/v1/hospitalportal"

frontend/hospital-portal/public/icons/ic_flag_en.svg

@@ -0,0 +1,18 @@
+<svg height="20" viewBox="0 0 28 20" width="28" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+	<defs><rect id="a" height="20" rx="3" width="28"/>
+		<mask id="b" fill="#fff">
+			<use fill="#fff" fill-rule="evenodd" xlink:href="#a"/>
+		</mask>
+	</defs>
+	<g fill="none" fill-rule="evenodd">
+		<use fill="#0a17a7" xlink:href="#a"/>
+		<path d="m29.2824692-1.91644623 1.4911811 2.21076686-9.4483006 6.37223314 6.6746503.0001129v6.66666663l-6.6746503-.0007795 9.4483006 6.3731256-1.4911811 2.2107668-11.9501195-8.0608924.0009836 7.4777795h-6.6666666l-.000317-7.4777795-11.9488189 8.0608924-1.49118107-2.2107668 9.448-6.3731256-6.67434973.0007795v-6.66666663l6.67434973-.0001129-9.448-6.37223314 1.49118107-2.21076686 11.9488189 8.06.000317-7.4768871h6.6666666l-.0009836 7.4768871z" fill="#fff" mask="url(#b)"/>
+		<g stroke="#db1f35" stroke-linecap="round" stroke-width=".667">
+			<path d="m18.668 6.332 12.665-8.332" mask="url(#b)"/>
+			<path d="m20.013 21.35 11.354-7.652" mask="url(#b)" transform="matrix(1 0 0 -1 0 35.048)"/>
+			<path d="m8.006 6.31-11.843-7.981" mask="url(#b)"/>
+			<path d="m9.29 22.31-13.127-8.705" mask="url(#b)" transform="matrix(1 0 0 -1 0 35.915)"/>
+		</g>
+		<path d="m0 12h12v8h4v-8h12v-4h-12v-8h-4v8h-12z" fill="#e6273e" mask="url(#b)"/>
+	</g>
+</svg>

frontend/hospital-portal/public/icons/ic_flag_id.svg

@@ -0,0 +1,9 @@
+<svg height="20" viewBox="0 0 28 20" width="28" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+  <defs>
+    <rect id="a" height="10" rx="0" width="28"/>
+  </defs>
+  <g fill="none" fill-rule="evenodd">
+    <use fill="#D82028" xlink:href="#a"/>
+    <use fill="#FFF" xlink:href="#a" y="10"/>
+  </g>
+</svg>

frontend/hospital-portal/public/lang/en-US.json

@@ -0,0 +1,15 @@
+{
+  "greeting": "Hello",
+  "buttonText": "Click Me",
+  "infoLogin": "Enter the registered account",
+  "txtLogin1" : "Sign in to Hospital Portal",
+  "txtLogin2" : "Enter your details below",
+  "txtCardSearchMember1" : "Guarantee Submission",
+  "txtCardSearchMember2" : "Find Member",
+  "txtCardSearchMember3" : "Date Birth",
+  "txtCardSearchMember4" : "Member ID",
+  "txtCardSearchMember5" : "Member",
+  "txtDialogMember1" : "Benefit Summary",
+  "txtDialogMember2" : "Request LOG",
+  "txtDialogMember3" : "Member Detail"
+}

frontend/hospital-portal/public/lang/id-ID.json

@@ -0,0 +1,15 @@
+{
+  "greeting": "Halo",
+  "buttonText": "Klik Saya",
+  "infoLogin": "Masukan akun yang telah terdaftar",
+  "txtLogin1" : "Masuk ke Hospital Portal",
+  "txtLogin2" : "Masukkan detail Anda di bawah ini",
+  "txtCardSearchMember1" : "Pengajuan Jaminan",
+  "txtCardSearchMember2" : "Cari Anggota",
+  "txtCardSearchMember3" : "Tanggal Lahir",
+  "txtCardSearchMember4" : "Member ID",
+  "txtCardSearchMember5" : "Member",
+  "txtDialogMember1" : "Ringkasan Manfaat",
+  "txtDialogMember2" : "Request LOG",
+  "txtDialogMember3" : "Detail Member"
+}

frontend/hospital-portal/src/LocalizationUtil.ts

@@ -0,0 +1,7 @@
+const getLocalizedData = async (locale) => {
+  const response = await fetch(`../public/lang/${locale}.json`); // Mengambil file lokal berdasarkan bahasa yang dipilih
+  const data = await response.json();
+  return data;
+};
+
+export default getLocalizedData;

frontend/hospital-portal/src/contexts/LanguageContext.tsx

@@ -0,0 +1,38 @@
+import React, { createContext, useState, useEffect, useRef } from 'react';
+import getLocalizedData from '../LocalizationUtil';
+export const LanguageContext = createContext();
+
+export const LanguageProvider = ({ children }) => {
+  const [currentLocale, setCurrentLocale] = useState(localStorage.getItem('currentLocale') ? localStorage.getItem('currentLocale') : 'id-ID');
+  const [localeData, setLocaleData] = useState('id');
+  const cancelToken = useRef(null); 
+
+  useEffect(() => {
+    const fetchData = async () => {
+      const token = { cancelled: false };
+      cancelToken.current = token;
+
+      try {
+        const data = await getLocalizedData(currentLocale);
+        if (!cancelToken.current.cancelled) {
+          setLocaleData(data);
+        }
+      } catch (error) {
+        console.error('Error fetching localized data:', error);
+        // Tangani kesalahan jika diperlukan
+      }
+    };
+
+    fetchData();
+
+    return () => {
+      cancelToken.current.cancelled = true;
+    };
+  }, [currentLocale]);
+
+  return (
+    <LanguageContext.Provider value={{ currentLocale, setCurrentLocale, localeData }}>
+      {children}
+    </LanguageContext.Provider>
+  );
+};

frontend/hospital-portal/src/contexts/LaravelAuthContext.tsx

@@ -122,10 +122,18 @@ function AuthProvider({ children }: AuthProviderProps) {
     initialize();
   }, []);
 
+  const headers = {
+      headers: {
+        'Accept': 'application/json',
+        'Content-Type' : 'application/json',
+        'Accept-Language': (localStorage.getItem('currentLocale') ? localStorage.getItem('currentLocale') : 'id-ID'),
+      },
+  };
+
   const login = async (email: string, password: string) => axios
-        .post('/login', { email, password })
+        .post('/login', { email, password }, headers)
         .then((response) => {
-          const { user, token } = response.data;
+          const { user, token } = response.data.data;
           setSession(token);
 
           dispatch({

frontend/hospital-portal/src/index.tsx

@@ -12,6 +12,7 @@ import { HelmetProvider } from 'react-helmet-async';
 // contexts
 import { SettingsProvider } from './contexts/SettingsContext';
 import { CollapseDrawerProvider } from './contexts/CollapseDrawerContext';
+import { LanguageProvider } from './contexts/LanguageContext';
 
 //
 import App from './App';
@@ -23,7 +24,9 @@ ReactDOM.render(
     <SettingsProvider>
       <CollapseDrawerProvider>
         <BrowserRouter>
-          <App />
+          <LanguageProvider>
+            <App />
+          </LanguageProvider>
         </BrowserRouter>
       </CollapseDrawerProvider>
     </SettingsProvider>

frontend/hospital-portal/src/layouts/dashboard/header/LanguagePopover.tsx

@@ -1,28 +1,24 @@
-import { useState } from 'react';
+import React, { useState, useContext } from 'react';
 // @mui
-import { MenuItem, Stack } from '@mui/material';
+import { ButtonBase, Box, Typography, MenuItem, Stack } from '@mui/material';
 // components
 import Image from '@/components/Image';
 import MenuPopover from '@/components/MenuPopover';
 import { IconButtonAnimate } from '@/components/animate';
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 // ----------------------------------------------------------------------
 
 const LANGS = [
+  {
+    label: 'Bahasa Indonesia',
+    value: 'id-ID',
+    icon: '/icons/ic_flag_id.svg',
+  },
   {
     label: 'English',
-    value: 'en',
+    value: 'en-US',
-    icon: 'https://minimal-assets-api.vercel.app/assets/icons/ic_flag_en.svg',
+    icon: '/icons/ic_flag_en.svg',
-  },
-  {
-    label: 'German',
-    value: 'de',
-    icon: 'https://minimal-assets-api.vercel.app/assets/icons/ic_flag_de.svg',
-  },
-  {
-    label: 'French',
-    value: 'fr',
-    icon: 'https://minimal-assets-api.vercel.app/assets/icons/ic_flag_fr.svg',
   },
 ];
 
@@ -39,18 +35,34 @@ export default function LanguagePopover() {
     setOpen(null);
   };
 
+  const { setCurrentLocale } = useContext(LanguageContext);
+  const handleChangeLanguage = (language) => {
+    localStorage.setItem('currentLocale', language);
+    setCurrentLocale(language);
+  };
+
   return (
     <>
-      <IconButtonAnimate
+      <Box display="flex" alignItems="center" border={0} borderColor="grey.300" borderRadius={3} p={1}>
-        onClick={handleOpen}
+        
-        sx={{
+          <IconButtonAnimate
-          width: 40,
+          onClick={handleOpen}
-          height: 40,
+            sx={{
-          ...(open && { bgcolor: 'action.selected' }),
+              width: 35,
-        }}
+              height: 35,
-      >
+              ...(open && { bgcolor: 'action.selected' }),
-        <Image disabledEffect src={LANGS[0].icon} alt={LANGS[0].label} />
+            }}
-      </IconButtonAnimate>
+          >
+            <Image disabledEffect src={!localStorage.getItem('currentLocale') ? LANGS[0].icon : (localStorage.getItem('currentLocale') === 'id-ID' ? LANGS[0].icon : LANGS[1].icon)} alt={!localStorage.getItem('currentLocale') ? LANGS[0].label : (localStorage.getItem('currentLocale') === 'id-ID' ? LANGS[0].label : LANGS[1].label)} />
+          </IconButtonAnimate>
+        
+
+        <ButtonBase onClick={handleOpen}>
+          <Typography variant="body2" component="span" marginRight={1} color="textPrimary">
+            Language
+          </Typography>
+        </ButtonBase>
+      </Box>
 
       <MenuPopover
         open={Boolean(open)}
@@ -67,17 +79,22 @@ export default function LanguagePopover() {
           {LANGS.map((option) => (
             <MenuItem
               key={option.value}
-              selected={option.value === LANGS[0].value}
+              selected={option.value === localStorage.getItem('currentLocale')}
-              onClick={handleClose}
+              onClick = {() => {
+                handleClose();
+                handleChangeLanguage(option.value);
+              }}
             >
               <Image
                 disabledEffect
                 alt={option.label}
                 src={option.icon}
-                sx={{ width: 28, mr: 2 }}
+                sx={{ width: 28 }}
               />
 
+              <Typography variant="body2" component="span" marginLeft={1} color="textPrimary">
               {option.label}
+              </Typography>
             </MenuItem>
           ))}
         </Stack>

frontend/hospital-portal/src/layouts/dashboard/header/index.tsx

@@ -93,8 +93,8 @@ export default function DashboardHeader({
 
         <Stack direction="row" alignItems="center" spacing={{ xs: 0.5, sm: 1.5 }}>
           <LanguagePopover />
-          <NotificationsPopover />
+          {/*<NotificationsPopover />
-          <ContactsPopover />
+          <ContactsPopover />*/}
           <AccountPopover />
         </Stack>
       </Toolbar>

frontend/hospital-portal/src/pages/Dashboard.tsx

@@ -20,12 +20,12 @@ import DialogDetailClaim from '@/components/dialogs/DialogDetailClaim';
 
 // const [notifications, setNotifications] = useState([])
 
-// const itemList = [
+const itemList = [
-//   // { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '08:00 WIB' },
+  { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '08:00 WIB' },
-//   // { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '09:00 WIB' },
+  { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '09:00 WIB' },
-//   // { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '10:00 WIB' },
+  { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '10:00 WIB' },
-//   // { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '11:00 WIB' },
+  { info: 'Mohon lengkapi dokumen Mahen sadarsa', date: 'Selasa, 20 April 22', time: '11:00 WIB' },
-// ];
+];
 
 // ----------------------------------------------------------------------
 
@@ -66,7 +66,7 @@ export default function Dashboard() {
   const [policyData, setPolicyData] = useState<PolicyProps>(defaultPolicyData);
 
   // TODO Remove This
-  const [itemList, setItemList] = useState([]);
+  //const [itemList, setItemList] = useState([]);
   function handleDataLoaded(dataTable) {
     let dummyData = [];
     dataTable.map(function(data) {

frontend/hospital-portal/src/pages/auth/Login.tsx

@@ -1,3 +1,4 @@
+import React, { useContext, useRef, useState, useEffect } from 'react';
 import { capitalCase } from "change-case";
 import { Link as RouterLink } from "react-router-dom";
 // @mui
@@ -23,6 +24,7 @@ import Logo from "@/components/Logo";
 import Image from "@/components/Image";
 // sections
 import { LoginForm } from "@/sections/auth/login";
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 // ----------------------------------------------------------------------
 
@@ -70,6 +72,7 @@ const ContentStyle = styled("div")(({ theme }) => ({
 // ----------------------------------------------------------------------
 
 export default function Login() {
+    const { localeData } = useContext(LanguageContext);
     const { method } = useAuth();
 
     const smUp = useResponsive("up", "sm");
@@ -80,7 +83,7 @@ export default function Login() {
         <Page title="Login">
             <RootStyle>
                 <HeaderStyle>
-                    <Logo sx={{ width: 150, height: 150 }} />
+                    {/*<Logo sx={{ width: 150, height: 150 }} />
                     {smUp && (
                         <Typography variant="body2" sx={{ mt: { md: -2 } }}>
                             Has problem with your account? {""}
@@ -97,7 +100,7 @@ export default function Login() {
                                 Contact Us
                             </Link>
                         </Typography>
-                    )}
+                    )}*/}
                 </HeaderStyle>
 
                 {/* {mdUp && (
@@ -121,16 +124,17 @@ export default function Login() {
                             alignItems="center"
                             sx={{ mb: 5 }}
                         >
+                            <Logo sx={{ width: 90, height: 90 }} />
                             <Box sx={{ flexGrow: 1 }}>
                                 <Typography variant="h4" gutterBottom>
-                                    Sign in to LinkSehat
+                                    {localeData.txtLogin1}
                                 </Typography>
-                                <Typography sx={{ color: "text.secondary" }}>
+                                <Typography variant="body1" sx={{ color: 'text.secondary' }}>
-                                    Enter your details below.
+                                    {localeData.txtLogin2}
                                 </Typography>
                             </Box>
 
-                            <Tooltip
+                            {/*<Tooltip
                                 title={capitalCase(method)}
                                 placement="right"
                             >
@@ -141,12 +145,12 @@ export default function Login() {
                                         sx={{ width: 32, height: 32 }}
                                     />
                                 </>
-                            </Tooltip>
+                            </Tooltip>*/}
                         </Stack>
 
                         <LoginForm />
 
-                        {false && !smUp && (
+                        {/*{false && !smUp && (
                             <Typography
                                 variant="body2"
                                 align="center"
@@ -161,7 +165,7 @@ export default function Login() {
                                     Get started
                                 </Link>
                             </Typography>
-                        )}
+                        )}*/}
                     </ContentStyle>
                 </Container>
             </RootStyle>

frontend/hospital-portal/src/sections/auth/login/LoginForm.tsx

@@ -1,5 +1,5 @@
 import * as Yup from 'yup';
-import { useState } from 'react';
+import React, { useContext, useRef, useState, useEffect } from 'react';
 import { Link as RouterLink, useNavigate } from 'react-router-dom';
 // form
 import { useForm } from 'react-hook-form';
@@ -15,6 +15,7 @@ import useIsMountedRef from '@/hooks/useIsMountedRef';
 // components
 import Iconify from '@/components/Iconify';
 import { FormProvider, RHFTextField, RHFCheckbox } from '@/components/hook-form';
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 // ----------------------------------------------------------------------
 
@@ -26,6 +27,7 @@ type FormValuesProps = {
 };
 
 export default function LoginForm() {
+  const { localeData } = useContext(LanguageContext);
   const { login } = useAuth();
   const navigate = useNavigate();
 
@@ -34,8 +36,8 @@ export default function LoginForm() {
   const [showPassword, setShowPassword] = useState(false);
 
   const LoginSchema = Yup.object().shape({
-    email: Yup.string().email('Email must be a valid email address').required('Email is required'),
+    email: Yup.string().email('Format email tidak valid').required('Email harus diisi'),
-    password: Yup.string().required('Password is required'),
+    password: Yup.string().required('Password harus diisi'),
   });
 
   const defaultValues = {
@@ -75,10 +77,10 @@ export default function LoginForm() {
   return (
     <FormProvider methods={methods} onSubmit={handleSubmit(onSubmit)}>
       <Stack spacing={3}>
-        <Alert severity="info">Email : admin@linksehat.dev & Password : password</Alert>
+        <Alert severity="info">{localeData.infoLogin}</Alert>
-        {!!errors.afterSubmit && <Alert severity="error">{errors.afterSubmit.message}</Alert>}
+        {!!errors.afterSubmit && <Alert severity="error">{errors.afterSubmit.data.meta.message}</Alert>}
 
-        <RHFTextField name="email" label="Email address" />
+        <RHFTextField name="email" label="Email" required/>
 
         <RHFTextField
           name="password"
@@ -93,14 +95,15 @@ export default function LoginForm() {
               </InputAdornment>
             ),
           }}
+          required
         />
       </Stack>
 
       <Stack direction="row" alignItems="center" justifyContent="space-between" sx={{ my: 2 }}>
-        <RHFCheckbox name="remember" label="Remember me" />
+        {/*<RHFCheckbox name="remember" label="Remember me" />
         <Link component={RouterLink} variant="subtitle2" to={PATH_AUTH.resetPassword}>
           Forgot password?
-        </Link>
+        </Link>*/}
       </Stack>
 
       <LoadingButton
@@ -109,6 +112,7 @@ export default function LoginForm() {
         type="submit"
         variant="contained"
         loading={isSubmitting}
+        sx={{ marginTop: 2 }}
       >
         Login
       </LoadingButton>

frontend/hospital-portal/src/sections/dashboard/CardSearchMember.tsx

@@ -13,7 +13,7 @@ import {
 } from '@mui/material';
 import { ChevronRight } from '@mui/icons-material';
 // React
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { LoadingButton } from '@mui/lab';
 import Iconify from '@/components/Iconify';
 import { DatePicker, LocalizationProvider, MobileDatePicker } from '@mui/x-date-pickers';
@@ -25,6 +25,7 @@ import MuiDialog from '@/components/MuiDialog';
 import axios from '@/utils/axios';
 import { useSnackbar } from 'notistack';
 import DialogMember from './DialogMember';
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 // ----------------------------------------------------------------------
 
@@ -46,29 +47,32 @@ const ItemNotificationStyle = styled(Card)(({ theme }) => ({
 // ----------------------------------------------------------------------
 
 export default function CardSearchMember(handleSubmitSuccess) {
+  const { localeData } = useContext(LanguageContext);
   const {enqueueSnackbar} = useSnackbar();
 
   const [noPolis, setNoPolis] = useState('AW001-01');
-  const [tanggalLahir, setTanggalLahir] = useState('1991-01-10');
+  const [birthDate, setBirthDate] = useState('1991-01-10');
   const [loadingBenefit, setLoadingBenefit] = useState(false);
   const [loadingClaim, setLoadingClaim] = useState(false);
   const [openDialogBenefit, setOpenDialogBenefit] = useState(false);
   const [openDialogClaim, setOpenDialogClaim] = useState(false);
   const [currentMember, setCurrentMember] = useState(null);
+  const [nameMember, setNameMember] = useState('');
   
   function handleSearchMember() {
     setLoadingBenefit(true)
 
     axios.post('/search-member', { 
       no_polis: noPolis, 
-      birth_date: tanggalLahir ? fPostFormat(tanggalLahir, 'yyyy-MM-dd') : null
+      birth_date: birthDate ? fPostFormat(birthDate, 'yyyy-MM-dd') : null
     })
     .then((response) => {
       setOpenDialogBenefit(true)
       setCurrentMember(response.data.data)
+      setNameMember(response.data.data.name);
     })
     .catch(({response}) => {
-      enqueueSnackbar(response.data.errors ? response.data.errors[0] : (response.data ? response.data.message : 'Opps, Something went Wrong!'), {variant : "error"})
+      enqueueSnackbar(response.data.errors ? response.data.errors[0] : (response.data ? response.data.meta.message : 'Opps, Something went Wrong!'), {variant : "error"})
     })
     .then(() => {
       setLoadingBenefit(false)
@@ -90,23 +94,23 @@ export default function CardSearchMember(handleSubmitSuccess) {
               component="span"
               sx={{ display: 'flex', alignItems: 'center' }}
             >
-              Pengajuan Jaminan
+              {localeData.txtCardSearchMember1}
             </Typography>
           </Typography>
         </Stack>
         <Stack gap={2}>
-          <TextField variant="outlined" label="Member ID" value={noPolis} onChange={(event) => {
+          <TextField variant="outlined" label={localeData.txtCardSearchMember4} value={noPolis} onChange={(event) => {
             setNoPolis(event.target.value)
-          }}></TextField>
+          }} required></TextField>
           <LocalizationProvider dateAdapter={AdapterDateFns}>
             <DatePicker
-              label="Tanggal Lahir"
+              label={localeData.txtCardSearchMember3}
-              value={tanggalLahir}
+              value={birthDate}
               onChange={(newValue) => {
                 setTanggalLahir(  (newValue));
               }}
               inputFormat="dd-MM-yyyy"
-              renderInput={(params) => <TextField {...params} />}
+              renderInput={(params) => <TextField {...params} required/>}
             />
           </LocalizationProvider>
 
@@ -124,7 +128,7 @@ export default function CardSearchMember(handleSubmitSuccess) {
               }}
             >
               <Iconify icon="eva:eye-fill" marginRight={0.75} />
-              Cari Member
+              {localeData.txtCardSearchMember2}
             </LoadingButton>
             {/* <LoadingButton
               variant="contained"
@@ -142,7 +146,7 @@ export default function CardSearchMember(handleSubmitSuccess) {
 {/* 
       <DialogBenefit open={openDialogBenefit} setOpen={setOpenDialogBenefit}></DialogBenefit> */}
       <MuiDialog
-          title={{name: "Member"}}
+          title={{name: nameMember}}
           openDialog={openDialogBenefit}
           setOpenDialog={setOpenDialogBenefit}
           content={DialogMember(currentMember, () => {setOpenDialogBenefit(false); handleSubmitSuccess()})}

frontend/hospital-portal/src/sections/dashboard/DialogMember.tsx

@@ -4,20 +4,22 @@ import { LoadingButton, TabPanel } from "@mui/lab";
 import { Button, Card, Divider, Grid, LinearProgress, linearProgressClasses, Typography } from "@mui/material";
 import { Tab, Tabs } from "@mui/material";
 import { Box, Stack } from "@mui/material";
-import { useEffect, useState } from "react";
+import React, { useEffect, useState, useContext } from "react";
 import { fCurrency } from '@/utils/formatNumber';
 import { fPostFormat } from '@/utils/formatTime';
 import { Avatar } from '@mui/material';
 import Iconify from '@/components/Iconify';
 import FormRequestClaim from './FormRequestClaim';
+import { LanguageContext } from '@/contexts/LanguageContext';
 
 export default function DialogMember(member, handleSubmitSuccess) {
+    const { localeData } =  useContext(LanguageContext);
     const [currentTab, setCurrentTab] = useState('request')
         
     // ----------------------------------------------------------------------
 
     useEffect(() => {
-        setCurrentTab('benefit')
+        setCurrentTab('detail')
     }, [member])
 
     function handleChangeTab(event: React.SyntheticEvent, newValue: string) {
@@ -67,13 +69,93 @@ export default function DialogMember(member, handleSubmitSuccess) {
                     onChange={handleChangeTab}
                     aria-label="wrapped label tabs example"
                 >
-                    <Tab
+                    <Tab value="detail" label={localeData.txtDialogMember3} />
-                    value="benefit"
+                    <Tab value="benefit" label={localeData.txtDialogMember1} />
-                    label="Benefit Summary"
+                    <Tab value="request" label={localeData.txtDialogMember2} />
-                    />
-                    <Tab value="request" label="Request Penjaminan" />
                 </Tabs>
 
+                <TabPanel value={currentTab} index={'detail'}>
+                    <Stack spacing={2}>
+                        <Grid container sx={{ pb: 2, mb: 2, borderBottom: 0 }}>
+                          <Grid item xs={6}>
+                            <Grid container>
+                              <Grid item xs={6}>
+                                Mapping ID
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Policy Number
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                NRIC
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+
+                              <Grid item xs={6}>
+                                NIK
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Email
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                            </Grid>
+                          </Grid>
+                          <Grid item xs={6}>
+                            <Grid container>
+                              <Grid item xs={6}>
+                                Birth Date
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Gender
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Marital Status
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Language
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Race
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                              <Grid item xs={6}>
+                                Relationship
+                              </Grid>
+                              <Grid item xs={6}>
+                                : {1 ?? '-'}
+                              </Grid>
+                            </Grid>
+                          </Grid>
+                        </Grid>
+                    </Stack>
+                </TabPanel>
+
                 <TabPanel value={currentTab} index={'benefit'}>
                     <Grid container spacing={2}>
                         { member && member?.current_plan?.corporate_benefits?.map((corporateBenefit, index) => {return (

frontend/hospital-portal/src/utils/token.ts

@@ -29,12 +29,18 @@ const setSession = (accessToken: string | null) => {
   if (accessToken) {
     localStorage.setItem('accessToken', accessToken);
     axios.defaults.headers.common.Authorization = `Bearer ${accessToken}`;
+    axios.defaults.headers.common['Accept-Language'] = (localStorage.getItem('currentLocale') ? localStorage.getItem('currentLocale') : 'id-ID');
+    axios.defaults.headers.common['Accept'] = 'application/json';
+    axios.defaults.headers.common['Content-Type'] = 'application/json';
     // This function below will handle when token is expired
     // const { exp } = jwtDecode(accessToken);
     // handleTokenExpired(exp);
   } else {
     localStorage.removeItem('accessToken');
     delete axios.defaults.headers.common.Authorization;
+    delete axios.defaults.headers.common['Accept-Language'];
+    delete axios.defaults.headers.common['Accept'];
+    delete axios.defaults.headers.common['Content-Type']; 
   }
 };
 

resources/lang/en/Message.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'success' => 'Request has been successfully processed.',
+    'server_error' => 'Internal server error.',
+    'not_found' => 'Data not found',
+    'password' => 'Password wrong. Please try again.'
+];

resources/lang/en/Validation.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'required' => 'The :attribute field is required.',
+    'invalid' => 'The :attribute field is invalid.',
+    'max' => ':attribute cannot exceed :length characters.',
+    'email' => 'Invalid email format.'
+];

resources/lang/id/Message.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'success' => 'Request berhasil dilakukan.',
+    'server_error' => 'Internal server error.',
+    'not_found' => 'Data tidak ditemukan.',
+    'password' => 'Password salah. Silakan coba lagi.'
+];

resources/lang/id/Validation.php

@@ -0,0 +1,8 @@
+<?php
+
+return [
+    'required' => 'Kolom :attribute harus diisi.',
+    'invalid' => 'Kolom :attribute tidak valid.',
+    'max' => ':attribute tidak boleh melebihi :length karakter.',
+    'email' => 'Format email salah.'
+];