From dbd3063868eca78a2de512435236fef815cdeb74 Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Mon, 27 Nov 2023 16:29:41 +0000 Subject: [PATCH] update switch language and update portfolio --- app/Http/Controllers/userController.php | 8 +- public/user_logos/1696761654.jpg | Bin 12412 -> 0 bytes public/user_logos/1701100033.jpg | Bin 0 -> 15160 bytes resources/lang/en/messages.php | 2 +- resources/lang/pt/messages.php | 3 +- .../Admin/CrudUsers/listCompany.blade.php | 8 +- .../views/Admin/CrudUsers/listUsers.blade.php | 28 ++--- .../DataManagement/manageassets.blade.php | 77 ++++++++++--- resources/views/Admin/index.blade.php | 35 +++--- resources/views/Admin/profile.blade.php | 104 ++++++++++-------- .../views/Templates/templateAdmin.blade.php | 36 +++--- resources/views/email/pendingUsers.blade.php | 20 ++-- .../projectsClients/articulated_2.blade.php | 5 + .../projectsClients/createProject.blade.php | 75 ++++++++----- routes/web.php | 1 + 15 files changed, 249 insertions(+), 153 deletions(-) delete mode 100644 public/user_logos/1696761654.jpg create mode 100644 public/user_logos/1701100033.jpg 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 ce91928d0f401447090aff08728e76d05dcb677a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12412 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 literal 0 HcmV?d00001 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())