Skip to content
Closed
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
2 changes: 1 addition & 1 deletion app/layout.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export default async function RootLayout({ children }) {
const Notice = dynamic(
() => import("@/app/_notice").then((mod) => mod.Notice),
{
ssr: false,
ssr: true,
},
);

Expand Down
5 changes: 2 additions & 3 deletions components/SubscribeNewsletter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,13 @@ import { Input } from "@/components/local-ui/input";

import { isEmailValid } from "@/lib/utils";

import { useState, useEffect } from "react";
import { useFormState } from "react-dom";
import { useState, useEffect, useActionState } from "react";
import mailbox from "@/public/images/mailbox.svg";
import { subscribeAction } from "@/lib/actions";
import { SubmitBtn } from "./local-ui/SubmitBtn";

export function SubscribeNewsletter({ isSubscribed }) {
const [state, dispatch] = useFormState(subscribeAction);
const [state, dispatch] = useActionState(subscribeAction);
const [subscribeNewsletterDom, setSubscribeNewsletterDom] = useState(null);
const [height, setHeight] = useState(0);
const [error, setError] = useState();
Expand Down
6 changes: 3 additions & 3 deletions components/pages/login/LoginForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import { SuccessMessage } from "@/components/local-ui/successMessage";
import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { authenticateAction } from "@/lib/actions";

import { useFormState, useFormStatus } from "react-dom";
import { useFormStatus } from "react-dom";

import routes from "@/data/routes.json";
import { cn } from "@/lib/utils";
import { useState } from "react";
import { useState, useActionState } from "react";
export function LoginForm({ className }) {
const [key, setKey] = useState(0);
const [state, dispatch] = useFormState(authenticateAction, null);
const [state, dispatch] = useActionState(authenticateAction, null);
// for resetting the form
if (state?.success === true) {
setKey((prev) => prev + 1);
Expand Down
4 changes: 2 additions & 2 deletions components/pages/password-reset/passwordResetForm.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { useActionState } from "react";
"use client";
import { Input } from "@/components/local-ui/input";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { AuthenticateWith } from "@/components/local-ui/authenticateWith";
import { sendPassResetCodeAction } from "@/lib/actions";
import { useFormState } from "react-dom";
export function PasswordResetForm() {
const [state, dispatch] = useFormState(sendPassResetCodeAction, undefined);
const [state, dispatch] = useActionState(sendPassResetCodeAction, undefined);
return (
<div className={"bg-white p-7 rounded-lg shadow-lg"}>
<form id={"password-reset-form"} action={dispatch}>
Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/AddAnotherEmailPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,15 @@ import {
import { Input } from "@/components/local-ui/input";

import { addNewEmailAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { Button } from "@/components/ui/button";

export function AddAnotherEmailPopup() {
const [state, dispatch] = useFormState(addNewEmailAction, null);
const [state, dispatch] = useActionState(addNewEmailAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/ChangeAddressPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ import {
import { Input } from "@/components/local-ui/input";

import { updateAddressAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
Expand All @@ -33,7 +32,7 @@ import { ChangeButton } from "./ChangeButton";
import { Button } from "@/components/ui/button";

export function ChangeAddressPopup() {
const [state, dispatch] = useFormState(updateAddressAction, null);
const [state, dispatch] = useActionState(updateAddressAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/ChangeDateOfBirthPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,15 @@ import {
import { Input } from "@/components/local-ui/input";

import { updateDateOfBirthAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { ChangeButton } from "./ChangeButton";
import { Button } from "@/components/ui/button";
export function ChangeDateOfBirthPopup() {
const [state, dispatch] = useFormState(updateDateOfBirthAction, null);
const [state, dispatch] = useActionState(updateDateOfBirthAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();
const [dateOfBirth, setDateOfBirth] = useState(undefined);
Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/ChangeEmailPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ import {
import { Input } from "@/components/local-ui/input";

import { updateEmailAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
Expand All @@ -23,7 +22,7 @@ import { Button } from "@/components/ui/button";
import { Edit } from "lucide-react";

export function ChangeEmailPopup({ emails }) {
const [state, dispatch] = useFormState(updateEmailAction, null);
const [state, dispatch] = useActionState(updateEmailAction, null);
const [opened, setOpened] = useState(false);
const [isEmailsEdited, setIsEmailsEdited] = useState({});
const { toast } = useToast();
Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/ChangePasswordPopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ import {
import { Input } from "@/components/local-ui/input";

import { updatePasswordAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { ChangeButton } from "./ChangeButton";
export function ChangePasswordPopup() {
const [state, dispatch] = useFormState(updatePasswordAction, null);
const [state, dispatch] = useActionState(updatePasswordAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/ChangePhonePopup.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ import {
import { Input } from "@/components/local-ui/input";

import { updatePhoneAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
Expand All @@ -33,7 +32,7 @@ import { ChangeButton } from "./ChangeButton";
import { Button } from "@/components/ui/button";

export function ChangePhonePopup() {
const [state, dispatch] = useFormState(updatePhoneAction, null);
const [state, dispatch] = useActionState(updatePhoneAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/UploadCoverPhoto.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
import Image from "next/image";

import { useState, useEffect } from "react";
import { useFormState } from "react-dom";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { updateCoverPhotoAction } from "@/lib/actions";
Expand All @@ -27,7 +26,7 @@ import upload from "@/public/icons/upload.svg";
export function UploadCoverPhoto() {
const [file, setFile] = useState(null);
const [opened, setOpened] = useState(false);
const [state, dispatch] = useFormState(updateCoverPhotoAction, undefined);
const [state, dispatch] = useActionState(updateCoverPhotoAction, undefined);

const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/VerifyEmailBtn.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
"use client";
import { useFormState } from "react-dom";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { sendEmailConfimationLinkAction } from "@/lib/actions";
import { useToast } from "@/components/ui/use-toast";
import { useEffect, useRef, useState } from "react";
import { useEffect, useRef, useState, useActionState } from "react";
import { addMinutes } from "date-fns";
export function VerifyEmailBtn({ email, sendAgainAt }) {
const { toast } = useToast();
const [state, dispatch] = useFormState(
const [state, dispatch] = useActionState(
sendEmailConfimationLinkAction,
undefined
);
Expand Down
5 changes: 2 additions & 3 deletions components/pages/profile/ui/changeNamePopup.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,14 @@ import {
import { Input } from "@/components/local-ui/input";

import { updateNameAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useState, useEffect } from "react";
import { useState, useEffect, useActionState } from "react";
import { useToast } from "@/components/ui/use-toast";

import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
import { ChangeButton } from "./ChangeButton";
export function ChangeNamePopup({ firstname, lastname }) {
const [state, dispatch] = useFormState(updateNameAction, null);
const [state, dispatch] = useActionState(updateNameAction, null);
const [opened, setOpened] = useState(false);
const { toast } = useToast();
const [errors, setErrors] = useState({});
Expand Down
6 changes: 3 additions & 3 deletions components/pages/set-new-password/setNewPasswordForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SuccessMessage } from "@/components/local-ui/successMessage";
import { AuthenticateWith } from "@/components/local-ui/authenticateWith";
import { setNewPasswordAction } from "@/lib/actions";
import { useFormState, useFormStatus } from "react-dom";
import { useEffect } from "react";
import { useFormStatus } from "react-dom";
import { useEffect, useActionState } from "react";
import { useRouter } from "next/navigation";
import routes from "@/data/routes.json";
export function SetNewPasswordForm() {
const router = useRouter();
const [state, dispatch] = useFormState(setNewPasswordAction, undefined);
const [state, dispatch] = useActionState(setNewPasswordAction, undefined);

useEffect(() => {
if (state?.success === true) {
Expand Down
5 changes: 2 additions & 3 deletions components/pages/settings/ui/DeleteAccountPopupForm.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"use client";
import { useFormState } from "react-dom";
import { useEffect, useState } from "react";
import { useEffect, useState, useActionState } from "react";
import { Button } from "@/components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { Input } from "@/components/local-ui/input";
Expand All @@ -10,7 +9,7 @@ import { useToast } from "@/components/ui/use-toast";
import { deleteAccountAction } from "@/lib/actions";

export default function DeleteAccountSection() {
const [state, dispatch] = useFormState(deleteAccountAction, null);
const [state, dispatch] = useActionState(deleteAccountAction, null);
const [showForm, setShowForm] = useState(false);
const { toast } = useToast();

Expand Down
5 changes: 2 additions & 3 deletions components/pages/signup/SignupForm.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client";
import React from "react";
import React, { useActionState } from "react";
import { Input } from "@/components/local-ui/input";
import { Checkbox } from "@/components/ui/checkbox";
import { SubmitBtn } from "@/components/local-ui/SubmitBtn";
Expand All @@ -8,13 +8,12 @@ import { AuthenticateWith } from "@/components/local-ui/authenticateWith";
import { ErrorMessage } from "@/components/local-ui/errorMessage";
import { SuccessMessage } from "@/components/local-ui/successMessage";
import { signUpAction } from "@/lib/actions";
import { useFormState } from "react-dom";
import { useEffect } from "react";
import { useRouter } from "next/navigation";
import routes from "@/data/routes.json";
export function SignupForm() {
const router = useRouter();
const [state, dispatch] = useFormState(signUpAction, undefined);
const [state, dispatch] = useActionState(signUpAction, undefined);

useEffect(() => {
if (state?.success === true && state?.error === undefined) {
Expand Down
5 changes: 2 additions & 3 deletions components/sections/writeReview.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import { LoginForm } from "../pages/login/LoginForm";
import { SuccessMessage } from "../local-ui/successMessage";
import { ErrorMessage } from "../local-ui/errorMessage";
import { RatingStar } from "@/components/local-ui/ratingStar";
import { useRef, useEffect, useState } from "react";
import { useFormState } from "react-dom";
import { useRef, useEffect, useState, useActionState } from "react";

import { writeReviewAction } from "@/lib/actions";
export function WriteReview({
Expand All @@ -24,7 +23,7 @@ export function WriteReview({
isAlreadyReviewed,
flightOrHotel,
);
const [state, dispatch] = useFormState(extendedWriteReviewAction, undefined);
const [state, dispatch] = useActionState(extendedWriteReviewAction, undefined);
const reviewInput = useRef();
const reviewBtn = useRef();

Expand Down
2 changes: 1 addition & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const cspHeader = `
frame-ancestors 'none';
upgrade-insecure-requests;
`;
/** @type {import('next').NextConfig} */

const helperDirName = join(process.cwd(), "lib/email/", "helpersHbs");

/** @type {import('next').NextConfig} */
const nextConfig = {
webpack: (config, { isServer }) => {
config.module.rules.push({
Expand Down
Loading
Loading