diff --git a/.gitignore b/.gitignore index 77cf5f2..ad1bf25 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ legacypublic migrated_artworks_files.tar.gz migrated_thumbnail_files.tar.gz site/.yarn/releases/yarn-1.22.19.cjs +site/public/assets +redis/* \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e5abf35..a2663b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,7 +26,18 @@ services: LARAVEL_SCHEDULE_ENABLED: true PHP_OPEN_BASEDIR: "/var/www/html:/static" ports: - - "80:80" + - "8776:80" + networks: + - proxy + - default + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + # Entry Point for https + - "traefik.http.routers.podcastartgen-secure.entrypoints=websecure" + - "traefik.http.routers.podcastartgen-secure.rule=Host(`new.noagendaartgenerator.com`)" + - "traefik.http.routers.podcastartgen-secure.service=podcastartgen-service" + - "traefik.http.services.podcastartgen-service.loadbalancer.server.port=80" links: - db - redis @@ -34,13 +45,24 @@ services: static: image: nginx:alpine volumes: - - ./static:/usr/share/nginx/html + - ${PATH_TO_STATIC}:/usr/share/nginx/html environment: TZ: UTC PUID: ${UID:-1000} PGID: ${GID:-1000} ports: - - "8181:80" + - "8777:80" + networks: + - proxy + - default + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + # Entry Point for https + - "traefik.http.routers.podcastartstatic-secure.entrypoints=websecure" + - "traefik.http.routers.podcastartstatic-secure.rule=Host(`static.noagendaartgenerator.com`)" + - "traefik.http.routers.podcastartstatic-secure.service=podcastartstatic-service" + - "traefik.http.services.podcastartstatic-service.loadbalancer.server.port=80" db: image: mariadb:latest env_file: .env @@ -53,15 +75,42 @@ services: volumes: - "./db/data:/var/lib/mysql" - "./db/dump:/docker-entrypoint-initdb.d" + networks: + - proxy + - default ports: - - "3306:3306" + - "51533:3306" # Adjust the external port if needed + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + - "traefik.http.routers.podcastartdb-secure.entrypoints=websecure" + - "traefik.http.routers.podcastartdb-secure.rule=Host(`podcastartdb.noagenda.dev`)" + - "traefik.http.routers.podcastartdb-secure.service=podcastartdb-service" + - "traefik.http.services.podcastartdb-service.loadbalancer.server.port=3306" redis: - image: redis:latest + image: redis:alpine + command: redis-server --appendonly yes --requirepass ${REDIS_SEC_PASSWORD} ports: - - "6379:6379" + - "56379:6379" + volumes: + - ./redis/redis.conf:/usr/local/etc/redis/redis.conf + - ./redis/redis-data:/var/lib/redis + environment: + - REDIS_REPLICATION_MODE=master + labels: + - "traefik.enable=true" + - "traefik.docker.network=proxy" + - "traefik.http.routers.paredis-secure.entrypoints=websecure" + - "traefik.http.routers.paredis-secure.rule=Host(`paredis.noagenda.dev`)" + - "traefik.http.routers.paredis-secure.service=paredis-service" + - "traefik.http.services.paredis-service.loadbalancer.server.port=6379" npm: image: node:latest working_dir: /var/www/html entrypoint: ["npm"] volumes: - - ./site:/var/www/html \ No newline at end of file + - ./site:/var/www/html +networks: + proxy: + external: true + diff --git a/site/app/Http/Controllers/ArtworkController.php b/site/app/Http/Controllers/ArtworkController.php index dc29c08..f62a400 100644 --- a/site/app/Http/Controllers/ArtworkController.php +++ b/site/app/Http/Controllers/ArtworkController.php @@ -30,7 +30,7 @@ public function index() ->with('artist') ->orderBy('episode_id', 'desc') ->orderBy('created_at', 'desc') - ->paginate($perPage = 3, $columns = ['*'], $pageName = 'artworks'); + ->paginate($perPage = 92, $columns = ['*'], $pageName = 'artworks'); $podcasts = Podcast::where('published', true)->with('episodes')->get(); return view('explore.artworks', [ 'user' => $user, diff --git a/site/resources/views/artworks/artwork.blade.php b/site/resources/views/artworks/artwork.blade.php index 016d653..e55b876 100644 --- a/site/resources/views/artworks/artwork.blade.php +++ b/site/resources/views/artworks/artwork.blade.php @@ -38,8 +38,8 @@
-
{{ $artwork->title }} by {{ $artwork->artist->name }} for {{ $artwork->podcast->title }}
@@ -61,10 +61,10 @@
diff --git a/site/resources/views/artworks/card.blade.php b/site/resources/views/artworks/card.blade.php index 13471de..159bf52 100644 --- a/site/resources/views/artworks/card.blade.php +++ b/site/resources/views/artworks/card.blade.php @@ -1,8 +1,7 @@
- filename ?? '#'}}" alt="{{ $thisArtwork->title }} by {{ $thisArtwork->artist->name }}"> @@ -12,12 +11,12 @@

- "{{ $thisArtwork->title }}" + "{{ $thisArtwork->title }}"

diff --git a/site/resources/views/episodes/episode.blade.php b/site/resources/views/episodes/episode.blade.php index f05fe57..5ab216e 100644 --- a/site/resources/views/episodes/episode.blade.php +++ b/site/resources/views/episodes/episode.blade.php @@ -26,8 +26,8 @@
-
{{ $episode->artwork->title }} by {{ $episode->artwork->artist->name }} for {{ $episode->artwork->podcast->title }}
@@ -45,10 +45,10 @@
diff --git a/site/resources/views/layouts/master.blade.php b/site/resources/views/layouts/master.blade.php index 1511261..e5cf4a1 100644 --- a/site/resources/views/layouts/master.blade.php +++ b/site/resources/views/layouts/master.blade.php @@ -23,19 +23,19 @@ @yield('page-content') @include('partials.footer.section') - - - - - - - - - - - - - + + + + + + + + + + + + + @livewireScriptConfig @vite(['resources/js/app.js']) diff --git a/site/resources/views/partials/favicon.blade.php b/site/resources/views/partials/favicon.blade.php index b599f47..feb78f7 100644 --- a/site/resources/views/partials/favicon.blade.php +++ b/site/resources/views/partials/favicon.blade.php @@ -1,20 +1,20 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + diff --git a/site/resources/views/podcasts/podcast.blade.php b/site/resources/views/podcasts/podcast.blade.php index 14b33d3..76ea550 100644 --- a/site/resources/views/podcasts/podcast.blade.php +++ b/site/resources/views/podcasts/podcast.blade.php @@ -34,8 +34,7 @@
- artwork->filename ?? '#'}}" alt="{{ $episode->title }}, {{ $episode->podcast->name }} Episode {{ number_format($episode->episode_number + 0) }}"> diff --git a/site/resources/views/profile/artist.blade.php b/site/resources/views/profile/artist.blade.php index c19ce7f..6476609 100644 --- a/site/resources/views/profile/artist.blade.php +++ b/site/resources/views/profile/artist.blade.php @@ -28,27 +28,7 @@
-
-
- {{ $artist->name }}'s Cover Photo -
-
- {{ $artist->name }} -

{{ $artist->name }}

-

{{ $artist->location ?? 'No Agenda Nation' }}

-

Artist For {{ $artist->artworks->sortBy('created_at')->first()->created_at->diffForHumans(now(), Carbon\CarbonInterface::DIFF_ABSOLUTE) }}

- @if ($artist->bio) -

Bio:

-

{{ nl2br($artist->bio) }}

- @endif - -
-
+ @include('profile.partials.single-artist-card')
{{-- end bio sidebar --}}
diff --git a/site/resources/views/profile/partials/single-artist-card.blade.php b/site/resources/views/profile/partials/single-artist-card.blade.php index f78f0b2..c16c743 100644 --- a/site/resources/views/profile/partials/single-artist-card.blade.php +++ b/site/resources/views/profile/partials/single-artist-card.blade.php @@ -7,7 +7,7 @@ alt="{{ $artist->name }}" />

{{ $artist->name }}

{{ $artist->location ?? 'No Agenda Nation' }}

-

Artist for {{ $artist->created_at->diffForHumans() }}

+

Artist For {{ $artist->artworks->sortBy('created_at')->first()->created_at->diffForHumans(now(), Carbon\CarbonInterface::DIFF_ABSOLUTE) }}

@if ($artist->bio)

Bio:

{{ nl2br($artist->bio) }}