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

View File

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

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.',
],
],
]);
}
} }

View File

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

View File

@@ -2,9 +2,8 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Model;
class TrackingContentSelection extends Model class TrackingContentSelection extends Model
{ {

View File

@@ -2,8 +2,8 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsTo;
class TrackingExport extends Model class TrackingExport extends Model

View File

@@ -2,8 +2,8 @@
namespace App\Models; namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
class TrackingSearch extends Model class TrackingSearch extends Model
{ {

View File

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

View File

@@ -2,9 +2,9 @@
namespace App\Services; namespace App\Services;
use App\Jobs\TrackSearchJob;
use App\Jobs\TrackContentSelectionJob; use App\Jobs\TrackContentSelectionJob;
use App\Jobs\TrackExportJob; use App\Jobs\TrackExportJob;
use App\Jobs\TrackSearchJob;
use App\Jobs\UpdateExportStatusJob; use App\Jobs\UpdateExportStatusJob;
use Carbon\Carbon; use Carbon\Carbon;

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');
});
}
};

View File

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

View File

@@ -30,7 +30,7 @@ const VideoDownloadModal = ({
const lastProgressTime = useRef(null); const lastProgressTime = useRef(null);
const lastProgress = useRef(0); const lastProgress = useRef(0);
const { premiumExportRequest, premiumExportComplete } = useUserStore(); const { premiumExportRequest, premiumExportComplete, basicExportRequest, basicExportComplete } = useUserStore();
const handleShareOrDownload = async () => { const handleShareOrDownload = async () => {
if (!videoBlob || !videoBlobFilename) { if (!videoBlob || !videoBlobFilename) {
@@ -116,11 +116,28 @@ const VideoDownloadModal = ({
} }
}; };
const handleExportWithWatermark = () => { const handleExportWithWatermark = async () => {
setIsPremiumExport(false); setIsPremiumExport(false);
setEstimatedTimeRemaining(null); setEstimatedTimeRemaining(null);
// 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'); setStatus('processing');
handleDownloadButton(); handleDownloadButton();
}
}; };
const handleClose = async () => { const handleClose = async () => {
@@ -140,15 +157,18 @@ const VideoDownloadModal = ({
useEffect(() => { useEffect(() => {
if (status === 'processing' && exportProgress >= 100) { if (status === 'processing' && exportProgress >= 100) {
setStatus('complete'); setStatus('complete');
// Call premiumExportComplete immediately when export completes // Call appropriate export complete method based on export type
if (isPremiumExport && exportToken) { if (isPremiumExport && exportToken) {
console.log('Calling premiumExportComplete with token:', exportToken); console.log('Calling premiumExportComplete with token:', exportToken);
premiumExportComplete(exportToken); premiumExportComplete(exportToken);
} else if (isPremiumExport && !exportToken) { } else if (!isPremiumExport && exportToken) {
console.error('Premium export completed but no token available'); 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 // Calculate estimated time remaining based on progress speed
useEffect(() => { useEffect(() => {

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 Footer from '@/pages/home/partials/Footer.jsx';
import { Head } from '@inertiajs/react';
import React from 'react';
interface PrivacyProps { interface PrivacyProps {
content: string; content: string;
@@ -14,18 +13,15 @@ const Privacy: React.FC<PrivacyProps> = ({ content, title }) => {
<Head title={title} /> <Head title={title} />
<div className="container mx-auto px-4 py-8"> <div className="container mx-auto px-4 py-8">
<div className="max-w-4xl mx-auto"> <div className="mx-auto max-w-4xl">
<div className="bg-white dark:bg-neutral-900 rounded-lg shadow-lg p-8"> <div className="rounded-lg bg-white p-8 shadow-lg dark:bg-neutral-900">
<div <div className="max-w-none" dangerouslySetInnerHTML={{ __html: content }} />
className="max-w-none"
dangerouslySetInnerHTML={{ __html: content }}
/>
</div> </div>
</div> </div>
</div> </div>
<Footer /> <Footer />
<AuthUser /> {/* <AuthUser /> */}
</div> </div>
); );
}; };

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 Footer from '@/pages/home/partials/Footer.jsx';
import { Head } from '@inertiajs/react';
import React from 'react';
interface TermsProps { interface TermsProps {
content: string; content: string;
@@ -14,18 +13,15 @@ const Terms: React.FC<TermsProps> = ({ content, title }) => {
<Head title={title} /> <Head title={title} />
<div className="container mx-auto px-4 py-8"> <div className="container mx-auto px-4 py-8">
<div className="max-w-4xl mx-auto"> <div className="mx-auto max-w-4xl">
<div className="bg-white dark:bg-neutral-900 rounded-lg shadow-lg p-8"> <div className="rounded-lg bg-white p-8 shadow-lg dark:bg-neutral-900">
<div <div className="max-w-none" dangerouslySetInnerHTML={{ __html: content }} />
className="max-w-none"
dangerouslySetInnerHTML={{ __html: content }}
/>
</div> </div>
</div> </div>
</div> </div>
<Footer /> <Footer />
<AuthUser /> {/* <AuthUser /> */}
</div> </div>
); );
}; };

View File

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

View File

@@ -108,6 +108,46 @@ const useUserStore = create(
console.error('Error fetching:', error); 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', name: 'UserStore',

File diff suppressed because one or more lines are too long

View File

@@ -17,6 +17,12 @@
Route::post('/ai-hints', [UserAIController::class, 'aiHints'])->name('api.ai_hints'); 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::middleware('auth:sanctum')->group(function () {
Route::group(['prefix' => 'user'], function () { Route::group(['prefix' => 'user'], function () {
@@ -31,9 +37,10 @@
Route::post('/logout', [SanctumAuthController::class, 'logout']); Route::post('/logout', [SanctumAuthController::class, 'logout']);
Route::post('/premium-export/request', [UserExportController::class, 'premiumExportRequest'])->name('api.user.premium_export.request'); Route::group(['prefix' => 'premium-export'], function () {
Route::post('/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::post('/complete', [UserExportController::class, 'premiumExportComplete'])->name('api.user.premium_export.complete');
});
Route::group(['prefix' => 'generate_meme'], function () { Route::group(['prefix' => 'generate_meme'], function () {
Route::post('/', [UserAIController::class, 'generateMeme'])->name('api.user.generate_meme'); Route::post('/', [UserAIController::class, 'generateMeme'])->name('api.user.generate_meme');