einundzwanzig/einundzwanzig-portal
1
0
Fork 0
mirror of https://github.com/Einundzwanzig-Podcast/einundzwanzig-portal.git synced 2025-12-11 06:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

lnbits paid articles added

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2023-03-13 16:35:20 +01:00
parent 9f51c71439
commit 639e17080c
30 changed files with 838 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Livewire/News/Form/NewsArticleForm.php
View File

@@ -24,8 +24,9 @@ class NewsArticleForm extends Component
public array $temporaryUrls = [];
public ?string $fromUrl = '';
public bool $paid = false;
protected $queryString = ['fromUrl' => ['except' => '']];
protected $queryString = ['fromUrl' => ['except' => ''], 'paid' => ['except' => false]];
public function rules()
{
@@ -37,6 +38,7 @@ class NewsArticleForm extends Component
'libraryItem.type' => 'required',
'libraryItem.language_code' => 'required',
'libraryItem.value' => 'required',
'libraryItem.sats' => 'required',
'libraryItem.subtitle' => 'string|nullable',
'libraryItem.excerpt' => 'required',
'libraryItem.main_image_caption' => 'string|nullable',
@@ -50,12 +52,14 @@ class NewsArticleForm extends Component
{
if ($this->libraryItem === null) {
$this->libraryItem = new LibraryItem([
'type' => 'markdown_article',
'value' => '',
'read_time' => 1,
'news' => true,
'language_code' => 'de',
'approved' => auth()
'type' => 'markdown_article',
'value' => '',
'value_to_be_paid' => '',
'read_time' => 1,
'sats' => 21,
'news' => true,
'language_code' => 'de',
'approved' => auth()
->user()
->hasRole('news-editor'),
]);

51
app/Http/Livewire/News/InternArticleView.php
View File

@@ -3,23 +3,72 @@
namespace App\Http\Livewire\News;
use App\Models\LibraryItem;
use App\Traits\LNBitsTrait;
use Carbon\Carbon;
use Livewire\Component;
use RalphJSmit\Laravel\SEO\Support\SEOData;
use SimpleSoftwareIO\QrCode\Facades\QrCode;
class InternArticleView extends Component
{
use LNBitsTrait;
public LibraryItem $libraryItem;
public $qrCode = '';
public $invoice = '';
public $paymentHash = '';
public $checkid = null;
public $checkThisPaymentHash = '';
public bool $invoicePaid = false;
public bool $alreadyPaid = false;
public function mount()
{
$this->libraryItem->load([
'libraries',
]);
if ($this->libraryItem->libraries->where('is_public', false)
->count() > 0 && ! auth()->check()) {
->count() > 0 && !auth()->check()) {
abort(403, __('Sorry! You are not authorized to perform this action.'));
}
if (auth()
->user()
->paidArticles()
->where('library_item_id', $this->libraryItem->id)
->count() > 0) {
$this->invoicePaid = true;
}
}
public function pay()
{
$invoice = $this->createInvoice(
sats: $this->libraryItem->sats,
memo: 'Payment for: "'.$this->libraryItem->slug.'" on Einundzwanzig Portal.'
);
session('payment_hash_article_'.$this->libraryItem->id, $invoice['payment_hash']);
$this->paymentHash = $invoice['payment_hash'];
$this->qrCode = base64_encode(QrCode::format('png')
->size(300)
->merge($this->libraryItem->lecturer->getFirstMedia('avatar') ? $this->libraryItem->lecturer->getFirstMediaPath('avatar') : '/public/img/einundzwanzig.png',
.3)
->errorCorrection('H')
->generate($invoice['payment_request']));
$this->invoice = $invoice['payment_request'];
$this->checkid = $invoice['checking_id'];
}
public function checkPaymentHash()
{
$invoice = $this->check($this->checkid ?? $this->checkThisPaymentHash);
if ($invoice['paid']) {
$this->invoicePaid = true;
auth()
->user()
->paidArticles()
->syncWithoutDetaching($this->libraryItem->id);
}
}
public function render()

49
app/Http/Livewire/Profile/LNBits.php Normal file
View File

@@ -0,0 +1,49 @@
<?php
namespace App\Http\Livewire\Profile;
use Livewire\Component;
use WireUi\Traits\Actions;
class LNBits extends Component
{
use Actions;
public array $settings = [
'url' => 'https://legend.lnbits.com',
'wallet_id' => '',
'read_key' => '',
];
public function rules()
{
return [
'settings.url' => 'required|url',
'settings.wallet_id' => 'required',
'settings.read_key' => 'required',
];
}
public function mount()
{
if (auth()->user()->lnbits) {
$this->settings = auth()->user()->lnbits;
}
}
public function save()
{
$this->validate();
$user = auth()->user();
$user->lnbits = $this->settings;
$user->save();
$this->notification()
->success(__('LNBits settings saved successfully!'));
}
public function render()
{
return view('livewire.profile.l-n-bits');
}
}

12
app/Models/LibraryItem.php
View File

@@ -31,20 +31,22 @@ class LibraryItem extends Model implements HasMedia, Sortable, Feedable
/**
* The attributes that aren't mass assignable.
*
* @var array
*/
protected $guarded = [];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [
'id' => 'integer',
'id' => 'integer',
'lecturer_id' => 'integer',
'library_id' => 'integer',
'library_id' => 'integer',
];
protected $hidden = [
'value_to_be_paid',
];
public static function getFeedItems()
@@ -63,7 +65,7 @@ class LibraryItem extends Model implements HasMedia, Sortable, Feedable
protected static function booted()
{
static::creating(function ($model) {
if (! $model->created_by) {
if (!$model->created_by) {
$model->created_by = auth()->id();
}
});

12
app/Models/User.php
View File

@@ -12,6 +12,7 @@ use Laravel\Jetstream\HasTeams;
use Laravel\Sanctum\HasApiTokens;
use ParagonIE\CipherSweet\BlindIndex;
use ParagonIE\CipherSweet\EncryptedRow;
use ParagonIE\CipherSweet\JsonFieldMap;
use QCod\Gamify\Gamify;
use Spatie\Comments\Models\Concerns\InteractsWithComments;
use Spatie\Comments\Models\Concerns\Interfaces\CanComment;
@@ -63,12 +64,18 @@ class User extends Authenticatable implements MustVerifyEmail, CanComment, Ciphe
public static function configureCipherSweet(EncryptedRow $encryptedRow): void
{
$map = (new JsonFieldMap())
->addTextField('url')
->addTextField('read_key')
->addTextField('wallet_id');
$encryptedRow
->addField('public_key')
->addField('lightning_address')
->addField('lnurl')
->addField('node_id')
->addField('email')
->addJsonField('lnbits', $map)
->addBlindIndex('public_key', new BlindIndex('public_key_index'))
->addBlindIndex('lightning_address', new BlindIndex('lightning_address_index'))
->addBlindIndex('lnurl', new BlindIndex('lnurl_index'))
@@ -95,4 +102,9 @@ class User extends Authenticatable implements MustVerifyEmail, CanComment, Ciphe
{
return $this->hasMany(Vote::class);
}
public function paidArticles()
{
return $this->belongsToMany(LibraryItem::class, 'library_item_user', 'user_id', 'library_item_id');
}
}

36
app/Traits/LNBitsTrait.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
namespace App\Traits;
use Illuminate\Support\Facades\Http;
trait LNBitsTrait
{
public function createInvoice($sats, $memo)
{
$lnbits = auth()->user()->lnbits;
$response = Http::withHeaders([
'X-Api-Key' => $lnbits['read_key'],
])
->post($lnbits['url'].'/api/v1/payments', [
'out' => false,
'amount' => $sats,
'memo' => $memo,
]);
return $response->json();
}
public function check($paymentHash)
{
$lnbits = auth()->user()->lnbits;
$response = Http::withHeaders([
'X-Api-Key' => $lnbits['read_key'],
])
->get($lnbits['url'].'/api/v1/payments/' . $paymentHash);
return $response->json();
}
}

7
composer.json
View File

@@ -76,7 +76,8 @@
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.5.10",
"spatie/laravel-ignition": "^2.0"
"spatie/laravel-ignition": "^2.0",
"laracasts/generators": "dev-master#7728ee6045ffdd5ae47fa209bc5fbd69492d90ce"
},
"autoload": {
"psr-4": {
@@ -139,6 +140,10 @@
"symlink": false
}
},
{
"type": "vcs",
"url": "https://github.com/HolgerHatGarKeineNode/Laravel-5-Generators-Extended"
},
{
"type": "vcs",
"url": "https://github.com/HolgerHatGarKeineNode/blade-country-flags"

103
composer.lock generated
View File

@@ -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": "e0d111fae990e22e853f49e91eaf4138",
"content-hash": "82090857f80131ea826eeac73a9f26dd",
"packages": [
{
"name": "akuechler/laravel-geoly",
@@ -5526,16 +5526,16 @@
},
{
"name": "openspout/openspout",
"version": "v4.12.2",
"version": "v4.13.0",
"source": {
"type": "git",
"url": "https://github.com/openspout/openspout.git",
"reference": "90ceeefef3750dd2afab95689ed2107dd576905e"
"reference": "e01cab951c04ef184c567a880290997e94386f94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/openspout/openspout/zipball/90ceeefef3750dd2afab95689ed2107dd576905e",
"reference": "90ceeefef3750dd2afab95689ed2107dd576905e",
"url": "https://api.github.com/repos/openspout/openspout/zipball/e01cab951c04ef184c567a880290997e94386f94",
"reference": "e01cab951c04ef184c567a880290997e94386f94",
"shasum": ""
},
"require": {
@@ -5603,7 +5603,7 @@
],
"support": {
"issues": "https://github.com/openspout/openspout/issues",
"source": "https://github.com/openspout/openspout/tree/v4.12.2"
"source": "https://github.com/openspout/openspout/tree/v4.13.0"
},
"funding": [
{
@@ -5615,7 +5615,7 @@
"type": "github"
}
],
"time": "2023-03-03T07:45:00+00:00"
"time": "2023-03-13T14:32:53+00:00"
},
{
"name": "paragonie/ciphersweet",
@@ -7557,16 +7557,16 @@
},
{
"name": "rap2hpoutre/fast-excel",
"version": "v5.1.1",
"version": "v5.2.0",
"source": {
"type": "git",
"url": "https://github.com/rap2hpoutre/fast-excel.git",
"reference": "05bc956fa6121b239c98960ea9b551116f20b058"
"reference": "c6d2b8b707b85f7c43028d3b4cc969388d8b6c17"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/rap2hpoutre/fast-excel/zipball/05bc956fa6121b239c98960ea9b551116f20b058",
"reference": "05bc956fa6121b239c98960ea9b551116f20b058",
"url": "https://api.github.com/repos/rap2hpoutre/fast-excel/zipball/c6d2b8b707b85f7c43028d3b4cc969388d8b6c17",
"reference": "c6d2b8b707b85f7c43028d3b4cc969388d8b6c17",
"shasum": ""
},
"require": {
@@ -7615,7 +7615,7 @@
],
"support": {
"issues": "https://github.com/rap2hpoutre/fast-excel/issues",
"source": "https://github.com/rap2hpoutre/fast-excel/tree/v5.1.1"
"source": "https://github.com/rap2hpoutre/fast-excel/tree/v5.2.0"
},
"funding": [
{
@@ -7623,7 +7623,7 @@
"type": "github"
}
],
"time": "2023-02-09T15:13:18+00:00"
"time": "2023-03-13T14:25:33+00:00"
},
{
"name": "rappasoft/laravel-livewire-tables",
@@ -7755,16 +7755,16 @@
},
{
"name": "sentry/sentry",
"version": "3.14.0",
"version": "3.15.0",
"source": {
"type": "git",
"url": "https://github.com/getsentry/sentry-php.git",
"reference": "60dd3f74ab21cc2bf53f39bf7c342798bc185c23"
"reference": "c6a0e24d2f8da8d8f57cdcc87ca635248c1a91c5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/60dd3f74ab21cc2bf53f39bf7c342798bc185c23",
"reference": "60dd3f74ab21cc2bf53f39bf7c342798bc185c23",
"url": "https://api.github.com/repos/getsentry/sentry-php/zipball/c6a0e24d2f8da8d8f57cdcc87ca635248c1a91c5",
"reference": "c6a0e24d2f8da8d8f57cdcc87ca635248c1a91c5",
"shasum": ""
},
"require": {
@@ -7843,7 +7843,7 @@
],
"support": {
"issues": "https://github.com/getsentry/sentry-php/issues",
"source": "https://github.com/getsentry/sentry-php/tree/3.14.0"
"source": "https://github.com/getsentry/sentry-php/tree/3.15.0"
},
"funding": [
{
@@ -7855,7 +7855,7 @@
"type": "custom"
}
],
"time": "2023-03-05T21:31:25+00:00"
"time": "2023-03-13T11:45:26+00:00"
},
{
"name": "sentry/sentry-laravel",
@@ -14541,6 +14541,68 @@
},
"time": "2023-02-13T14:52:08+00:00"
},
{
"name": "laracasts/generators",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/HolgerHatGarKeineNode/Laravel-5-Generators-Extended.git",
"reference": "7728ee6045ffdd5ae47fa209bc5fbd69492d90ce"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/HolgerHatGarKeineNode/Laravel-5-Generators-Extended/zipball/7728ee6045ffdd5ae47fa209bc5fbd69492d90ce",
"reference": "7728ee6045ffdd5ae47fa209bc5fbd69492d90ce",
"shasum": ""
},
"require": {
"illuminate/support": "~6.0|~7.0|~8.0|~9.0|~10.0"
},
"require-dev": {
"phpspec/phpspec": "~6.0"
},
"default-branch": true,
"type": "library",
"extra": {
"laravel": {
"providers": [
"Laracasts\\Generators\\GeneratorsServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Laracasts\\Generators\\": "src/"
}
},
"scripts": {
"test": [
"vendor/bin/phpspec run"
]
},
"license": [
"MIT"
],
"authors": [
{
"name": "Jeffrey Way",
"email": "jeffrey@laracasts.com"
},
{
"name": "Cristian Tabacitu",
"email": "hello@tabaciu.ro"
}
],
"description": "Advanced Laravel generators, that include schema information.",
"keywords": [
"generators",
"laravel"
],
"support": {
"source": "https://github.com/HolgerHatGarKeineNode/Laravel-5-Generators-Extended/tree/master"
},
"time": "2023-03-13T14:54:33+00:00"
},
{
"name": "laravel-lang/attributes",
"version": "v2.3.2",
@@ -17253,7 +17315,8 @@
"ebess/advanced-nova-media-library": 20,
"qcod/laravel-gamify": 20,
"stijnvanouplines/blade-country-flags": 20,
"wireui/wireui": 20
"wireui/wireui": 20,
"laracasts/generators": 20
},
"prefer-stable": true,
"prefer-lowest": false,

28
database/migrations/2023_03_13_130046_add_lnbits_field_to_users_table.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('users', function (Blueprint $table) {
$table->json('lnbits')
->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('users', function (Blueprint $table) {
//
});
}
};

28
database/migrations/2023_03_13_133526_add_value_to_be_paid_field_to_library_items_table.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('library_items', function (Blueprint $table) {
$table->text('value_to_be_paid')
->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('library_items', function (Blueprint $table) {
//
});
}
};

28
database/migrations/2023_03_13_134313_add_sats_field_to_library_items_table.php Normal file
View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration {
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('library_items', function (Blueprint $table) {
$table->unsignedBigInteger('sats')
->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('library_items', function (Blueprint $table) {
//
});
}
};

33
database/migrations/2023_03_13_145545_create_library_item_user_pivot_table.php Normal file
View File

@@ -0,0 +1,33 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateLibraryItemUserPivotTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('library_item_user', function (Blueprint $table) {
$table->unsignedBigInteger('library_item_id')->index();
$table->foreign('library_item_id')->references('id')->on('library_items')->onDelete('cascade');
$table->unsignedBigInteger('user_id')->index();
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
$table->primary(['library_item_id', 'user_id']);
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('library_item_user');
}
}

10
draft.yaml
View File

@@ -1,11 +1 @@
models:
ProjectProposal:
user_id: foreign
name: string unique
support_in_sats: integer unsigned
description: text
Vote:
user_id: foreign
project_proposal_id: foreign
value: integer unsigned
reason: text nullable

23
resources/lang/de.json
View File

@@ -820,6 +820,25 @@
"sats": "sats",
"Your vote": "Deine Stimme",
"Association": "Verein",
"for voting you have to be logged in": "",
"Yes, support it!": "Ja, unterstützen!"
"for voting you have to be logged in": "für die Abstimmung musst du angemeldet sein",
"Yes, support it!": "Ja, unterstützen!",
"LNBits settings saved successfully!": "LNBits-Einstellungen erfolgreich gespeichert!",
"LNBits": "",
"Submit paid news article": "Reiche einen bezahlten News-Artikel ein",
"Paid article": "Bezahlter Artikel",
"Paid News Article": "Bezahlter News-Artikel",
"How many sats to read this article?": "Wie viele sats für den Zugriff auf diesen Artikel?",
"Free part of the Article as Markdown": "Kostenloser Teil des Artikels als Markdown",
"Part of the article to be paid": "Zu zahlender Teil des Artikels",
"You can read the full article if you paid with Lightning": "Du kannst den vollständigen Artikel lesen, wenn du mit Lightning bezahlt hast",
"Receiver": "Empfänger",
"already paid?": "schon bezahlt?",
"Payment Hash": "Payment Hash",
"Payment hash copied!": "Payment Hash kopiert!",
"Copy payment hash": "Kopiere Payment Hash",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "Gib hier die Daten deiner LNBits-Instanz ein, um sats für zum Beispiel Artikel zu erhalten.",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": "zu bezahlen"
}

22
resources/lang/en.json
View File

@@ -818,5 +818,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/es.json
View File

@@ -818,5 +818,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/fr.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/hr.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/it.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/mk.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/pl.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/pt.json
View File

@@ -819,5 +819,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/sv.json
View File

@@ -781,5 +781,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

22
resources/lang/tr.json
View File

@@ -793,5 +793,25 @@
"Your vote": "",
"Association": "",
"for voting you have to be logged in": "",
"Yes, support it!": ""
"Yes, support it!": "",
"LNBits settings saved successfully!": "",
"LNBits": "",
"Submit paid news article": "",
"Paid article": "",
"Paid News Article": "",
"Sats": "",
"How many sats to read this article?": "",
"Free part of the Article as Markdown": "",
"Part of the article to be paid": "",
"You can read the full article if you paid with Lightning": "",
"Receiver": "",
"already paid?": "",
"Payment Hash": "",
"Payment hash copied!": "",
"Copy payment hash": "",
"Enter the data of your LNBits instance here to receive sats for articles, for example.": "",
"LNBits Url": "",
"Wallet ID": "",
"Invoice\/read key": "",
"paid": ""
}

6
resources/views/livewire/frontend/navigation/profile.blade.php
View File

@@ -42,6 +42,12 @@
{{ __('My meetups') }}
</a>
<a href="{{ route('profile.lnbits') }}"
class="flex gap-x-4 py-2 text-sm font-semibold leading-6 text-gray-900">
<i class="fa-thin fa-key-skeleton-left-right flex-none text-gray-400"></i>
{{ __('LNBits') }}
</a>
</div>
</div>
</div>

21
resources/views/livewire/news/article-overview.blade.php
View File

@@ -15,11 +15,22 @@
<div>
@auth
<x-button
class="whitespace-nowrap"
:href="route('news.form')"
primary>
<i class="fa fa-thin fa-plus"></i>
{{ __('Submit news articles') }}
</x-button>
@if(auth()->user()->lnbits)
<x-button
class="whitespace-nowrap"
:href="route('news.form', ['paid' => true])"
primary>
<i class="fa fa-thin fa-plus"></i>
{{ __('Submit paid news article') }}
<i class="fa fa-thin fa-coins"></i>
</x-button>
@endif
@endauth
</div>
</div>
@@ -28,7 +39,15 @@
@foreach($libraryItems as $libraryItem)
@if($libraryItem->approved || $libraryItem->created_by === auth()->id() || auth()->user()?->hasRole('news-editor'))
<div wire:key="library_item_{{ $libraryItem->id }}" wire:loading.class="opacity-25"
class="flex flex-col overflow-hidden rounded-lg border-2 border-[#F7931A]">
class="relative flex flex-col overflow-hidden rounded-lg border-2 border-[#F7931A]">
@if($libraryItem->sats)
<div class="absolute -left-1 top-0 h-16 w-16">
<div
class="absolute transform -rotate-45 bg-amber-500 text-center text-white font-semibold py-1 left-[-34px] top-[32px] w-[170px]">
{{ __('paid') }}
</div>
</div>
@endif
<div class="flex-shrink-0 pt-6">
<a href="{{ route('article.view', ['libraryItem' => $libraryItem]) }}">
<img class="h-48 w-full object-contain"

24
resources/views/livewire/news/form/news-article-form.blade.php
View File

@@ -5,7 +5,11 @@
<div class="container p-4 mx-auto bg-21gray my-2">
<div class="pb-5 flex flex-row justify-between">
<h3 class="text-lg font-medium leading-6 text-gray-200">{{ __('News Article') }}</h3>
@if($paid)
<h3 class="text-lg font-medium leading-6 text-gray-200">{{ __('Paid News Article') }}</h3>
@else
<h3 class="text-lg font-medium leading-6 text-gray-200">{{ __('News Article') }}</h3>
@endif
<div class="flex flex-row space-x-2 items-center justify-between">
<div x-data="{}">
@if($libraryItem->created_by === auth()->id())
@@ -36,6 +40,13 @@
<div class="space-y-8 divide-y divide-gray-700 sm:space-y-5">
<div class="mt-6 sm:mt-5 space-y-6 sm:space-y-5">
@if($paid)
<x-input.group :for="md5('libraryItem.sats')" :label="__('sats')">
<x-inputs.number min="21" autocomplete="off" wire:model.debounce="libraryItem.sats"
:placeholder="__('sats')" :hint="__('How many sats to read this article?')"/>
</x-input.group>
@endif
<x-input.group :for="md5('libraryItem.lecturer_id')">
<x-slot name="label">
<div class="flex flex-row space-x-4 items-center">
@@ -113,13 +124,22 @@
/>
</x-input.group>
<x-input.group :for="md5('libraryItem.value')" :label="__('Article as Markdown')">
<x-input.group :for="md5('libraryItem.value')" :label="$paid ? __('Free part of the Article as Markdown') : __('Article as Markdown')">
<div
class="text-amber-500 text-xs py-2">{{ __('For images in Markdown, please use eg. Imgur or another provider.') }}</div>
<x-input.simple-mde wire:model.defer="libraryItem.value"/>
@error('libraryItem.value') <span class="text-red-500 py-2">{{ $message }}</span> @enderror
</x-input.group>
@if($paid)
<x-input.group :for="md5('libraryItem.value_to_be_paid')" :label="__('Part of the article to be paid')">
<div
class="text-amber-500 text-xs py-2">{{ __('For images in Markdown, please use eg. Imgur or another provider.') }}</div>
<x-input.simple-mde wire:model.defer="libraryItem.value_to_be_paid"/>
@error('libraryItem.value_to_be_paid') <span class="text-red-500 py-2">{{ $message }}</span> @enderror
</x-input.group>
@endif
<x-input.group :for="md5('libraryItem.read_time')" :label="__('Time to read')">
<x-inputs.number min="1" autocomplete="off" wire:model.debounce="libraryItem.read_time"
:placeholder="__('Time to read')" :hint="__('How many minutes to read?')"/>

127
resources/views/livewire/news/intern-article-view.blade.php
View File

@@ -138,7 +138,127 @@
{!! $libraryItem->value !!}
</x-markdown>
@endif
</div>
@if($libraryItem->sats && !$invoicePaid)
<div
class="mx-auto max-w-7xl sm:px-6 lg:px-8">
<div
class="relative isolate overflow-hidden bg-gray-900 px-6 py-12 text-center shadow-2xl sm:rounded-3xl sm:px-16">
<h2 class="mx-auto max-w-2xl text-3xl font-bold tracking-tight text-white sm:text-4xl">
{{ __('You can read the full article if you paid with Lightning') }}
</h2>
<div
class="flex max-w-2xl text-3xl font-bold tracking-tight text-white sm:text-4xl justify-center items-center">
<div class="mt-6 flex items-center">
<div class="flex-shrink-0">
<div>
<span
class="sr-only text-gray-200">{{ $libraryItem->lecturer->name }}</span>
<img class="h-10 w-10 object-cover rounded"
src="{{ $libraryItem->lecturer->getFirstMediaUrl('avatar') }}"
alt="{{ $libraryItem->lecturer->name }}">
</div>
</div>
<div class="ml-3">
<div class="text-sm font-medium text-gray-200">
<div class="text-gray-200">{{ __('Receiver') }}
: {{ $libraryItem->lecturer->name }}</div>
</div>
<div class="flex space-x-1 text-sm text-gray-300">
<time
datetime="2020-03-16">{{ number_format($libraryItem->sats, 0, ',', '.') }} {{ __('sats') }}</time>
</div>
</div>
</div>
</div>
@if(!$invoice)
<div class="mt-10 flex items-center justify-center gap-x-6">
<div
wire:click="pay"
class="cursor-pointer rounded-md bg-white px-3.5 py-2.5 text-sm font-semibold text-gray-900 shadow-sm hover:bg-gray-100 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-white">
<i class="fa-thin fa-bolt"></i>
Pay with lightning
</div>
<div wire:click="$set('alreadyPaid', true)" class="cursor-pointer text-sm font-semibold leading-6 text-white">{{ __('already paid?') }} <span aria-hidden="true">→</span></div>
</div>
@else
<div class="mt-10 flex items-center justify-center gap-x-6 bg-white py-12">
<div class="flex justify-center" wire:key="qrcode">
<a href="lightning:{{ $this->invoice }}">
<img src="{{ 'data:image/png;base64, '. $this->qrCode }}" alt="qrcode">
</a>
</div>
</div>
@endif
@if(!$invoice)
<svg viewBox="0 0 1024 1024"
class="absolute top-1/2 left-1/2 -z-10 h-[64rem] w-[64rem] -translate-x-1/2 [mask-image:radial-gradient(closest-side,white,transparent)]"
aria-hidden="true">
<circle cx="512" cy="512" r="512"
fill="url(#827591b1-ce8c-4110-b064-7cb85a0b1217)" fill-opacity="0.7"/>
<defs>
<radialGradient id="827591b1-ce8c-4110-b064-7cb85a0b1217">
<stop stop-color="#F7931A"/>
<stop offset="1" stop-color="#F7931A"/>
</radialGradient>
</defs>
</svg>
@endif
@if($alreadyPaid)
<div class="flex items-center justify-center gap-x-6 py-2">
<div class="w-full flex flex-col space-y-2 justify-center" wire:key="paymentHash">
<div class="w-full my-2 flex justify-center font-mono break-all py-2">
<x-input.group :for="md5('checkThisPaymentHash')" :label="__('Payment Hash')">
<x-input autocomplete="off" wire:model.debounce="checkThisPaymentHash"
:placeholder="__('Payment Hash')"/>
</x-input.group>
</div>
</div>
@if($checkThisPaymentHash)
<div wire:poll.keep-alive="checkPaymentHash" wire:key="checkPaymentHash"></div>
@endif
</div>
@endif
@if($invoice)
<div class="flex items-center justify-center gap-x-6 bg-white py-2">
<div class="w-full flex flex-col space-y-2 justify-center" wire:key="paymentHash">
<div class="w-full my-2 flex justify-center font-mono break-all py-2">
<input class="w-full" readonly wire:key="paymentHashInput"
onClick="this.select();"
value="{{ $this->paymentHash }}"/>
</div>
<div
x-data="{
textToCopy: '{{ $this->paymentHash }}',
}"
@click.prevent="window.navigator.clipboard.writeText(textToCopy);window.$wireui.notify({title:'{{ __('Payment hash copied!') }}',icon:'success'});"
>
<x-button
black
>
<i class="fa fa-thin fa-clipboard"></i>
{{ __('Copy payment hash') }}
</x-button>
</div>
</div>
<div wire:poll.keep-alive="checkPaymentHash" wire:key="checkPaymentHash"></div>
</div>
@endif
</div>
</div>
@else
<div
class="prose md:prose-lg prose-invert mx-auto mt-5 text-gray-100 lg:col-start-1 lg:row-start-1 lg:max-w-none">
<x-markdown class="leading-normal">
{!! $libraryItem->value_to_be_paid !!}
</x-markdown>
</div>
@endif
<div wire:ignore>
<div class="flex flex-col sm:flex-row justify-center space-x-4 border-t border-white py-4 mt-4">
@if($libraryItem->lecturer->lightning_address || $libraryItem->lecturer->lnurl || $libraryItem->lecturer->node_id)
<h1>value-4-value</h1>
@@ -163,7 +283,14 @@
{{-- FOOTER --}}
<livewire:frontend.footer/>
<div x-data="{paid: @entangle('invoicePaid')}" x-init="$watch('paid', value => {if (value) {
party.confetti(document.body, {
count: party.variation.range(20, 40),
});
}})"></div>
<div wire:ignore class="z-50">
<script src="https://cdn.jsdelivr.net/npm/party-js@latest/bundle/party.min.js"></script>
<script
src="{{ asset('dist/einundzwanzig.chat.js') }}"
data-website-owner-pubkey="daf83d92768b5d0005373f83e30d4203c0b747c170449e02fea611a0da125ee6"

53
resources/views/livewire/profile/l-n-bits.blade.php Normal file
View File

@@ -0,0 +1,53 @@
<div>
{{-- HEADER --}}
<livewire:frontend.header :country="null"/>
<div class="flex flex-col">
<section class="">
<div class="px-10 pt-6 mx-auto max-w-7xl">
<div class="w-full mx-auto text-left md:text-center">
<h1 class="mb-6 text-5xl font-extrabold leading-none max-w-5xl mx-auto tracking-normal text-gray-900 sm:text-6xl md:text-6xl lg:text-7xl md:tracking-tight">
<span
class="w-full text-transparent bg-clip-text bg-gradient-to-r from-amber-400 via-amber-500 to-amber-500 lg:inline">{{ __('LNBits') }}</span>
</h1>
<p class="px-0 mb-6 text-lg text-gray-200 md:text-xl lg:px-24">
{{ __('Enter the data of your LNBits instance here to receive sats for articles, for example.') }}
</p>
</div>
</div>
</section>
<div class="container p-4 mx-auto bg-21gray my-2">
<form class="space-y-8 divide-y divide-gray-700 pb-24">
<div class="space-y-8 divide-y divide-gray-700 sm:space-y-5">
<div class="mt-6 sm:mt-5 space-y-6 sm:space-y-5">
<x-input.group :for="md5('settings.url')" :label="__('LNBits Url')">
<x-input autocomplete="off" wire:model.debounce="settings.url"
:placeholder="__('LNBits Url')"/>
</x-input.group>
<x-input.group :for="md5('settings.wallet_id')" :label="__('Wallet ID')">
<x-input autocomplete="off" wire:model.debounce="settings.wallet_id"
:placeholder="__('Wallet ID')"/>
</x-input.group>
<x-input.group :for="md5('settings.read_key')" :label="__('Invoice/read key')">
<x-input autocomplete="off" wire:model.debounce="settings.read_key"
:placeholder="__('Invoice/read key')"/>
</x-input.group>
<x-input.group :for="md5('save')" label="">
<x-button primary wire:click="save">
<i class="fa fa-thin fa-save"></i>
{{ __('Save') }}
</x-button>
</x-input.group>
</div>
</div>
</form>
</div>
</div>
</div>

9
routes/web.php
View File

@@ -128,6 +128,12 @@ Route::middleware([
->get('/my-meetups', \App\Http\Livewire\Profile\Meetups::class)
->name('profile.meetups');
Route::middleware([
'auth',
])
->get('/lnbits', \App\Http\Livewire\Profile\LNBits::class)
->name('profile.lnbits');
Route::middleware([
'auth',
])
@@ -220,7 +226,8 @@ Route::middleware([])
->as('project.')
->prefix('/{country:code}/project-funding')
->group(function () {
Route::get('/project/form/{projectProposal?}', \App\Http\Livewire\ProjectProposal\Form\ProjectProposalForm::class)
Route::get('/project/form/{projectProposal?}',
\App\Http\Livewire\ProjectProposal\Form\ProjectProposalForm::class)
->name('projectProposal.form')
->middleware(['auth']);