diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index 7c09161..a5c44b3 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -61,12 +61,15 @@ public function registerAction(RegisterRequest $request){ 'company_annual_tax_return_doc', 'company_domicile_certificate_doc', 'company_profile_doc', - 'company_cooperation_request_doc', ]; $companyFileNames = []; foreach($companyFiles as $file){ - $companyFileNames[$file] = store_file($validatedData[$file], '/uploads/companies', 'public')['randomFileName']; + if($request->hasFile($file)){ + $companyFileNames[$file] = store_file($validatedData[$file], '/uploads/companies', 'public')['randomFileName']; + }else{ + $companyFileNames[$file] = null; + } } $createdCompany = Company::create([ @@ -90,8 +93,6 @@ public function registerAction(RegisterRequest $request){ 'domicile_certificate_doc' => $companyFileNames['company_domicile_certificate_doc'], 'profile' => $validatedData['company_profile'], 'profile_doc' => $companyFileNames['company_profile_doc'], - 'cooperation_request' => $validatedData['company_cooperation_request'], - 'cooperation_request_doc' => $companyFileNames['company_cooperation_request_doc'], 'user_id' => $createdUser->id, ]); @@ -102,7 +103,11 @@ public function registerAction(RegisterRequest $request){ $mediaFileNames = []; foreach($mediaFiles as $file){ - $mediaFileNames[$file] = store_file($validatedData[$file], '/uploads/media', 'public')['randomFileName']; + if($request->hasFile($file)){ + $mediaFileNames[$file] = store_file($validatedData[$file], '/uploads/media', 'public')['randomFileName']; + }else{ + $mediaFileNames[$file] = null; + } } $createdMedia = Media::create([ @@ -125,7 +130,11 @@ public function registerAction(RegisterRequest $request){ $journalistFileNames = []; foreach($journalistFiles as $file){ - $journalistFileNames[$file] = store_file($validatedData[$file], '/uploads/journalists', 'public')['randomFileName']; + if($request->hasFile($file)){ + $journalistFileNames[$file] = store_file($validatedData[$file], '/uploads/journalists', 'public')['randomFileName']; + }else{ + $journalistFileNames[$file] = null; + } } $createdJournalist = Journalist::create([ diff --git a/app/Http/Requests/RegisterRequest.php b/app/Http/Requests/RegisterRequest.php index 33d37fd..c926067 100644 --- a/app/Http/Requests/RegisterRequest.php +++ b/app/Http/Requests/RegisterRequest.php @@ -26,7 +26,7 @@ public function rules(): array return [ // Login credential 'name' => ['required'], - 'email' => ['required', 'email'], + 'email' => ['required', 'email','unique:users,email'], 'password' => ['required', 'confirmed', Password::min(8) ->mixedCase() ->numbers() @@ -38,40 +38,168 @@ public function rules(): array 'company_director_name' => ['required', 'max:100'], 'company_director_nik' => ['required', 'max:100'], 'company_director_nik_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_deed_incorporation' => ['required', 'max:100'], - 'company_deed_incorporation_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_trade_license' => ['required', 'max:100'], - 'company_trade_license_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_tax_id_number' => ['required', 'max:100'], - 'company_tax_id_number_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_taxable_enterprise' => ['required', 'max:100'], - 'company_taxable_enterprise_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_annual_tax_return' => ['required', 'max:100'], - 'company_annual_tax_return_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_domicile_certificate' => ['required', 'max:100'], - 'company_domicile_certificate_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_profile' => ['required', 'max:100'], - 'company_profile_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'company_cooperation_request' => ['required', 'max:100'], - 'company_cooperation_request_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], + 'company_deed_incorporation' => ['nullable', 'max:100'], + 'company_deed_incorporation_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_trade_license' => ['nullable', 'max:100'], + 'company_trade_license_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_tax_id_number' => ['nullable', 'max:100'], + 'company_tax_id_number_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_taxable_enterprise' => ['nullable', 'max:100'], + 'company_taxable_enterprise_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_annual_tax_return' => ['nullable', 'max:100'], + 'company_annual_tax_return_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_domicile_certificate' => ['nullable', 'max:100'], + 'company_domicile_certificate_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'company_profile' => ['nullable', 'max:100'], + 'company_profile_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], // Media 'media_name' => ['required', 'max:100'], 'media_address' => ['required'], 'media_link' => ['required'], - 'media_type' => ['required'], - 'media_classification' => ['required'], - 'media_journalism_organization' => ['required', 'max:100'], - 'media_journalism_organization_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'media_press_council_certificate' => ['required', 'max:100'], - 'media_press_council_certificate_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], + 'media_type' => ['required', 'in:online,cetak,radio,televisi'], + 'media_classification' => ['required', 'in:lokal,regional,nasional'], + 'media_journalism_organization' => ['nullable', 'max:100'], + 'media_journalism_organization_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'media_press_council_certificate' => ['nullable', 'max:100'], + 'media_press_council_certificate_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], // Journalist 'journalist_name' => ['required', 'max:100'], 'journalist_email' => ['required', 'max:100', 'email'], 'journalist_phone_number' => ['required', 'max:100'], - 'journalist_press_card' => ['required', 'max:100'], - 'journalist_press_card_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], - 'journalist_ukw_sertificate' => ['required', 'max:100'], - 'journalist_ukw_sertificate_doc' => ['required', 'file', 'mimes:pdf', 'max:2048'], + 'journalist_press_card' => ['nullable', 'max:100'], + 'journalist_press_card_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], + 'journalist_ukw_sertificate' => ['nullable', 'max:100'], + 'journalist_ukw_sertificate_doc' => ['nullable', 'file', 'mimes:pdf', 'max:2048'], ]; } + + public function messages(): array + { + return [ + // Login credential + 'name.required' => 'Nama wajib diisi.', + 'email.required' => 'Email wajib diisi.', + 'email.email' => 'Email tidak valid.', + 'email.unique' => 'Email sudah terdaftar.', + 'password.required' => 'Password wajib diisi.', + 'password.confirmed' => 'Konfirmasi password tidak cocok.', + 'password.min' => 'Password harus memiliki minimal 8 karakter.', + 'password.mixedCase' => 'Password harus mengandung huruf besar dan kecil.', + 'password.numbers' => 'Password harus mengandung angka.', + 'password.symbols' => 'Password harus mengandung simbol.', + + // Company + 'company_name.required' => 'Nama perusahaan wajib diisi.', + 'company_name.max' => 'Nama perusahaan maksimal 100 karakter.', + 'company_email.required' => 'Email perusahaan wajib diisi.', + 'company_email.email' => 'Email perusahaan tidak valid.', + 'company_email.max' => 'Email perusahaan maksimal 100 karakter.', + 'company_address.required' => 'Alamat perusahaan wajib diisi.', + 'company_director_name.required' => 'Nama direktur perusahaan wajib diisi.', + 'company_director_name.max' => 'Nama direktur perusahaan maksimal 100 karakter.', + 'company_director_nik.required' => 'NIK direktur perusahaan wajib diisi.', + 'company_director_nik.max' => 'NIK direktur perusahaan maksimal 100 karakter.', + 'company_director_nik_doc.required' => 'Dokumen NIK direktur perusahaan wajib diunggah.', + 'company_director_nik_doc.file' => 'Dokumen NIK direktur perusahaan harus berupa file.', + 'company_director_nik_doc.mimes' => 'Dokumen NIK direktur perusahaan harus dalam format PDF.', + 'company_director_nik_doc.max' => 'Ukuran dokumen NIK direktur perusahaan maksimal 2 MB.', + + // Documents + 'company_deed_incorporation.max' => 'Akta pendirian perusahaan maksimal 100 karakter.', + 'company_deed_incorporation_doc.file' => 'Dokumen akta pendirian perusahaan harus berupa file.', + 'company_deed_incorporation_doc.mimes' => 'Dokumen akta pendirian perusahaan harus dalam format PDF.', + 'company_deed_incorporation_doc.max' => 'Ukuran dokumen akta pendirian perusahaan maksimal 2 MB.', + 'company_trade_license.max' => 'Lisensi perdagangan perusahaan maksimal 100 karakter.', + 'company_trade_license_doc.file' => 'Dokumen lisensi perdagangan perusahaan harus berupa file.', + 'company_trade_license_doc.mimes' => 'Dokumen lisensi perdagangan perusahaan harus dalam format PDF.', + 'company_trade_license_doc.max' => 'Ukuran dokumen lisensi perdagangan perusahaan maksimal 2 MB.', + 'company_tax_id_number.max' => 'Nomor NPWP perusahaan maksimal 100 karakter.', + 'company_tax_id_number_doc.file' => 'Dokumen NPWP perusahaan harus berupa file.', + 'company_tax_id_number_doc.mimes' => 'Dokumen NPWP perusahaan harus dalam format PDF.', + 'company_tax_id_number_doc.max' => 'Ukuran dokumen NPWP perusahaan maksimal 2 MB.', + 'company_taxable_enterprise.max' => 'Nomor PKP perusahaan maksimal 100 karakter.', + 'company_taxable_enterprise_doc.file' => 'Dokumen PKP perusahaan harus berupa file.', + 'company_taxable_enterprise_doc.mimes' => 'Dokumen PKP perusahaan harus dalam format PDF.', + 'company_taxable_enterprise_doc.max' => 'Ukuran dokumen PKP perusahaan maksimal 2 MB.', + 'company_annual_tax_return.max' => 'Laporan SPT tahunan perusahaan maksimal 100 karakter.', + 'company_annual_tax_return_doc.file' => 'Dokumen SPT tahunan perusahaan harus berupa file.', + 'company_annual_tax_return_doc.mimes' => 'Dokumen SPT tahunan perusahaan harus dalam format PDF.', + 'company_annual_tax_return_doc.max' => 'Ukuran dokumen SPT tahunan perusahaan maksimal 2 MB.', + 'company_domicile_certificate.max' => 'Sertifikat domisili perusahaan maksimal 100 karakter.', + 'company_domicile_certificate_doc.file' => 'Dokumen sertifikat domisili perusahaan harus berupa file.', + 'company_domicile_certificate_doc.mimes' => 'Dokumen sertifikat domisili perusahaan harus dalam format PDF.', + 'company_domicile_certificate_doc.max' => 'Ukuran dokumen sertifikat domisili perusahaan maksimal 2 MB.', + 'company_profile.max' => 'Profil perusahaan maksimal 100 karakter.', + 'company_profile_doc.file' => 'Dokumen profil perusahaan harus berupa file.', + 'company_profile_doc.mimes' => 'Dokumen profil perusahaan harus dalam format PDF.', + 'company_profile_doc.max' => 'Ukuran dokumen profil perusahaan maksimal 2 MB.', + + // Media + 'media_name.required' => 'Nama media wajib diisi.', + 'media_name.max' => 'Nama media maksimal 100 karakter.', + 'media_address.required' => 'Alamat media wajib diisi.', + 'media_link.required' => 'Link media wajib diisi.', + 'media_type.required' => 'Tipe media wajib dipilih.', + 'media_type.in' => 'Tipe media tidak valid.', + 'media_classification.required' => 'Klasifikasi media wajib dipilih.', + 'media_classification.in' => 'Klasifikasi media tidak valid.', + 'media_journalism_organization.max' => 'Organisasi jurnalistik media maksimal 100 karakter.', + 'media_journalism_organization_doc.file' => 'Dokumen organisasi jurnalistik media harus berupa file.', + 'media_journalism_organization_doc.mimes' => 'Dokumen organisasi jurnalistik media harus dalam format PDF.', + 'media_journalism_organization_doc.max' => 'Ukuran dokumen organisasi jurnalistik media maksimal 2 MB.', + 'media_press_council_certificate.max' => 'Sertifikat Dewan Pers media maksimal 100 karakter.', + 'media_press_council_certificate_doc.file' => 'Dokumen sertifikat Dewan Pers media harus berupa file.', + 'media_press_council_certificate_doc.mimes' => 'Dokumen sertifikat Dewan Pers media harus dalam format PDF.', + 'media_press_council_certificate_doc.max' => 'Ukuran dokumen sertifikat Dewan Pers media maksimal 2 MB.', + + // Journalist + 'journalist_name.required' => 'Nama jurnalis wajib diisi.', + 'journalist_name.max' => 'Nama jurnalis maksimal 100 karakter.', + 'journalist_email.required' => 'Email jurnalis wajib diisi.', + 'journalist_email.max' => 'Email jurnalis maksimal 100 karakter.', + 'journalist_email.email' => 'Email jurnalis tidak valid.', + 'journalist_phone_number.required' => 'Nomor telepon jurnalis wajib diisi.', + 'journalist_phone_number.max' => 'Nomor telepon jurnalis maksimal 100 karakter.', + 'journalist_press_card.max' => 'Kartu pers jurnalis maksimal 100 karakter.', + 'journalist_press_card_doc.file' => 'Dokumen kartu pers jurnalis harus berupa file.', + 'journalist_press_card_doc.mimes' => 'Dokumen kartu pers jurnalis harus dalam format PDF.', + 'journalist_press_card_doc.max' => 'Ukuran dokumen kartu pers jurnalis maksimal 2 MB.', + 'journalist_ukw_sertificate.max' => 'Sertifikat UKW jurnalis maksimal 100 karakter.', + 'journalist_ukw_sertificate_doc.file' => 'Dokumen sertifikat UKW jurnalis harus berupa file.', + 'journalist_ukw_sertificate_doc.mimes' => 'Dokumen sertifikat UKW jurnalis harus dalam format PDF.', + 'journalist_ukw_sertificate_doc.max' => 'Ukuran dokumen sertifikat UKW jurnalis maksimal 2 MB.', + ]; + } + + protected function prepareForValidation() + { + $this->merge([ + 'company_deed_incorporation' => filled($this->company_deed_incorporation) ? $this->company_deed_incorporation : null, + 'company_deed_incorporation_doc' => filled($this->company_deed_incorporation_doc) ? $this->company_deed_incorporation_doc : null, + 'company_trade_license' => filled($this->company_trade_license) ? $this->company_trade_license : null, + 'company_trade_license_doc' => filled($this->company_trade_license_doc) ? $this->company_trade_license_doc : null, + 'company_tax_id_number' => filled($this->company_tax_id_number) ? $this->company_tax_id_number : null, + 'company_tax_id_number_doc' => filled($this->company_tax_id_number_doc) ? $this->company_tax_id_number_doc : null, + 'company_taxable_enterprise' => filled($this->company_taxable_enterprise) ? $this->company_taxable_enterprise : null, + 'company_taxable_enterprise_doc' => filled($this->company_taxable_enterprise_doc) ? $this->company_taxable_enterprise_doc : null, + 'company_annual_tax_return' => filled($this->company_annual_tax_return) ? $this->company_annual_tax_return : null, + 'company_annual_tax_return_doc' => filled($this->company_annual_tax_return_doc) ? $this->company_annual_tax_return_doc : null, + 'company_domicile_certificate' => filled($this->company_domicile_certificate) ? $this->company_domicile_certificate : null, + 'company_domicile_certificate_doc' => filled($this->company_domicile_certificate_doc) ? $this->company_domicile_certificate_doc : null, + 'company_profile' => filled($this->company_profile) ? $this->company_profile : null, + 'company_profile_doc' => filled($this->company_profile_doc) ? $this->company_profile_doc : null, + // Media + 'media_journalism_organization' => filled($this->media_journalism_organization) ? $this->media_journalism_organization : null, + 'media_journalism_organization_doc' => filled($this->media_journalism_organization_doc) ? $this->media_journalism_organization_doc : null, + 'media_press_council_certificate' => filled($this->media_press_council_certificate) ? $this->media_press_council_certificate : null, + 'media_press_council_certificate_doc' => filled($this->media_press_council_certificate_doc) ? $this->media_press_council_certificate_doc : null, + // Journalist + 'journalist_press_card' => filled($this->journalist_press_card) ? $this->journalist_press_card : null, + 'journalist_press_card_doc' => filled($this->journalist_press_card_doc) ? $this->journalist_press_card_doc : null, + 'journalist_ukw_sertificate' => filled($this->journalist_ukw_sertificate) ? $this->journalist_ukw_sertificate : null, + 'journalist_ukw_sertificate_doc' => filled($this->journalist_ukw_sertificate_doc) ? $this->journalist_ukw_sertificate_doc : null, + ]); + } + + } diff --git a/database/migrations/2025_02_25_024741_create_companies_table.php b/database/migrations/2025_02_25_024741_create_companies_table.php index 8c7d06d..67c64ac 100644 --- a/database/migrations/2025_02_25_024741_create_companies_table.php +++ b/database/migrations/2025_02_25_024741_create_companies_table.php @@ -19,17 +19,17 @@ public function up(): void $table->string('director_name'); $table->string('director_nik'); $table->string('director_nik_doc')->nullable(); - $table->string('deed_incorporation'); + $table->string('deed_incorporation')->nullable(); $table->string('deed_incorporation_doc')->nullable(); - $table->string('trade_license'); + $table->string('trade_license')->nullable(); $table->string('trade_license_doc')->nullable(); - $table->string('tax_id_number'); + $table->string('tax_id_number')->nullable(); $table->string('tax_id_number_doc')->nullable(); - $table->string('taxable_enterprise'); + $table->string('taxable_enterprise')->nullable(); $table->string('taxable_enterprise_doc')->nullable(); - $table->string('annual_tax_return'); + $table->string('annual_tax_return')->nullable(); $table->string('annual_tax_return_doc')->nullable(); - $table->string('domicile_certificate'); + $table->string('domicile_certificate')->nullable(); $table->string('domicile_certificate_doc')->nullable(); $table->string('profile')->nullable(); $table->string('profile_doc')->nullable(); diff --git a/public/assets/defaults/instagram.png b/public/assets/defaults/instagram.png index da645b7..6181afa 100644 Binary files a/public/assets/defaults/instagram.png and b/public/assets/defaults/instagram.png differ diff --git a/public/assets/defaults/telegram.png b/public/assets/defaults/telegram.png new file mode 100644 index 0000000..d955219 Binary files /dev/null and b/public/assets/defaults/telegram.png differ diff --git a/public/assets/defaults/twitter.png b/public/assets/defaults/twitter.png index eb76313..c85b76e 100644 Binary files a/public/assets/defaults/twitter.png and b/public/assets/defaults/twitter.png differ diff --git a/public/assets/defaults/whatsapp.png b/public/assets/defaults/whatsapp.png new file mode 100644 index 0000000..26ad8c9 Binary files /dev/null and b/public/assets/defaults/whatsapp.png differ diff --git a/resources/views/auth/register-success.blade.php b/resources/views/auth/register-success.blade.php index 9268bbb..e2ebf54 100644 --- a/resources/views/auth/register-success.blade.php +++ b/resources/views/auth/register-success.blade.php @@ -70,10 +70,12 @@ diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index fabd206..f4882e3 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -66,7 +66,7 @@
- +
@error('email') {{$message}} @@ -161,7 +161,7 @@
- +
@@ -172,9 +172,9 @@
- +
- +
@error('company_deed_incorporation') {{$message}} @@ -194,9 +194,9 @@
- +
- +
@error('company_trade_license') {{$message}} @@ -216,9 +216,9 @@
- +
- +
@error('company_tax_id_number') {{$message}} @@ -238,9 +238,9 @@
- +
- +
@error('company_taxable_enterprise') {{$message}} @@ -260,9 +260,9 @@
- +
- +
@error('company_annual_tax_return') {{$message}} @@ -282,9 +282,9 @@
- +
- +
@error('company_domicile_certificate') {{$message}} @@ -304,9 +304,9 @@
- +
- +
@error('company_profile') {{$message}} @@ -315,37 +315,15 @@
- +
- +
@error('company_profile_doc') {{$message}} @enderror
-
-
- -
- -
- @error('company_cooperation_request') - {{$message}} - @enderror -
-
-
-
- -
- -
- @error('company_cooperation_request_doc') - {{$message}} - @enderror -
-
@@ -369,7 +347,7 @@
- + @error('media_address') {{$message}} @enderror @@ -383,7 +361,7 @@
- +
@error('media_link') {{$message}} @@ -401,20 +379,20 @@
  • - - + +
  • - +
  • - - + +
  • @@ -427,20 +405,20 @@
    • - - + +
    • - +
    • - - + +
    @@ -450,9 +428,9 @@
    - +
    - +
    @error('media_journalism_organization') {{$message}} @@ -472,9 +450,9 @@
    - +
    - +
    @error('media_press_council_certificate') {{$message}} @@ -535,9 +513,9 @@
    - +
    - +
    @error('journalist_press_card') {{$message}} @@ -546,7 +524,7 @@
    - +
    @@ -557,9 +535,9 @@
    - +
    - +
    @error('journalist_ukw_sertificate') {{$message}} @@ -568,7 +546,7 @@
    - +