Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use browser native datepicker for user expire time #517

Merged
merged 1 commit into from
Aug 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
"qrcode.react": "^3.1.0",
"react": "18.2.0",
"react-copy-to-clipboard": "^5.1.0",
"react-datepicker": "^4.21.0",
"react-dom": "18.2.0",
"react-hot-toast": "^2.4.0",
"react-timeago": "^7.1.0",
Expand Down Expand Up @@ -107,4 +106,4 @@
"prisma": {
"seed": "ts-node --compiler-options {\"module\":\"CommonJS\"} prisma/seed.ts"
}
}
}
2 changes: 1 addition & 1 deletion src/components/adminPage/users/table/accounts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const Accounts = () => {
}`}</span>
</p>
),
rootStyle: "text-left",
rootStyle: "text-left max-w-2xl ",
content: <UserOptionsModal userId={original?.id} />,
})
}
Expand Down
133 changes: 68 additions & 65 deletions src/components/adminPage/users/userIsActive.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import { User } from "@prisma/client";
import { useTranslations } from "next-intl";
import React, { ForwardedRef, forwardRef, MouseEvent } from "react";
import React, { useState } from "react";
import toast from "react-hot-toast";
import { api } from "~/utils/api";
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import {
useTrpcApiErrorHandler,
useTrpcApiSuccessHandler,
Expand All @@ -13,31 +11,13 @@ import {
interface Iuser {
user: Partial<User>;
}
const DateContainer = ({ children }) => {
return (
<div className="react-datepicker">
<div>{children}</div>
</div>
);
};

interface DateButtonProps {
value?: string | null;
onClick?: (event: MouseEvent<HTMLButtonElement>) => void;
}

const DateButton = forwardRef<HTMLButtonElement, DateButtonProps>(
({ value, onClick }, ref: ForwardedRef<HTMLButtonElement>) => (
<>
<button className="btn btn-primary btn-sm" onClick={onClick} ref={ref}>
{value ? value : "Never"}
</button>
</>
),
);

const UserIsActive = ({ user }: Iuser) => {
const t = useTranslations("admin");
const [manualDate, setManualDate] = useState<string | null>(
user.expiresAt ? new Date(user.expiresAt).toISOString().substring(0, 10) : null,
);
const [isEdited, setIsEdited] = useState<boolean>(false);

const handleApiError = useTrpcApiErrorHandler();
const handleApiSuccess = useTrpcApiSuccessHandler();
Expand All @@ -55,7 +35,46 @@ const UserIsActive = ({ user }: Iuser) => {
onError: handleApiError,
onSuccess: handleApiSuccess({ actions: [refetchUser, refetchUsers] }),
});

const handleManualDateChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setManualDate(e.target.value);
setIsEdited(true);
};
const handleSaveDate = () => {
if (manualDate) {
const parsedDate = new Date(manualDate);
if (!Number.isNaN(parsedDate.getTime())) {
updateUser(
{
id: user?.id,
params: { expiresAt: parsedDate },
},
{
onSuccess: () => {
toast.success("User updated successfully");
setIsEdited(false);
},
},
);
} else {
toast.error("Invalid date format");
}
}
};
const handleResetDate = () => {
updateUser(
{
id: user?.id,
params: { expiresAt: null },
},
{
onSuccess: () => {
toast.success("User updated successfully");
setManualDate(null);
setIsEdited(false);
},
},
);
};
return (
<div>
<p className="text-sm text-gray-500">
Expand Down Expand Up @@ -91,48 +110,32 @@ const UserIsActive = ({ user }: Iuser) => {
<p className="text-sm">
{t("users.users.userOptionModal.account.userExpireLabel")}
</p>
<div className="flex gap-5">
<DatePicker
className="bg-gray-500"
selected={user.expiresAt}
popperPlacement="bottom-start"
// popperClassName="absolute"
onChange={(date) =>
updateUser(
{
id: user?.id,
params: { expiresAt: date },
},
{
onSuccess: () => {
toast.success("User updated successfully");
},
},
)
}
calendarContainer={DateContainer}
customInput={<DateButton />}
<div className="flex gap-5 relative">
<input
type={manualDate ? "date" : "text"}
onFocus={(e) => {
e.target.type = "date";
}}
aria-label="Date"
className="input input-bordered btn-sm"
placeholder="Never"
value={manualDate || ""}
onChange={handleManualDateChange}
style={{
zIndex: 2,
backgroundColor: manualDate ? "inherit" : "transparent",
}}
/>
{user.expiresAt ? (
<button
className="btn btn-sm"
onClick={() =>
updateUser(
{
id: user?.id,
params: { expiresAt: null },
},
{
onSuccess: () => {
toast.success("User updated successfully");
},
},
)
}
>
{manualDate && isEdited && (
<button className="btn btn-sm btn-primary" onClick={handleSaveDate}>
Save
</button>
)}
{user.expiresAt && !isEdited && (
<button className="btn btn-sm" onClick={handleResetDate}>
Reset
</button>
) : null}
)}
</div>
</div>
</div>
Expand Down
Loading