Tags update
This commit is contained in:
parent
8d6fe0f108
commit
0c8efbc0d7
7 changed files with 211 additions and 55 deletions
|
|
@ -59,7 +59,7 @@ class NewsController extends Controller
|
|||
public function create()
|
||||
{
|
||||
/** @var \Illuminate\Database\Eloquent\Collection */
|
||||
$tags = Tag::query()->select(['id', 'name'])->get();
|
||||
$tags = Tag::query()->select(['id', 'name', 'slug'])->get();
|
||||
return view('back.news.create', compact('tags'));
|
||||
}
|
||||
|
||||
|
|
@ -98,7 +98,7 @@ class NewsController extends Controller
|
|||
{
|
||||
/** @var \Illuminate\Database\Eloquent\Collection */
|
||||
$tags = Tag::whereNotIn('id', $news->tags()->pluck('id'))
|
||||
->select(['id', 'name'])->get();
|
||||
->select(['id', 'name', 'slug'])->get();
|
||||
|
||||
return view('back.news.edit', [
|
||||
'newsModel' => $news,
|
||||
|
|
|
|||
|
|
@ -74,6 +74,23 @@ class TagController extends Controller
|
|||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \App\Http\Requests\Bo\Tags\StoreTagRequest $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function jsonStore(StoreTagRequest $request)
|
||||
{
|
||||
return DB::transaction(function () use ($request) {
|
||||
/** @var \App\Models\Tag */
|
||||
$tag = Tag::where('slug', Str::slug($request->name))->firstOrNew();
|
||||
$tag->fill($request->validated());
|
||||
$saved = $tag->saveOrFail();
|
||||
return \response()->json($saved ? $tag->toArray() : [], $saved ? 200 : 500);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Show the form for editing the specified resource.
|
||||
*
|
||||
|
|
|
|||
75
package-lock.json
generated
75
package-lock.json
generated
|
|
@ -4,9 +4,6 @@
|
|||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"autoprefixer": "10.4.5"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@ckpack/vue-color": "^1.1.9",
|
||||
"@fortawesome/fontawesome-free": "^6.1.1",
|
||||
|
|
@ -27,6 +24,7 @@
|
|||
"resolve-url-loader": "^5.0.0",
|
||||
"sass": "^1.52.1",
|
||||
"sass-loader": "^12.6.0",
|
||||
"slugify": "^1.6.5",
|
||||
"sweetalert2": "^11.4.17",
|
||||
"toastify-js": "^1.11.2",
|
||||
"ts-loader": "^9.3.0",
|
||||
|
|
@ -2810,6 +2808,7 @@
|
|||
"version": "10.4.5",
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.5.tgz",
|
||||
"integrity": "sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
|
|
@ -3197,6 +3196,7 @@
|
|||
"version": "4.21.0",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz",
|
||||
"integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
|
|
@ -3306,6 +3306,7 @@
|
|||
"version": "1.0.30001359",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz",
|
||||
"integrity": "sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
|
|
@ -4323,7 +4324,8 @@
|
|||
"node_modules/electron-to-chromium": {
|
||||
"version": "1.4.170",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.170.tgz",
|
||||
"integrity": "sha512-rZ8PZLhK4ORPjFqLp9aqC4/S1j4qWFsPPz13xmWdrbBkU/LlxMcok+f+6f8YnQ57MiZwKtOaW15biZZsY5Igvw=="
|
||||
"integrity": "sha512-rZ8PZLhK4ORPjFqLp9aqC4/S1j4qWFsPPz13xmWdrbBkU/LlxMcok+f+6f8YnQ57MiZwKtOaW15biZZsY5Igvw==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/elliptic": {
|
||||
"version": "6.5.4",
|
||||
|
|
@ -4423,6 +4425,7 @@
|
|||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
|
||||
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=6"
|
||||
}
|
||||
|
|
@ -4850,6 +4853,7 @@
|
|||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
|
||||
"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": "*"
|
||||
},
|
||||
|
|
@ -6388,6 +6392,7 @@
|
|||
"version": "3.3.4",
|
||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
|
||||
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
|
||||
"dev": true,
|
||||
"bin": {
|
||||
"nanoid": "bin/nanoid.cjs"
|
||||
},
|
||||
|
|
@ -6477,7 +6482,8 @@
|
|||
"node_modules/node-releases": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
|
||||
"integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
|
||||
"integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/normalize-path": {
|
||||
"version": "3.0.0",
|
||||
|
|
@ -6492,6 +6498,7 @@
|
|||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
|
||||
"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
|
|
@ -6878,7 +6885,8 @@
|
|||
"node_modules/picocolors": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
|
||||
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
|
||||
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
|
|
@ -6938,6 +6946,7 @@
|
|||
"version": "8.4.14",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
|
||||
"integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
|
|
@ -7488,7 +7497,8 @@
|
|||
"node_modules/postcss-value-parser": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
|
||||
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
|
||||
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/pretty-time": {
|
||||
"version": "1.1.0",
|
||||
|
|
@ -8326,6 +8336,15 @@
|
|||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/slugify": {
|
||||
"version": "1.6.5",
|
||||
"resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz",
|
||||
"integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/sockjs": {
|
||||
"version": "0.3.24",
|
||||
"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
|
||||
|
|
@ -8356,6 +8375,7 @@
|
|||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
|
||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
|
|
@ -8902,6 +8922,7 @@
|
|||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",
|
||||
"integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==",
|
||||
"dev": true,
|
||||
"funding": [
|
||||
{
|
||||
"type": "opencollective",
|
||||
|
|
@ -11784,6 +11805,7 @@
|
|||
"version": "10.4.5",
|
||||
"resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.5.tgz",
|
||||
"integrity": "sha512-Fvd8yCoA7lNX/OUllvS+aS1I7WRBclGXsepbvT8ZaPgrH24rgXpZzF0/6Hh3ZEkwg+0AES/Osd196VZmYoEFtw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"browserslist": "^4.20.2",
|
||||
"caniuse-lite": "^1.0.30001332",
|
||||
|
|
@ -12086,6 +12108,7 @@
|
|||
"version": "4.21.0",
|
||||
"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.0.tgz",
|
||||
"integrity": "sha512-UQxE0DIhRB5z/zDz9iA03BOfxaN2+GQdBYH/2WrSIWEUrnpzTPJbhqt+umq6r3acaPRTW1FNTkrcp0PXgtFkvA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"caniuse-lite": "^1.0.30001358",
|
||||
"electron-to-chromium": "^1.4.164",
|
||||
|
|
@ -12169,7 +12192,8 @@
|
|||
"caniuse-lite": {
|
||||
"version": "1.0.30001359",
|
||||
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001359.tgz",
|
||||
"integrity": "sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw=="
|
||||
"integrity": "sha512-Xln/BAsPzEuiVLgJ2/45IaqD9jShtk3Y33anKb4+yLwQzws3+v6odKfpgES/cDEaZMLzSChpIGdbOYtH9MyuHw==",
|
||||
"dev": true
|
||||
},
|
||||
"chalk": {
|
||||
"version": "4.1.2",
|
||||
|
|
@ -12946,7 +12970,8 @@
|
|||
"electron-to-chromium": {
|
||||
"version": "1.4.170",
|
||||
"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.170.tgz",
|
||||
"integrity": "sha512-rZ8PZLhK4ORPjFqLp9aqC4/S1j4qWFsPPz13xmWdrbBkU/LlxMcok+f+6f8YnQ57MiZwKtOaW15biZZsY5Igvw=="
|
||||
"integrity": "sha512-rZ8PZLhK4ORPjFqLp9aqC4/S1j4qWFsPPz13xmWdrbBkU/LlxMcok+f+6f8YnQ57MiZwKtOaW15biZZsY5Igvw==",
|
||||
"dev": true
|
||||
},
|
||||
"elliptic": {
|
||||
"version": "6.5.4",
|
||||
|
|
@ -13029,7 +13054,8 @@
|
|||
"escalade": {
|
||||
"version": "3.1.1",
|
||||
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
|
||||
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw=="
|
||||
"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
|
||||
"dev": true
|
||||
},
|
||||
"escape-html": {
|
||||
"version": "1.0.3",
|
||||
|
|
@ -13356,7 +13382,8 @@
|
|||
"fraction.js": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz",
|
||||
"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA=="
|
||||
"integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==",
|
||||
"dev": true
|
||||
},
|
||||
"fresh": {
|
||||
"version": "0.5.2",
|
||||
|
|
@ -14514,7 +14541,8 @@
|
|||
"nanoid": {
|
||||
"version": "3.3.4",
|
||||
"resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
|
||||
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
|
||||
"integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
|
||||
"dev": true
|
||||
},
|
||||
"negotiator": {
|
||||
"version": "0.6.3",
|
||||
|
|
@ -14592,7 +14620,8 @@
|
|||
"node-releases": {
|
||||
"version": "2.0.5",
|
||||
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz",
|
||||
"integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="
|
||||
"integrity": "sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q==",
|
||||
"dev": true
|
||||
},
|
||||
"normalize-path": {
|
||||
"version": "3.0.0",
|
||||
|
|
@ -14603,7 +14632,8 @@
|
|||
"normalize-range": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
|
||||
"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="
|
||||
"integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
|
||||
"dev": true
|
||||
},
|
||||
"normalize-url": {
|
||||
"version": "6.1.0",
|
||||
|
|
@ -14891,7 +14921,8 @@
|
|||
"picocolors": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
|
||||
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
|
||||
"integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
|
||||
"dev": true
|
||||
},
|
||||
"picomatch": {
|
||||
"version": "2.3.1",
|
||||
|
|
@ -14933,6 +14964,7 @@
|
|||
"version": "8.4.14",
|
||||
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.14.tgz",
|
||||
"integrity": "sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"nanoid": "^3.3.4",
|
||||
"picocolors": "^1.0.0",
|
||||
|
|
@ -15260,7 +15292,8 @@
|
|||
"postcss-value-parser": {
|
||||
"version": "4.2.0",
|
||||
"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
|
||||
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
|
||||
"integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
|
||||
"dev": true
|
||||
},
|
||||
"pretty-time": {
|
||||
"version": "1.1.0",
|
||||
|
|
@ -15910,6 +15943,12 @@
|
|||
"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
|
||||
"dev": true
|
||||
},
|
||||
"slugify": {
|
||||
"version": "1.6.5",
|
||||
"resolved": "https://registry.npmjs.org/slugify/-/slugify-1.6.5.tgz",
|
||||
"integrity": "sha512-8mo9bslnBO3tr5PEVFzMPIWwWnipGS0xVbYf65zxDqfNwmzYn1LpiKNrR6DlClusuvo+hDHd1zKpmfAe83NQSQ==",
|
||||
"dev": true
|
||||
},
|
||||
"sockjs": {
|
||||
"version": "0.3.24",
|
||||
"resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
|
||||
|
|
@ -15936,7 +15975,8 @@
|
|||
"source-map-js": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
|
||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw=="
|
||||
"integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
|
||||
"dev": true
|
||||
},
|
||||
"source-map-support": {
|
||||
"version": "0.5.21",
|
||||
|
|
@ -16331,6 +16371,7 @@
|
|||
"version": "1.0.4",
|
||||
"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz",
|
||||
"integrity": "sha512-jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"escalade": "^3.1.1",
|
||||
"picocolors": "^1.0.0"
|
||||
|
|
|
|||
|
|
@ -29,14 +29,12 @@
|
|||
"resolve-url-loader": "^5.0.0",
|
||||
"sass": "^1.52.1",
|
||||
"sass-loader": "^12.6.0",
|
||||
"slugify": "^1.6.5",
|
||||
"sweetalert2": "^11.4.17",
|
||||
"toastify-js": "^1.11.2",
|
||||
"ts-loader": "^9.3.0",
|
||||
"typescript": "^4.7.3",
|
||||
"vue": "^3.2.36",
|
||||
"vue-loader": "^16.8.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"autoprefixer": "10.4.5"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +1,30 @@
|
|||
<template>
|
||||
<div class="taggableDropdown">
|
||||
<VueTagsInputCls
|
||||
v-model="tag"
|
||||
:tags="tags"
|
||||
:autocomplete-items="filteredItems"
|
||||
:autocomplete-min-length="0"
|
||||
@before-adding-tag="beforeTagSave"
|
||||
@tags-changed="changedTags"
|
||||
:max-tags="6"
|
||||
placeholder="Ajoutez ici vos étiquettes"
|
||||
/>
|
||||
<div v-if="errorMessages.length">
|
||||
<span class="d-block text-danger" v-for="errorMessage of errorMessages">
|
||||
{{ errorMessage }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="d-inline-block tagInput">
|
||||
<VueTagsInputCls
|
||||
v-model="tag"
|
||||
:tags="tags"
|
||||
:autocomplete-items="filteredItems"
|
||||
:autocomplete-min-length="0"
|
||||
@before-adding-tag="beforeTagSave"
|
||||
@tags-changed="changedTags"
|
||||
:max-tags="6"
|
||||
:placeholder="__('Ajoutez ici vos étiquettes')"
|
||||
/>
|
||||
<div class="text-center py-2" v-if="waitingListObjects.length">
|
||||
<button class="btn btn-sm btn-primary ms-2" v-on:click.prevent="addTags">
|
||||
{{ __("Créer et ajouter à la liste") }}
|
||||
</button>
|
||||
<button class="btn btn-sm btn-dark ms-2" v-on:click.prevent="cancelTags">
|
||||
{{ __("Annuler") }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<template v-for="(sTag, index) in tags" :key="index">
|
||||
<input :name="`${name}[${String(index)}][id]`" type="hidden" :value="sTag.id" />
|
||||
<input :name="`${name}[${String(index)}][name]`" type="hidden" :value="sTag.text" />
|
||||
|
|
@ -21,11 +36,13 @@
|
|||
import { defineComponent } from "vue";
|
||||
import type VueTagsInput from "@sipec/vue3-tags-input";
|
||||
import { VueTagsInput as VueTagsInputCls } from "@sipec/vue3-tags-input";
|
||||
import slugify from "slugify";
|
||||
import route from "../../modules/route";
|
||||
import toast from "../../modules/toast";
|
||||
import trans from "../../modules/trans";
|
||||
|
||||
export default defineComponent({
|
||||
mixins: [toast, route],
|
||||
mixins: [toast, route, trans],
|
||||
components: {
|
||||
VueTagsInputCls,
|
||||
},
|
||||
|
|
@ -46,42 +63,84 @@ export default defineComponent({
|
|||
tag: string;
|
||||
tags: Array<CustomTag>;
|
||||
autocompleteItems: Array<CustomTag>;
|
||||
waitingListObjects: Array<VueTagsInput.IAddArgs>;
|
||||
errorMessages: Array<string>;
|
||||
} {
|
||||
return {
|
||||
name: "",
|
||||
tag: "",
|
||||
tags: [],
|
||||
autocompleteItems: [],
|
||||
waitingListObjects: [],
|
||||
errorMessages: [],
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
parseTags(tags: any) {
|
||||
parseTags(tags: Array<CustomTag>): Array<CustomTag> {
|
||||
return tags.map((tag: CustomTag) => {
|
||||
tag.text = String(tag.name);
|
||||
tag.slug = String(tag.slug);
|
||||
return tag;
|
||||
});
|
||||
},
|
||||
beforeTagSave(obj: VueTagsInput.IAddArgs) {
|
||||
const self = this;
|
||||
if (
|
||||
self.autocompleteItems.filter((tag: CustomTag) => {
|
||||
return tag.id === (obj.tag as CustomTag).id;
|
||||
}).length
|
||||
) {
|
||||
obj.addTag();
|
||||
addTags(): void {
|
||||
for (const obj of this.waitingListObjects) {
|
||||
this.ajaxSaveTag(obj);
|
||||
}
|
||||
},
|
||||
cancelTags(): void {
|
||||
this.$nextTick(() => {
|
||||
this.waitingListObjects = [];
|
||||
this.tag = "";
|
||||
this.showErrorMessages([]);
|
||||
});
|
||||
},
|
||||
beforeTagSave(obj: VueTagsInput.IAddArgs): void {
|
||||
this.waitingListObjects = [];
|
||||
this.showErrorMessages([]);
|
||||
// * Tag exists in selected tags
|
||||
if (this.tagExists(this.tags, obj.tag)) {
|
||||
this.showErrorMessages([this.__("Cette étiquette est déjà dans la liste.")]);
|
||||
return;
|
||||
}
|
||||
const storeTagRoute = route.methods.route("bo.tags.store");
|
||||
// * Tag exists in local list
|
||||
let customTag = this.tagExists(this.autocompleteItems, obj.tag);
|
||||
if (customTag) {
|
||||
obj.tag = customTag;
|
||||
this.tags.push(customTag);
|
||||
this.tag = "";
|
||||
return;
|
||||
}
|
||||
// * Add tag in waiting list
|
||||
this.waitingListObjects.push(obj);
|
||||
},
|
||||
ajaxSaveTag(obj: VueTagsInput.IAddArgs): void {
|
||||
const self = this,
|
||||
storeTagRoute = route.methods.route("bo.tags.jsonStore");
|
||||
if (!storeTagRoute) {
|
||||
throw new Error("Undefined route bo.tags.store");
|
||||
throw new Error("Undefined route bo.tags.jsonStore");
|
||||
}
|
||||
window.axios
|
||||
.post(storeTagRoute, { name: this.tag })
|
||||
.post(storeTagRoute, { name: self.tag })
|
||||
.then((reponse) => {
|
||||
this.autocompleteItems.push(this.parseTags([reponse.data])[0]);
|
||||
obj.addTag();
|
||||
const parsedTag = self.parseTags([reponse.data])[0] as CustomTag,
|
||||
tag = obj.tag as CustomTag;
|
||||
self.autocompleteItems.push(parsedTag);
|
||||
tag.id = parsedTag.id;
|
||||
tag.slug = parsedTag.slug;
|
||||
obj.tag = tag;
|
||||
this.tags.push(tag);
|
||||
})
|
||||
.catch((error) => {
|
||||
let message = "Une erreur est survenue merci de ressayer plus tard";
|
||||
if (error.response.status === 422) {
|
||||
message =
|
||||
error.response?.data?.errors?.name?.[0] ||
|
||||
error.response?.data?.errors?.slug?.[0] ||
|
||||
message;
|
||||
this.showErrorMessages([message]);
|
||||
return;
|
||||
}
|
||||
if (error.response) {
|
||||
console.error(error.response.data);
|
||||
} else if (error.request) {
|
||||
|
|
@ -90,11 +149,15 @@ export default defineComponent({
|
|||
// Something happened in setting up the request that triggered an Error
|
||||
console.error("Error", error.message);
|
||||
}
|
||||
self.errorNotify("Une erreur est survenue merci de ressayer plus tard");
|
||||
self.errorNotify(message);
|
||||
})
|
||||
.then(() => {
|
||||
this.waitingListObjects = [];
|
||||
this.tag = "";
|
||||
});
|
||||
},
|
||||
beforeTagDelete(obj: VueTagsInput.IDeleteArgs) {
|
||||
let self = this;
|
||||
beforeTagDelete(obj: VueTagsInput.IDeleteArgs): void {
|
||||
const self = this;
|
||||
if (obj.tag) {
|
||||
const destroyTagRoute = route.methods.route("bo.tags.destroy");
|
||||
if (!destroyTagRoute) {
|
||||
|
|
@ -109,9 +172,24 @@ export default defineComponent({
|
|||
});
|
||||
}
|
||||
},
|
||||
changedTags(newTags: Array<CustomTag>) {
|
||||
changedTags(newTags: Array<CustomTag>): void {
|
||||
this.tags = newTags as Array<CustomTag>;
|
||||
},
|
||||
tagExists(items: Array<CustomTag>, tagToCheck: VueTagsInput.ITag): CustomTag | null {
|
||||
let customTag: CustomTag | null = null;
|
||||
items.filter((tag: CustomTag) => {
|
||||
if (
|
||||
tag.id === (tagToCheck as CustomTag).id ||
|
||||
tag.slug === slugify(tagToCheck.text)
|
||||
) {
|
||||
customTag = tag;
|
||||
}
|
||||
});
|
||||
return customTag;
|
||||
},
|
||||
showErrorMessages(messages: Array<string>): void {
|
||||
this.errorMessages = messages;
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
filteredItems() {
|
||||
|
|
@ -124,10 +202,23 @@ export default defineComponent({
|
|||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
@import "../../../../node_modules/bootstrap/scss/bootstrap-utilities.scss";
|
||||
|
||||
.taggableDropdown {
|
||||
.ti-autocomplete {
|
||||
overflow-y: scroll !important;
|
||||
max-height: 10rem !important;
|
||||
.tagInput {
|
||||
width: 100%;
|
||||
|
||||
@include media-breakpoint-up(lg) {
|
||||
width: 75%;
|
||||
}
|
||||
|
||||
.vue-tags-input {
|
||||
max-width: inherit !important;
|
||||
}
|
||||
.ti-autocomplete {
|
||||
overflow-y: scroll !important;
|
||||
max-height: 10rem !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -8,5 +8,13 @@
|
|||
if(!window.__SYSTEM._routes) {
|
||||
window.__SYSTEM._routes = {}
|
||||
}
|
||||
window.__SYSTEM._routes['crud-policies.upload'] = '{{ route('crud-policies.upload') }}';
|
||||
window.__SYSTEM._routes['crud-policies'] = {
|
||||
upload: '{{ route('crud-policies.upload') }}'
|
||||
};
|
||||
window.__SYSTEM._routes.bo = {
|
||||
tags: {
|
||||
store: '{{ route('bo.tags.store') }}',
|
||||
jsonStore: '{{ route('bo.tags.jsonStore') }}'
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ Route::prefix('bo')->name('bo.')->group(function () {
|
|||
|
||||
Route::resource('sliders', SliderController::class)->except(['show']);
|
||||
Route::resource('tags', TagController::class)->except(['show']);
|
||||
Route::post('/tags/store', [TagController::class, 'jsonStore'])->name('tags.jsonStore');
|
||||
Route::resource('news', NewsController::class)
|
||||
->except(['show'])
|
||||
->withoutMiddleware('htmlsanitize')
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue