andika/membership-fe
3
1
Fork 1
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

Test Preparation

Browse Source
This commit is contained in:
Koncept Kit
2025-12-26 20:04:08 +07:00
parent 33fc3a101d
commit a6c2475092
8 changed files with 1267 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/admin/AdminMembers.js
View File

@@ -19,7 +19,7 @@ import PaymentActivationDialog from '../../components/PaymentActivationDialog';
import ConfirmationDialog from '../../components/ConfirmationDialog';
import CreateMemberDialog from '../../components/CreateMemberDialog';
import InviteStaffDialog from '../../components/InviteStaffDialog';
import ImportMembersDialog from '../../components/ImportMembersDialog';
import WordPressImportWizard from '../../components/WordPressImportWizard';
const AdminMembers = () => {
const navigate = useNavigate();
@@ -569,7 +569,7 @@ const AdminMembers = () => {
onSuccess={fetchMembers}
/>
<ImportMembersDialog
<WordPressImportWizard
open={importDialogOpen}
onOpenChange={setImportDialogOpen}
onSuccess={fetchMembers}

39
src/pages/admin/AdminValidations.js
View File

@@ -74,7 +74,7 @@ const AdminValidations = () => {
try {
const response = await api.get('/admin/users');
const pending = response.data.filter(user =>
['pending_email', 'pending_validation', 'pre_validated', 'payment_pending'].includes(user.status)
['pending_email', 'pending_validation', 'pre_validated', 'payment_pending', 'rejected'].includes(user.status)
);
setPendingUsers(pending);
} catch (error) {
@@ -218,12 +218,28 @@ const AdminValidations = () => {
}
};
const handleReactivateUser = async (user) => {
setActionLoading(user.id);
try {
await api.put(`/admin/users/${user.id}/status`, {
status: 'pending_validation'
});
toast.success(`${user.first_name} ${user.last_name} has been reactivated and moved to pending validation`);
fetchPendingUsers();
} catch (error) {
toast.error(error.response?.data?.detail || 'Failed to reactivate user');
} finally {
setActionLoading(null);
}
};
const getStatusBadge = (status) => {
const config = {
pending_email: { label: 'Awaiting Email', className: 'bg-orange-100 text-orange-700' },
pending_validation: { label: 'Pending Validation', className: 'bg-gray-200 text-gray-700' },
pre_validated: { label: 'Pre-Validated', className: 'bg-[#81B29A] text-white' },
payment_pending: { label: 'Payment Pending', className: 'bg-orange-500 text-white' }
payment_pending: { label: 'Payment Pending', className: 'bg-orange-500 text-white' },
rejected: { label: 'Rejected', className: 'bg-red-100 text-red-700' }
};
const statusConfig = config[status];
@@ -302,6 +318,12 @@ const AdminValidations = () => {
{pendingUsers.filter(u => u.status === 'payment_pending').length}
</p>
</div>
<div>
<p className="text-sm text-red-600 mb-2" style={{ fontFamily: "'Nunito Sans', sans-serif" }}>Rejected</p>
<p className="text-3xl font-semibold text-red-800" style={{ fontFamily: "'Inter', sans-serif" }}>
{pendingUsers.filter(u => u.status === 'rejected').length}
</p>
</div>
</div>
</Card>
@@ -327,6 +349,8 @@ const AdminValidations = () => {
<SelectItem value="pending_email">Awaiting Email</SelectItem>
<SelectItem value="pending_validation">Pending Validation</SelectItem>
<SelectItem value="pre_validated">Pre-Validated</SelectItem>
<SelectItem value="payment_pending">Payment Pending</SelectItem>
<SelectItem value="rejected">Rejected</SelectItem>
</SelectContent>
</Select>
</div>
@@ -384,7 +408,16 @@ const AdminValidations = () => {
</TableCell>
<TableCell>
<div className="flex gap-2">
{user.status === 'pending_email' ? (
{user.status === 'rejected' ? (
<Button
onClick={() => handleReactivateUser(user)}
disabled={actionLoading === user.id}
size="sm"
className="bg-[#81B29A] text-white hover:bg-[#6FA087]"
>
{actionLoading === user.id ? 'Reactivating...' : 'Reactivate'}
</Button>
) : user.status === 'pending_email' ? (
<>
<Button
onClick={() => handleBypassAndValidateRequest(user)}