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

update assets and dependencies #63

Merged
merged 1 commit into from
Sep 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,298 changes: 839 additions & 459 deletions composer.lock

Large diffs are not rendered by default.

23 changes: 14 additions & 9 deletions config/zeus.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,24 @@

return [
/**
* you can use the default layout as a starting point for your blog.
* however, if you're already using your own component, just set the path here.
* set the default theme for all zeus packages
*
* Available layouts with artemis:
*
* breeze, daisy, another-portfolio
*/
'layout' => 'zeus::components.app',
//'layout' => 'zeus::themes.breeze.layouts.app',
//'layout' => 'zeus::themes.daisyui.layouts.app',
'theme' => 'zeus',

/**
* the default theme, for now we only have one theme, and soon we will provide more free and premium themes.
* set the defualt layout component
*
* Available layouts with artemis:
*
* zeus::themes.breeze.layouts.app
* zeus::themes.daisy.layouts.app
* zeus::themes.another-portfolio.layouts.app
*/
'theme' => 'zeus',
//'theme' => 'breeze',
//'theme' => 'daisyui',
'layout' => 'zeus::components.app',

/**
* this will be set up the default seo site title. read more about it in 'laravel-seo'.
Expand Down
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,23 @@
"purge": "filament-purge -i ./resources/dist/filament-tail.css -o ./resources/dist/lara-zeus.css -v 3.x"
},
"devDependencies": {
"@tailwindcss/forms": "^0.5.6",
"@tailwindcss/typography": "^0.5.10",
"alpinejs": "^3.13.0",
"autoprefixer": "^10.4.15",
"daisyui": "^3.1.7",
"laravel-mix": "^6.0.49",
"lodash": "^4.17.21",
"photoswipe": "^5.3.9",
"postcss": "^8.4.29",
"tailwindcss": "^3.3.3",
"tailwindcss-debug-screens": "^2.2.1",
"tippy.js": "^6.3.7",
"@alpinejs/collapse": "^3.12.0",
"@alpinejs/focus": "^3.12.0",
"@awcodes/filament-plugin-purge": "^1.1.1",
"@ryangjchandler/alpine-tooltip": "^1.2.0",
"@tailwindcss/forms": "^0.5.4",
"@tailwindcss/typography": "^0.5.9",
"alpinejs": "^3.12.2",
"autoprefixer": "^10.4.14",
"laravel-mix": "^6.0.49",
"postcss": "^8.4.27",
"postcss-import": "^15.1.0",
"tailwindcss": "^3.3.3",
"tailwindcss-debug-screens": "^2.2.1",
"tippy.js": "^6.3.7"
"postcss-import": "^15.1.0"
},
"dependencies": {}
}
2 changes: 1 addition & 1 deletion resources/dist/filament-tail.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/frontend.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion resources/dist/lara-zeus.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions resources/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"/dist/frontend.css": "/dist/frontend.css?id=369acbe42f37942fbc5a473785b8b80a",
"/dist/filament-tail.css": "/dist/filament-tail.css?id=00506f0db900050c0b4407e46453228c"
"/dist/frontend.css": "/dist/frontend.css?id=effaa79c25869cae9b774fd34336860d",
"/dist/filament-tail.css": "/dist/filament-tail.css?id=ae8207b4d69dda20023f60b4380ef2cc"
}
5 changes: 5 additions & 0 deletions src/CoreServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,11 @@ public function configurePackage(Package $package): void
public static function setThemePath(string $path): void
{
$viewPath = 'zeus::themes.' . config('zeus.theme') . '.' . $path;

if (! view()->exists($viewPath . '.home')) {
$viewPath = 'zeus::themes.zeus.' . $path;
}

View::share($path . 'Theme', $viewPath);
App::singleton($path . 'Theme', function () use ($viewPath) {
return $viewPath;
Expand Down
11 changes: 1 addition & 10 deletions tailwind-filament.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,16 @@ import colors from 'tailwindcss/colors'
module.exports = {
presets: [preset],
content: [
// Core

// Wind
'../demo/vendor/lara-zeus/wind/src/Filament/Resources/LetterResource.php',

'../wind/src/Filament/Resources/LetterResource.php',
// Sky
'../sky/resources/views/filament/**/*.blade.php',
'../sky/src/Models/PostStatus.php',





// Rain
'../rain/resources/views/filament/**/*.blade.php',
'../rain/src/Models/Columns.php',
// Rhea
'../rhea/resources/views/**/*.blade.php',

// Bolt
'../bolt/resources/views/filament/**/*.blade.php',
// Thunder
Expand Down
4 changes: 3 additions & 1 deletion tailwind-frontend.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ module.exports = {
content: [
// Core
'./resources/views/**/*.blade.php',
'./src/CoreServiceProvider.php',
// Wind
'../wind/resources/views/themes/**/*.blade.php',
// Sky
Expand All @@ -15,12 +16,13 @@ module.exports = {
// Thunder
'../thunder/resources/views/themes/**/*.blade.php',
'../thunder/src/Models/TicketsStatus.php',
// hermes
'../hermes/resources/views/themes/**/*.blade.php',
// Rain
'../rain/resources/views/themes/**/*.blade.php',
'../rain/src/Models/Columns.php',
// filament
'./vendor/filament/**/*.blade.php',
'./src/CoreServiceProvider.php',
],
theme: {
extend: {
Expand Down
Loading