Skip to content

Commit

Permalink
feat: Add filament color to load order status, and add pagination on …
Browse files Browse the repository at this point in the history
…customer orders page
  • Loading branch information
mckenziearts committed Aug 5, 2024
1 parent b90f387 commit 48617f9
Show file tree
Hide file tree
Showing 22 changed files with 75,105 additions and 16,025 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/npm-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,31 @@ jobs:
if: github.event.pull_request.merged == true
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: 2.x

- name: Setup Node
uses: actions/setup-node@v2
- uses: pnpm/action-setup@v4
name: Install pnpm
with:
node-version: '16.x'
version: 8
run_install: false

- name: Setup Node.js
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'pnpm'

- name: Install dependencies
run: yarn install --frozen-lockfile
run: pnpm install

- name: Build assets
run: yarn run build
run: pnpm build

- name: Commit changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
branch: 2.x
commit_message: >
chore: Compile assets
chore: Build assets
2 changes: 1 addition & 1 deletion .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: ${{ github.event.release.target_commitish }}

Expand Down
Empty file added CHANGELOG.md
Empty file.
12 changes: 7 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"phpstan/phpstan": "^1.8",
"phpunit/phpunit": "^10.5",
"reecem/mocker": "^1.2",
"shopper/core": "*",
"spatie/laravel-package-tools": "^1.15",
"symplify/monorepo-builder": "^10.0"
},
Expand Down Expand Up @@ -83,11 +84,12 @@
"phpstan/extension-installer": true
}
},
"replace": {
"shopper/core": "self.version",
"shopper/framework": "self.version",
"shopper/sidebar": "self.version"
},
"repositories": [
{
"type": "path",
"url": "./packages/core"
}
],
"minimum-stability": "dev",
"prefer-stable": true
}
3 changes: 0 additions & 3 deletions packages/admin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@
"illuminate/support": "^10.0|^11.0",
"illuminate/view": "^10.0|^11.0",
"jenssegers/agent": "^2.6",
"laravel/prompts": "^0.1.15",
"livewire/livewire": "^3.4",
"maatwebsite/excel": "^3.1",
"mckenziearts/blade-untitledui-icons": "^1.3",
"milon/barcode": "^10.0|^11.0",
"moneyphp/money": "^3.3",
"pragmarx/google2fa": "^8.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/config/admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
|
*/

'filament-color' => Color::Blue,
'filament_color' => Color::Blue,

/*
|--------------------------------------------------------------------------
Expand All @@ -103,7 +103,7 @@
|
*/

'inventory-limit' => 4,
'inventory_limit' => 4,

/*
|--------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions packages/admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
"license": "MIT",
"type": "module",
"scripts": {
"dev:css": "npx tailwindcss -i resources/css/shopper.css -o public/shopper.css --postcss --watch",
"dev:css": "npx tailwindcss -c ./tailwind.config.js -i resources/css/shopper.css -o public/shopper.css --watch",
"dev:js": "node scripts/build.js --dev",
"dev": "npm-run-all --parallel dev:*",
"build:css": "npx tailwindcss -i resources/css/shopper.css -o public/shopper.css --postcss --minify",
"build:css": "npx tailwindcss -c ./tailwind.config.js -i resources/css/shopper.css -o public/shopper.css --minify",
"build:js": "node scripts/build.js",
"build": "npm-run-all build:*",
"prettier": "npx prettier --write ./resources"
Expand Down
Loading

0 comments on commit 48617f9

Please sign in to comment.