fix translations, recovery password

omatech · Mar 4, 2019 · ef7700b · ef7700b
1 parent 886cc6b
commit ef7700b
Show file tree

Hide file tree

Showing 84 changed files with 2,728 additions and 72,232 deletions.
diff --git a/package.json b/package.json
@@ -25,13 +25,14 @@
     "ionicons": "^4.5.5",
     "jquery": "^3.3.1",
     "laravel-mix": "^4.0.14",
+    "libsodium-wrappers": "^0.7.4",
     "open-sans-fonts": "^1.5.0",
     "popper.js": "^1.14.7",
     "resolve-url-loader": "2.3.1",
     "sass": "^1.17.0",
     "sass-loader": "7.*",
     "select2": "^4.0.6-rc.1",
-    "sweetalert": "^2.1.2",
+    "sweetalert2": "^8.2.4",
     "vue-template-compiler": "^2.6.5"
   }
 }
diff --git a/src/MageServiceProvider.php b/src/MageServiceProvider.php
@@ -3,6 +3,8 @@
 namespace Omatech\Mage;
 
 use Illuminate\Support\ServiceProvider;
+use Omatech\Mage\App\Providers\BladeServiceProvider;
+use Omatech\Mage\App\Providers\TranslatorServiceProvider;
 use Omatech\Mage\App\Providers\ViewServiceProvider;
 use Omatech\Mage\App\Providers\HelperServiceProvider;
 use Omatech\Mage\App\Providers\CommandServiceProvider;
@@ -46,6 +48,8 @@ public function register()
         $this->app->register(MiddlewareServiceProvider::class);
         $this->app->register(HelperServiceProvider::class);
         $this->app->register(CommandServiceProvider::class);
+        $this->app->register(TranslatorServiceProvider::class);
+        $this->app->register(BladeServiceProvider::class);
 
         $this->app->register(SpatiePermissionsServiceProvider::class);
 

diff --git a/src/app/Events/UserCreated.php b/src/app/Events/UserCreated.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Omatech\Mage\App\Events;
+
+class UserCreated
+{
+    public $user;
+
+    /**
+     * Create a new event instance.
+     *
+     * @return void
+     */
+    public function __construct($user)
+    {
+        $this->user = $user;
+    }
+}
diff --git a/src/app/Http/Controllers/Auth/ForgotPasswordController.php b/src/app/Http/Controllers/Auth/ForgotPasswordController.php
@@ -2,6 +2,7 @@
 
 namespace Omatech\Mage\App\Http\Controllers\Auth;
 
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
 
@@ -18,4 +19,21 @@ public function showLinkRequestForm()
     {
         return view('mage::pages.auth.forgot-password');
     }
+
+    /**
+     * Validate the email for the given request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return void
+     */
+    protected function validateEmail(Request $request)
+    {
+        $request->validate([
+            'email' => 'required|string|email'
+        ],[
+            'email.required' => __('mage.auth.validations.email.required'),
+            'email.string' => __('mage.auth.validations.email.string'),
+            'email.email' => __('mage.auth.validations.email.email'),
+        ]);
+    }
 }
diff --git a/src/app/Http/Controllers/Auth/LoginController.php b/src/app/Http/Controllers/Auth/LoginController.php
@@ -5,6 +5,7 @@
 use Illuminate\Foundation\Auth\AuthenticatesUsers;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 
 class LoginController extends Controller
@@ -26,4 +27,25 @@ public function redirectTo()
     {
         return route(config('mage.on_login_to_route'));
     }
+
+    /**
+     * Validate the user login request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @return void
+     *
+     */
+    protected function validateLogin(Request $request)
+    {
+        $request->validate([
+            $this->username() => 'required|email|string',
+            'password' => 'required|string',
+        ], [
+            'email.required' => __('mage.auth.validations.email.required'),
+            'email.string' => __('mage.auth.validations.email.string'),
+            'email.email' => __('mage.auth.validations.email.email'),
+            'password.required' => __('mage.auth.validations.password.required'),
+            'password.string' => __('mage.auth.validations.password.string'),
+        ]);
+    }
 }
diff --git a/src/app/Http/Controllers/Auth/ResetPasswordController.php b/src/app/Http/Controllers/Auth/ResetPasswordController.php
@@ -41,4 +41,21 @@ public function redirectTo()
     {
         return route(config('mage.on_login_to_route'));
     }
+
+    /**
+     * Get the password reset validation error messages.
+     *
+     * @return array
+     */
+    protected function validationErrorMessages()
+    {
+        return [
+            'email.required' => __('mage.auth.validations.email.required'),
+            'email.email' => __('mage.auth.validations.email.email'),
+            'token.required' => __('mage.auth.validations.token.required'),
+            'password.required' => __('mage.auth.validations.password.required'),
+            'password.confirmed' => __('mage.auth.validations.password.confirmed'),
+            'password.min' => __('mage.auth.validations.password.min'),
+        ];
+    }
 }
diff --git a/src/app/Http/Controllers/DatatableController.php b/src/app/Http/Controllers/DatatableController.php
@@ -9,37 +9,58 @@ class DatatableController extends Controller
     public function i18n()
     {
         return response()->json([
-            "sProcessing"     => trans('Cargando...'),
-            "sLengthMenu"     => trans('Mostrar _MENU_ registros'),
-            "sZeroRecords"    => trans('No se encontraron resultados'),
-            "sEmptyTable"     => trans('Ningún dato disponible en esta tabla'),
-            "sInfo"           => trans('Mostrando registros del _START_ al _END_ de un total de _TOTAL_ registros'),
-            "sInfoEmpty"      => trans('Mostrando registros del 0 al 0 de un total de 0 registros'),
-            "sInfoFiltered"   => trans('filtrado de un total de _MAX_ registros'),
-            "sInfoPostFix"    => trans(''),
-            "sSearch"         => trans('Buscar:'),
-            "sUrl"            => trans(''),
-            "sInfoThousands"  => trans(','),
-            "sLoadingRecords" => trans('Cargando...'),
+            "sProcessing"     => __('mage.datatables.sProcessing'),
+            "sLengthMenu"     => __('mage.datatables.sLengthMenu'),
+            "sZeroRecords"    => __('mage.datatables.sZeroRecords'),
+            "sEmptyTable"     => __('mage.datatables.sEmptyTable'),
+            "sInfo"           => __('mage.datatables.sInfo'),
+            "sInfoEmpty"      => __('mage.datatables.sInfoEmpty'),
+            "sInfoFiltered"   => __('mage.datatables.sInfoFiltered'),
+            "sInfoPostFix"    => __('mage.datatables.sInfoPostFix'),
+            "sSearch"         => __('mage.datatables.sSearch'),
+            "sUrl"            => __('mage.datatables.sUrl'),
+            "sInfoThousands"  => __('mage.datatables.sInfoThousands'),
+            "sLoadingRecords" => __('mage.datatables.sLoadingRecords'),
             "oPaginate"       => [
-                "sFirst"    => trans('Primero'),
-                "sLast"     => trans('Último'),
-                "sNext"     => trans('Siguiente'),
-                "sPrevious" => trans('Anterior')
+                "sFirst"    => __('mage.datatables.oPaginate.sFirst'),
+                "sLast"     => __('mage.datatables.oPaginate.sLast'),
+                "sNext"     => __('mage.datatables.oPaginate.sNext'),
+                "sPrevious" => __('mage.datatables.oPaginate.sPrevious')
             ],
             "oAria" => [
-                "sSortAscending"  => trans(': Activar para ordenar la columna de manera ascendente'),
-                "sSortDescending" => trans(': Activar para ordenar la columna de manera descendente')
+                "sSortAscending"  => __('mage.datatables.oAria.sSortAscending'),
+                "sSortDescending" => __('mage.datatables.oAria.sSortDescending')
             ],
             "sweetAlert" => [
-                "title"   => trans('mage.sweet.title'),
-                "text"    => trans('mage.sweet.description'),
-                "success" => trans('mage.sweet.success'),
-                "buttons" => [
-                    trans('mage.sweet.cancel'),
-                    trans('mage.sweet.confirm')
+                "translations" => [
+                    "title" => __('mage.datatable.sweetalert.translations.title'),
+                    "text" => __('mage.datatable.sweetalert.translations.text'),
+                    "success" => __('mage.datatable.sweetalert.translations.success'),
+                    "error" => __('mage.datatable.sweetalert.translations.error'),
+                ],
+                "users" => [
+                    "title" => __('mage.datatable.sweetalert.users.title'),
+                    "text" => __('mage.datatable.sweetalert.users.text'),
+                    "success" => __('mage.datatable.sweetalert.users.success'),
+                    "error" => __('mage.datatable.sweetalert.users.error'),
+                ],
+                "roles" => [
+                    "title" => __('mage.datatable.sweetalert.roles.title'),
+                    "text" => __('mage.datatable.sweetalert.roles.text'),
+                    "success" => __('mage.datatable.sweetalert.roles.success'),
+                    "error" => __('mage.datatable.sweetalert.roles.error'),
                 ],
-                "close" => trans('mage.sweet.close')
+                "permissions" => [
+                    "title" => __('mage.datatable.sweetalert.permissions.title'),
+                    "text" => __('mage.datatable.sweetalert.permissions.text'),
+                    "success" => __('mage.datatable.sweetalert.permissions.success'),
+                    "error" => __('mage.datatable.sweetalert.permissions.error'),
+                ],
+                "buttons" => [
+                    "confirm" => __('mage.datatables.sweetalert.buttons.confirm'),
+                    "cancel" => __('mage.datatables.sweetalert.buttons.cancel'),
+                    "close" => __('mage.datatables.sweetalert.buttons.close'),
+                ]
             ]
         ]);
     }

diff --git a/...ttp/Controllers/PermissionsController.php → ...Http/Controllers/PermissionController.php b/...ttp/Controllers/PermissionsController.php → ...Http/Controllers/PermissionController.php
@@ -11,7 +11,7 @@
 use Omatech\Mage\App\Repositories\Permission\ListPermissionDatatable;
 use Omatech\Mage\App\Repositories\Permission\UpdatePermission;
 
-class PermissionsController extends Controller
+class PermissionController extends Controller
 {
     public function index()
     {

diff --git a/src/app/Http/Controllers/RolesController.php → src/app/Http/Controllers/RolController.php b/src/app/Http/Controllers/RolesController.php → src/app/Http/Controllers/RolController.php
@@ -13,7 +13,7 @@
 use Omatech\Mage\App\Repositories\Role\ListRoleDatatable;
 use Omatech\Mage\App\Repositories\Role\UpdateRole;
 
-class RolesController extends Controller
+class RolController extends Controller
 {
     public function index()
     {

diff --git a/src/app/Http/Controllers/TranslationController.php b/src/app/Http/Controllers/TranslationController.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace Omatech\Mage\App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Omatech\Mage\App\Http\Requests\Translations\CreateRequest;
+use Omatech\Mage\App\Repositories\Translation\UpdateTranslation;
+use Omatech\Mage\App\Repositories\Translation\ListTranslationsDatatable;
+use Omatech\Mage\App\Repositories\Translation\CreateTranslation;
+
+class TranslationController extends Controller
+{
+    public function index()
+    {
+        return view('mage::pages.translations.index');
+    }
+
+    public function list(ListTranslationsDatatable $translations)
+    {
+        $filter = request()->get('notTranslated');
+        $filter = filter_var($filter, FILTER_VALIDATE_BOOLEAN);
+
+        return $translations->make($filter);
+    }
+
+    public function create()
+    {
+        return view('mage::pages.translations.create');
+    }
+
+    public function store(CreateRequest $request, CreateTranslation $translation)
+    {
+        $data = $request->validated();
+
+        $fields = [
+            'key' => $data['translations_key'],
+            'group' => $data['translations_group']
+        ];
+
+        foreach (config('mage.translations.available_locales') as $lang) {
+            $fields["text->$lang"] = $data["translations_text-$lang"] ?? '';
+        }
+
+        $translation->make($fields);
+
+        return redirect(route('mage.translations.index'))->with('status', 'created');
+    }
+
+    public function update($id, UpdateTranslation $update)
+    {
+        $params = request('params');
+
+        $update->make($id, $params['lang'], $params['value']);
+    }
+}
diff --git a/src/app/Http/Controllers/UserController.php b/src/app/Http/Controllers/UserController.php
@@ -3,8 +3,6 @@
 namespace Omatech\Mage\App\Http\Controllers;
 
 use App\Http\Controllers\Controller;
-use Illuminate\Filesystem\Filesystem;
-use Illuminate\Support\Facades\Storage;
 use Omatech\Mage\App\Http\Requests\Users\CreateRequest;
 use Omatech\Mage\App\Repositories\Role\GetRoles;
 use Omatech\Mage\App\Repositories\User\CreateUser;
@@ -13,7 +11,6 @@
 use Omatech\Mage\App\Repositories\User\ListUserDatatable;
 use Omatech\Mage\App\Http\Requests\Users\UpdateRequest;
 use Omatech\Mage\App\Repositories\User\UpdateUserAssignRoles;
-use Spatie\TranslationLoader\LanguageLine;
 
 class UserController extends Controller
 {

diff --git a/src/app/Http/Requests/Permissions/CreateRequest.php b/src/app/Http/Requests/Permissions/CreateRequest.php
@@ -31,4 +31,17 @@ public function rules()
             ],
         ];
     }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'permissions_name.required' => __('mage.permissions.validations.name.required'),
+            'permissions_name.unique' => __('mage.permissions.validations.name.unique')
+        ];
+    }
 }
diff --git a/src/app/Http/Requests/Permissions/UpdateRequest.php b/src/app/Http/Requests/Permissions/UpdateRequest.php
@@ -31,4 +31,16 @@ public function rules()
             ],
         ];
     }
-}
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'permissions_name.required' => __('mage.permissions.validations.name.required'),
+            'permissions_name.unique' => __('mage.permissions.validations.name.unique')
+        ];
+    }}
diff --git a/src/app/Http/Requests/Roles/CreateRequest.php b/src/app/Http/Requests/Roles/CreateRequest.php
@@ -31,4 +31,17 @@ public function rules()
             ],
         ];
     }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'roles_name.required' => __('mage.roles.validations.name.required'),
+            'roles_name.unique' => __('mage.roles.validations.name.unique')
+        ];
+    }
 }
diff --git a/src/app/Http/Requests/Roles/UpdateRequest.php b/src/app/Http/Requests/Roles/UpdateRequest.php
@@ -31,4 +31,17 @@ public function rules()
             ],
         ];
     }
+
+    /**
+     * Get custom messages for validator errors.
+     *
+     * @return array
+     */
+    public function messages()
+    {
+        return [
+            'roles_name.required' => __('mage.roles.validations.name.required'),
+            'roles_name.unique' => __('mage.roles.validations.name.unique')
+        ];
+    }
 }