einundzwanzig/einundzwanzig-verein
1
0
Fork 0
mirror of https://github.com/HolgerHatGarKeineNode/einundzwanzig-nostr.git synced 2025-12-14 06:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: replace hardcoded relay URL with config variable

Browse Source 
This commit replaces hardcoded relay server URL with a configuration variable in services.php. The relay URL is now fetched from the environment variable NOSTR_RELAY. This change has been made in the files Election:year.blade.php and admin/Election:year.blade.php under association/election directory.
This commit is contained in:
fsociety
2024-09-29 19:38:26 +02:00
parent dd2b5bf3c2
commit a4052b1ed5
3 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/services.php
View File

@@ -14,6 +14,8 @@ return [
| |
*/ */
'relay' => env('NOSTR_RELAY'),
'postmark' => [ 'postmark' => [
'token' => env('POSTMARK_TOKEN'), 'token' => env('POSTMARK_TOKEN'),
], ],

33
resources/views/pages/association/election/[Election:year].blade.php
View File

@@ -86,7 +86,7 @@ $loadEvents = function () {
$requestMessage = new RequestMessage($subscriptionId, $filters); $requestMessage = new RequestMessage($subscriptionId, $filters);
$relays = [ $relays = [
new Relay('ws://relay:7000'), new Relay(config('services.relay')),
]; ];
$relaySet = new RelaySet(); $relaySet = new RelaySet();
$relaySet->setRelays($relays); $relaySet->setRelays($relays);
@@ -94,7 +94,7 @@ $loadEvents = function () {
$request = new Request($relaySet, $requestMessage); $request = new Request($relaySet, $requestMessage);
$response = $request->send(); $response = $request->send();
$this->events = collect($response['ws://relay:7000']) $this->events = collect($response[config('services.relay')])
->map(fn($event) ->map(fn($event)
=> [ => [
'id' => $event->event->id, 'id' => $event->event->id,
@@ -133,7 +133,7 @@ $signEvent = function ($event) {
$note->setTags($event['tags']); $note->setTags($event['tags']);
$note->setCreatedAt($event['created_at']); $note->setCreatedAt($event['created_at']);
$eventMessage = new EventMessage($note); $eventMessage = new EventMessage($note);
$relayUrl = 'ws://relay:7000'; $relayUrl = config('services.relay');
$relay = new Relay($relayUrl); $relay = new Relay($relayUrl);
$relay->setMessage($eventMessage); $relay->setMessage($eventMessage);
$result = $relay->send(); $result = $relay->send();
@@ -429,20 +429,21 @@ $signEvent = function ($event) {
</div> </div>
<footer class="mt-5"> <footer class="mt-5">
<div class="grid grid-cols-3 gap-y-2"> <div class="grid grid-cols-3 gap-y-2">
@foreach($electionConfig->firstWhere('type', $type)['candidates'] as $c) @foreach($electionConfig->firstWhere('type', $type)['candidates'] as $c)
<div <div
@if($isNotClosed)wire:click="vote('{{ $c['pubkey'] }}', '{{ $type }}')"@endif @if($isNotClosed)wire:click="vote('{{ $c['pubkey'] }}', '{{ $type }}')"
class="{{ $c['votedClass'] }} cursor-pointer text-xs inline-flex font-medium rounded-full text-center px-2.5 py-1"> @endif
<div class="flex items-center"> class="{{ $c['votedClass'] }} cursor-pointer text-xs inline-flex font-medium rounded-full text-center px-2.5 py-1">
<img class="w-6 h-6 rounded-full mr-2 bg-black" <div class="flex items-center">
src="{{ $c['picture'] ?? 'https://robohash.org/' . $c['pubkey'] }}" <img class="w-6 h-6 rounded-full mr-2 bg-black"
onerror="this.onerror=null; this.src='https://robohash.org/{{ $c['pubkey'] }}';" src="{{ $c['picture'] ?? 'https://robohash.org/' . $c['pubkey'] }}"
width="24" height="24" onerror="this.onerror=null; this.src='https://robohash.org/{{ $c['pubkey'] }}';"
alt="{{ $c['name'] }}"/> width="24" height="24"
{{ $c['name'] }} alt="{{ $c['name'] }}"/>
</div> {{ $c['name'] }}
</div> </div>
@endforeach </div>
@endforeach
</div> </div>
</footer> </footer>
</div> </div>

4
resources/views/pages/association/election/admin/[Election:year].blade.php
View File

@@ -126,7 +126,7 @@ $loadEvents = function () {
$requestMessage = new RequestMessage($subscriptionId, $filters); $requestMessage = new RequestMessage($subscriptionId, $filters);
$relays = [ $relays = [
new Relay('ws://relay:7000'), new Relay(config('services.relay')),
]; ];
$relaySet = new RelaySet(); $relaySet = new RelaySet();
$relaySet->setRelays($relays); $relaySet->setRelays($relays);
@@ -134,7 +134,7 @@ $loadEvents = function () {
$request = new Request($relaySet, $requestMessage); $request = new Request($relaySet, $requestMessage);
$response = $request->send(); $response = $request->send();
$this->events = collect($response['ws://relay:7000']) $this->events = collect($response[config('services.relay')])
->map(fn($event) ->map(fn($event)
=> [ => [
'id' => $event->event->id, 'id' => $event->event->id,