Skip to content

Square orientation user avatar generation for CP header#5731

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.

Sign up for GitHub

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

Merged
jasonvarga merged 7 commits into from
Apr 14, 2022
Merged

Square orientation user avatar generation for CP header #5731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
163da05
Square orientation user avatar generation for CP header
ncla Apr 3, 2022
969f045
Adjust HasAvatarTest
ncla Apr 3, 2022
12bf301
Style fixes
ncla Apr 3, 2022
673872f
One more style fix
ncla Apr 3, 2022
a676ad4
Bring back avatarFieldUrl method
jasonvarga Apr 14, 2022
745e1c0
no harm checking the whole url
jasonvarga Apr 14, 2022
b2bc751
nitpick
jasonvarga Apr 14, 2022
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
2 changes: 1 addition & 1 deletion routes/cp.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
Route::get('assets-fieldtype', 'FieldtypeController@index');
Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
});
Expand Down
22 changes: 20 additions & 2 deletions src/Auth/HasAvatar.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
/**
* Get a user's avatar URL.
*
* Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
* Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
*/
public function avatar($size = 64)
{
if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
return $url;
}

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
return optional($this->avatarFieldValue()->value())->url();
}

/**
* Square thumbnail URL of the avatar from the asset field.
*/
public function avatarFieldSquareThumbnailUrl()
{
$assetId = optional($this->avatarFieldValue()->value())->id();

if (! $assetId) {
return null;
}

return cp_route('assets.thumbnails.show', [
'encoded_asset' => base64_encode($assetId),
'size' => 'small',
'orientation' => 'square',
]);
}

/**
* The Gravatar URL.
*/
Expand Down
34 changes: 30 additions & 4 deletions src/Http/Controllers/CP/Assets/ThumbnailController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
protected $server;

/**
* @var Generator
* @var ImageGenerator
*/
protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
*/
protected $size;

/**
* @var string
*/
protected $orientation;

/**
* @var string
*/
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
*
* @param string $asset
* @param string $size
* @param string $orientation
* @return \Illuminate\Http\Response
*/
public function show($asset, $size = null)
public function show($asset, $size = null, $orientation = null)
{
$this->size = $size;
$this->orientation = $orientation;
$this->asset = $this->asset($asset);

if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
return $path;
}

public function getPreset()
/**
* Get control panel thumbnail image preset name.
*
* Statamic has few control panel specific image presets
*
* @see \Statamic\Imaging\Manager::cpManipulationPresets
*
* @return string
*/
private function getPreset()
{
return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
}

/**
* Get orientation override from URL path or directly from asset.
*
* @return string|null
*/
private function getOrientation()
{
return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
return $this->orientation ?? $this->asset->orientation();
}

/**
Expand Down
6 changes: 4 additions & 2 deletions tests/Auth/HasAvatarTest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
{
$user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

$this->assertEquals('/avatars/john.jpg', $user->avatar());
$this->assertEquals('/avatars/john.jpg', $user->avatar(64));
$this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
$this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
$this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
$this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
$this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
$this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
$this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Square orientation user avatar generation for CP header by ncla · Pull Request #5731 · statamic/cms · GitHub
Skip to content
Square orientation user avatar generation for CP header#5731

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.

 Sign up for GitHub

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

 Merged

jasonvarga
merged 7 commits into

from

Apr 14, 2022
 Merged


Square orientation user avatar generation for CP header
#5731
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
163da05

Square orientation user avatar generation for CP header


ncla Apr 3, 2022
969f045

Adjust HasAvatarTest


ncla Apr 3, 2022
12bf301

Style fixes


ncla Apr 3, 2022
673872f

One more style fix


ncla Apr 3, 2022
a676ad4

Bring back avatarFieldUrl method


jasonvarga Apr 14, 2022
745e1c0

no harm checking the whole url


jasonvarga Apr 14, 2022
b2bc751

nitpick


jasonvarga Apr 14, 2022

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


2 changes: 1 addition & 1 deletion
routes/cp.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@
 Route::get('assets-fieldtype', 'FieldtypeController@index');
 Route::resource('assets', 'AssetsController')->parameters(['assets' => 'encoded_asset']);
 Route::get('assets/{encoded_asset}/download', 'AssetsController@download')->name('assets.download');
 Route::get('thumbnails/{encoded_asset}/{size?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('thumbnails/{encoded_asset}/{size?}/{orientation?}', 'ThumbnailController@show')->name('assets.thumbnails.show');
 Route::get('svgs/{encoded_asset}', 'SvgController@show')->name('assets.svgs.show');
 Route::get('pdfs/{encoded_asset}', 'PdfController@show')->name('assets.pdfs.show');
 });
Expand Down

22 changes: 20 additions & 2 deletions
src/Auth/HasAvatar.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,11 +10,11 @@ trait HasAvatar
 /**
 * Get a user's avatar URL.
 *
 * Could be an asset's URL through a field named avatar, a Gravatar URL, or null.
 * Could be an asset thumbnail URL through a field named avatar, a Gravatar URL, or null.
 */
 public function avatar($size = 64)
 {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldUrl())) {
 if ($this->hasAvatarField() && ($url = $this->avatarFieldSquareThumbnailUrl())) {
 return $url;
 }

Expand DownExpand Up@@ -50,6 +50,24 @@ public function avatarFieldUrl()
 return optional($this->avatarFieldValue()->value())->url();
 }

 /**
 * Square thumbnail URL of the avatar from the asset field.
 */
 public function avatarFieldSquareThumbnailUrl()
 {
 $assetId = optional($this->avatarFieldValue()->value())->id();

 if (! $assetId) {
 return null;
 }

 return cp_route('assets.thumbnails.show', [
 'encoded_asset' => base64_encode($assetId),
 'size' => 'small',
 'orientation' => 'square',
 ]);
 }

 /**
 * The Gravatar URL.
 */
Expand Down

34 changes: 30 additions & 4 deletions
src/Http/Controllers/CP/Assets/ThumbnailController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -18,7 +18,7 @@ class ThumbnailController extends Controller
 protected $server;

 /**
 * @var Generator
 * @var ImageGenerator
 */
 protected $generator;

Expand All@@ -32,6 +32,11 @@ class ThumbnailController extends Controller
 */
 protected $size;

 /**
 * @var string
 */
 protected $orientation;

 /**
 * @var string
 */
Expand All@@ -52,11 +57,13 @@ public function __construct(Server $server, ImageGenerator $generator)
 *
 * @param string $asset
 * @param string $size
 * @param string $orientation
 * @return \Illuminate\Http\Response
 */
 public function show($asset, $size = null)
 public function show($asset, $size = null, $orientation = null)
 {
 $this->size = $size;
 $this->orientation = $orientation;
 $this->asset = $this->asset($asset);

 if ($placeholder = $this->getPlaceholderResponse()) {
Expand DownExpand Up@@ -107,9 +114,28 @@ private function generate()
 return $path;
 }

 public function getPreset()
 /**
 * Get control panel thumbnail image preset name.
 *
 * Statamic has few control panel specific image presets
 *
 * @see \Statamic\Imaging\Manager::cpManipulationPresets
 *
 * @return string
 */
 private function getPreset()
 {
 return "cp_thumbnail_{$this->size}_{$this->getOrientation()}";
 }

 /**
 * Get orientation override from URL path or directly from asset.
 *
 * @return string|null
 */
 private function getOrientation()
 {
 return "cp_thumbnail_{$this->size}_{$this->asset->orientation()}";
 return $this->orientation ?? $this->asset->orientation();
 }

 /**
Expand Down

6 changes: 4 additions & 2 deletions
tests/Auth/HasAvatarTest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -76,8 +76,10 @@ public function it_gets_the_avatar_if_theres_a_field_defined_in_the_blueprint_an
 {
 $user = $this->withAvatarField()->withGravatar()->userWithUploadedAvatar();

 $this->assertEquals('/avatars/john.jpg', $user->avatar());
 $this->assertEquals('/avatars/john.jpg', $user->avatar(64));
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl());
 $this->assertEquals('/avatars/john.jpg', $user->avatarFieldUrl(64));
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar());
 $this->assertEquals('http://localhost/cp/thumbnails/YXZhdGFyczo6am9obi5qcGc=/small/square', $user->avatar(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl());
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=64', $user->gravatarUrl(64));
 $this->assertEquals('https://www.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=128', $user->gravatarUrl(128));
Expand Down