Merge branch 'master' of https://coders.3fresources.com/trainee/mileage-claim

config/laravolt/ui.php

@@ -35,6 +35,7 @@
      */
     // Layout, Available options: 'modern', 'fullscreen', 'classic'
     'login_layout' => 'modern',
+    'layout'       => 'ui::layouts.auth',
 
     // Background image
     'login_background' => '/laravolt/img/wallpaper/animated-svg/dark.svg',

lang/en/auth.php

 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used during authentication for various
-    | messages that we need to display to the user. You are free to modify
-    | these language lines according to your application's requirements.
-    |
-    */
-
-    'failed' => 'These credentials do not match our records.',
-    'password' => 'The provided password is incorrect.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
+    'activation_success'       => 'Your account successfully activated.',
+    'already_registered?'      => 'Have an account?',
+    'click_to_activate'        => 'Please click <a href=":link">this activation link</a> to activate your account.',
+    'email'                    => 'Email',
+    'failed'                   => 'Invalid credentials',
+    'forgot_password'          => 'Forgot password',
+    'identifier'               => 'Email',
+    'login'                    => 'Login',
+    'login_here'               => 'Login Here',
+    'name'                     => 'Name',
+    'not_registered_yet?'      => 'Not registered yet?',
+    'password'                 => 'Password',
+    'password_confirmation'    => 'Confirm Your Password',
+    'password_new'             => 'New Password',
+    'password_confirm'         => 'Confirm New Password',
+    'register'                 => 'Register',
+    'register_here'            => 'Register Here',
+    'registration_success'     => 'Registration success. Please check your email to activate your account.',
+    'remember'                 => 'Remember me',
+    'reset_password'           => 'Reset Password',
+    'send_reset_password_link' => 'Send Reset Password Link',
 ];

packages/portal/mileage/src/Http/Controllers/ApplyformController.php

@@ -99,7 +99,7 @@ public function index()
         } else {
             // Non-admin → only their assigned projects
             $projects = Project::whereHas('projectTeam', function($q) use ($user) {
-                $q->where('pt_staff_id', $user->employee_code);
+                $q->where('pt_staff_id', $user->employeeCode);
             })->get();
         }
 

packages/portal/mileage/src/Model/AclRole.php.back

+<?php
+
+namespace Portal\Mileage\Model;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AclRole extends Model
+{
+    protected $table = 'acl_roles'; // ⚠️ must be your roles definition table
+    protected $primaryKey = 'id';
+    public $timestamps = false;
+
+    public function users()
+    {
+        return $this->belongsToMany(
+            \App\Models\User::class,
+            'acl_role_user',
+            'role_id',
+            'user_id'
+        );
+    }
+}
+

resources/views/auth/login.blade.php

-<x-volt-auth>
-    <h3 class="ui header horizontal divider section">@lang('laravolt::auth.login')</h3>
+@extends(config('laravolt.ui.layout'))
+
+@section('content')
+
+    @if (session('success'))
+        <div class="ui success message">
+            <p>{{ session('success') }}</p>
+        </div>
+    @endif
 
     {!! form()->open(route('auth::login.store'))->attribute('up-target', 'body') !!}
-    {!! form()->email('email')->label(__('laravolt::auth.identifier')) !!}
-    {!! form()->password('password')->label(__('laravolt::auth.password')) !!}
+        <input type="hidden" name="_token" value="{{ csrf_token() }}">
 
-    @if(config('laravolt.platform.features.captcha'))
+        <div class="ui field left icon input fluid">
+            <input type="text" name="email" placeholder="email" value="{{ old('email') }}">
+            <i class="mail icon"></i>
+        </div>
+        <div class="ui field left icon input fluid">
+            <!-- <input type="password" name="password" placeholder="Password"> -->
+            <input type="password" name="password" placeholder="@lang('auth::password')">
+            <i class="lock icon"></i>
+        </div>
+        @if(config('laravolt.auth.captcha'))
             <div class="field">
                 {!! app('captcha')->display() !!}
-            {!! app('captcha')->renderJs() !!}
-
             </div>
         @endif
-
-    <div class="ui field m-b-2">
-        <div class="ui equal width grid">
+        <div class="ui field">
+            <!-- <button type="submit" class="ui fluid button primary">Login</button> -->
+            <button type="submit" class="ui fluid button primary">@lang('auth::login')</button>
+        </div>
+        <div class="ui equal width grid field">
             <div class="column left aligned">
                 <div class="ui checkbox">
                     <input type="checkbox" name="remember" {{ request()->old('remember')?'checked':'' }}>
-                    <label>@lang('laravolt::auth.remember')</label>
+                    <!-- <label>Remember me</label> -->
+                    <label>@lang('auth::remember')</label>
                 </div>
             </div>
             <div class="column right aligned">
-                <a themed href="{{ route('auth::forgot.show') }}"
-                   class="link">@lang('laravolt::auth.forgot_password')</a>
-            </div>
-        </div>
+                <a href="{{route('auth::forgot.show')}}">@lang('auth::forgot_password')</a>
             </div>
 
-    <div class="field action">
-        <x-volt-button class="fluid">@lang('laravolt::auth.login')</x-volt-button>
         </div>
 
-    @if(config('laravolt.platform.features.registration'))
-        <div class="ui divider section"></div>
-        <div>
-            @lang('laravolt::auth.not_registered_yet?')
-            <a themed href="{{ route('auth::registration.show') }}"
-               class="link">@lang('laravolt::auth.register_here')</a>
-        </div>
+    </form>
+
+
+    @if(config('laravolt.auth.registration.enable'))
+        <div class="ui divider hidden section"></div>
+        @lang('auth::not_registered_yet?')
+        <a href="{{ route('auth::register.show') }}">@lang('auth::register_here')</a>
     @endif
-    {!! form()->close() !!}
 
-</x-volt-auth>
+@endsection
+
+@push('script')
+    @if(config('laravolt.auth.captcha'))
+        {!! app('captcha')->renderJs() !!}
+    @endif
+@endpush

resources/views/vendor/ui/layouts/auth.blade.php

 @extends('ui::layouts.base', ['bodyClass' => 'auth'])
-<style type="text/css">
-    
-.discl{
-
-position: fixed;
-bottom: 15px;
-width: 100%;
-margin-left:unset !important;
-margin-right:unset !important;
-
-}
-.discl .disc{
-color: #FFFFFF;width: 100%; background: black; text-align: center; 
-
-}
-
-@media only screen and (max-width:480px) {
-    
-.discl{
-
-display:none !important;;
-}
-
-</style>
 @section('body')
     <div class="ui divider hidden section"></div>
     <div class="ui grid stackable">
@@ -39,10 +15,6 @@
                 </div>
             </div>
         </div>
-
     </div>
-    <div class="ui grid stackable discl" >
-    <span class="disc">Sesuai dipapar menggunakan Firefox 48 , Chrome 52 , Windows Edge and Safari 9 dengan paparan 1280 x 800. Hak Cipta Terpelihara © 2019, Perbadanan Putrajaya.</span></div>
-
 @endsection