Merge pull request #19 from VortexExpansion/main

custom prettier fix
diverta · Mar 8, 2024 · c1ee6b9 · c1ee6b9
2 parents f5add5a + 28db9ec
commit c1ee6b9
Show file tree

Hide file tree

Showing 20 changed files with 348 additions and 311 deletions.
diff --git a/.prettierrc b/.prettierrc
@@ -1,7 +1,5 @@
 {
-    "semi": false,
-    "singleQuote": true,
-    "tabWidth": 2,
-    "trailingComma": "all"
-  }
-
+  "semi": false,
+  "tabWidth": 2,
+  "trailingComma": "all"
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,4 @@
+{
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "editor.formatOnSave": true
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "eslint": "latest",
     "eslint-config-next": "latest",
     "postcss": "latest",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "sass": "^1.69.5",
     "tailwindcss": "latest"
   }

diff --git a/src/app/(pages)/(SigleColumn)/login/page.jsx b/src/app/(pages)/(SigleColumn)/login/page.jsx
@@ -1,43 +1,41 @@
-"use client";
-
-import { useUser } from "@/components/common/userContext";
-import { login } from "@/components/common/fetchData";
-import { useRef } from "react";
-import { useRouter } from "next/navigation";
-import Link from "next/link";
-import Breadcrumb from "@/components/common/Breadcrumb";
-import PageTitle from "@/components/common/PageTitle";
-import { getLabels } from "@/components/common/fetchData";
-import AlertError from "@/components/ui/AlertError";
-import { useState } from "react";
+"use client"
 
+import { useUser } from "@/components/common/userContext"
+import { login } from "@/components/common/fetchData"
+import { useRef } from "react"
+import { useRouter } from "next/navigation"
+import Link from "next/link"
+import Breadcrumb from "@/components/common/Breadcrumb"
+import PageTitle from "@/components/common/PageTitle"
+import { getLabels } from "@/components/common/fetchData"
+import AlertError from "@/components/ui/AlertError"
+import { useState } from "react"
 
 export default function Login() {
-  const email = useRef("");
-  const password = useRef("");
-  const { user, loading, storeUser } = useUser();
-  const router = useRouter();
-  const contentDirectory = getLabels();
-  const content = contentDirectory.login;
-  const [alert, setAlert] = useState(false);
+  const email = useRef("")
+  const password = useRef("")
+  const { user, loading, storeUser } = useUser()
+  const router = useRouter()
+  const contentDirectory = getLabels()
+  const content = contentDirectory.login
+  const [alert, setAlert] = useState(false)
 
   const handleChange = () => {
-    setAlert(false);
-  };
+    setAlert(false)
+  }
 
   const handleLogin = async (event) => {
-    event.preventDefault();
-    const user = await login(email.current.value, password.current.value);
+    event.preventDefault()
+    const user = await login(email.current.value, password.current.value)
 
     if (user) {
-      setAlert(false);
-      storeUser(user);
-      router.push("member/mypage");
-    }
-    else{
-      setAlert(true);
+      setAlert(false)
+      storeUser(user)
+      router.push("member/mypage")
+    } else {
+      setAlert(true)
     }
-  };
+  }
 
   return (
     <div className="l-container">
@@ -50,9 +48,14 @@ export default function Login() {
           ) : user ? (
             <div>You have already logged in.</div>
           ) : (
-            <form className="c-form c-box" onSubmit={handleLogin} onChange={handleChange}>
-
-              {alert && <AlertError message="メールアドレスまたはパスワードが間違っています。" />}
+            <form
+              className="c-form c-box"
+              onSubmit={handleLogin}
+              onChange={handleChange}
+            >
+              {alert && (
+                <AlertError message="メールアドレスまたはパスワードが間違っています。" />
+              )}
               <div className="c-form-group">
                 <label htmlFor="email" className="c-form-label">
                   メールアドレス
@@ -86,10 +89,8 @@ export default function Login() {
               </div>
             </form>
           )}
-
         </div>
       </div>
-
     </div>
-  );
+  )
 }
diff --git a/src/app/(pages)/(SigleColumn)/register/page.jsx b/src/app/(pages)/(SigleColumn)/register/page.jsx
@@ -1,62 +1,68 @@
-"use client";
+"use client"
 
-import Breadcrumb from "@/components/common/Breadcrumb";
-import PageTitle from "@/components/common/PageTitle";
-import { getLabels } from "@/components/common/fetchData";
-import Link from "next/link";
-import { useRef, useState } from "react";
-import { register } from "@/components/common/fetchData";
-import { useUser } from "@/components/common/userContext";
-import { useRouter } from "next/navigation";
-import AlertError from "@/components/ui/AlertError";
+import Breadcrumb from "@/components/common/Breadcrumb"
+import PageTitle from "@/components/common/PageTitle"
+import { getLabels } from "@/components/common/fetchData"
+import Link from "next/link"
+import { useRef, useState } from "react"
+import { register } from "@/components/common/fetchData"
+import { useUser } from "@/components/common/userContext"
+import { useRouter } from "next/navigation"
+import AlertError from "@/components/ui/AlertError"
 
 export default function Register() {
-  const contentDirectory = getLabels();
-  const content = contentDirectory.register;
-  const { user, loading, storeUser } = useUser();
-  const router = useRouter();
-  const [alert, setAlert] = useState(false);
+  const contentDirectory = getLabels()
+  const content = contentDirectory.register
+  const { user, loading, storeUser } = useUser()
+  const router = useRouter()
+  const [alert, setAlert] = useState(false)
 
-  const name1 = useRef("");
-  const name2 = useRef("");
-  const email = useRef("");
-  const login_pwd = useRef("");
+  const name1 = useRef("")
+  const name2 = useRef("")
+  const email = useRef("")
+  const login_pwd = useRef("")
 
   const handleChange = () => {
-    setAlert(false);
-  };
+    setAlert(false)
+  }
 
   const handleRegister = async (event) => {
-    event.preventDefault();
+    event.preventDefault()
 
     const user = await register(
       name1.current.value,
       name2.current.value,
       email.current.value,
-      login_pwd.current.value
-    );
+      login_pwd.current.value,
+    )
 
     if (user) {
-      setAlert(false);
-      storeUser(user);
-      router.push("member/mypage");
+      setAlert(false)
+      storeUser(user)
+      router.push("member/mypage")
     } else {
-      setAlert(true);
+      setAlert(true)
     }
-  };
+  }
 
   return (
     <div className="l-container">
       <Breadcrumb paths={[{ label: content.text }]} />
       <PageTitle content={content} />
       <div className="l-container--small l-container--contents">
-        <form className="c-form c-box" onSubmit={handleRegister} onChange={handleChange}>
+        <form
+          className="c-form c-box"
+          onSubmit={handleRegister}
+          onChange={handleChange}
+        >
           <div className="c-form-group u-text-align-center">
             <p className="c-text--small">
               <span className="c-form-label__required">*</span>は必須項目です。
             </p>
           </div>
-          {alert && <AlertError message="エントリー内容を再度ご確認ください。" />}
+          {alert && (
+            <AlertError message="エントリー内容を再度ご確認ください。" />
+          )}
           <div className="c-form-group">
             <label htmlFor="name1" className="c-form-label">
               名前（姓）
@@ -110,8 +116,7 @@ export default function Register() {
             に同意したこととなります。
           </p>
         </form>
-
       </div>
     </div>
-  );
+  )
 }
diff --git a/src/app/(pages)/(SigleColumn)/reminder/page.jsx b/src/app/(pages)/(SigleColumn)/reminder/page.jsx
@@ -1,23 +1,23 @@
-'use client'
+"use client"
 
-import Breadcrumb from '@/components/common/Breadcrumb'
-import PageTitle from '@/components/common/PageTitle'
-import { getLabels } from '@/components/common/fetchData'
-import Link from 'next/link'
-import { useRef, useState } from 'react'
-import { reminder, reset } from '@/components/common/fetchData'
-import AlertSuccess from '@/components/ui/AlertSuccess'
+import Breadcrumb from "@/components/common/Breadcrumb"
+import PageTitle from "@/components/common/PageTitle"
+import { getLabels } from "@/components/common/fetchData"
+import Link from "next/link"
+import { useRef, useState } from "react"
+import { reminder, reset } from "@/components/common/fetchData"
+import AlertSuccess from "@/components/ui/AlertSuccess"
 
 export default function Reminder({ searchParams }) {
   const token = searchParams && searchParams.token ? searchParams.token : null
   const contentDirectory = getLabels()
   const content = contentDirectory.reminder
-  const mail = useRef('')
-  const temp_pwd = useRef('')
-  const login_pwd = useRef('')
+  const mail = useRef("")
+  const temp_pwd = useRef("")
+  const login_pwd = useRef("")
 
   const [alert, setAlert] = useState(false)
-  const [alertMessage, setAlertMessage] = useState('')
+  const [alertMessage, setAlertMessage] = useState("")
 
   const handleChange = () => {
     setAlert(false)

diff --git a/src/app/(pages)/(SingleColumnLarge)/layout.jsx b/src/app/(pages)/(SingleColumnLarge)/layout.jsx
@@ -1,18 +1,16 @@
-import Breadcrumb from "@/components/common/Breadcrumb";
-import PageTitle from "@/components/common/PageTitle";
+import Breadcrumb from "@/components/common/Breadcrumb"
+import PageTitle from "@/components/common/PageTitle"
 
 export default function SingleLargeLayout({ children }) {
   const content = {
     text: "プライバシーポリシー",
-    text_en: "PRIVACY POLICY"
-  };
+    text_en: "PRIVACY POLICY",
+  }
   return (
     <div className="l-container">
       <Breadcrumb paths={[{ label: content.text }]} />
       <PageTitle content={content} />
-      <div className="l-container--large l-container--contents">
-        {children}
-      </div>
+      <div className="l-container--large l-container--contents">{children}</div>
     </div>
   )
-}
+}
diff --git a/src/app/(pages)/(SingleColumnLarge)/privacy/page.jsx b/src/app/(pages)/(SingleColumnLarge)/privacy/page.jsx
@@ -36,5 +36,5 @@ export default function Privacy() {
         改定日：2023年7月1日
       </p>
     </article>
-  );
+  )
 }
diff --git a/src/app/(pages)/(TwoColumn)/article/[id]/page.jsx b/src/app/(pages)/(TwoColumn)/article/[id]/page.jsx
@@ -1,26 +1,28 @@
-import DetailBody from '@/components/section/twoColumn/DetailBody'
-import { getDetails, getAllContentList } from '@/components/common/fetchData'
-import Banner from '@/components/common/Banner'
-import Breadcrumb from '@/components/common/Breadcrumb'
-import TagArea from '@/components/common/TagArea'
-import TagKeyword from '@/components/common/TagKeyword'
-import Feature from '@/components/section/feature/Feature'
+import DetailBody from "@/components/section/twoColumn/DetailBody"
+import { getDetails, getAllContentList } from "@/components/common/fetchData"
+import Banner from "@/components/common/Banner"
+import Breadcrumb from "@/components/common/Breadcrumb"
+import TagArea from "@/components/common/TagArea"
+import TagKeyword from "@/components/common/TagKeyword"
+import Feature from "@/components/section/feature/Feature"
 
 export async function generateStaticParams() {
   const items = await getAllContentList()
   const paramID = items.map((item) => ({
     id: item.topics_id.toString(),
   }))
-  return paramID;
+  return paramID
 }
 
 export default async function Food({ params }) {
-  const item = await getDetails(params.id);
-
+  const item = await getDetails(params.id)
 
   const paths = [
-    { href: `/article?topic=${item.contents_type_nm.toLowerCase()}`, label: item.contents_type_ext_col_01 },
-    { label: '記事詳細' }
+    {
+      href: `/article?topic=${item.contents_type_nm.toLowerCase()}`,
+      label: item.contents_type_ext_col_01,
+    },
+    { label: "記事詳細" },
   ]
 
   return (
@@ -29,7 +31,7 @@ export default async function Food({ params }) {
       <div className="l-container--col-2 c-article">
         <div className="l-container--col-2__main">
           <div>
-            <DetailBody data={item} params={params}/>
+            <DetailBody data={item} params={params} />
           </div>
         </div>
         <div className="l-container--col-2__side">
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,5 +36,5 @@ export default function Privacy() { @@
             改定日：2023年7月1日
           </p>
         </article>
-      );
+      )
     }