diff --git a/nginx/default.conf b/nginx/default.conf index f15595a..be70174 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -23,6 +23,10 @@ server { fastcgi_pass unix:/var/run/php/php-fpm.sock; } + location ^~ /livewire { + try_files $uri $uri/ /index.php?$query_string; + } + # handle .php location ~ \.php$ { fastcgi_pass unix:/var/run/php/php-fpm.sock; diff --git a/site/app/Http/Controllers/ArtistController.php b/site/app/Http/Controllers/ArtistController.php index 5d55c2d..e50bebf 100644 --- a/site/app/Http/Controllers/ArtistController.php +++ b/site/app/Http/Controllers/ArtistController.php @@ -31,6 +31,11 @@ public function index() ]); } + public function avatar() { + $user = auth()->user(); + return view('') + } + /** * Show the form for creating a new resource. * diff --git a/site/app/Http/Controllers/ProfileController.php b/site/app/Http/Controllers/ProfileController.php index a48eb8d..1baeefb 100644 --- a/site/app/Http/Controllers/ProfileController.php +++ b/site/app/Http/Controllers/ProfileController.php @@ -18,6 +18,8 @@ public function edit(Request $request): View { return view('profile.edit', [ 'user' => $request->user(), + 'artist' => $request->user()->artists->first(), + 'avatar' => $request->user()->artists->first()->avatar, ]); } diff --git a/site/app/Livewire/Artist/Avatar.php b/site/app/Livewire/Artist/Avatar.php new file mode 100644 index 0000000..2dd0fda --- /dev/null +++ b/site/app/Livewire/Artist/Avatar.php @@ -0,0 +1,44 @@ +avatar->store('avatars', 'static'); + + Image::load($disk->path($avatar)) + ->manualCrop($this->width, $this->height, $this->x, $this->y) + ->save(); + ImageOptimizer::optimize($disk->path($avatar)); + auth()->user()->artists()->first()->update(compact('avatar')); + $this->avatar = null; + return redirect(request()->header('Referer')); + } +} diff --git a/site/app/Models/Artist.php b/site/app/Models/Artist.php index 82f069f..b8ba6ed 100644 --- a/site/app/Models/Artist.php +++ b/site/app/Models/Artist.php @@ -61,4 +61,12 @@ public function wallets() return $this->hasMany(Wallet::class); } + public function avatar() + { + if (!$this->avatar) { + return asset('resources/img/default_avatars/default_avatar_male.svg'); + } + return config('app.static_asset_url') . '/' . $this->avatar; + } + } diff --git a/site/composer.json b/site/composer.json index 2b7a0b8..87b9874 100644 --- a/site/composer.json +++ b/site/composer.json @@ -19,6 +19,7 @@ "laravel/tinker": "^2.8", "livewire/livewire": "^3.2", "mckenziearts/blade-untitledui-icons": "^1.2", + "spatie/image": "^2.2", "spatie/laravel-image-optimizer": "^1.7" }, "require-dev": { diff --git a/site/composer.lock b/site/composer.lock index 1478821..a3fc352 100644 --- a/site/composer.lock +++ b/site/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "78067a62b08c07fdd16ae78c4a9de27e", + "content-hash": "9d6e4f83e7c9482fd5ba88df35ad732f", "packages": [ { "name": "andreiio/blade-remix-icon", @@ -3157,6 +3157,71 @@ ], "time": "2023-12-04T10:14:46+00:00" }, + { + "name": "league/glide", + "version": "2.3.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/glide.git", + "reference": "2ff92c8f1edc80b74e2d3c5efccfc7223f74d407" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/glide/zipball/2ff92c8f1edc80b74e2d3c5efccfc7223f74d407", + "reference": "2ff92c8f1edc80b74e2d3c5efccfc7223f74d407", + "shasum": "" + }, + "require": { + "intervention/image": "^2.7", + "league/flysystem": "^2.0|^3.0", + "php": "^7.2|^8.0", + "psr/http-message": "^1.0|^2.0" + }, + "require-dev": { + "mockery/mockery": "^1.3.3", + "phpunit/php-token-stream": "^3.1|^4.0", + "phpunit/phpunit": "^8.5|^9.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "League\\Glide\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jonathan Reinink", + "email": "jonathan@reinink.ca", + "homepage": "http://reinink.ca" + }, + { + "name": "Titouan Galopin", + "email": "galopintitouan@gmail.com", + "homepage": "https://titouangalopin.com" + } + ], + "description": "Wonderfully easy on-demand image manipulation library with an HTTP based API.", + "homepage": "http://glide.thephpleague.com", + "keywords": [ + "ImageMagick", + "editing", + "gd", + "image", + "imagick", + "league", + "manipulation", + "processing" + ], + "support": { + "issues": "https://github.com/thephpleague/glide/issues", + "source": "https://github.com/thephpleague/glide/tree/2.3.0" + }, + "time": "2023-07-08T06:26:07+00:00" + }, { "name": "league/mime-type-detection", "version": "1.14.0", @@ -5069,6 +5134,75 @@ ], "time": "2022-12-18T12:58:32+00:00" }, + { + "name": "spatie/image", + "version": "2.2.7", + "source": { + "type": "git", + "url": "https://github.com/spatie/image.git", + "reference": "2f802853aab017aa615224daae1588054b5ab20e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/image/zipball/2f802853aab017aa615224daae1588054b5ab20e", + "reference": "2f802853aab017aa615224daae1588054b5ab20e", + "shasum": "" + }, + "require": { + "ext-exif": "*", + "ext-json": "*", + "ext-mbstring": "*", + "league/glide": "^2.2.2", + "php": "^8.0", + "spatie/image-optimizer": "^1.7", + "spatie/temporary-directory": "^1.0|^2.0", + "symfony/process": "^3.0|^4.0|^5.0|^6.0" + }, + "require-dev": { + "pestphp/pest": "^1.22", + "phpunit/phpunit": "^9.5", + "symfony/var-dumper": "^4.0|^5.0|^6.0", + "vimeo/psalm": "^4.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\Image\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Freek Van der Herten", + "email": "freek@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Manipulate images with an expressive API", + "homepage": "https://github.com/spatie/image", + "keywords": [ + "image", + "spatie" + ], + "support": { + "source": "https://github.com/spatie/image/tree/2.2.7" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2023-07-24T13:54:13+00:00" + }, { "name": "spatie/image-optimizer", "version": "1.7.2", @@ -5311,6 +5445,67 @@ ], "time": "2023-08-23T09:04:39+00:00" }, + { + "name": "spatie/temporary-directory", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/spatie/temporary-directory.git", + "reference": "efc258c9f4da28f0c7661765b8393e4ccee3d19c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spatie/temporary-directory/zipball/efc258c9f4da28f0c7661765b8393e4ccee3d19c", + "reference": "efc258c9f4da28f0c7661765b8393e4ccee3d19c", + "shasum": "" + }, + "require": { + "php": "^8.0" + }, + "require-dev": { + "phpunit/phpunit": "^9.5" + }, + "type": "library", + "autoload": { + "psr-4": { + "Spatie\\TemporaryDirectory\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alex Vanderbist", + "email": "alex@spatie.be", + "homepage": "https://spatie.be", + "role": "Developer" + } + ], + "description": "Easily create, use and destroy temporary directories", + "homepage": "https://github.com/spatie/temporary-directory", + "keywords": [ + "php", + "spatie", + "temporary-directory" + ], + "support": { + "issues": "https://github.com/spatie/temporary-directory/issues", + "source": "https://github.com/spatie/temporary-directory/tree/2.2.0" + }, + "funding": [ + { + "url": "https://spatie.be/open-source/support-us", + "type": "custom" + }, + { + "url": "https://github.com/spatie", + "type": "github" + } + ], + "time": "2023-09-25T07:13:36+00:00" + }, { "name": "symfony/console", "version": "v6.4.1", diff --git a/site/config/livewire.php b/site/config/livewire.php new file mode 100644 index 0000000..299c194 --- /dev/null +++ b/site/config/livewire.php @@ -0,0 +1,159 @@ + 'App\\Livewire', + + /* + |--------------------------------------------------------------------------- + | View Path + |--------------------------------------------------------------------------- + | + | This value is used to specify where Livewire component Blade templates are + | stored when running file creation commands like `artisan make:livewire`. + | It is also used if you choose to omit a component's render() method. + | + */ + + 'view_path' => resource_path('views/livewire'), + + /* + |--------------------------------------------------------------------------- + | Layout + |--------------------------------------------------------------------------- + | The view that will be used as the layout when rendering a single component + | as an entire page via `Route::get('/post/create', CreatePost::class);`. + | In this case, the view returned by CreatePost will render into $slot. + | + */ + + 'layout' => 'components.layouts.app', + + /* + |--------------------------------------------------------------------------- + | Lazy Loading Placeholder + |--------------------------------------------------------------------------- + | Livewire allows you to lazy load components that would otherwise slow down + | the initial page load. Every component can have a custom placeholder or + | you can define the default placeholder view for all components below. + | + */ + + 'lazy_placeholder' => null, + + /* + |--------------------------------------------------------------------------- + | Temporary File Uploads + |--------------------------------------------------------------------------- + | + | Livewire handles file uploads by storing uploads in a temporary directory + | before the file is stored permanently. All file uploads are directed to + | a global endpoint for temporary storage. You may configure this below: + | + */ + + 'temporary_file_upload' => [ + 'disk' => 'local', // Example: 'local', 's3' | Default: 'default' + 'rules' => null, // Example: ['file', 'mimes:png,jpg'] | Default: ['required', 'file', 'max:12288'] (12MB) + 'directory' => 'tmp', // Example: 'tmp' | Default: 'livewire-tmp' + 'middleware' => null, // Example: 'throttle:5,1' | Default: 'throttle:60,1' + 'preview_mimes' => [ // Supported file types for temporary pre-signed file URLs... + 'png', 'gif', 'bmp', 'svg', 'wav', 'mp4', + 'mov', 'avi', 'wmv', 'mp3', 'm4a', + 'jpg', 'jpeg', 'mpga', 'webp', 'wma', + ], + 'max_upload_time' => 5, // Max duration (in minutes) before an upload is invalidated... + ], + + /* + |--------------------------------------------------------------------------- + | Render On Redirect + |--------------------------------------------------------------------------- + | + | This value determines if Livewire will run a component's `render()` method + | after a redirect has been triggered using something like `redirect(...)` + | Setting this to true will render the view once more before redirecting + | + */ + + 'render_on_redirect' => false, + + /* + |--------------------------------------------------------------------------- + | Eloquent Model Binding + |--------------------------------------------------------------------------- + | + | Previous versions of Livewire supported binding directly to eloquent model + | properties using wire:model by default. However, this behavior has been + | deemed too "magical" and has therefore been put under a feature flag. + | + */ + + 'legacy_model_binding' => false, + + /* + |--------------------------------------------------------------------------- + | Auto-inject Frontend Assets + |--------------------------------------------------------------------------- + | + | By default, Livewire automatically injects its JavaScript and CSS into the + | and of pages containing Livewire components. By disabling + | this behavior, you need to use @livewireStyles and @livewireScripts. + | + */ + + 'inject_assets' => true, + + /* + |--------------------------------------------------------------------------- + | Navigate (SPA mode) + |--------------------------------------------------------------------------- + | + | By adding `wire:navigate` to links in your Livewire application, Livewire + | will prevent the default link handling and instead request those pages + | via AJAX, creating an SPA-like effect. Configure this behavior here. + | + */ + + 'navigate' => [ + 'show_progress_bar' => true, + 'progress_bar_color' => '#2299dd', + ], + + /* + |--------------------------------------------------------------------------- + | HTML Morph Markers + |--------------------------------------------------------------------------- + | + | Livewire intelligently "morphs" existing HTML into the newly rendered HTML + | after each update. To make this process more reliable, Livewire injects + | "markers" into the rendered Blade surrounding @if, @class & @foreach. + | + */ + + 'inject_morph_markers' => true, + + /* + |--------------------------------------------------------------------------- + | Pagination Theme + |--------------------------------------------------------------------------- + | + | When enabling Livewire's pagination feature by using the `WithPagination` + | trait, Livewire will use Tailwind templates to render pagination views + | on the page. If you want Bootstrap CSS, you can specify: "bootstrap" + | + */ + + 'pagination_theme' => 'bootstrap', +]; diff --git a/site/package.json b/site/package.json index 8ede342..009db9e 100644 --- a/site/package.json +++ b/site/package.json @@ -20,6 +20,7 @@ "version": "0.0.0", "dependencies": { "aos": "^3.0.0-beta.6", + "cropperjs": "^1.6.1", "guillotine": "^1.3.1", "isotope-layout": "^3.0.6", "jquery": "^3.7.0", diff --git a/site/resources/views/layouts/guest.blade.php b/site/resources/views/layouts/guest.blade.php index be98531..2b4668b 100644 --- a/site/resources/views/layouts/guest.blade.php +++ b/site/resources/views/layouts/guest.blade.php @@ -21,18 +21,6 @@ @section('page-content')
- {{-- -
-
- -
-
- --}}
diff --git a/site/resources/views/layouts/master.blade.php b/site/resources/views/layouts/master.blade.php index e5cf4a1..1b78688 100644 --- a/site/resources/views/layouts/master.blade.php +++ b/site/resources/views/layouts/master.blade.php @@ -38,5 +38,6 @@ @livewireScriptConfig @vite(['resources/js/app.js']) + @yield('additional_footers') diff --git a/site/resources/views/livewire/artist/avatar.blade.php b/site/resources/views/livewire/artist/avatar.blade.php new file mode 100644 index 0000000..77fcb8f --- /dev/null +++ b/site/resources/views/livewire/artist/avatar.blade.php @@ -0,0 +1,42 @@ +
+ @if($avatar) +
+
+ +
+
+ +
+
+ @else +
+ +
+
+ +
+ @endif +
diff --git a/site/resources/views/partials/nav/head.blade.php b/site/resources/views/partials/nav/head.blade.php index 9a584b5..8f8a948 100644 --- a/site/resources/views/partials/nav/head.blade.php +++ b/site/resources/views/partials/nav/head.blade.php @@ -51,12 +51,12 @@ --}} @if (!Auth::user())
  • - Join In + Join In
    • @else
  • artists->first()) - src="{{ Vite::asset(Auth::user()->artists->first()->avatar ?? 'resources/img/default_avatars/default_avatar_male.svg') }}" + @if (Auth::user() && Auth::user()->artists->first() && Auth::user()->artists->first()->avatar) + src="{{ Auth::user()->artists->first()->avatar() }}" @else src="{{ Vite::asset('resources/img/default_avatars/default_avatar_male.svg') }}" @endif diff --git a/site/resources/views/profile/edit.blade.php b/site/resources/views/profile/edit.blade.php index 8cc3aba..ba7e907 100644 --- a/site/resources/views/profile/edit.blade.php +++ b/site/resources/views/profile/edit.blade.php @@ -1,3 +1,11 @@ +@section('additional_headers') + @parent + +@endsection +@section('additional_footers') + @parent + +@endsection

    @@ -7,7 +15,7 @@ + diff --git a/site/resources/views/profile/partials/update-avatar-form.blade.php b/site/resources/views/profile/partials/update-avatar-form.blade.php new file mode 100644 index 0000000..aefe6ac --- /dev/null +++ b/site/resources/views/profile/partials/update-avatar-form.blade.php @@ -0,0 +1,15 @@ +
    +
    + +
    +
    +
    +
    + +
    +
    diff --git a/site/routes/web.php b/site/routes/web.php index 177b2f6..652ab79 100644 --- a/site/routes/web.php +++ b/site/routes/web.php @@ -38,6 +38,7 @@ Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy'); Route::get('/create-artwork', [ArtworkController::class, 'create']); Route::post('/create-artwork', [ArtworkController::class, 'store']); + Route::get('/update-avatar', [ArtistController::class, 'avatar'])->name('avatar.edit'); }); Route::get('/counter', Counter::class); diff --git a/site/yarn.lock b/site/yarn.lock index a3992da..3062b64 100644 --- a/site/yarn.lock +++ b/site/yarn.lock @@ -396,6 +396,11 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== +cropperjs@^1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/cropperjs/-/cropperjs-1.6.1.tgz#fd132021d93b824b1b0f2c2c3b763419fb792d89" + integrity sha512-F4wsi+XkDHCOMrHMYjrTEE4QBOrsHHN5/2VsVAaRq8P7E5z7xQpT75S+f/9WikmBEailas3+yo+6zPIomW+NOA== + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"