chore: Fix syntax errors and add missing semicolons in code files

takoserver · Jul 11, 2024 · 8230a07 · 8230a07
1 parent c0e4aae
commit 8230a07
Show file tree

Hide file tree

Showing 59 changed files with 966 additions and 894 deletions.
diff --git a/components/ChatDate.tsx b/components/ChatDate.tsx
@@ -1,17 +1,17 @@
 const ChatDate = ({ date }: { date: Date }) => {
-  const currentDate = new Date()
-  const chatDate = new Date(date)
+  const currentDate = new Date();
+  const chatDate = new Date(date);
 
-  const isToday = chatDate.getDate() === currentDate.getDate()
-  const isYesterday = chatDate.getDate() === currentDate.getDate() - 1
+  const isToday = chatDate.getDate() === currentDate.getDate();
+  const isYesterday = chatDate.getDate() === currentDate.getDate() - 1;
 
-  let formattedDate = ""
+  let formattedDate = "";
   if (isToday) {
-    formattedDate = "今日"
+    formattedDate = "今日";
   } else if (isYesterday) {
-    formattedDate = "昨日"
+    formattedDate = "昨日";
   } else {
-    formattedDate = chatDate.toLocaleDateString()
+    formattedDate = chatDate.toLocaleDateString();
   }
 
   return (
@@ -20,6 +20,6 @@ const ChatDate = ({ date }: { date: Date }) => {
         <p>{formattedDate}</p>
       </div>
     </li>
-  )
-}
-export default ChatDate
+  );
+};
+export default ChatDate;
diff --git a/components/Header.tsx b/components/Header.tsx
@@ -1,4 +1,4 @@
-import HeaderButton from "../islands/headerButton.tsx"
+import HeaderButton from "../islands/headerButton.tsx";
 export default function ChatHeader(props: { state: any }) {
   return (
     <>
@@ -112,5 +112,5 @@ export default function ChatHeader(props: { state: any }) {
         </ul>
       </header>
     </>
-  )
+  );
 }
diff --git a/components/OtherMessage.tsx b/components/OtherMessage.tsx
@@ -1,13 +1,13 @@
 const ChatOtherMessage = (
   { time, message, sender, senderNickName, isPrimary }: {
-    time: string
-    message: string
-    sender: string
-    senderNickName: string
-    isPrimary: boolean
+    time: string;
+    message: string;
+    sender: string;
+    senderNickName: string;
+    isPrimary: boolean;
   },
 ) => {
-  const isPrimaryClass = isPrimary ? "c-talk-chat other primary" : "c-talk-chat other subsequent"
+  const isPrimaryClass = isPrimary ? "c-talk-chat other primary" : "c-talk-chat other subsequent";
 
   return (
     <li class={isPrimaryClass}>
@@ -40,27 +40,27 @@ const ChatOtherMessage = (
         </div>
       </div>
     </li>
-  )
-}
+  );
+};
 //preactで動作する改行を反映させるために、改行コードをbrタグに変換する関数
 function convertLineBreak(message: string | null | undefined) {
-  if (message === null || message === undefined) return
+  if (message === null || message === undefined) return;
   return message.split("\n").map((line, index) => (
     <span key={index}>
       {line}
       <br />
     </span>
-  ))
+  ));
 }
 //Date型のデータを受け取り、午前か午後何時何分かを返す関数
 function convertTime(time: string | number | Date) {
-  const date = new Date(time)
-  const hours = date.getHours()
-  const minutes = date.getMinutes()
-  const ampm = hours >= 12 ? "午後" : "午前"
-  const hour = hours % 12
-  const zeroPaddingHour = hour === 0 ? 12 : hour
-  const zeroPaddingMinutes = String(minutes).padStart(2, "0")
-  return `${ampm} ${zeroPaddingHour}:${zeroPaddingMinutes}`
+  const date = new Date(time);
+  const hours = date.getHours();
+  const minutes = date.getMinutes();
+  const ampm = hours >= 12 ? "午後" : "午前";
+  const hour = hours % 12;
+  const zeroPaddingHour = hour === 0 ? 12 : hour;
+  const zeroPaddingMinutes = String(minutes).padStart(2, "0");
+  return `${ampm} ${zeroPaddingHour}:${zeroPaddingMinutes}`;
 }
-export default ChatOtherMessage
+export default ChatOtherMessage;
diff --git a/components/SendMessage.tsx b/components/SendMessage.tsx
@@ -1,11 +1,11 @@
 const ChatSendMessage = ({ isRead, time, message, isPrimary, isSendPrimary }: {
-  isRead: boolean
-  time: string
-  message: string
-  isPrimary: boolean
-  isSendPrimary: boolean
+  isRead: boolean;
+  time: string;
+  message: string;
+  isPrimary: boolean;
+  isSendPrimary: boolean;
 }) => {
-  const isPrimaryClass = `c-talk-chat self ${isPrimary ? "primary" : "subsequent"}${isSendPrimary ? " mt-2" : ""}`
+  const isPrimaryClass = `c-talk-chat self ${isPrimary ? "primary" : "subsequent"}${isSendPrimary ? " mt-2" : ""}`;
   return (
     <li class={isPrimaryClass}>
       <div class="c-talk-chat-box">
@@ -22,26 +22,26 @@ const ChatSendMessage = ({ isRead, time, message, isPrimary, isSendPrimary }: {
         </div>
       </div>
     </li>
-  )
-}
-export default ChatSendMessage
+  );
+};
+export default ChatSendMessage;
 function convertTime(time: string | number | Date) {
-  const date = new Date(time)
-  const hours = date.getHours()
-  const minutes = date.getMinutes()
-  const ampm = hours >= 12 ? "午後" : "午前"
-  const hour = hours % 12
-  const zeroPaddingHour = hour === 0 ? 12 : hour
-  const zeroPaddingMinutes = String(minutes).padStart(2, "0")
-  return `${ampm} ${zeroPaddingHour}:${zeroPaddingMinutes}`
+  const date = new Date(time);
+  const hours = date.getHours();
+  const minutes = date.getMinutes();
+  const ampm = hours >= 12 ? "午後" : "午前";
+  const hour = hours % 12;
+  const zeroPaddingHour = hour === 0 ? 12 : hour;
+  const zeroPaddingMinutes = String(minutes).padStart(2, "0");
+  return `${ampm} ${zeroPaddingHour}:${zeroPaddingMinutes}`;
 }
 //preactで動作する改行を反映させるために、改行コードをbrタグに変換する関数
 function convertLineBreak(message: string | null | undefined) {
-  if (message === null || message === undefined) return
+  if (message === null || message === undefined) return;
   return message.split("\n").map((line, index) => (
     <span key={index}>
       {line}
       <br />
     </span>
-  ))
+  ));
 }
diff --git a/components/User.tsx b/components/User.tsx
@@ -1,22 +1,22 @@
 export default function User(
   { userName, latestMessage, icon, onClick, userName2, isNewMessage, isSelected }: {
-    userName: string
-    latestMessage: string
-    icon: string
-    onClick?: () => void
-    userName2?: string
-    isNewMessage: boolean
-    isSelected: boolean
+    userName: string;
+    latestMessage: string;
+    icon: string;
+    onClick?: () => void;
+    userName2?: string;
+    isNewMessage: boolean;
+    isSelected: boolean;
   },
 ) {
-  let resultLatestMessage
+  let resultLatestMessage;
   if (latestMessage.length > 17) {
-    resultLatestMessage = latestMessage.substr(0, 17) + "..."
+    resultLatestMessage = latestMessage.substr(0, 17) + "...";
   } else {
-    resultLatestMessage = latestMessage
+    resultLatestMessage = latestMessage;
   }
 
-  const className = isSelected ? "c-talk-rooms is-active" : "c-talk-rooms"
+  const className = isSelected ? "c-talk-rooms is-active" : "c-talk-rooms";
 
   return (
     <>
@@ -46,12 +46,12 @@ export default function User(
         </a>
       </li>
     </>
-  )
+  );
 }
 
 const isOnClickUndefind = (fn: (() => void) | null | undefined) => {
   if (fn === undefined || fn === null) {
-    return () => {}
+    return () => {};
   }
-  return fn
-}
+  return fn;
+};
diff --git a/components/chat.tsx b/components/chat.tsx
@@ -1,25 +1,27 @@
-import Header from "../components/header.tsx"
-import TalkListHeader from "../islands/talkListHeader.tsx"
-import TalkListContent from "../islands/TalkListContent.tsx"
-import SetDefaultState from "../islands/setDefaultState.tsx"
-import { signal, effect } from "@preact/signals"
-import { createContext } from "preact"
-import { AppStateType } from "../util/types.ts"
-import Main from "./chatmain.tsx"
+import Header from "../components/header.tsx";
+import TalkListHeader from "../islands/talkListHeader.tsx";
+import TalkListContent from "../islands/TalkListContent.tsx";
+import SetDefaultState from "../islands/setDefaultState.tsx";
+import { effect, signal } from "@preact/signals";
+import { createContext } from "preact";
+import { AppStateType } from "../util/types.ts";
+import Main from "./chatmain.tsx";
 function createAppState(obj: {
-  isChoiceUser: boolean
-  roomid: string
-  userName: string
-  page: number
+  isChoiceUser: boolean;
+  roomid: string;
+  userName: string;
+  page: number;
 }): AppStateType {
-  const isChoiceUser = signal(obj.isChoiceUser)
-  const ws = signal(null)
-  const talkData = signal([])
-  const roomid = signal(obj.roomid)
-  const sessionid = signal("")
-  const friendList = signal([])
-  const roomName = signal("")
-  const page = signal(obj.page)
+  const isChoiceUser = signal(obj.isChoiceUser);
+  const ws = signal(null);
+  const talkData = signal([]);
+  const roomid = signal(obj.roomid);
+  const sessionid = signal("");
+  const friendList = signal([]);
+  const roomName = signal("");
+  const page = signal(obj.page);
+  const inputMessage = signal("");
+  const setIsValidInput = signal(false);
   return {
     isChoiceUser: isChoiceUser,
     ws: ws,
@@ -30,15 +32,17 @@ function createAppState(obj: {
     friendList: friendList,
     roomName: roomName,
     page: page,
-  }
+    inputMessage: inputMessage,
+    isValidInput: setIsValidInput,
+  };
 }
 function chat(props: { page: any; userName: string }) {
   const AppState = createAppState({
     isChoiceUser: false,
     roomid: "",
     userName: props.userName,
     page: props.page,
-  })
+  });
   return (
     <>
       <head>
@@ -51,7 +55,7 @@ function chat(props: { page: any; userName: string }) {
       </head>
       <App state={AppState} />
     </>
-  )
+  );
 }
 function App({ state }: { state: AppStateType }) {
   return (
@@ -80,6 +84,6 @@ function App({ state }: { state: AppStateType }) {
         </main>
       </div>
     </>
-  )
+  );
 }
-export default chat
+export default chat;
diff --git a/components/chatmain.tsx b/components/chatmain.tsx
@@ -1,8 +1,8 @@
-import ChatTalkTitle from "../islands/ChatTalkTitle.tsx"
-import ChatTalkContent from "../islands/ChatTalkContent.tsx"
-import ChatSend from "../islands/ChatSend.tsx"
-import ChatTalkTitleContent from "../islands/ChatTalkTitleContent.tsx"
-import { AppStateType } from "../util/types.ts"
+import ChatTalkTitle from "../islands/ChatTalkTitle.tsx";
+import ChatTalkContent from "../islands/ChatTalkContent.tsx";
+import ChatSend from "../islands/ChatSend.tsx";
+import ChatTalkTitleContent from "../islands/ChatTalkTitleContent.tsx";
+import { AppStateType } from "../util/types.ts";
 function chatmain({ state }: { state: AppStateType }) {
   return (
     <>
@@ -15,9 +15,9 @@ function chatmain({ state }: { state: AppStateType }) {
         </div>
         <ChatTalkContent state={state} />
       </div>
-      <ChatSend />
+      <ChatSend state={state} />
     </>
-  )
+  );
 }
 
-export default chatmain
+export default chatmain;
diff --git a/deno.json b/deno.json
@@ -38,7 +38,7 @@
     "react-dom": "preact/compat"
   },
   "fmt": {
-    "semiColons": false,
+    "semiColons": true,
     "exclude": ["fresh.gen.ts", "node_moduls/"],
     "indentWidth": 2,
     "lineWidth": 200

diff --git a/dev.ts b/dev.ts
@@ -1,19 +1,19 @@
 #!/usr/bin/env -S deno run -A --watch=static/,routes/
 
-import dev from "$fresh/dev.ts"
-import config from "./fresh.config.ts"
+import dev from "$fresh/dev.ts";
+import config from "./fresh.config.ts";
 
-import "$std/dotenv/load.ts"
+import "$std/dotenv/load.ts";
 /**connect mongoDB */
-import mongoose from "mongoose"
-import { load } from "$std/dotenv/mod.ts"
+import mongoose from "mongoose";
+import { load } from "$std/dotenv/mod.ts";
 /**connect mongoDB */
-const env = await load()
-const url = env["MONGO_URL"]
+const env = await load();
+const url = env["MONGO_URL"];
 await mongoose.connect(url).then(() => {
-  console.log("mongo DB 接続")
+  console.log("mongo DB 接続");
 }).catch((err) => {
-  console.log(err)
-})
+  console.log(err);
+});
 
-await dev(import.meta.url, "./main.ts", config)
+await dev(import.meta.url, "./main.ts", config);
diff --git a/fresh.config.ts b/fresh.config.ts
@@ -1,7 +1,7 @@
-import { defineConfig } from "$fresh/server.ts"
+import { defineConfig } from "$fresh/server.ts";
 //import twindPlugin from "$fresh/plugins/twind.ts"
 //import twindConfig from "./twind.config.ts";
-import tailwind from "$fresh/plugins/tailwind.ts"
+import tailwind from "$fresh/plugins/tailwind.ts";
 export default defineConfig({
   plugins: [tailwind()],
-})
+});