Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix settings tags view create and update. #1506

Merged
merged 2 commits into from
Aug 28, 2024
Merged

fix settings tags view create and update. #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f008cd3
fix settings tags view create and update.
suraj-webkul Aug 27, 2024
323c427
show selected tag color.
suraj-webkul Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions packages/Webkul/Admin/src/DataGrids/Settings/TagDataGrid.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,6 @@ public function prepareColumns(): void
'sortable' => true,
'searchable' => true,
'filterable' => true,
'closure' => function ($row) {
$color = $row->color ?? 'gray-500';
$html = "<div class=\"flex items-center gap-2\">
<span class='inline-block h-4 w-4 cursor-pointer rounded-full bg-{$color } shadow-md'></span>
<span>{$row->name}</span>
</div>";

return $html;
},
]);

$this->addColumn([
Expand Down
141 changes: 45 additions & 96 deletions packages/Webkul/Admin/src/Resources/views/settings/tags/index.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,19 +91,23 @@ class="icon-checkbox-outline peer-checked:icon-checkbox-select cursor-pointer ro
></label>
</div>

<!-- Tag ID -->
<!-- ID -->
<p>@{{ record.id }}</p>

<!-- Tag Name -->
<p v-html="record.name"></p>


{{-- <p>@{{ record.name }}</p> --}}
<!-- Name and Color -->
<p class="flex gap-2 items-center">
<span
class="block h-6 w-6 cursor-pointer rounded-full shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
:style="`background-color: ${record.color}`"
></span>

<span>@{{ record.name }}</span>
</p>

<!-- Tag User Name -->
<!-- User Name -->
<p>@{{ record.user_name }}</p>

<!-- Tag Created Date -->
<!-- Created Date -->
<p>@{{ record.created_at }}</p>

<!-- Actions -->
Expand Down Expand Up @@ -181,95 +185,24 @@ class="cursor-pointer rounded-md p-1.5 text-2xl transition-all hover:bg-gray-200
</x-admin::form.control-group.label>

<div class="flex gap-3">
<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="blue-500"
name="color"
value="blue-500"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="blue-500"
class="block h-6 w-6 cursor-pointer rounded-full bg-blue-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
>
</label>
</span>

<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="yellow-400"
name="color"
value="yellow-400"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="yellow-400"
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-yellow-400 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
>
</label>
</span>

<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="pink-500"
name="color"
value="pink-500"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="pink-500"
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-pink-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
>
</label>
</span>

<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="cyan-500"
name="color"
value="cyan-500"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="cyan-500"
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-cyan-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
>
</label>
</span>

<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="orange-500"
name="color"
value="orange-500"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="orange-500"
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-orange-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
<template v-for="(color, index) in colors">
<span class="relative inline-block">
<x-admin::form.control-group.control
type="radio"
::id="index"
name="color"
::value="color.background"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>

<label
:for="index"
class="block h-6 w-6 cursor-pointer rounded-full shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-gray-850"
:style="`background-color: ${color.background}`"
>
</label>
</span>

<span class="mr-1.25 relative inline-block">
<x-admin::form.control-group.control
type="radio"
id="green-500"
name="color"
value="green-500"
class="peer absolute left-0 right-3 top-5 z-10 h-full w-full cursor-pointer opacity-0"
/>
<label
for="green-500"
class="inline-block h-6 w-6 cursor-pointer rounded-full bg-green-500 shadow-md transition duration-200 ease-in-out peer-checked:border-4 peer-checked:border-solid peer-checked:border-white"
>
</label>
</span>
</label>
</span>
</template>
</div>

{!! view_render_event('krayin.admin.settings.tags.index.content.after') !!}
Expand Down Expand Up @@ -300,6 +233,22 @@ class="primary-button justify-center"
data() {
return {
isProcessing: false,

colors: [
{
background: '#FEE2E2',
}, {
background: '#FFEDD5',
}, {
background: '#FEF3C7',
}, {
background: '#FEF9C3',
}, {
background: '#ECFCCB',
}, {
background: '#DCFCE7',
},
],
};
},

Expand Down
Loading