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.

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

Package admin dev #137

Merged
merged 94 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
8bce6df
Merge pull request #116 from xxl4/main_de
xxl4 Mar 14, 2024
6676f6d
#117 add lp admin function
xxl4 Mar 14, 2024
ffce579
#117 fix the create and edit page
xxl4 Mar 14, 2024
5ecbc90
#117 fix the create and edit page
xxl4 Mar 14, 2024
2ae97e1
fix the lp edit page
xxl4 Mar 14, 2024
9314634
fix delete
xxl4 Mar 14, 2024
fd8ed81
#96 add base manage package
xxl4 Mar 14, 2024
996d476
#96 add base manage package
xxl4 Mar 14, 2024
d3fb68b
#96 add base manage package
xxl4 Mar 14, 2024
ecbaa2e
#96 add base manage package
xxl4 Mar 14, 2024
a62f99a
#96 fix the manage url name
xxl4 Mar 14, 2024
e80d4ff
#96 fix the manage url name
xxl4 Mar 14, 2024
fc209a7
#96 fix the manage url name
xxl4 Mar 14, 2024
0ad83cc
#96 fix the manage url name
xxl4 Mar 14, 2024
bb1d971
fix manage helper
xxl4 Mar 15, 2024
2370bef
fix the version name
xxl4 Mar 15, 2024
b8f1223
update
xxl4 Mar 17, 2024
9ae1cc4
add manage tests dir
xxl4 Mar 17, 2024
559cc1b
add manage tests dir
xxl4 Mar 17, 2024
1d36e95
add data grid
xxl4 Mar 18, 2024
8820106
add data grid
xxl4 Mar 18, 2024
a70c5d1
fix
xxl4 Mar 18, 2024
ba3a91c
fix manage composer
xxl4 Mar 18, 2024
47145d4
fix session base
xxl4 Mar 18, 2024
f647ac9
fix session base
xxl4 Mar 18, 2024
16937dc
fix manage user
xxl4 Mar 18, 2024
be3a515
add lang
xxl4 Mar 18, 2024
bb1227c
add manage url config
xxl4 Mar 18, 2024
6ea51f4
fix session to new auth
xxl4 Mar 18, 2024
0a93703
fix manage
xxl4 Mar 18, 2024
e095e47
fix user module
xxl4 Mar 18, 2024
3ff09d2
fix support manage themes
xxl4 Mar 18, 2024
62a06a6
add version
xxl4 Mar 18, 2024
ab28a9b
add new themes
xxl4 Mar 18, 2024
c651ab4
fix the manage
xxl4 Mar 18, 2024
e1c974e
fix the new admin
xxl4 Mar 19, 2024
9b653df
fix the old admin
xxl4 Mar 19, 2024
ff9ffed
fix del
xxl4 Mar 19, 2024
837c293
fix old admin
xxl4 Mar 19, 2024
b14c8a5
fix the new admin
xxl4 Mar 19, 2024
88bd080
fix
xxl4 Mar 19, 2024
287e811
fix
xxl4 Mar 19, 2024
e50ca4d
fix
xxl4 Mar 19, 2024
66c6a94
fix
xxl4 Mar 19, 2024
166d90f
fix delete
xxl4 Mar 19, 2024
85207e2
#123 fix the user login
xxl4 Mar 19, 2024
73a51f0
#123 fix the user login
xxl4 Mar 19, 2024
703af73
#123 fix the user login
xxl4 Mar 19, 2024
0a1e829
#123 fix the user login
xxl4 Mar 19, 2024
eadbe6f
fix new admin
xxl4 Mar 19, 2024
b872a32
add adminLTE
xxl4 Mar 19, 2024
38da0e3
admin menu
xxl4 Mar 19, 2024
fc2284a
fix manifest json
xxl4 Mar 19, 2024
4897cdf
fix the icon
xxl4 Mar 19, 2024
d856d14
fix the layout
xxl4 Mar 19, 2024
d6a4c3c
add footer layout
xxl4 Mar 19, 2024
1916acc
fix the menu
xxl4 Mar 19, 2024
3b70279
fix the dashboard
xxl4 Mar 19, 2024
6577aa2
disable the dark mode
xxl4 Mar 20, 2024
81ad74c
Merge pull request #128 from xxl4/package_lp_dev
xxl4 Mar 20, 2024
cd93547
fix delete lp page
xxl4 Mar 20, 2024
13fbe3e
fix add new lp page
xxl4 Mar 20, 2024
ec7c245
fix change the controller
xxl4 Mar 20, 2024
5ade6b3
fix the layout
xxl4 Mar 20, 2024
c917cbd
fix add base sale order
xxl4 Mar 20, 2024
c692dec
fix add join function for ssp
xxl4 Mar 20, 2024
fcf7278
fix add key
xxl4 Mar 20, 2024
8a94525
fix
xxl4 Mar 20, 2024
daf9132
move the db to SSP file
xxl4 Mar 20, 2024
b7d7b35
fix the order page
xxl4 Mar 20, 2024
fea72c4
fix manage module
xxl4 Mar 20, 2024
713461d
fix order sales
xxl4 Mar 20, 2024
8face1d
fix the dashboard
xxl4 Mar 21, 2024
db5c473
产品页面
gekaiyuan Mar 21, 2024
5255e45
Merge pull request #130 from xxl4/main_de
xxl4 Mar 21, 2024
cc2a2b3
fix the order select
xxl4 Mar 21, 2024
c657946
fix the order select
xxl4 Mar 21, 2024
e8130f1
fix
xxl4 Mar 21, 2024
6a41b09
fix show order detail
xxl4 Mar 21, 2024
6b18f4e
fix order page
xxl4 Mar 21, 2024
b3f0545
fix remove the old admin
xxl4 Mar 21, 2024
0ba0c83
提交编辑页面
gekaiyuan Mar 21, 2024
d98ff33
Merge branch 'package_admin_dev' of github.com:xxl4/NexaMerchant into…
gekaiyuan Mar 21, 2024
897377e
show track_number
xxl4 Mar 22, 2024
d92ccc8
show track_number
xxl4 Mar 22, 2024
8fe603b
提交样式配置文件和编辑页面
gekaiyuan Mar 22, 2024
b7b30db
Merge pull request #135 from xxl4/main_de
xxl4 Mar 25, 2024
182c186
fix the database seeders
xxl4 Mar 25, 2024
1f236e9
fix package manage order
xxl4 Mar 25, 2024
02baa2b
ix
xxl4 Mar 25, 2024
5210b2b
fix remove
xxl4 Mar 25, 2024
90b2f36
ix
xxl4 Mar 25, 2024
fa616e7
fix the old admin testcase
xxl4 Mar 26, 2024
6a9fddf
fix the old admin testcase
xxl4 Mar 26, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
APP_ADMIN_URL=admin
APP_ADMIN_URL=manage
APP_MANAGE_URL=manage
APP_TIMEZONE=Asia/Kolkata
APP_LOCALE=en
APP_CURRENCY=USD
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/laravel_dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: Dev

on:
push:
branches: [ "develop" ]
branches: [ "develop","package_admin_dev" ]
paths-ignore:
- .github/**
- docs/**
pull_request:
branches: [ "develop" ]
branches: [ "develop","package_admin_dev" ]

jobs:
laravel-tests:
Expand Down Expand Up @@ -62,5 +62,5 @@ jobs:
script: |
cd ${{ secrets.WWW_DEV_DIR }} && sudo git pull
composer update
php artisan migrate && php artisan db:seed
php artisan migrate
vendor/bin/pest
2 changes: 1 addition & 1 deletion app/Providers/AppServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class AppServiceProvider extends ServiceProvider
public function boot(): void
{
Schema::defaultStringLength(191);
\Illuminate\Support\Facades\URL::forceScheme('https');
// \Illuminate\Support\Facades\URL::forceScheme('https');
}

/**
Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
"App\\": "app/",
"Database\\Factories\\": "database/factories/",
"Database\\Seeders\\": "database/seeders/",
"Webkul\\Admin\\": "packages/Webkul/Admin/src",
"Webkul\\Attribute\\": "packages/Webkul/Attribute/src",
"Webkul\\CartRule\\": "packages/Webkul/CartRule/src",
"Webkul\\CatalogRule\\": "packages/Webkul/CatalogRule/src",
Expand Down Expand Up @@ -95,7 +94,7 @@
"Nicelizhi\\Airwallex\\": "packages/Webkul/Airwallex/src",
"Nicelizhi\\Shopify\\": "packages/Nicelizhi/Shopify/src",
"Nicelizhi\\ShopLine\\": "packages/Nicelizhi/ShopLine/src",
"Nicelizhi\\Admin\\": "packages/Nicelizhi/Admin/src",
"Nicelizhi\\Manage\\": "packages/Nicelizhi/Manage/src",
"Nicelizhi\\Checkout\\": "packages/Nicelizhi/Checkout/src",
"Nicelizhi\\Lp\\": "packages/Nicelizhi/Lp/src",
"Nicelizhi\\Binom\\": "packages/Nicelizhi/Binom/src",
Expand All @@ -105,12 +104,12 @@
"autoload-dev": {
"psr-4": {
"Tests\\": "tests/",
"Webkul\\Admin\\Tests\\": "packages/Webkul/Admin/tests",
"Webkul\\DataGrid\\Tests\\": "packages/Webkul/DataGrid/tests",
"Webkul\\Shop\\Tests\\": "packages/Webkul/Shop/tests",
"Nicelizhi\\Checkout\\Tests\\": "packages/Nicelizhi/Checkout/tests",
"Nicelizhi\\Binom\\Tests\\": "packages/Nicelizhi/Binom/tests",
"Nicelizhi\\Shopify\\Tests\\": "packages/Nicelizhi/Shopify/tests",
"Nicelizhi\\Maange\\Tests\\": "packages/Nicelizhi/Mange/tests",
"Nicelizhi\\OneBuy\\Tests\\": "packages/Nicelizhi/OneBuy/tests",
"Nicelizhi\\ShopLine\\Tests\\": "packages/Nicelizhi/ShopLine/tests"
}
Expand Down
14 changes: 12 additions & 2 deletions config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@

'admin_url' => env('APP_ADMIN_URL', 'admin'),

/**
* -----------------------------------------------------------------------
* Application Manage URL
* -----------------------------------------------------------------------
* This URL suffix is used to define the manage url for example
* manage/
*
*/
'manage_url'=> env('APP_MANAGE_URL', 'manage'),

/*
|--------------------------------------------------------------------------
| Application Timezone
Expand Down Expand Up @@ -193,7 +203,7 @@
/**
* Webkul package service providers.
*/
Webkul\Admin\Providers\AdminServiceProvider::class,
//Webkul\Admin\Providers\AdminServiceProvider::class,
Webkul\Attribute\Providers\AttributeServiceProvider::class,
Webkul\CartRule\Providers\CartRuleServiceProvider::class,
Webkul\CatalogRule\Providers\CatalogRuleServiceProvider::class,
Expand Down Expand Up @@ -229,7 +239,7 @@
Nicelizhi\Shopify\Providers\ShopifyServiceProvider::class,
Nicelizhi\ShopLine\Providers\ShopLineServiceProvider::class,

//Nicelizhi\Admin\Providers\AdminServiceProvider::class,
Nicelizhi\Manage\Providers\ManageServiceProvider::class,
Nicelizhi\Checkout\Providers\CheckoutServiceProvider::class,
Nicelizhi\Lp\Providers\LpServiceProvider::class,

Expand Down
17 changes: 17 additions & 0 deletions config/auth.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
'provider' => 'customers',
],

'manage' => [
'driver' => 'session',
'provider' => 'manage',
],

'admin' => [
'driver' => 'session',
'provider' => 'admins',
Expand All @@ -28,6 +33,11 @@
'driver' => 'eloquent',
'model' => Webkul\User\Models\Admin::class,
],

'manage' => [
'driver' => 'eloquent',
'model' => Webkul\User\Models\Admin::class,
],
],

'passwords' => [
Expand All @@ -44,5 +54,12 @@
'expire' => 60,
'throttle' => 60,
],

'manage' => [
'provider' => 'manage',
'table' => 'admin_password_resets',
'expire' => 60,
'throttle' => 60,
]
],
];
2 changes: 1 addition & 1 deletion config/concord.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
*/

\Webkul\Admin\Providers\ModuleServiceProvider::class,
//\Webkul\Admin\Providers\ModuleServiceProvider::class,
\Webkul\Attribute\Providers\ModuleServiceProvider::class,
\Webkul\CartRule\Providers\ModuleServiceProvider::class,
\Webkul\CatalogRule\Providers\ModuleServiceProvider::class,
Expand Down
15 changes: 15 additions & 0 deletions config/themes.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,19 @@
],
],
],

'manage-default' => 'default',
'manage-themes' => [
'default' => [
'name' => 'Default',
'assets_path' => 'public/themes/manage/default',
'views_path' => 'resources/manage-themes/default/views',

'vite' => [
'hot_file' => 'manage-default-vite.hot',
'build_directory' => 'themes/manage/default/build',
'package_assets_directory' => 'src/Resources/assets',
],
],
],
];
2 changes: 1 addition & 1 deletion database/seeders/DatabaseSeeder.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace Database\Seeders;

use Illuminate\Database\Seeder;
use Webkul\Admin\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder;
use Nicelizhi\Manage\Database\Seeders\DatabaseSeeder as BagistoDatabaseSeeder;

class DatabaseSeeder extends Seeder
{
Expand Down
1 change: 0 additions & 1 deletion packages/Nicelizhi/Admin/src/Routes/web.php

This file was deleted.

13 changes: 12 additions & 1 deletion packages/Nicelizhi/Lp/src/Config/menu.php
Original file line number Diff line number Diff line change
@@ -1,2 +1,13 @@
<?php
return [];
return [
/**
* Lp Dashboard.
*/
[
'key' => 'lp-index',
'name' => 'lp::app.lp.index',
'route' => 'admin.lp.index',
'sort' => 11,
'icon' => 'icon-dashboard',
]
];
6 changes: 6 additions & 0 deletions packages/Nicelizhi/Lp/src/Contracts/Lp.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?php
namespace Nicelizhi\Lp\Contracts;

interface Lp
{
}
124 changes: 124 additions & 0 deletions packages/Nicelizhi/Lp/src/DataGrids/Lp/LpDataGrid.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?php

namespace Nicelizhi\Lp\DataGrids\Lp;

use Illuminate\Support\Facades\DB;
use Webkul\DataGrid\DataGrid;

class LpDataGrid extends DataGrid
{
/**
* Prepare query builder.
*
* @return \Illuminate\Database\Query\Builder
*/
public function prepareQueryBuilder()
{
$whereInLocales = core()->getRequestedLocaleCode() === 'all'
? core()->getAllLocales()->pluck('code')->toArray()
: [core()->getRequestedLocaleCode()];

$queryBuilder = DB::table('lps')
->select(
'lps.id',
'lps.name',
'lps.slug'
);

$this->addFilter('id', 'lps.id');

return $queryBuilder;
}

/**
* Add columns.
*
* @return void
*/
public function prepareColumns()
{
$this->addColumn([
'index' => 'id',
'label' => trans('admin::app.cms.index.datagrid.id'),
'type' => 'integer',
'searchable' => false,
'filterable' => true,
'sortable' => true,
]);

$this->addColumn([
'index' => 'name',
'label' => trans('admin::app.cms.index.datagrid.page-title'),
'type' => 'string',
'searchable' => true,
'filterable' => true,
'sortable' => true,
]);

$this->addColumn([
'index' => 'slug',
'label' => trans('admin::app.cms.index.datagrid.url-key'),
'type' => 'string',
'searchable' => true,
'filterable' => true,
'sortable' => true,
]);
}

/**
* Prepare actions.
*
* @return void
*/
public function prepareActions()
{
$this->addAction([
'icon' => 'icon-view',
'title' => trans('admin::app.cms.index.datagrid.view'),
'method' => 'GET',
'index' => 'slug',
'target' => '_blank',
'url' => function ($row) {
return route('lp.products.slug.page', $row->slug);
},
]);

if (bouncer()->hasPermission('lp.edit')) {
$this->addAction([
'icon' => 'icon-edit',
'title' => trans('admin::app.cms.index.datagrid.edit'),
'method' => 'GET',
'url' => function ($row) {
return route('admin.lp.edit', $row->id);
},
]);
}

if (bouncer()->hasPermission('lp.delete')) {
$this->addAction([
'icon' => 'icon-delete',
'title' => trans('admin::app.cms.index.datagrid.delete'),
'method' => 'DELETE',
'url' => function ($row) {
return route('admin.lp.delete', $row->id);
},
]);
}
}

/**
* Prepare mass actions.
*
* @return void
*/
public function prepareMassActions()
{
if (bouncer()->hasPermission('cms.mass-delete')) {
$this->addMassAction([
'title' => trans('admin::app.cms.index.datagrid.delete'),
'method' => 'POST',
'url' => route('admin.cms.mass_delete'),
]);
}
}
}
Loading
Loading