Skip to content
GitLab
Menu
Projects
Groups
Snippets
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mihajlo Srebrenoski
Team4-Hackathon-Marinov-AdminPanel
Commits
4c06cba0
Commit
4c06cba0
authored
1 year ago
by
Nikola Chuchukovski
Browse files
Options
Download
Plain Diff
Merge branch 'gift-cards' into 'dev'
fix See merge request
!51
parents
033ede78
53941e7e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
AdminPanel-Marinov/resources/views/custom_orders/all-orders.blade.php
+1
-2
...arinov/resources/views/custom_orders/all-orders.blade.php
AdminPanel-Marinov/resources/views/layouts/navigation.blade.php
+3
-3
...anel-Marinov/resources/views/layouts/navigation.blade.php
AdminPanel-Marinov/routes/api.php
+5
-2
AdminPanel-Marinov/routes/api.php
with
9 additions
and
7 deletions
+9
-7
AdminPanel-Marinov/resources/views/custom_orders/all-orders.blade.php
+
1
-
2
View file @
4c06cba0
...
...
@@ -8,8 +8,7 @@
</
div
>
@
endif
<
div
class
=
"flex justify-between items-center pt-3 px-3"
>
<
h2
class
=
"font-bold pt-2 pl-2"
>
All
Costom
Orders
</
h2
>
<
h2
class
=
"font-bold pt-2 pl-2"
>
All
Custom
Orders
</
h2
>
</
div
>
<
div
class
=
"p-3"
>
<
div
class
=
"relative overflow-x-auto shadow-md sm:rounded-lg"
>
...
...
This diff is collapsed.
Click to expand it.
AdminPanel-Marinov/resources/views/layouts/navigation.blade.php
+
3
-
3
View file @
4c06cba0
...
...
@@ -153,7 +153,7 @@
<div
class=
"hidden space-x-8 sm:-my-px sm:ms-10 sm:flex hover:underline-black pt-3"
>
<x-nav-link
:href=
"route('custom_order.index')"
:active=
"request()->routeIs('custom_order.index')"
>
{{ __('C
o
stom Made Orders') }}
{{ __('C
u
stom Made Orders') }}
</x-nav-link>
</div>
...
...
@@ -216,7 +216,7 @@
<div
class=
"hidden space-x-8 sm:-my-px sm:ms-10 sm:flex hover:underline-black pt-3"
>
<x-nav-link
:href=
"route('dashboard')"
:active=
"request()->routeIs('dashboard')"
>
{{ __('C
o
stom Made Orders') }}
{{ __('C
u
stom Made Orders') }}
</x-nav-link>
</div>
...
...
@@ -291,7 +291,7 @@
</div>
<div
class=
"pt-2 pb-3 space-y-1"
>
<x-responsive-nav-link
:href=
"route('dashboard')"
:active=
"request()->routeIs('dashboard')"
>
{{ __('C
o
stom Made Orders') }}
{{ __('C
u
stom Made Orders') }}
</x-responsive-nav-link>
</div>
...
...
This diff is collapsed.
Click to expand it.
AdminPanel-Marinov/routes/api.php
+
5
-
2
View file @
4c06cba0
...
...
@@ -10,8 +10,7 @@ use App\Http\Controllers\Api\CustomOrderController;
use
App\Http\Controllers\Admin\MaintenanceController
;
use
App\Http\Controllers\Api\FaqController
;
use
App\Http\Controllers\Api\GalleryController
;
use
App\Models\Product
;
use
App\Models\Type
;
/*
|--------------------------------------------------------------------------
...
...
@@ -51,3 +50,7 @@ Route::get('gallery', [GalleryController::class, 'index'])->name('gallery.index'
// get latest six images from gallery
Route
::
get
(
'gallery/latest'
,
[
GalleryController
::
class
,
'latestSix'
])
->
name
(
'gallery.latest'
);
//Customer Register/login
Route
::
post
(
'register'
,
[
AuthController
::
class
,
'registerUser'
])
->
name
(
'register'
);
Route
::
post
(
'login'
,
[
AuthController
::
class
,
'loginUser'
])
->
name
(
'login'
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets