diff --git a/app/Views/admin/page/create.php b/app/Views/admin/page/create.php
index 75a1ef7f..087b0805 100644
--- a/app/Views/admin/page/create.php
+++ b/app/Views/admin/page/create.php
@@ -26,15 +26,23 @@
'data-slugify' => 'title',
]) ?>
-= form_label(lang('Page.form.slug'), 'slug', ['class' => 'max-w-sm']) ?>
+= form_label(
+ lang('Page.form.permalink'),
+ 'slug',
+ [],
+) ?>
+
= form_label(lang('Page.form.content'), 'content') ?>
diff --git a/app/Views/admin/page/edit.php b/app/Views/admin/page/edit.php
index 7a2a581a..4f74d2c3 100644
--- a/app/Views/admin/page/edit.php
+++ b/app/Views/admin/page/edit.php
@@ -24,17 +24,25 @@
'value' => old('title', $page->title),
'required' => 'required',
'data-slugify' => 'title',
+ 'slot' => 'slug-input',
]) ?>
-= form_label(lang('Page.form.slug'), 'slug', ['class' => 'max-w-sm']) ?>
+= form_label(
+ lang('Page.form.permalink'),
+ 'slug',
+ [],
+) ?>
+
+= base_url('pages') . '/' ?>
= form_input([
'id' => 'slug',
'name' => 'slug',
- 'class' => 'form-input mb-4 max-w-sm',
+ 'class' => 'form-input flex-1 w-0 text-xs',
'value' => old('slug', $page->slug),
'required' => 'required',
'data-slugify' => 'slug',
]) ?>
+
= form_label(lang('Page.form.content'), 'content') ?>
diff --git a/package-lock.json b/package-lock.json
index 605508c7..4ad9004a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,11 +9,12 @@
"version": "1.0.0-alpha.80",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "@amcharts/amcharts4": "^4.10.20",
+ "@amcharts/amcharts4": "^4.10.21",
"@amcharts/amcharts4-geodata": "^4.1.21",
+ "@github/clipboard-copy-element": "^1.1.2",
"@github/markdown-toolbar-element": "^1.5.1",
"@github/time-elements": "^3.1.2",
- "@popperjs/core": "^2.9.2",
+ "@popperjs/core": "^2.9.3",
"@vime/core": "^5.0.33",
"choices.js": "^9.0.1",
"flatpickr": "^4.6.9",
@@ -28,25 +29,23 @@
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/exec": "^5.0.0",
"@semantic-release/git": "^9.0.0",
- "@semantic-release/gitlab": "^6.2.1",
+ "@semantic-release/gitlab": "^6.2.2",
"@tailwindcss/forms": "^0.3.3",
"@tailwindcss/line-clamp": "^0.2.1",
"@tailwindcss/typography": "^0.4.1",
"@types/leaflet": "^1.7.5",
"@types/marked": "^2.0.4",
- "@types/prosemirror-markdown": "^1.5.2",
- "@types/prosemirror-view": "^1.18.0",
- "@typescript-eslint/eslint-plugin": "^4.28.5",
- "@typescript-eslint/parser": "^4.28.5",
+ "@typescript-eslint/eslint-plugin": "^4.29.1",
+ "@typescript-eslint/parser": "^4.29.1",
"cross-env": "^7.0.3",
"cssnano": "^5.0.7",
"cz-conventional-changelog": "^3.3.0",
- "eslint": "^7.31.0",
+ "eslint": "^7.32.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
"husky": "^7.0.1",
"is-ci": "^3.0.0",
- "lint-staged": "^11.1.1",
+ "lint-staged": "^11.1.2",
"lit": "^2.0.0-rc.2",
"postcss-import": "^14.0.2",
"postcss-preset-env": "^6.7.0",
@@ -1035,6 +1034,11 @@
"resolved": "https://registry.npmjs.org/@foliojs-fork/restructure/-/restructure-2.0.2.tgz",
"integrity": "sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA=="
},
+ "node_modules/@github/clipboard-copy-element": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@github/clipboard-copy-element/-/clipboard-copy-element-1.1.2.tgz",
+ "integrity": "sha512-L6CMrcA5we0udafvoSuRCE/Ci/3xrLWKYRGup2IlhxF771bQYsQ2EB1of182pI8ZWM4oxgwzu37+igMeoZjN/A=="
+ },
"node_modules/@github/markdown-toolbar-element": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/@github/markdown-toolbar-element/-/markdown-toolbar-element-1.5.3.tgz",
@@ -1941,12 +1945,6 @@
"integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
"dev": true
},
- "node_modules/@types/highlight.js": {
- "version": "9.12.4",
- "resolved": "https://registry.npmjs.org/@types/highlight.js/-/highlight.js-9.12.4.tgz",
- "integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
- "dev": true
- },
"node_modules/@types/http-cache-semantics": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -1977,23 +1975,6 @@
"@types/geojson": "*"
}
},
- "node_modules/@types/linkify-it": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.0.tgz",
- "integrity": "sha512-x9OaQQTb1N2hPZ/LWJsqushexDvz7NgzuZxiRmZio44WPuolTZNHDBCrOxCzRVOMwamJRO2dWax5NbygOf1OTQ==",
- "dev": true
- },
- "node_modules/@types/markdown-it": {
- "version": "12.0.1",
- "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.0.1.tgz",
- "integrity": "sha512-mHfT8j/XkPb1uLEfs0/C3se6nd+webC2kcqcy8tgcVr0GDEONv/xaQzAN+aQvkxQXk/jC0Q6mPS+0xhFwRF35g==",
- "dev": true,
- "dependencies": {
- "@types/highlight.js": "^9.7.0",
- "@types/linkify-it": "*",
- "@types/mdurl": "*"
- }
- },
"node_modules/@types/marked": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.5.tgz",
@@ -2009,12 +1990,6 @@
"@types/unist": "*"
}
},
- "node_modules/@types/mdurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
- "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
- "dev": true
- },
"node_modules/@types/minimist": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
@@ -2033,18 +2008,13 @@
"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
"dev": true
},
- "node_modules/@types/orderedmap": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@types/orderedmap/-/orderedmap-1.0.0.tgz",
- "integrity": "sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw==",
- "dev": true
- },
"node_modules/@types/parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
+<<<<<<< HEAD
"node_modules/@types/prosemirror-markdown": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/@types/prosemirror-markdown/-/prosemirror-markdown-1.5.4.tgz",
@@ -2095,6 +2065,8 @@
"@types/prosemirror-transform": "*"
}
},
+=======
+>>>>>>> c94a163 (feat: replace slug field with interactive permalink component)
"node_modules/@types/responselike": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
@@ -20247,6 +20219,11 @@
"resolved": "https://registry.npmjs.org/@foliojs-fork/restructure/-/restructure-2.0.2.tgz",
"integrity": "sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA=="
},
+ "@github/clipboard-copy-element": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/@github/clipboard-copy-element/-/clipboard-copy-element-1.1.2.tgz",
+ "integrity": "sha512-L6CMrcA5we0udafvoSuRCE/Ci/3xrLWKYRGup2IlhxF771bQYsQ2EB1of182pI8ZWM4oxgwzu37+igMeoZjN/A=="
+ },
"@github/markdown-toolbar-element": {
"version": "1.5.3",
"resolved": "https://registry.npmjs.org/@github/markdown-toolbar-element/-/markdown-toolbar-element-1.5.3.tgz",
@@ -20975,12 +20952,6 @@
"integrity": "sha512-1rkryxURpr6aWP7R786/UQOkJ3PcpQiWkAXBmdWc7ryFWqN6a4xfK7BtjXvFBKO9LjQ+MWQSWxYeZX1OApnArA==",
"dev": true
},
- "@types/highlight.js": {
- "version": "9.12.4",
- "resolved": "https://registry.npmjs.org/@types/highlight.js/-/highlight.js-9.12.4.tgz",
- "integrity": "sha512-t2szdkwmg2JJyuCM20e8kR2X59WCE5Zkl4bzm1u1Oukjm79zpbiAv+QjnwLnuuV0WHEcX2NgUItu0pAMKuOPww==",
- "dev": true
- },
"@types/http-cache-semantics": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -21011,23 +20982,6 @@
"@types/geojson": "*"
}
},
- "@types/linkify-it": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-3.0.0.tgz",
- "integrity": "sha512-x9OaQQTb1N2hPZ/LWJsqushexDvz7NgzuZxiRmZio44WPuolTZNHDBCrOxCzRVOMwamJRO2dWax5NbygOf1OTQ==",
- "dev": true
- },
- "@types/markdown-it": {
- "version": "12.0.1",
- "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-12.0.1.tgz",
- "integrity": "sha512-mHfT8j/XkPb1uLEfs0/C3se6nd+webC2kcqcy8tgcVr0GDEONv/xaQzAN+aQvkxQXk/jC0Q6mPS+0xhFwRF35g==",
- "dev": true,
- "requires": {
- "@types/highlight.js": "^9.7.0",
- "@types/linkify-it": "*",
- "@types/mdurl": "*"
- }
- },
"@types/marked": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/@types/marked/-/marked-2.0.5.tgz",
@@ -21043,12 +20997,6 @@
"@types/unist": "*"
}
},
- "@types/mdurl": {
- "version": "1.0.2",
- "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-1.0.2.tgz",
- "integrity": "sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==",
- "dev": true
- },
"@types/minimist": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.1.tgz",
@@ -21067,18 +21015,13 @@
"integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==",
"dev": true
},
- "@types/orderedmap": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@types/orderedmap/-/orderedmap-1.0.0.tgz",
- "integrity": "sha512-dxKo80TqYx3YtBipHwA/SdFmMMyLCnP+5mkEqN0eMjcTBzHkiiX0ES118DsjDBjvD+zeSsSU9jULTZ+frog+Gw==",
- "dev": true
- },
"@types/parse-json": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz",
"integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
"dev": true
},
+<<<<<<< HEAD
"@types/prosemirror-markdown": {
"version": "1.5.4",
"resolved": "https://registry.npmjs.org/@types/prosemirror-markdown/-/prosemirror-markdown-1.5.4.tgz",
@@ -21129,6 +21072,8 @@
"@types/prosemirror-transform": "*"
}
},
+=======
+>>>>>>> c94a163 (feat: replace slug field with interactive permalink component)
"@types/responselike": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
diff --git a/package.json b/package.json
index 005821c7..b69dcc70 100644
--- a/package.json
+++ b/package.json
@@ -28,10 +28,11 @@
},
"dependencies": {
"@amcharts/amcharts4-geodata": "^4.1.21",
- "@amcharts/amcharts4": "^4.10.20",
+ "@amcharts/amcharts4": "^4.10.21",
+ "@github/clipboard-copy-element": "^1.1.2",
"@github/markdown-toolbar-element": "^1.5.1",
"@github/time-elements": "^3.1.2",
- "@popperjs/core": "^2.9.2",
+ "@popperjs/core": "^2.9.3",
"@vime/core": "^5.0.33",
"choices.js": "^9.0.1",
"flatpickr": "^4.6.9",
@@ -46,25 +47,23 @@
"@semantic-release/changelog": "^5.0.1",
"@semantic-release/exec": "^5.0.0",
"@semantic-release/git": "^9.0.0",
- "@semantic-release/gitlab": "^6.2.1",
+ "@semantic-release/gitlab": "^6.2.2",
"@tailwindcss/forms": "^0.3.3",
"@tailwindcss/line-clamp": "^0.2.1",
"@tailwindcss/typography": "^0.4.1",
"@types/leaflet": "^1.7.5",
"@types/marked": "^2.0.4",
- "@types/prosemirror-markdown": "^1.5.2",
- "@types/prosemirror-view": "^1.18.0",
- "@typescript-eslint/eslint-plugin": "^4.28.5",
- "@typescript-eslint/parser": "^4.28.5",
+ "@typescript-eslint/eslint-plugin": "^4.29.1",
+ "@typescript-eslint/parser": "^4.29.1",
"cross-env": "^7.0.3",
"cssnano": "^5.0.7",
"cz-conventional-changelog": "^3.3.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^3.4.0",
- "eslint": "^7.31.0",
+ "eslint": "^7.32.0",
"husky": "^7.0.1",
"is-ci": "^3.0.0",
- "lint-staged": "^11.1.1",
+ "lint-staged": "^11.1.2",
"lit": "^2.0.0-rc.2",
"postcss-import": "^14.0.2",
"postcss-preset-env": "^6.7.0",