diff --git a/app/Helpers/components_helper.php b/app/Helpers/components_helper.php index a15db511..45d12a15 100644 --- a/app/Helpers/components_helper.php +++ b/app/Helpers/components_helper.php @@ -41,7 +41,7 @@ if (! function_exists('button')) { $variantClass = [ 'default' => 'text-black bg-gray-300 hover:bg-gray-400', - 'primary' => 'text-white bg-pine-700 hover:bg-pine-800', + 'primary' => 'text-white bg-pine-500 hover:bg-pine-800', 'secondary' => 'text-white bg-gray-700 hover:bg-gray-800', 'accent' => 'text-white bg-rose-600 hover:bg-rose-800', 'success' => 'text-white bg-green-600 hover:bg-green-700', diff --git a/app/Resources/icons/account-circle.svg b/app/Resources/icons/account-circle.svg new file mode 100644 index 00000000..c825dc5a --- /dev/null +++ b/app/Resources/icons/account-circle.svg @@ -0,0 +1,6 @@ + diff --git a/app/Resources/icons/user.svg b/app/Resources/icons/user.svg deleted file mode 100755 index f6566c8e..00000000 --- a/app/Resources/icons/user.svg +++ /dev/null @@ -1,6 +0,0 @@ - diff --git a/app/Resources/styles/layout.css b/app/Resources/styles/layout.css index e5535241..8faf449d 100644 --- a/app/Resources/styles/layout.css +++ b/app/Resources/styles/layout.css @@ -1,26 +1,33 @@ /* Admin layout */ .holy-grail-grid { @apply grid min-h-screen overflow-y-auto; - grid-template: 1fr auto / auto 1fr; + grid-template: auto 1fr auto / auto 1fr; - & .holy-grail-sidebar { - @apply col-start-1 col-end-2 row-start-1 row-end-3 w-80; + & .holy-grail__header { + @apply h-10 col-start-1 col-end-4 row-start-1 row-end-2; } - & .holy-grail-main { - @apply w-full col-start-1 col-end-3 row-start-1 row-end-2; + & .holy-grail__sidebar { + @apply col-start-1 col-end-2 row-start-2 row-end-4; + + width: 300px; + max-height: calc(100vh - 2.5rem); } - & .holy-grail-footer { - @apply w-full col-start-1 col-end-3 row-start-2 row-end-3; + & .holy-grail__main { + @apply col-start-1 col-end-3 row-start-2 row-end-3; + } + + & .holy-grail__footer { + @apply col-start-1 col-end-3 row-start-3 row-end-4; } @screen md { - & .holy-grail-main { + & .holy-grail__main { @apply col-start-2; } - & .holy-grail-footer { + & .holy-grail__footer { @apply col-start-2; } } diff --git a/app/Views/Components/Button.php b/app/Views/Components/Button.php index 3ba713fd..3c29a3a3 100644 --- a/app/Views/Components/Button.php +++ b/app/Views/Components/Button.php @@ -29,7 +29,7 @@ class Button extends Component $variantClass = [ 'default' => 'text-black bg-gray-300 hover:bg-gray-400', - 'primary' => 'text-white bg-pine-700 hover:bg-pine-800', + 'primary' => 'text-white bg-pine-500 hover:bg-pine-800', 'secondary' => 'text-white bg-gray-700 hover:bg-gray-800', 'accent' => 'text-white bg-rose-600 hover:bg-rose-800', 'success' => 'text-white bg-green-600 hover:bg-green-700', diff --git a/modules/Admin/Controllers/MyAccountController.php b/modules/Admin/Controllers/MyAccountController.php index 93147249..696f5bff 100644 --- a/modules/Admin/Controllers/MyAccountController.php +++ b/modules/Admin/Controllers/MyAccountController.php @@ -18,14 +18,14 @@ class MyAccountController extends BaseController { public function index(): string { - return view('my_account\view'); + return view('my_account/view'); } public function changePassword(): string { helper('form'); - return view('my_account\change_password'); + return view('my_account/change_password'); } public function attemptChange(): RedirectResponse diff --git a/modules/Admin/Language/en/AdminNavigation.php b/modules/Admin/Language/en/AdminNavigation.php index f5ca5aea..92a5f59b 100644 --- a/modules/Admin/Language/en/AdminNavigation.php +++ b/modules/Admin/Language/en/AdminNavigation.php @@ -9,7 +9,7 @@ declare(strict_types=1); */ return [ - 'go_to_website' => 'Go to website', + 'go_to_website' => 'View site', 'dashboard' => 'Dashboard', 'admin' => 'Home', 'podcasts' => 'Podcasts', diff --git a/modules/Admin/Language/en/Navigation.php b/modules/Admin/Language/en/Navigation.php index f5ca5aea..92a5f59b 100644 --- a/modules/Admin/Language/en/Navigation.php +++ b/modules/Admin/Language/en/Navigation.php @@ -9,7 +9,7 @@ declare(strict_types=1); */ return [ - 'go_to_website' => 'Go to website', + 'go_to_website' => 'View site', 'dashboard' => 'Dashboard', 'admin' => 'Home', 'podcasts' => 'Podcasts', diff --git a/package-lock.json b/package-lock.json index 5a2084d7..92ed51a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -55,6 +55,7 @@ "lit": "^2.0.0-rc.2", "postcss-import": "^14.0.2", "postcss-preset-env": "^6.7.0", + "postcss-reporter": "^7.0.2", "prettier": "2.3.2", "prettier-plugin-organize-imports": "^2.3.3", "semantic-release": "^17.4.4", @@ -62,6 +63,7 @@ "stylelint-config-standard": "^22.0.0", "svgo": "^2.3.1", "tailwindcss": "^2.2.7", + "tailwindcss-scroll-snap": "^1.1.0", "typescript": "^4.3.5", "vite": "^2.4.4" } @@ -13724,6 +13726,26 @@ "node": ">=0.10.0" } }, + "node_modules/postcss-reporter": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz", + "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==", + "dev": true, + "dependencies": { + "picocolors": "^1.0.0", + "thenby": "^1.3.4" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + "peerDependencies": { + "postcss": "^8.1.0" + } + }, "node_modules/postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -16172,6 +16194,16 @@ "postcss": "^8.0.9" } }, + "node_modules/tailwindcss-scroll-snap": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tailwindcss-scroll-snap/-/tailwindcss-scroll-snap-1.1.0.tgz", + "integrity": "sha512-qmV7PJMqQrdzf2uKjaIrgIW9fpz8SNdD6hhVtbUbRGjz95CsZvsVozHRCz3NrPphro+tbRMbUhDYmTNKP6qPSw==", + "dev": true, + "dependencies": { + "lodash": "^4.17.15", + "reduce-css-calc": "^2.1.7" + } + }, "node_modules/tailwindcss/node_modules/fs-extra": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz", @@ -16308,6 +16340,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "node_modules/thenby": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz", + "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", + "dev": true + }, "node_modules/through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -27630,6 +27668,16 @@ } } }, + "postcss-reporter": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz", + "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==", + "dev": true, + "requires": { + "picocolors": "^1.0.0", + "thenby": "^1.3.4" + } + }, "postcss-resolve-nested-selector": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", @@ -29621,6 +29669,16 @@ } } }, + "tailwindcss-scroll-snap": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/tailwindcss-scroll-snap/-/tailwindcss-scroll-snap-1.1.0.tgz", + "integrity": "sha512-qmV7PJMqQrdzf2uKjaIrgIW9fpz8SNdD6hhVtbUbRGjz95CsZvsVozHRCz3NrPphro+tbRMbUhDYmTNKP6qPSw==", + "dev": true, + "requires": { + "lodash": "^4.17.15", + "reduce-css-calc": "^2.1.7" + } + }, "temp-dir": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz", @@ -29660,6 +29718,12 @@ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", "dev": true }, + "thenby": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz", + "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==", + "dev": true + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", diff --git a/package.json b/package.json index fa95bf38..fbc32ce7 100644 --- a/package.json +++ b/package.json @@ -73,12 +73,14 @@ "lit": "^2.0.0-rc.2", "postcss-import": "^14.0.2", "postcss-preset-env": "^6.7.0", + "postcss-reporter": "^7.0.2", "prettier-plugin-organize-imports": "^2.3.3", "prettier": "2.3.2", "semantic-release": "^17.4.4", "stylelint-config-standard": "^22.0.0", "stylelint": "^13.13.1", "svgo": "^2.3.1", + "tailwindcss-scroll-snap": "^1.1.0", "tailwindcss": "^2.2.7", "typescript": "^4.3.5", "vite": "^2.4.4" diff --git a/postcss.config.js b/postcss.config.js index f2f8cb17..aec4a674 100644 --- a/postcss.config.js +++ b/postcss.config.js @@ -3,6 +3,7 @@ module.exports = { plugins: [ require("postcss-import"), + require("postcss-reporter"), require("tailwindcss"), require("postcss-preset-env")({ stage: 1 }), ...(process.env.NODE_ENV === "production" diff --git a/tailwind.config.js b/tailwind.config.js index ce028e81..c9a7ffab 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -19,16 +19,16 @@ module.exports = { }, colors: { pine: { - 50: "#ebf8f8", - 100: "#cff7f3", - 200: "#9df2e4", - 300: "#5ee8d4", - 400: "#1cd7ba", - 500: "#08c09a", - 600: "#07a57d", - 700: "#009486", - 800: "#006D60", - 900: "#00564A", + 50: "#F2FAF9", + 100: "#E7F9E4", + 200: "#bfe4e1", + 300: "#99d4cf", + 400: "#4db4aa", + 500: "#009486", + 600: "#008579", + 700: "#006D60", + 800: "#00564A", + 900: "#003D0B", }, rose: { 50: "#fcf9f8", @@ -56,5 +56,6 @@ module.exports = { require("@tailwindcss/forms"), require("@tailwindcss/typography"), require("@tailwindcss/line-clamp"), + require("tailwindcss-scroll-snap"), ], }; diff --git a/themes/cp_admin/_layout.php b/themes/cp_admin/_layout.php index 9ecdaa3f..174f9cc0 100644 --- a/themes/cp_admin/_layout.php +++ b/themes/cp_admin/_layout.php @@ -13,20 +13,70 @@ = service('vite')->asset('js/audio-player.ts', 'js') ?> -
+ -