Skip to content

Commit 7a75fc6

Browse files
JulianPrieberJulianPrieber
authored
Merge branch 'main' into bsky_button
2 parents da2660a + cefd28a commit 7a75fc6

File tree

8 files changed

+95
-35
lines changed

8 files changed

+95
-35
lines changed

‎.env‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MAINTENANCE_MODE=false
5252
DB_CONNECTION=sqlite
5353

5454
#Mail Settings=LinkStack comes with a free to use built-in SMTP server for sending mail. You can leave this setting as is, if you wish to use this service please read our terms and conditions at llc-mail.tru.io. If you do not wish to use the built-in SMTP server, change the setting below.
55-
#=MAIL_MAILER either smtp or built-in. Make sure to change this setting if you want to add a custom SMTP server.
55+
#=MAIL_MAILER either smtp, sendmail or built-in. Make sure to change this setting if you want to add a custom SMTP server or use sendmail.
5656
MAIL_MAILER=built-in
5757
MAIL_HOST=
5858
MAIL_PORT=
@@ -61,6 +61,8 @@ MAIL_PASSWORD=
6161
MAIL_ENCRYPTION=
6262
MAIL_FROM_ADDRESS=
6363
MAIL_FROM_NAME="${APP_NAME}"
64+
#= Set the path to sendmail binary and set options. Default is /usr/sbin/sendmail -bs
65+
MAIL_SENDMAIL=
6466

6567
#Cache Settings=Completely optional.
6668
MEMCACHED_HOST=127.0.0.1

‎assets/linkstack/css/brands.css‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,23 @@ button:hover,
441441
filter: brightness(90%);
442442
}
443443

444+
/* Firefish */
445+
.button.button-firefish {
446+
color: #fff;
447+
background-image: linear-gradient(
448+
45deg,
449+
#DB44DB,
450+
1%,
451+
#EC476D,
452+
80%,
453+
#F6AE4A
454+
);
455+
}
456+
.button.button-firefish:hover,
457+
.button.button-firefish:focus {
458+
filter: brightness(90%);
459+
}
460+
444461
/* Firefox */
445462
.button.button-firefox {
446463
color: #FFFFFF;

‎assets/linkstack/icons/firefish.svg‎

Lines changed: 21 additions & 0 deletions
Loading

‎composer.lock‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/button-names.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
'dev-to' => 'DEV',
1313
'epic-games' => 'Epic Games',
1414
'f-droid' => 'F-Droid',
15+
'firefish' => 'Firefish',
1516
'furaffinity' => 'FurAffinity',
1617
'github' => 'GitHub',
1718
'gitlab' => 'GitLab',

‎config/mail.php‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
*/
3535

3636
'mailers' => [
37+
'sendmail' => [
38+
'transport' => 'sendmail',
39+
'path' => env('MAIL_SENDMAIL', '/usr/sbin/sendmail -bs'),
40+
'from' => [
41+
'address' => env('MAIL_FROM_ADDRESS'),
42+
'name' => env('MAIL_FROM_NAME'),
43+
]
44+
],
3745
'smtp' => [
3846
'transport' => 'smtp',
3947
'host' => env('MAIL_HOST'),

‎database/seeders/ButtonSeeder.php‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ public function run()
421421
[
422422
'name' => 'trakt'
423423
],
424-
424+
425425
[
426426
'name' => 'last-fm'
427427
],
@@ -433,11 +433,14 @@ public function run()
433433
[
434434
'name' => 'furaffinity'
435435
],
436-
436+
437437
[
438438
'name' => 'bluesky'
439439
],
440440

441+
[
442+
'name' => 'firefish'
443+
],
441444
];
442445

443446
Button::insert($buttons);

‎resources/views/littlelink.blade.php‎

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@
55
<head>
66
<meta charset="utf-8">
77

8-
{{-- Mastodon re="me" link --}}
8+
{{-- Fediverse rel="me" links --}}
9+
@php
10+
$relMe = "mastodon, firefish";
11+
$relMeList = explode(', ', $relMe);
12+
@endphp
13+
914
@foreach($links as $link)
10-
@if($link->name === "mastodon")
15+
@if(in_array($link->name, $relMeList))
1116
<link href="{{$link->link}}" rel="me">
1217
@endif
1318
@endforeach
14-
19+
1520
<?php
1621
// Theme Config
1722
if (!function_exists('theme')) {
@@ -51,7 +56,7 @@ function themeAsset($path){
5156
@endif
5257

5358
@if(env('CUSTOM_META_TAGS') == 'true')
54-
@include('layouts.meta')
59+
@include('layouts.meta')
5560
@else
5661
<meta name="description" content="{{ $userinfo->littlelink_description }}">
5762
<meta name="author" content="{{ $userinfo->name }}">
@@ -82,7 +87,7 @@ function themeAsset($path){
8287
</style>
8388
@endif
8489
@endif
85-
90+
8691
<!--#### BEGIN Meta Tags social media preview images ####-->
8792
<!-- This shows a preview for title, description and avatar image of users profiles if shared on social media sites -->
8893

@@ -98,7 +103,7 @@ function themeAsset($path){
98103
@else
99104
<meta property="og:image" content="{{ asset('assets/linkstack/images/logo.svg') }}">
100105
@endif
101-
106+
102107
<!-- Twitter Meta Tags -->
103108
<meta name="twitter:card" content="summary_large_image">
104109
<meta property="twitter:domain" content="{{ url('') }}/{{ "@" . $littlelink_name }}">
@@ -119,7 +124,7 @@ function themeAsset($path){
119124
{{-- <script>{!! file_get_contents(base_path("assets/external-dependencies/fontawesome.js")) !!}</script> --}}
120125
<style>{!! str_replace('../', 'studio/', file_get_contents(base_path("assets/external-dependencies/fontawesome.css"))) !!}</style>
121126

122-
@include('layouts.fonts')
127+
@include('layouts.fonts')
123128
<style>{!! file_get_contents(base_path("assets/linkstack/css/normalize.css")) !!}</style>
124129
<style>{!! file_get_contents(base_path("assets/linkstack/css/animate.css")) !!}</style>
125130
@if(file_exists(base_path("assets/linkstack/images/").findFile('favicon')))
@@ -265,7 +270,7 @@ function themeAsset($path){
265270
<!-- Short Bio -->
266271
<style>.description-parent * {margin-bottom: 1em;}.description-parent {padding-bottom: 30px;}</style>
267272
<center><div class="fadein description-parent"><p class="fadein">@if(env('ALLOW_USER_HTML') === true){!! $info->littlelink_description !!}@else{{ $info->littlelink_description }}@endif</p></div></center>
268-
273+
269274
<!-- Icons -->
270275
@php $icons = DB::table('links')->where('user_id', $userinfo->id)->where('button_id', 94)->get(); @endphp
271276
@if(count($icons) > 0)
@@ -276,7 +281,7 @@ function themeAsset($path){
276281
</div>
277282
@endif
278283

279-
@endforeach
284+
@endforeach
280285

281286
<!-- Buttons -->
282287
@php $initial = 1; @endphp
@@ -296,6 +301,9 @@ function themeAsset($path){
296301
@case('buy me a coffee')
297302
<div style="--delay: {{ $initial++ }}s" class="button-entrance"><a class="button button-coffee button button-hover icon-hover" rel="noopener noreferrer nofollow" href="{{ route('clickNumber') . '/' . $link->id . "?" . $link->link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif ><img alt="{{ $link->name }}" class="icon hvr-icon" src="@if(theme('use_custom_icons') == "true"){{ url('themes/' . $GLOBALS['themeName'] . '/extra/custom-icons')}}/coffee{{theme('custom_icon_extension')}} @else{{ asset('\/assets/linkstack/icons\/')}}coffee.svg @endif">Buy me a Coffee</a></div>
298303
@break
304+
@case('firefish')
305+
<div style="--delay: {{ $initial++ }}s" class="button-entrance"><a class="button button-{{ $link->name }} button button-hover icon-hover" rel="me noopener noreferrer nofollow" href="{{ route('clickNumber') . '/' . $link->id . "?" . $link->link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif ><img alt="{{ $link->name }}" class="icon hvr-icon" src="@if(theme('use_custom_icons') == "true"){{ url('themes/' . $GLOBALS['themeName'] . '/extra/custom-icons')}}/{{$linkName}}{{theme('custom_icon_extension')}} @else{{ asset('\/assets/linkstack/icons\/') . "firefish" }}.svg @endif">{{ $link->title }}</a></div>
306+
@break
299307
@case('mastodon')
300308
<div style="--delay: {{ $initial++ }}s" class="button-entrance"><a class="button button-{{ $link->name }} button button-hover icon-hover" rel="me noopener noreferrer nofollow" href="{{ route('clickNumber') . '/' . $link->id . "?" . $link->link }}" @if(theme('open_links_in_same_tab') != "true")target="_blank"@endif ><img alt="{{ $link->name }}" class="icon hvr-icon" src="@if(theme('use_custom_icons') == "true"){{ url('themes/' . $GLOBALS['themeName'] . '/extra/custom-icons')}}/{{$linkName}}{{theme('custom_icon_extension')}} @else{{ asset('\/assets/linkstack/icons\/') . "mastodon" }}.svg @endif">{{ $link->title }}</a></div>
301309
@break
@@ -334,12 +342,12 @@ function themeAsset($path){
334342
@endforeach
335343

336344
@include('layouts.footer')
337-
345+
338346
</div>
339347
</div>
340348
</div>
341349

342350
@if(theme('enable_custom_code') == "true" and theme('enable_custom_body_end') == "true" and env('ALLOW_CUSTOM_CODE_IN_THEMES') == 'true')@include($GLOBALS['themeName'] . '.extra.custom-body-end')@endif
343351

344352
</body>
345-
</html>
353+
</html>

0 commit comments

Comments
 (0)