Skip to content

Commit

Permalink
Discounts UI (Fix misplaced Actions) 🎁
Browse files Browse the repository at this point in the history
  • Loading branch information
inikoo committed Jan 5, 2025
1 parent bd55d1c commit daa46c9
Show file tree
Hide file tree
Showing 15 changed files with 93 additions and 95 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function htmlResponse(LengthAwarePaginator $campaigns, ActionRequest $req
$iconRight = null;

return Inertia::render(
'Org/Shop/B2b/Campaigns/Campaigns',
'Org/Discounts/Campaigns',
[
'breadcrumbs' => $this->getBreadcrumbs(
$request->route()->getName(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function asController(Organisation $organisation, Shop $shop, OfferCampai
public function htmlResponse(OfferCampaign $offerCampaign, ActionRequest $request): Response
{
return Inertia::render(
'Org/Shop/B2b/Campaigns/Campaign',
'Org/Discounts/Campaign',
[
'title' => __('Offer Campaign'),
'breadcrumbs' => $this->getBreadcrumbs($offerCampaign, $request->route()->getName(), $request->route()->originalParameters()),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

/*
* Author: Raul Perusquia <raul@inikoo.com>
* Created: Mon, 06 Mar 2023 18:44:51 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2023, Raul A Perusquia Flores
* Created: Sun, 05 Jan 2025 14:07:49 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2025, Raul A Perusquia Flores
*/

namespace App\Actions\UI\Dropshipping\Offers;
namespace App\Actions\Discounts\UI;

use App\Actions\Catalogue\Shop\UI\ShowShop;
use App\Actions\OrgAction;
use App\Enums\UI\Dropshipping\OffersTabsEnum;
use App\Enums\UI\Discounts\DiscountsDashboardTabsEnum;
use App\Models\Catalogue\Shop;
use App\Models\SysAdmin\Organisation;
use Inertia\Inertia;
use Inertia\Response;
use Lorisleiva\Actions\ActionRequest;

class ShowOfferDashboard extends OrgAction
class ShowDiscountsDashboard extends OrgAction
{
public function authorize(ActionRequest $request): bool
{
Expand All @@ -36,25 +36,24 @@ public function asController(Organisation $organisation, Shop $shop, ActionReque
public function htmlResponse(ActionRequest $request): Response
{
return Inertia::render(
'Org/Shop/Dropshipping/OffersDashboard',
'Org/Discounts/DiscountsDashboard',
[
'breadcrumbs' => $this->getBreadcrumbs($request->route()->originalParameters()),
'title' => __('offers'),
'title' => __('Offers dashboard'),
'pageHead' => [
'icon' => [
'icon' => ['fal', 'fa-badge-percent'],
'title' => __('offer')
'title' => __('Offers dashboard')
],
'model' => __('Offers'),
'iconRight' => [
'icon' => ['fal', 'fa-chart-network'],
'title' => __('offer')
],
'title' => __('dashboard'),
'title' => __('Offers dashboard'),
],
'tabs' => [
'current' => $this->tab,
'navigation' => OffersTabsEnum::navigation()
'navigation' => DiscountsDashboardTabsEnum::navigation()
],
'stats' => [
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

use App\Actions\Catalogue\Shop\UI\ShowShop;
use App\Actions\OrgAction;
use App\Enums\UI\Dropshipping\MarketingTabsEnum;
use App\Enums\UI\Marketing\MarketingDashboardTabsEnum;
use App\Models\Catalogue\Shop;
use App\Models\SysAdmin\Organisation;
use Inertia\Inertia;
Expand All @@ -27,7 +27,7 @@ public function authorize(ActionRequest $request): bool

public function asController(Organisation $organisation, Shop $shop, ActionRequest $request): ActionRequest
{
$this->initialisationFromShop($shop, $request)->withTab(MarketingTabsEnum::values());
$this->initialisationFromShop($shop, $request)->withTab(MarketingDashboardTabsEnum::values());

return $request;
}
Expand All @@ -36,7 +36,7 @@ public function asController(Organisation $organisation, Shop $shop, ActionReque
public function htmlResponse(ActionRequest $request): Response
{
return Inertia::render(
'Org/Shop/Dropshipping/MarketingDashboard',
'Org/Marketing/MarketingDashboard',
[
'breadcrumbs' => $this->getBreadcrumbs($request->route()->originalParameters()),
'title' => __('Marketing Dashboard'),
Expand All @@ -53,7 +53,7 @@ public function htmlResponse(ActionRequest $request): Response
],
'tabs' => [
'current' => $this->tab,
'navigation' => MarketingTabsEnum::navigation()
'navigation' => MarketingDashboardTabsEnum::navigation()
],
'dashboard_stats' => [
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

/*
* Author: Raul Perusquia <raul@inikoo.com>
* Created: Sat, 11 May 2024 20:45:45 British Summer Time, Sheffield, UK
* Copyright (c) 2024, Raul A Perusquia Flores
* Created: Sun, 05 Jan 2025 14:31:39 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2025, Raul A Perusquia Flores
*/

namespace App\Enums\UI\Dropshipping;
namespace App\Enums\UI\Discounts;

use App\Enums\EnumHelperTrait;
use App\Enums\HasTabs;

enum MarketingTabsEnum: string
enum DiscountsDashboardTabsEnum: string
{
use EnumHelperTrait;
use HasTabs;
Expand All @@ -21,7 +21,7 @@ enum MarketingTabsEnum: string
public function blueprint(): array
{
return match ($this) {
MarketingTabsEnum::DASHBOARD => [
DiscountsDashboardTabsEnum::DASHBOARD => [
'title' => __('dashboard'),
'icon' => 'fal fa-tachometer-alt-fast',
],
Expand Down
59 changes: 0 additions & 59 deletions app/Enums/UI/Dropshipping/OffersTabsEnum.php

This file was deleted.

30 changes: 30 additions & 0 deletions app/Enums/UI/Marketing/MarketingDashboardTabsEnum.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

/*
* Author: Raul Perusquia <raul@inikoo.com>
* Created: Sun, 05 Jan 2025 14:31:08 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2025, Raul A Perusquia Flores
*/

namespace App\Enums\UI\Marketing;

use App\Enums\EnumHelperTrait;
use App\Enums\HasTabs;

enum MarketingDashboardTabsEnum: string
{
use EnumHelperTrait;
use HasTabs;

case DASHBOARD = 'dashboard';

public function blueprint(): array
{
return match ($this) {
MarketingDashboardTabsEnum::DASHBOARD => [
'title' => __('dashboard'),
'icon' => 'fal fa-tachometer-alt-fast',
],
};
}
}
29 changes: 29 additions & 0 deletions app/Enums/UI/SysAdmin/SysAdminAnalyticsDashboardTabsEnum.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php
/*
* Author: Raul Perusquia <raul@inikoo.com>
* Created: Sun, 05 Jan 2025 14:40:20 Malaysia Time, Kuala Lumpur, Malaysia
* Copyright (c) 2025, Raul A Perusquia Flores
*/

namespace App\Enums\UI\SysAdmin;

use App\Enums\EnumHelperTrait;
use App\Enums\HasTabs;

enum SysAdminAnalyticsDashboardTabsEnum: string
{
use EnumHelperTrait;
use HasTabs;

case DASHBOARD = 'dashboard';

public function blueprint(): array
{
return match ($this) {
SysAdminAnalyticsDashboardTabsEnum::DASHBOARD => [
'title' => __('dashboard'),
'icon' => 'fal fa-tachometer-alt-fast',
],
};
}
}
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
<script setup lang="ts">
import { Head } from '@inertiajs/vue3'
import PageHeading from '@/Components/Headings/PageHeading.vue'
import Tabs from "@/Components/Navigation/Tabs.vue"
import { useTabChange } from "@/Composables/tab-change"
import { capitalize } from "@/Composables/capitalize"
import { computed, defineAsyncComponent, inject, ref } from 'vue'
import { computed, inject, ref } from 'vue'
import type { Component } from 'vue'
import { PageHeading as TSPageHeading } from '@/types/PageHeading'
import { Tabs as TSTabs } from '@/types/Tabs'
import { aikuLocaleStructure } from '@/Composables/useLocaleStructure'
import SimpleBox from '@/Components/DataDisplay/SimpleBox.vue'
// import FileShowcase from '@/xxxxxxxxxxxx'
import CountUp from 'vue-countup-v3'
import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome'
import { } from '@fas'
import { library } from '@fortawesome/fontawesome-svg-core'
import { trans } from 'laravel-vue-i18n'
library.add()
const props = defineProps<{
title: string,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
<!--
- Author: Raul Perusquia <raul@inikoo.com>
- Created: Sun, 05 Jan 2025 14:40:55 Malaysia Time, Kuala Lumpur, Malaysia
- Copyright (c) 2025, Raul A Perusquia Flores
-->

<script setup lang="ts">
import { Head } from '@inertiajs/vue3'
import PageHeading from '@/Components/Headings/PageHeading.vue'
Expand Down
4 changes: 2 additions & 2 deletions routes/grp/web/org/shops/discounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
use App\Actions\Discounts\Offer\UI\IndexOffers;
use App\Actions\Discounts\OfferCampaign\UI\IndexOfferCampaigns;
use App\Actions\Discounts\OfferCampaign\UI\ShowOfferCampaign;
use App\Actions\UI\Dropshipping\Offers\ShowOfferDashboard;
use App\Actions\Discounts\UI\ShowDiscountsDashboard;
use App\Stubs\UIDummies\CreateDummy;
use App\Stubs\UIDummies\EditDummy;
use App\Stubs\UIDummies\ShowDummy;
use Illuminate\Support\Facades\Route;

Route::get('', ShowOfferDashboard::class)->name('dashboard');
Route::get('', ShowDiscountsDashboard::class)->name('dashboard');
Route::name("campaigns.")->prefix('campaigns')
->group(function () {
Route::get('', IndexOfferCampaigns::class)->name('index');
Expand Down
6 changes: 3 additions & 3 deletions tests/Feature/AikuSections/DiscountsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@

$response->assertInertia(function (AssertableInertia $page) {
$page
->component('Org/Shop/B2b/Campaigns/Campaigns')
->component('Org/Discounts/Campaigns')
->has('title')
->has('pageHead')
->has('data')
Expand All @@ -137,7 +137,7 @@

$response->assertInertia(function (AssertableInertia $page) use ($offerCampaign) {
$page
->component('Org/Shop/B2b/Campaigns/Campaign')
->component('Org/Discounts/Campaign')
->has('title')
->has(
'pageHead',
Expand All @@ -156,7 +156,7 @@

$response->assertInertia(function (AssertableInertia $page) {
$page
->component('Org/Shop/B2b/Offers/Offers')
->component('Org/Discounts/Offers')
->has('title')
->has('pageHead')
->has('data')
Expand Down

0 comments on commit daa46c9

Please sign in to comment.