charlestehio/memefast
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
ct
2025-07-16 12:38:06 +08:00
parent d4b69df538
commit d4c5fb5589
25 changed files with 249 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Facades/TrackingAnalytics.php
View File

@@ -21,4 +21,4 @@ protected static function getFacadeAccessor(): string
{
return 'tracking-analytics';
}
}
}

4
app/Http/Controllers/FrontMediaController.php
View File

@@ -59,7 +59,7 @@ public function background(Request $request)
public function searchMemes(Request $request)
{
$query = $request->input('query', '');
$limit = $request->input('limit', 30);
$limit = 30;
if (empty($query)) {
// Return random memes if no search query
@@ -106,7 +106,7 @@ public function searchMemes(Request $request)
public function searchBackgrounds(Request $request)
{
$query = $request->input('query', '');
$limit = $request->input('limit', 30);
$limit = 30;
if (empty($query)) {
// Return random backgrounds if no search query

60
app/Http/Controllers/UserExportController.php
View File

@@ -89,4 +89,64 @@ public function premiumExportComplete(Request $request)
],
]);
}
public function basicExportRequest(Request $request)
{
// No authentication required for basic exports
// Create export token (expires in 30 minutes)
$token = ExportToken::create([
'user_id' => null, // Anonymous user
'token' => Str::uuid()->toString(),
'is_premium' => false,
'credits_reserved' => 0, // No credits for basic exports
'expires_at' => now()->addMinutes(30),
]);
return response()->json([
'success' => [
'data' => [
'export_token' => $token->token,
],
],
]);
}
public function basicExportComplete(Request $request)
{
$request->validate([
'export_token' => 'required|string',
]);
// Find the token (no user requirement)
$token = ExportToken::where('token', $request->export_token)
->whereNull('user_id') // Only anonymous tokens
->first();
if (! $token) {
return response()->json([
'error' => [
'message' => 'Invalid export token.',
],
]);
}
if (! $token->isValid()) {
return response()->json([
'error' => [
'message' => 'Export token has expired or already been used.',
],
]);
}
// Mark token as used
$token->markAsUsed();
return response()->json([
'success' => [
'data' => [
'message' => 'Export completed successfully.',
],
],
]);
}
}

4
app/Jobs/TrackContentSelectionJob.php
View File

@@ -52,7 +52,7 @@ public function handle(): void
'content_id' => $this->contentId,
'error' => $e->getMessage(),
]);
throw $e;
}
}
@@ -66,4 +66,4 @@ public function failed(\Throwable $exception): void
'exception' => $exception->getMessage(),
]);
}
}
}

4
app/Jobs/TrackExportJob.php
View File

@@ -57,7 +57,7 @@ public function handle(): int
'export_format' => $this->exportFormat,
'error' => $e->getMessage(),
]);
throw $e;
}
}
@@ -71,4 +71,4 @@ public function failed(\Throwable $exception): void
'exception' => $exception->getMessage(),
]);
}
}
}

4
app/Jobs/TrackSearchJob.php
View File

@@ -48,7 +48,7 @@ public function handle(): void
'search_query' => $this->searchQuery,
'error' => $e->getMessage(),
]);
throw $e;
}
}
@@ -62,4 +62,4 @@ public function failed(\Throwable $exception): void
'exception' => $exception->getMessage(),
]);
}
}
}

6
app/Jobs/UpdateExportStatusJob.php
View File

@@ -28,7 +28,7 @@ public function handle(): void
{
try {
$trackingExport = TrackingExport::findOrFail($this->trackingExportId);
$updateData = [
'export_status' => $this->status,
];
@@ -50,7 +50,7 @@ public function handle(): void
'status' => $this->status,
'error' => $e->getMessage(),
]);
throw $e;
}
}
@@ -63,4 +63,4 @@ public function failed(\Throwable $exception): void
'exception' => $exception->getMessage(),
]);
}
}
}

5
app/Models/ExportToken.php
View File

@@ -30,6 +30,11 @@ public function user(): BelongsTo
return $this->belongsTo(User::class);
}
public function isAnonymous(): bool
{
return is_null($this->user_id);
}
public function isExpired(): bool
{
return $this->expires_at->isPast();

9
app/Models/TrackingContentSelection.php
View File

@@ -2,9 +2,8 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Model;
class TrackingContentSelection extends Model
{
@@ -41,11 +40,11 @@ public function content()
if ($this->content_type === 'meme') {
return $this->belongsTo(MemeMedia::class, 'content_id');
}
if ($this->content_type === 'background') {
return $this->belongsTo(BackgroundMedia::class, 'content_id');
}
return null;
}
}
}

4
app/Models/TrackingExport.php
View File

@@ -2,8 +2,8 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
class TrackingExport extends Model
@@ -88,4 +88,4 @@ public function scopeProcessing($query)
{
return $query->where('export_status', 'processing');
}
}
}

4
app/Models/TrackingSearch.php
View File

@@ -2,8 +2,8 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TrackingSearch extends Model
{
@@ -30,4 +30,4 @@ class TrackingSearch extends Model
protected $attributes = [
'platform' => 'web',
];
}
}

2
app/Providers/AppServiceProvider.php
View File

@@ -15,7 +15,7 @@ class AppServiceProvider extends ServiceProvider
public function register(): void
{
$this->app->singleton('tracking-analytics', function ($app) {
return new TrackingAnalyticsService();
return new TrackingAnalyticsService;
});
}

18
app/Services/TrackingAnalyticsService.php
View File

@@ -2,9 +2,9 @@
namespace App\Services;
use App\Jobs\TrackSearchJob;
use App\Jobs\TrackContentSelectionJob;
use App\Jobs\TrackExportJob;
use App\Jobs\TrackSearchJob;
use App\Jobs\UpdateExportStatusJob;
use Carbon\Carbon;
@@ -118,7 +118,7 @@ public function updateExportStatus(
public function getDeviceContext(): array
{
$request = request();
return [
'user_agent' => $request->userAgent(),
'ip_address' => $request->ip(),
@@ -132,15 +132,15 @@ public function getDeviceContext(): array
public function generateDeviceId(): string
{
$request = request();
// Generate a consistent device ID based on session or create new one
if ($request->session()->has('device_id')) {
return $request->session()->get('device_id');
}
$deviceId = str()->uuid()->toString();
$request->session()->put('device_id', $deviceId);
return $deviceId;
}
@@ -151,7 +151,7 @@ public function quickTrackSearch(string $searchType, string $searchQuery, ?array
{
$context = $this->getDeviceContext();
$deviceId = $this->generateDeviceId();
$this->trackSearch(
$deviceId,
$searchType,
@@ -168,7 +168,7 @@ public function quickTrackContentSelection(string $contentType, int $contentId,
{
$context = $this->getDeviceContext();
$deviceId = $this->generateDeviceId();
$this->trackContentSelection(
$deviceId,
$contentType,
@@ -187,7 +187,7 @@ public function quickTrackExport(?int $memeId, ?int $memeMediaId, ?int $backgrou
{
$context = $this->getDeviceContext();
$deviceId = $this->generateDeviceId();
return $this->trackExport(
$deviceId,
$memeId,
@@ -202,4 +202,4 @@ public function quickTrackExport(?int $memeId, ?int $memeMediaId, ?int $backgrou
$context['platform']
);
}
}
}

8
database/migrations/2025_07_16_034613_create_tracking_searches_table.php
View File

@@ -13,22 +13,22 @@ public function up(): void
{
Schema::create('tracking_searches', function (Blueprint $table) {
$table->id();
// Common fields
$table->string('device_id');
$table->text('user_agent')->nullable();
$table->string('ip_address')->nullable();
$table->enum('platform', ['web', 'ios', 'android'])->default('web');
// Search-specific fields
$table->enum('search_type', ['meme', 'background']);
$table->text('search_query');
$table->json('search_filters')->nullable();
// Timestamps
$table->timestamp('action_at');
$table->timestamps();
// Indexes
$table->index(['device_id', 'action_at']);
$table->index(['search_type', 'action_at']);

8
database/migrations/2025_07_16_034628_create_tracking_content_selections_table.php
View File

@@ -13,24 +13,24 @@ public function up(): void
{
Schema::create('tracking_content_selections', function (Blueprint $table) {
$table->id();
// Common fields
$table->string('device_id');
$table->text('user_agent')->nullable();
$table->string('ip_address')->nullable();
$table->enum('platform', ['web', 'ios', 'android'])->default('web');
// Content selection fields
$table->enum('content_type', ['meme', 'background']);
$table->unsignedBigInteger('content_id');
$table->string('content_name');
$table->text('search_query')->nullable();
$table->enum('selection_method', ['search', 'browse', 'featured', 'recent']);
// Timestamps
$table->timestamp('action_at');
$table->timestamps();
// Indexes
$table->index(['device_id', 'action_at']);
$table->index(['content_type', 'content_id']);

10
database/migrations/2025_07_16_034642_create_tracking_exports_table.php
View File

@@ -13,13 +13,13 @@ public function up(): void
{
Schema::create('tracking_exports', function (Blueprint $table) {
$table->id();
// Common fields
$table->string('device_id');
$table->text('user_agent')->nullable();
$table->string('ip_address')->nullable();
$table->enum('platform', ['web', 'ios', 'android'])->default('web');
// Export-specific fields
$table->unsignedBigInteger('meme_id')->nullable();
$table->unsignedBigInteger('meme_media_id')->nullable();
@@ -29,17 +29,17 @@ public function up(): void
$table->enum('export_quality', ['standard', 'premium'])->default('standard');
$table->enum('export_status', ['initiated', 'processing', 'completed', 'failed'])->default('initiated');
$table->text('error_message')->nullable();
// Timestamps
$table->timestamp('action_at');
$table->timestamp('completed_at')->nullable();
$table->timestamps();
// Foreign key constraints
$table->foreign('meme_id')->references('id')->on('memes')->onDelete('set null');
$table->foreign('meme_media_id')->references('id')->on('meme_medias')->onDelete('set null');
$table->foreign('background_media_id')->references('id')->on('background_medias')->onDelete('set null');
// Indexes
$table->index(['device_id', 'action_at']);
$table->index(['export_status', 'action_at']);

42
database/migrations/2025_07_16_042908_modify_export_tokens_table_for_anonymous_users.php Normal file
View File

@@ -0,0 +1,42 @@
<?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('export_tokens', function (Blueprint $table) {
// Drop foreign key constraint first
$table->dropForeign(['user_id']);
// Make user_id nullable
$table->unsignedBigInteger('user_id')->nullable()->change();
// Add foreign key back with nullable support
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('export_tokens', function (Blueprint $table) {
// Drop foreign key constraint
$table->dropForeign(['user_id']);
// Make user_id NOT nullable again
$table->unsignedBigInteger('user_id')->nullable(false)->change();
// Add foreign key back without nullable
$table->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
});
}
};

3
resources/js/modules/editor/editor.jsx
View File

@@ -8,7 +8,6 @@ import useVideoEditorStore from '@/stores/VideoEditorStore';
// Import fonts first - this loads all Fontsource packages
import '@/modules/editor/fonts';
import UpgradeSheet from '../upgrade/upgrade-sheet';
import EditNavSidebar from './partials/edit-nav-sidebar';
import EditSidebar from './partials/edit-sidebar';
import EditorAISheet from './partials/editor-ai-sheet';
@@ -218,7 +217,7 @@ const Editor = () => {
</>
)}
</div>
<UpgradeSheet />
{/* <UpgradeSheet /> */}
<EditorAISheet />
</>
);

36
resources/js/modules/editor/partials/canvas/video-download/video-download-modal.jsx
View File

@@ -30,7 +30,7 @@ const VideoDownloadModal = ({
const lastProgressTime = useRef(null);
const lastProgress = useRef(0);
const { premiumExportRequest, premiumExportComplete } = useUserStore();
const { premiumExportRequest, premiumExportComplete, basicExportRequest, basicExportComplete } = useUserStore();
const handleShareOrDownload = async () => {
if (!videoBlob || !videoBlobFilename) {
@@ -116,11 +116,28 @@ const VideoDownloadModal = ({
}
};
const handleExportWithWatermark = () => {
const handleExportWithWatermark = async () => {
setIsPremiumExport(false);
setEstimatedTimeRemaining(null);
setStatus('processing');
handleDownloadButton();
// Call basicExportRequest and check response
const response = await basicExportRequest();
if (response?.error) {
// Halt the process if there's an error
setIsPremiumExport(false);
return;
}
if (response?.success) {
// Store the export token
const token = response.success.data.export_token;
console.log('Received basic export token:', token);
setExportToken(token);
// Continue with export if successful
setStatus('processing');
handleDownloadButton();
}
};
const handleClose = async () => {
@@ -140,15 +157,18 @@ const VideoDownloadModal = ({
useEffect(() => {
if (status === 'processing' && exportProgress >= 100) {
setStatus('complete');
// Call premiumExportComplete immediately when export completes
// Call appropriate export complete method based on export type
if (isPremiumExport && exportToken) {
console.log('Calling premiumExportComplete with token:', exportToken);
premiumExportComplete(exportToken);
} else if (isPremiumExport && !exportToken) {
console.error('Premium export completed but no token available');
} else if (!isPremiumExport && exportToken) {
console.log('Calling basicExportComplete with token:', exportToken);
basicExportComplete(exportToken);
} else if (!exportToken) {
console.error('Export completed but no token available');
}
}
}, [exportProgress, status, isPremiumExport, exportToken, premiumExportComplete]);
}, [exportProgress, status, isPremiumExport, exportToken, premiumExportComplete, basicExportComplete]);
// Calculate estimated time remaining based on progress speed
useEffect(() => {

22
resources/js/pages/FrontPages/Privacy.tsx
View File

@@ -1,7 +1,6 @@
import React from 'react';
import { Head } from '@inertiajs/react';
import AuthUser from '@/modules/auth/auth-user';
import Footer from '@/pages/home/partials/Footer.jsx';
import { Head } from '@inertiajs/react';
import React from 'react';
interface PrivacyProps {
content: string;
@@ -12,22 +11,19 @@ const Privacy: React.FC<PrivacyProps> = ({ content, title }) => {
return (
<div className="min-h-[100vh] bg-neutral-50 dark:bg-black">
<Head title={title} />
<div className="container mx-auto px-4 py-8">
<div className="max-w-4xl mx-auto">
<div className="bg-white dark:bg-neutral-900 rounded-lg shadow-lg p-8">
<div
className="max-w-none"
dangerouslySetInnerHTML={{ __html: content }}
/>
<div className="mx-auto max-w-4xl">
<div className="rounded-lg bg-white p-8 shadow-lg dark:bg-neutral-900">
<div className="max-w-none" dangerouslySetInnerHTML={{ __html: content }} />
</div>
</div>
</div>
<Footer />
<AuthUser />
{/* <AuthUser /> */}
</div>
);
};
export default Privacy;
export default Privacy;

22
resources/js/pages/FrontPages/Terms.tsx
View File

@@ -1,7 +1,6 @@
import React from 'react';
import { Head } from '@inertiajs/react';
import AuthUser from '@/modules/auth/auth-user';
import Footer from '@/pages/home/partials/Footer.jsx';
import { Head } from '@inertiajs/react';
import React from 'react';
interface TermsProps {
content: string;
@@ -12,22 +11,19 @@ const Terms: React.FC<TermsProps> = ({ content, title }) => {
return (
<div className="min-h-[100vh] bg-neutral-50 dark:bg-black">
<Head title={title} />
<div className="container mx-auto px-4 py-8">
<div className="max-w-4xl mx-auto">
<div className="bg-white dark:bg-neutral-900 rounded-lg shadow-lg p-8">
<div
className="max-w-none"
dangerouslySetInnerHTML={{ __html: content }}
/>
<div className="mx-auto max-w-4xl">
<div className="rounded-lg bg-white p-8 shadow-lg dark:bg-neutral-900">
<div className="max-w-none" dangerouslySetInnerHTML={{ __html: content }} />
</div>
</div>
</div>
<Footer />
<AuthUser />
{/* <AuthUser /> */}
</div>
);
};
export default Terms;
export default Terms;

3
resources/js/pages/home/home.tsx
View File

@@ -1,4 +1,3 @@
import AuthUser from '@/modules/auth/auth-user';
import { useEffect, useState } from 'react';
import FAQDiscord from './partials/FAQDiscord.jsx';
import Features from './partials/Features.jsx';
@@ -36,7 +35,7 @@ const Home = ({ faqData }) => {
<FAQDiscord faqData={faqData} />
</div>
<Footer />
<AuthUser />
{/* <AuthUser /> */}
</div>
);
};

40
resources/js/stores/UserStore.js
View File

@@ -108,6 +108,46 @@ const useUserStore = create(
console.error('Error fetching:', error);
}
},
basicExportRequest: async () => {
try {
const response = await axiosInstance.post(route('api.basic_export.request'));
if (response?.data?.success?.message) {
toast.success(response.data.success.message);
}
if (response?.data?.error?.message) {
toast.error(response.data.error.message);
}
return response.data;
} catch (error) {
console.error(route('api.basic_export.request'));
console.error('Error fetching:', error);
}
},
basicExportComplete: async (exportToken) => {
try {
const response = await axiosInstance.post(route('api.basic_export.complete'), {
export_token: exportToken,
});
if (response?.data?.success?.message) {
toast.success(response.data.success.message);
}
if (response?.data?.error?.message) {
toast.error(response.data.error.message);
}
return response.data;
} catch (error) {
console.error(route('api.basic_export.complete'));
console.error('Error fetching:', error);
}
},
})),
{
name: 'UserStore',

2
resources/js/ziggy.js
View File

File diff suppressed because one or more lines are too long

13
routes/api.php
View File

@@ -17,6 +17,12 @@
Route::post('/ai-hints', [UserAIController::class, 'aiHints'])->name('api.ai_hints');
// Basic export routes (no authentication required)
Route::group(['prefix' => 'basic-export'], function () {
Route::post('/request', [UserExportController::class, 'basicExportRequest'])->name('api.basic_export.request');
Route::post('/complete', [UserExportController::class, 'basicExportComplete'])->name('api.basic_export.complete');
});
Route::middleware('auth:sanctum')->group(function () {
Route::group(['prefix' => 'user'], function () {
@@ -31,9 +37,10 @@
Route::post('/logout', [SanctumAuthController::class, 'logout']);
Route::post('/premium-export/request', [UserExportController::class, 'premiumExportRequest'])->name('api.user.premium_export.request');
Route::post('/premium-export/complete', [UserExportController::class, 'premiumExportComplete'])->name('api.user.premium_export.complete');
Route::group(['prefix' => 'premium-export'], function () {
Route::post('/request', [UserExportController::class, 'premiumExportRequest'])->name('api.user.premium_export.request');
Route::post('/complete', [UserExportController::class, 'premiumExportComplete'])->name('api.user.premium_export.complete');
});
Route::group(['prefix' => 'generate_meme'], function () {
Route::post('/', [UserAIController::class, 'generateMeme'])->name('api.user.generate_meme');