From 513b69904dd4e8e58b5109b5f5382686ca6fb4db Mon Sep 17 00:00:00 2001
From: Alireza Mohammadi Arani
Date: Sat, 3 May 2025 12:53:48 +0400
Subject: [PATCH 1/8] add issue and expiry date
---
...d_issue_and_expiry_date_to_files_table.php | 29 ++++++++++
packages/Webkul/Activity/src/Models/File.php | 2 +
.../src/Repositories/ActivityRepository.php | 29 +++++-----
.../Http/Resources/ActivityFileResource.php | 14 +++--
.../Admin/src/Resources/lang/en/app.php | 2 +
.../views/activities/index.blade.php | 56 +++++++++----------
.../activities/actions/file.blade.php | 36 ++++++++++--
.../components/activities/index.blade.php | 55 +++++++++++++++---
.../views/leads/index/upload.blade.php | 2 +-
9 files changed, 164 insertions(+), 61 deletions(-)
create mode 100644 database/migrations/2025_05_03_111731_add_issue_and_expiry_date_to_files_table.php
diff --git a/database/migrations/2025_05_03_111731_add_issue_and_expiry_date_to_files_table.php b/database/migrations/2025_05_03_111731_add_issue_and_expiry_date_to_files_table.php
new file mode 100644
index 000000000..3852a7819
--- /dev/null
+++ b/database/migrations/2025_05_03_111731_add_issue_and_expiry_date_to_files_table.php
@@ -0,0 +1,29 @@
+date('issue_date')->nullable();
+ $table->date('expiry_date')->nullable();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ */
+ public function down(): void
+ {
+ Schema::table('activity_files', function (Blueprint $table) {
+ $table->dropColumn(['issue_date', 'expiry_date']);
+ });
+ }
+};
diff --git a/packages/Webkul/Activity/src/Models/File.php b/packages/Webkul/Activity/src/Models/File.php
index efbf90c5b..cc80aeac6 100644
--- a/packages/Webkul/Activity/src/Models/File.php
+++ b/packages/Webkul/Activity/src/Models/File.php
@@ -31,6 +31,8 @@ class File extends Model implements FileContract
'name',
'path',
'activity_id',
+ 'issue_date',
+ 'expiry_date',
];
/**
diff --git a/packages/Webkul/Activity/src/Repositories/ActivityRepository.php b/packages/Webkul/Activity/src/Repositories/ActivityRepository.php
index 3b4d6a4f8..8398c75b6 100755
--- a/packages/Webkul/Activity/src/Repositories/ActivityRepository.php
+++ b/packages/Webkul/Activity/src/Repositories/ActivityRepository.php
@@ -14,8 +14,9 @@ class ActivityRepository extends Repository
*/
public function __construct(
protected FileRepository $fileRepository,
- Container $container
- ) {
+ Container $container
+ )
+ {
parent::__construct($container);
}
@@ -40,13 +41,15 @@ public function create(array $data)
if (isset($data['file'])) {
$this->fileRepository->create([
- 'name' => $data['name'] ?? $data['file']->getClientOriginalName(),
- 'path' => $data['file']->store('activities/'.$activity->id),
+ 'issue_date' => $data['issue_date'] ?? null,
+ 'expiry_date' => $data['expiry_date'] ?? null,
+ 'name' => $data['name'] ?? $data['file']->getClientOriginalName(),
+ 'path' => $data['file']->store('activities/' . $activity->id),
'activity_id' => $activity->id,
]);
}
- if (! isset($data['participants'])) {
+ if (!isset($data['participants'])) {
return $activity;
}
@@ -68,8 +71,8 @@ public function create(array $data)
/**
* Update pipeline.
*
- * @param int $id
- * @param string $attribute
+ * @param int $id
+ * @param string $attribute
* @return \Webkul\Activity\Contracts\Activity
*/
public function update(array $data, $id, $attribute = 'id')
@@ -114,7 +117,7 @@ public function update(array $data, $id, $attribute = 'id')
}
/**
- * @param string $dateRange
+ * @param string $dateRange
* @return mixed
*/
public function getActivities($dateRange)
@@ -143,10 +146,10 @@ public function getActivities($dateRange)
}
/**
- * @param string $startFrom
- * @param string $endFrom
- * @param array $participants
- * @param int $id
+ * @param string $startFrom
+ * @param string $endFrom
+ * @param array $participants
+ * @param int $id
* @return bool
*/
public function isDurationOverlapping($startFrom, $endFrom, $participants, $id)
@@ -176,7 +179,7 @@ public function isDurationOverlapping($startFrom, $endFrom, $participants, $id)
})
->groupBy('activities.id');
- if (! is_null($id)) {
+ if (!is_null($id)) {
$queryBuilder->where('activities.id', '!=', $id);
}
diff --git a/packages/Webkul/Admin/src/Http/Resources/ActivityFileResource.php b/packages/Webkul/Admin/src/Http/Resources/ActivityFileResource.php
index abfdc0d31..76a5853e3 100644
--- a/packages/Webkul/Admin/src/Http/Resources/ActivityFileResource.php
+++ b/packages/Webkul/Admin/src/Http/Resources/ActivityFileResource.php
@@ -15,12 +15,14 @@ class ActivityFileResource extends JsonResource
public function toArray($request)
{
return [
- 'id' => $this->id,
- 'name' => $this->name,
- 'path' => $this->path,
- 'url' => $this->url,
- 'created_at' => $this->created_at,
- 'updated_at' => $this->updated_at,
+ 'id' => $this->id,
+ 'name' => $this->name,
+ 'path' => $this->path,
+ 'url' => $this->url,
+ 'issue_date' => $this->issue_date,
+ 'expiry_date' => $this->expiry_date,
+ 'created_at' => $this->created_at,
+ 'updated_at' => $this->updated_at,
];
}
}
diff --git a/packages/Webkul/Admin/src/Resources/lang/en/app.php b/packages/Webkul/Admin/src/Resources/lang/en/app.php
index 7bb10634a..12bd1c800 100644
--- a/packages/Webkul/Admin/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Admin/src/Resources/lang/en/app.php
@@ -123,6 +123,8 @@
'description' => 'Description',
'file' => 'File',
'save-btn' => 'Save File',
+ 'issue-date' => 'Issue Date',
+ 'expiry-date' => 'Expiry Date',
],
'note' => [
diff --git a/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php
index bb370e2e6..3e3bed79b 100644
--- a/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/activities/index.blade.php
@@ -11,7 +11,7 @@
-
+
@lang('admin::app.activities.index.title')
@@ -19,7 +19,7 @@
-
+
@@ -37,7 +37,7 @@
{!! view_render_event('admin.activities.index.activities.after') !!}
@pushOnce('scripts')
-
-@endPushOnce
\ No newline at end of file
+@endPushOnce
diff --git a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php
index 7413c42cb..323bde4e5 100644
--- a/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/components/activities/index.blade.php
@@ -202,22 +202,48 @@ class="dark:text-white"
class="flex flex-wrap gap-2"
v-if="activity.files.length"
>
-
+
+ class="flex cursor-pointer items-center gap-1 rounded-md p-1.5"
+ >
+
@{{ file.name }}
-
+
+
+
+
+
+ Issue Date : @{{ file.issue_date }}
+
+
+
+
+
+
+ Expire Date : @{{ file.expiry_date }}
+ (
+ @{{ getRemainingDays(file.expiry_date) }}
+ )
+
+
+
+
+
{!! view_render_event('admin.components.activities.content.activity.item.attachments.after') !!}
@@ -634,6 +660,21 @@ class="dark:mix-blend-exclusion dark:invert"
}
});
},
+
+ getRemainingDays(expiryDate) {
+ const now = new Date();
+ const expiry = new Date(expiryDate);
+ const diffTime = expiry - now;
+ const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24));
+
+ if (diffDays > 0) {
+ return `${diffDays} day(s) left`;
+ } else if (diffDays === 0) {
+ return 'Expires today';
+ } else {
+ return `${Math.abs(diffDays)} day(s) ago`;
+ }
+ },
},
});
diff --git a/packages/Webkul/Admin/src/Resources/views/leads/index/upload.blade.php b/packages/Webkul/Admin/src/Resources/views/leads/index/upload.blade.php
index e6d598d71..25cb79bec 100644
--- a/packages/Webkul/Admin/src/Resources/views/leads/index/upload.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/leads/index/upload.blade.php
@@ -26,7 +26,7 @@ class="secondary-button"
as="div"
ref="modalForm"
>
-
From e4bf6a4748b244889f1ebcaca1e94b705f1272b4 Mon Sep 17 00:00:00 2001
From: Alireza Mohammadi Arani
Date: Tue, 27 May 2025 20:58:58 +0400
Subject: [PATCH 6/8] update
---
resources/views/landing.blade.php | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index 904895e65..198e19d48 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -28,9 +28,18 @@
body, html {
height: 100%;
- font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
- }
+ overflow-x: hidden;
+ }
+ img {
+ max-width: 100%;
+ height: auto;
+ display: block;
+ }
+ .content {
+ max-width: 100%;
+ overflow: hidden;
+ }
.hero {
height: 100vh;
position: relative;
@@ -48,14 +57,8 @@
padding: 20px;
}
- .content {
- max-width: 500px;
- min-width: 350px;
- }
-
.heading {
font-size: 1.5rem;
- margin-bottom: 30px;
}
.social-icons {
@@ -63,7 +66,6 @@
justify-content: center;
gap: 30px;
font-size: 2rem;
- margin-bottom: 30px;
}
.social-icons a {
@@ -76,10 +78,6 @@
transform: scale(1.2);
}
- .credit {
- font-size: 0.9rem;
- color: #ccc;
- }
.credit a {
color: white;
@@ -92,7 +90,6 @@
-
From 4e85818c03237a345afbf5cc2d68180a63a80b34 Mon Sep 17 00:00:00 2001
From: Alireza Mohammadi Arani
Date: Tue, 27 May 2025 21:03:30 +0400
Subject: [PATCH 7/8] update
---
resources/views/landing.blade.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index 198e19d48..0a72a39fb 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -50,11 +50,18 @@
height: 100%;
width: 100%;
display: flex;
- align-items: center;
justify-content: center;
- text-align: center;
+ align-items: center; /* Center vertically */
color: white;
- padding: 20px;
+ padding-top: 0; /* Default */
+ text-align: center;
+ }
+
+ @media (max-width: 768px) {
+ .overlay {
+ align-items: flex-start; /* Push content up on mobile */
+ padding-top: 15vh; /* Adjust this value as needed */
+ }
}
.heading {
From 0939f24cb970ba724dd9572a572b0f46c45d5d7b Mon Sep 17 00:00:00 2001
From: Alireza Mohammadi Arani
Date: Tue, 27 May 2025 21:07:05 +0400
Subject: [PATCH 8/8] update
---
.../Resources/views/errors/index.blade.php | 24 +++++++++----------
resources/views/landing.blade.php | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php b/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php
index 0c73cc6f3..2d8f83042 100644
--- a/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/errors/index.blade.php
@@ -9,10 +9,10 @@
->cookie('dark_mode')
- ? vite()->asset('images/dark-logo.svg')
- : vite()->asset('images/logo.svg')
+ src=)
cookie('dark_mode')
+ ? vite()->asset('images/dark-logo.svg')
+ : vite()->asset('images/logo.svg')
}}"
class="w-40 ltr:pr-16 rtl:pl-16"
>
@@ -39,18 +39,18 @@ class="cursor-pointer text-sm font-semibold text-blue-600 transition-all hover:u
-
- @lang('admin::app.errors.dashboard')
-
+{{--
--}}
+{{-- @lang('admin::app.errors.dashboard')--}}
+{{-- --}}
@lang('admin::app.errors.support', [
- 'link' => 'mailto:support@example.com',
- 'email' => 'support@example.com',
+ 'link' => 'mailto:alireza2756@gmail.com',
+ 'email' => 'alireza2756@gmail.com',
'class' => 'font-semibold text-blue-600 transition-all hover:underline',
])
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index 0a72a39fb..1c9bde6cd 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -103,7 +103,7 @@