Merge pull request #978 from openclassify/dia

#3411 [references] Add image to share link to settings
This commit is contained in:
Muammer Top 2021-03-04 09:27:08 +03:00 committed by GitHub
commit 9e47b0e235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 12 deletions

View File

@ -916,7 +916,7 @@
.iti__flag { .iti__flag {
height: 15px; height: 15px;
box-shadow: 0px 0px 1px 0px #888; box-shadow: 0px 0px 1px 0px #888;
background-image: url('{{ img("visiosoft.theme.base::images/flags.png").url }}'); background-image: url('{{ img("visiosoft.theme.base::images/flags.png").path }}');
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: #DBDBDB; background-color: #DBDBDB;
background-position: 20px 0; } background-position: 20px 0; }

View File

@ -0,0 +1,31 @@
<?php namespace Visiosoft\ProfileModule\Http\Middleware;
use Anomaly\FilesModule\File\Command\GetFile;
use Anomaly\Streams\Platform\View\ViewTemplate;
use Closure;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Http\Request;
class OGImage
{
use DispatchesJobs;
private $template;
public function __construct(ViewTemplate $template)
{
$this->template = $template;
}
public function handle(Request $request, Closure $next)
{
if (($ogImage = session()->get('ogImage')) && ($file = $this->dispatch(new GetFile($ogImage)))) {
$this->template->set(
'og_image',
$file->make()->url()
);
}
return $next($request);
}
}

View File

@ -1,6 +1,4 @@
<?php <?php namespace Visiosoft\ProfileModule\Http\Middleware;
namespace Visiosoft\ProfileModule\Http\Middleware;
use Closure; use Closure;
use Illuminate\Contracts\Auth\Guard; use Illuminate\Contracts\Auth\Guard;
@ -8,7 +6,6 @@ use Illuminate\Http\Request;
class authCheck class authCheck
{ {
private $auth; private $auth;
private $request; private $request;
@ -18,15 +15,12 @@ class authCheck
$this->request = $request; $this->request = $request;
} }
/**
* @param Guard $auth
* @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
*/
public function handle(Request $request, Closure $next) public function handle(Request $request, Closure $next)
{ {
if ($this->auth->check()) { if ($this->auth->check()) {
return redirect($this->request->get('redirect', '/')); return redirect($this->request->get('redirect', '/'));
} }
return $next($request); return $next($request);
} }
} }

View File

@ -15,6 +15,7 @@ use Visiosoft\ProfileModule\Education\Contract\EducationRepositoryInterface;
use Visiosoft\ProfileModule\Education\EducationModel; use Visiosoft\ProfileModule\Education\EducationModel;
use Visiosoft\ProfileModule\Education\EducationRepository; use Visiosoft\ProfileModule\Education\EducationRepository;
use Visiosoft\ProfileModule\Http\Middleware\authCheck; use Visiosoft\ProfileModule\Http\Middleware\authCheck;
use Visiosoft\ProfileModule\Http\Middleware\OGImage;
use Visiosoft\ProfileModule\Profile\Password\ForgotPassFormBuilder; use Visiosoft\ProfileModule\Profile\Password\ForgotPassFormBuilder;
use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder; use Visiosoft\ProfileModule\Profile\Password\PasswordFormBuilder;
use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder; use Visiosoft\ProfileModule\Profile\Profile\ProfileFormBuilder;
@ -84,7 +85,8 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
// RegisterController // RegisterController
'register' => [ 'register' => [
'middleware' => [ 'middleware' => [
authCheck::class authCheck::class,
OGImage::class
], ],
'ttl' => 0, 'ttl' => 0,
'uses' => 'Anomaly\UsersModule\Http\Controller\RegisterController@register', 'uses' => 'Anomaly\UsersModule\Http\Controller\RegisterController@register',