diff --git a/app/Http/Controllers/userController.php b/app/Http/Controllers/userController.php index 44f291fb..0b0f9ec5 100755 --- a/app/Http/Controllers/userController.php +++ b/app/Http/Controllers/userController.php @@ -25,7 +25,11 @@ class userController extends Controller { public function EditProfile(Request $request) { - // dd($request); + // Verifica se um arquivo foi enviado e se o tamanho é maior que 70 KB + if ($request->hasFile('user_logo') && $request->file('user_logo')->getSize() > 71680) { + return back()->with('danger', 'O tamanho da imagem não deve ser maior que 70KB, valores não alteradas.'); + } + $messages = [ 'user_logo.max' => 'O tamanho da imagem não deve ser maior que 70KB.', ]; @@ -38,6 +42,8 @@ public function EditProfile(Request $request) 'nif' => 'required', ], $messages); + // dd($messages); + $user = User::find($request->userID); if ($request->hasFile('user_logo')) { diff --git a/public/user_logos/1696761654.jpg b/public/user_logos/1696761654.jpg deleted file mode 100644 index ce91928d..00000000 Binary files a/public/user_logos/1696761654.jpg and /dev/null differ diff --git a/public/user_logos/1701100033.jpg b/public/user_logos/1701100033.jpg new file mode 100644 index 00000000..d63c1fb5 Binary files /dev/null and b/public/user_logos/1701100033.jpg differ diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php index 187668f5..afb48962 100644 --- a/resources/lang/en/messages.php +++ b/resources/lang/en/messages.php @@ -118,7 +118,7 @@ 'email_address' => 'Email address', 'user_type' => 'User type', 'mobile_phone' => 'Mobile phone', - 'account_creation_date' => 'account_creation_date' + 'account_creation_date' => 'Account creation date' ], 'edit_profile' => [ 'edit_profile'=> 'Edit profile', diff --git a/resources/lang/pt/messages.php b/resources/lang/pt/messages.php index 9e2937b0..82827051 100644 --- a/resources/lang/pt/messages.php +++ b/resources/lang/pt/messages.php @@ -118,9 +118,10 @@ 'account_creation_date' => 'Conta Criada em' ], 'edit_profile' => [ + 'edit_profile' => 'Editar Perfil', 'update_your_logo' => 'Actualizar o seu logótipo', 'image' => 'Imagem', - 'full_name'=> 'Nome e Apelido', + 'full_name' => 'Nome e Apelido', 'nif' => 'Nif', 'email_address' => 'Email', 'mobile_phone' => 'Telemóvel', diff --git a/resources/views/Admin/CrudUsers/listCompany.blade.php b/resources/views/Admin/CrudUsers/listCompany.blade.php index 7fff767a..51a3ce1e 100755 --- a/resources/views/Admin/CrudUsers/listCompany.blade.php +++ b/resources/views/Admin/CrudUsers/listCompany.blade.php @@ -11,12 +11,12 @@
-

Empresas

+

{{__('messages.users_listUsers.top_view_part.companies')}}

    -
  1. Administração
    2. -
  2. Empresas
    3. +
  3. {{__('messages.users_listUsers.top_view_part.administration')}}
    4. +
  4. {{__('messages.users_listUsers.top_view_part.companies')}}
@@ -27,7 +27,7 @@
-

Tabela Empresas

+

{{__('messages.users_listUsers.top_view_part.companies_table')}}

{{-- ./card-header --}}
diff --git a/resources/views/Admin/CrudUsers/listUsers.blade.php b/resources/views/Admin/CrudUsers/listUsers.blade.php index c233fe89..bcb05571 100755 --- a/resources/views/Admin/CrudUsers/listUsers.blade.php +++ b/resources/views/Admin/CrudUsers/listUsers.blade.php @@ -11,12 +11,12 @@
-

Empresas

+

{{__('messages.users_listUsers.top_view_part.companies')}}

    -
  1. Administração
    2. -
  2. Empresas
    3. +
  3. {{__('messages.users_listUsers.top_view_part.administration')}}
    4. +
  4. {{__('messages.users_listUsers.top_view_part.companies')}}
@@ -27,7 +27,7 @@
-

Tabela Utilizadores

+

{{__('messages.users_listUsers.top_view_part.users_table')}}

@@ -35,12 +35,12 @@ - - - - - - Empresas + + + + + + @foreach ($users as $user) @@ -59,12 +59,12 @@ class="actions-btn btn btn-light circle "> - Detalhes + {{__('messages.portfolio.users_table.actions.details')}} - Editar + {{__('messages.portfolio.users_table.actions.edit')}} @method('DELETE') @@ -104,4 +104,4 @@ class="dropdown-item text-light"> }).buttons().container().appendTo('#TableReceiveAllUsers_wrapper .col-md-6:eq(0)'); }); -@endsection +@endsection \ No newline at end of file diff --git a/resources/views/Admin/DataManagement/manageassets.blade.php b/resources/views/Admin/DataManagement/manageassets.blade.php index aff9ae2e..edee801f 100755 --- a/resources/views/Admin/DataManagement/manageassets.blade.php +++ b/resources/views/Admin/DataManagement/manageassets.blade.php @@ -6,12 +6,12 @@
-

Gestão de ativos

+

{{ __('messages.portfolio.top_view_part.management_assets') }}

    -
  1. Portefólio
    2. -
  2. Gerir ativos
    3. +
  3. {{ __('messages.portfolio.top_view_part.portfolio') }}
    4. +
  4. {{ __('messages.portfolio.top_view_part.managing_assets') }}
@@ -28,13 +28,12 @@
@@ -43,23 +42,22 @@
-

Tabela de Ativos

+

{{ __('messages.portfolio.change_buttons.asset_table') }}

-
IDNomeEmailTipo de UtilizadorAções
{{__('messages.portfolio.users_table.id')}}{{__('messages.portfolio.users_table.name')}}{{__('messages.portfolio.users_table.email')}}{{__('messages.portfolio.users_table.user_type')}}{{__('messages.portfolio.users_table.actions.actions')}}
+
+ - - - + + - - + {{-- @foreach ($equipments as $equipment) @@ -69,8 +67,51 @@ @endforeach - + --}}
ID TagTipo EquipamentoFábricasDescrição EquipamentoFabricaTipo Ações
{{ $equipment->equipment_tag }}Ações
+ + + +
@@ -79,9 +120,9 @@
{{-- ./cardAssetsTable --}} -
+ {{--
-
+
--}}
diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php index aa5eab8b..68fb54cd 100755 --- a/resources/views/Admin/index.blade.php +++ b/resources/views/Admin/index.blade.php @@ -32,11 +32,11 @@
- Em planeamento + {{ __('messages.dashboard.planning.description') }} {{ $CompanyProject->where('order_project', 1)->count() }} - Em planeamento de 2023 + {{ __('messages.dashboard.planning.text') }}
@@ -48,7 +48,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 1)->count() } @if ($project->order_project == 1)
-
{{ $project->company_project_description }}
+
{{ $project->company_project_description }} +
@@ -71,12 +72,12 @@ class="btn btn-tool">
- Preparadas - {{ $CompanyProject->where('order_project', 2)->count() }} - + {{ __('messages.dashboard.prepared.description') }} + + {{ $CompanyProject->where('order_project', 2)->count() }} + - Aguardam o início da obra. + {{ __('messages.dashboard.prepared.text') }}
@@ -88,7 +89,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 2)->count() } @if ($project->order_project == 2)
-
{{ $project->company_project_description }}
+
{{ $project->company_project_description }} +
@@ -111,12 +113,12 @@ class="btn btn-tool">
- Em execução + {{__('messages.dashboard.on_going.description')}} {{ $CompanyProject->where('order_project', 3)->count() }} - - Obras em curso. - + + {{__('messages.dashboard.on_going.text')}} +
@@ -127,7 +129,8 @@ class="info-box-number">{{ $CompanyProject->where('order_project', 3)->count() } @if ($project->order_project == 3)
-
{{ $project->company_project_description }}
+
{{ $project->company_project_description }} +
@@ -150,11 +153,11 @@ class="btn btn-tool">
- Concluídas + {{__('messages.dashboard.finished.description')}} {{ $CompanyProject->where('order_project', 4)->count() }} - Últimas obras de 2023 + {{__('messages.dashboard.finished.text')}}
diff --git a/resources/views/Admin/profile.blade.php b/resources/views/Admin/profile.blade.php index 24b2306d..e4565d5d 100755 --- a/resources/views/Admin/profile.blade.php +++ b/resources/views/Admin/profile.blade.php @@ -14,7 +14,20 @@ @endif - @if ($errors->any()) + @if (session('danger')) + + + @endif + + {{-- @if ($errors->any())