Takagineer · Takagineer · Dec 7, 2021 · Dec 7, 2021 · Dec 8, 2021 · Dec 11, 2021
diff --git a/firebaseFunctions.js b/firebaseFunctions.js
@@ -1,17 +1,17 @@
-const { join } = require('path')
-const { https } = require('firebase-functions')
-const { default: next } = require('next')
+const { join } = require("path");
+const { https } = require("firebase-functions");
+const { default: next } = require("next");
 
-const nextjsDistDir = join('src', require('./src/next.config.js').distDir)
+const nextjsDistDir = join("src", require("./src/next.config.js").distDir);
 
 const nextjsServer = next({
   dev: false,
   conf: {
     distDir: nextjsDistDir,
   },
-})
-const nextjsHandle = nextjsServer.getRequestHandler()
+});
+const nextjsHandle = nextjsServer.getRequestHandler();
 
 exports.nextjsFunc = https.onRequest((req, res) => {
-  return nextjsServer.prepare().then(() => nextjsHandle(req, res))
-})
+  return nextjsServer.prepare().then(() => nextjsHandle(req, res));
+});
diff --git a/package.json b/package.json
@@ -17,6 +17,7 @@
     "@material-ui/core": "^4.12.2",
     "@material-ui/icons": "^4.11.2",
     "@mui/styles": "^5.0.1",
+    "@types/react-dom": "^17.0.11",
     "firebase": "^8.9.1",
     "firebase-admin": "^9.4.2",
     "firebase-functions": "^3.13.1",
@@ -27,12 +28,16 @@
     "react-select": "^4.3.1",
     "recoil": "^0.4.1",
     "styled-components": "^5.3.0",
-    "swiper": "^6.8.2"
+    "swiper": "^6.8.2",
+    "yarn": "^1.22.17"
   },
   "devDependencies": {
+    "@types/node": "^16.11.12",
+    "@types/react": "^17.0.37",
     "babel-plugin-styled-components": "^1.13.3",
     "firebase-functions-test": "^0.2.3",
-    "firebase-tools": "^9.3.0"
+    "firebase-tools": "^9.3.0",
+    "typescript": "^4.5.3"
   },
   "license": "MIT",
   "volta": {

diff --git a/src/Auth.jsx b/src/Auth.jsx
diff --git a/src/Auth.tsx b/src/Auth.tsx
@@ -0,0 +1,11 @@
+import React from 'react'
+
+function Auth() {
+  return (
+    <div>
+
+    </div>
+  )
+}
+
+export default Auth
diff --git a/src/_app.js b/src/_app.js
@@ -13,3 +13,34 @@ const App = ({ Component, pageProps }) => {
 };
 
 export default App;
+
+// import React from 'react'
+// import { AppProps } from 'next/app'
+// import Head from 'next/head'
+// import { CssBaseline } from '@material-ui/core'
+// import { ThemeProvider } from '@material-ui/core/styles'
+// import theme from './theme'
+
+// export default function MyApp({ Component, pageProps }: AppProps): JSX.Element {
+//   React.useEffect(() => {
+//     // Remove the server-side injected CSS.
+//     const jssStyles = document.querySelector('#jss-server-side')
+//     jssStyles?.parentElement?.removeChild(jssStyles)
+//   }, [])
+
+//   return (
+//     <>
+//       <Head>
+//         <title>MyApp</title>
+//         <meta
+//           name="viewport"
+//           content="minimum-scale=1, initial-scale=1, width=device-width"
+//         />
+//       </Head>
+//       <ThemeProvider theme={theme}>
+//         <CssBaseline />
+//         <Component {...pageProps} />
+//       </ThemeProvider>
+//     </>
+//   )
+// }
diff --git a/src/_document.js b/src/_document.js
@@ -8,7 +8,7 @@ import Document, {
   DocumentInitialProps,
 } from "next/document";
 import createEmotionServer from "@emotion/server/create-instance";
-import theme from "../src/theme";
+import theme from "./theme";
 import createEmotionCache from "../src/createEmotionCache";
 import { ServerStyleSheet } from "styled-components";
 

diff --git a/src/components/App.jsx → src/components/App.tsx b/src/components/App.jsx → src/components/App.tsx
diff --git a/src/components/ApplyBusiness.jsx → src/components/ApplyBusiness.tsx b/src/components/ApplyBusiness.jsx → src/components/ApplyBusiness.tsx
diff --git a/src/components/BusinessCard.jsx → src/components/BusinessCard.tsx b/src/components/BusinessCard.jsx → src/components/BusinessCard.tsx
diff --git a/src/components/BusinessData.jsx → src/components/BusinessData.tsx b/src/components/BusinessData.jsx → src/components/BusinessData.tsx
diff --git a/src/components/BusinessInformation.jsx → src/components/BusinessInformation.tsx b/src/components/BusinessInformation.jsx → src/components/BusinessInformation.tsx
diff --git a/src/components/ChildModal.jsx → src/components/ChildModal.tsx b/src/components/ChildModal.jsx → src/components/ChildModal.tsx
diff --git a/src/components/Content.jsx → src/components/Content.tsx b/src/components/Content.jsx → src/components/Content.tsx
diff --git a/src/components/FavoBusiness.jsx → src/components/FavoBusiness.tsx b/src/components/FavoBusiness.jsx → src/components/FavoBusiness.tsx
diff --git a/src/components/Filetr.jsx → src/components/Filetr.tsx b/src/components/Filetr.jsx → src/components/Filetr.tsx
diff --git a/src/components/Footer.jsx → src/components/Footer.tsx b/src/components/Footer.jsx → src/components/Footer.tsx
@@ -9,7 +9,7 @@ import {
   Typography,
 } from "@material-ui/core";
 
-const Header = ({ pathname }) => (
+const Header = ({ pathname }:{pathname?:any}) => (
   <FOoter>
     <APpBar position="static">
       <Toolbar>

diff --git a/src/components/Header.jsx → src/components/Header.tsx b/src/components/Header.jsx → src/components/Header.tsx
@@ -15,7 +15,7 @@ import { auth, db } from "../firebase";
 import { useRecoilState } from "recoil";
 import { userState } from "../store/userState";
 
-export default function Header({ pathname }) {
+export default function Header({ pathname }:{pathname?:any}) {
   const [anchorElCompany, setAnchorElCompany] = useState(null);
   const [anchorElStudent, setAnchorElStudent] = useState(null);
   const [logInUser, setLogInUser] = useRecoilState(userState);

diff --git a/src/components/NewBusiness.jsx → src/components/NewBusiness.tsx b/src/components/NewBusiness.jsx → src/components/NewBusiness.tsx
diff --git a/src/components/PopularBusinesses.jsx → src/components/PopularBusinesses.tsx b/src/components/PopularBusinesses.jsx → src/components/PopularBusinesses.tsx
diff --git a/src/components/RewardBusiness.jsx → src/components/RewardBusiness.tsx b/src/components/RewardBusiness.jsx → src/components/RewardBusiness.tsx
diff --git a/src/components/SwiperBusinessInformation.jsx → src/components/SwiperBusinessInformation.tsx b/src/components/SwiperBusinessInformation.jsx → src/components/SwiperBusinessInformation.tsx
diff --git a/src/firebase.js → src/firebase.ts b/src/firebase.js → src/firebase.ts
diff --git a/src/next-env.d.ts b/src/next-env.d.ts
@@ -0,0 +1,6 @@
+/// <reference types="next" />
+/// <reference types="next/types/global" />
+/// <reference types="next/image-types/global" />
+
+// NOTE: This file should not be edited
+// see https://nextjs.org/docs/basic-features/typescript for more information.
diff --git a/src/pages/Loading.jsx → src/pages/Loading.tsx b/src/pages/Loading.jsx → src/pages/Loading.tsx
diff --git a/src/pages/auth/CompanySignIn.jsx → src/pages/auth/CompanySignIn.tsx b/src/pages/auth/CompanySignIn.jsx → src/pages/auth/CompanySignIn.tsx
diff --git a/src/pages/auth/CompanySignUp.jsx → src/pages/auth/CompanySignUp.tsx b/src/pages/auth/CompanySignUp.jsx → src/pages/auth/CompanySignUp.tsx
diff --git a/src/pages/auth/StudentSignIn.jsx → src/pages/auth/StudentSignIn.tsx b/src/pages/auth/StudentSignIn.jsx → src/pages/auth/StudentSignIn.tsx
diff --git a/src/pages/auth/StudentSignUp.jsx → src/pages/auth/StudentSignUp.tsx b/src/pages/auth/StudentSignUp.jsx → src/pages/auth/StudentSignUp.tsx
diff --git a/src/pages/auth/UpdateCompanyInformation.jsx → src/pages/auth/UpdateCompanyInformation.tsx b/src/pages/auth/UpdateCompanyInformation.jsx → src/pages/auth/UpdateCompanyInformation.tsx
diff --git a/src/pages/auth/UpdateStudentInformation.jsx → src/pages/auth/UpdateStudentInformation.tsx b/src/pages/auth/UpdateStudentInformation.jsx → src/pages/auth/UpdateStudentInformation.tsx
diff --git a/src/pages/index.jsx → src/pages/index.tsx b/src/pages/index.jsx → src/pages/index.tsx
diff --git a/...es/individual-pages/CompanyBusinesses.jsx → ...es/individual-pages/CompanyBusinesses.tsx b/...es/individual-pages/CompanyBusinesses.jsx → ...es/individual-pages/CompanyBusinesses.tsx
@@ -19,12 +19,12 @@ const useStyles = makeStyles((theme) => ({
 export default function CompanyBusinesses() {
   const [business, setBusiness] = useState("");
   const [detail, setDetail] = useState("");
-  const [reward, setReward] = useState();
+  const [reward, setReward] = useState<number>(0);
   const [number, setNumber] = useState("");
   const [location, setLocation] = useState("");
-  const [skill, setSkill] = useState("");
+  const [skill, setSkill] = useState<any>("");
   const [message, setMessage] = useState("");
-  const [image, setImage] = useState([]);
+  const [image, setImage] = useState<any>([]);
   const [fileUrl, setFileUrl] = useState();
   const [applyStatus, setApplyStatus] = useState("");
   const router = useRouter();
@@ -112,7 +112,7 @@ export default function CompanyBusinesses() {
       alert("募集をかけました");
       setBusiness("");
       setDetail("");
-      setReward("");
+      setReward(0);
       setNumber("");
       setLocation("");
       setSkill("");
@@ -196,7 +196,9 @@ export default function CompanyBusinesses() {
             <br />
           </form>
 
-          <Button variant="contained" color="label">
+          <Button variant="contained"
+          //  color="label"
+           >
             <input type="file" onChange={handleImage} />
           </Button>
           <br />

diff --git a/src/pages/individual-pages/Guide.jsx → src/pages/individual-pages/Guide.tsx b/src/pages/individual-pages/Guide.jsx → src/pages/individual-pages/Guide.tsx
diff --git a/.../individual-pages/business/[business].jsx → .../individual-pages/business/[business].tsx b/.../individual-pages/business/[business].jsx → .../individual-pages/business/[business].tsx
@@ -22,10 +22,10 @@ export default function business() {
   const router = useRouter();
   const isReady = router.isReady;
   const [loading, setLoading] = useState(false);
-  const [businessInfo, setBusinessInfo] = useState([]);
+  const [businessInfo, setBusinessInfo] = useState<any>([]);
   const [businessImageUrl, setBusinessImageUrl] = useState();
   const [businessStatus, setBusinessStatus] = useState("募集中");
-  const [logInUser, setLogInUser] = useState();
+  const [logInUser, setLogInUser] = useState<string>();
   const [isApplied, setIsApplied] = useState(false);
   const [open, setOpen] = React.useState(false);
   const [studentId, setStudentId] = useState([]);
@@ -34,12 +34,14 @@ export default function business() {
     setOpen(false);
   };
 
+const queryBusiness:any = router.query.business
+
   const getBusinessInformation = async () => {
     const info = await db
       .collection("Businesses")
-      .doc(router.query.business)
+      .doc(queryBusiness)
       .get();
-    setBusinessInfo(info.data());
+    setBusinessInfo(info.data() as any);
   };
 
   const checkExistWhichCollection = async () => {
@@ -81,7 +83,7 @@ export default function business() {
   };
 
   const changeBusinessStatus = (e) => {
-    db.collection("Businesses").doc(router.query.business).set(
+    db.collection("Businesses").doc(queryBusiness).set(
       {
         applyStatus: businessStatus,
       },
@@ -93,7 +95,7 @@ export default function business() {
   const applyWork = async () => {
     const appliedData = await db
       .collection("Businesses")
-      .doc(router.query.business)
+      .doc(queryBusiness)
       .collection("isApplied")
       .where("studentId", "==", auth.currentUser.uid)
       .get();
@@ -102,7 +104,7 @@ export default function business() {
     if (zeroOrOne === 0) {
       await db
         .collection("Businesses")
-        .doc(router.query.business)
+        .doc(queryBusiness)
         .collection("isApplied")
         .doc(auth.currentUser.uid)
         .set(
@@ -117,7 +119,7 @@ export default function business() {
         .collection("Students")
         .doc(auth.currentUser.uid)
         .collection("apply")
-        .doc(router.query.business)
+        .doc(queryBusiness)
         .set(
           {
             businessId: router.query.business,
@@ -150,7 +152,7 @@ export default function business() {
     setOpen(true);
     const studentId = await db
       .collection("Businesses")
-      .doc(router.query.business)
+      .doc(queryBusiness)
       .collection("isApplied")
       .get();
     const _studentId = [];
@@ -178,7 +180,9 @@ export default function business() {
                       <Loading />
                     ) : (
                       <>
-                        <td colSpan="2">
+                        <td 
+                        colSpan={2}
+                        >
                           {businessInfo.imageURL && (
                             <Image
                               src={businessInfo.imageURL}
@@ -230,7 +234,9 @@ export default function business() {
             ""
           ) : businessInfo.companyId === auth.currentUser.uid ? (
             <>
-              <FormControl sx={{ m: 1, minWidth: 120 }}>
+              <FormControl
+              //  sx={{ m: 1, minWidth: 120 }}
+               >
                 <InputLabel id="demo-simple-select-helper-label">
                   募集状況
                 </InputLabel>
@@ -273,7 +279,7 @@ export default function business() {
               >
                 <Box
                   sx={{ ...style, width: 400 }}
-                  variant="contained"
+                  // variant="contained"
                   color="primary"
                 >
                   {studentId.map((student, index) => {

diff --git a/...es/individual-pages/company/[company].jsx → ...es/individual-pages/company/[company].tsx b/...es/individual-pages/company/[company].jsx → ...es/individual-pages/company/[company].tsx
@@ -26,8 +26,8 @@ export default function company() {
   const router = useRouter();
   const isReady = router.isReady;
   const [loading, setLoading] = useState(false);
-  const [companyInfo, setCompanyInfo] = useState();
-  const [companyBusinessInfo, setCompanyBusinessInfo] = useState();
+  const [companyInfo, setCompanyInfo] = useState<any>();
+  const [companyBusinessInfo, setCompanyBusinessInfo] = useState<any>();
   const [companyBusinessImageUrl, setCompanyBusinessImageUrl] = useState([]);
   // const [exists, setExists] = useState(false);
   const [open, setOpen] = React.useState(false);
@@ -44,17 +44,19 @@ export default function company() {
     p: 4,
   };
 
+  const queryCompany:any = router.query.company
+
   const getCompanyInformation = async () => {
     const info = await db
       .collection("Companies")
-      .doc(router.query.company)
+      .doc(queryCompany)
       .get();
-    setCompanyInfo(info.data());
+    setCompanyInfo(info.data() as any);
   };
 
   const getCompanyBusinessInformation = async () => {
     const _companyBusinessInfo = [];
-    const _businessInfoWithSub = [];
+    const _businessInfoWithSub:any = [];
 
     const businessInfo = await db
       .collection("Businesses")
@@ -200,15 +202,21 @@ export default function company() {
                             >
                               {business.business}
                             </Typography>
-                            <Typography variant="body2" color="text.secondary">
+                            <Typography variant="body2" 
+                            // color="text.secondary"
+                            >
                               {business.message}
                             </Typography>
                             <br />
-                            <Typography variant="body2" color="text.secondary">
+                            <Typography variant="body2" 
+                            // color="text.secondary"
+                            >
                               {business.location}
                             </Typography>
                             <br />
-                            <Typography variant="body2" color="text.secondary">
+                            <Typography variant="body2" 
+                            // color="text.secondary"
+                            >
                               {`${business.reward}/月`}
                             </Typography>
                           </CardContent>

diff --git a/...es/individual-pages/student/[student].jsx → ...es/individual-pages/student/[student].tsx b/...es/individual-pages/student/[student].jsx → ...es/individual-pages/student/[student].tsx
@@ -23,21 +23,23 @@ export default function student() {
   const router = useRouter();
   const isReady = router.isReady;
   const [loading, setLoading] = useState(false);
-  const [studentInfo, setStudentInfo] = useState();
+  const [studentInfo, setStudentInfo] = useState<any>();
   const [studentBusinessInfo, setStudentBusinessInfo] = useState([]);
 
+  const queryStudent:any = router.query.student
+
   const getStudentInformation = async () => {
     const info = await db
       .collection("Students")
-      .doc(router.query.student)
+      .doc(queryStudent)
       .get();
-    setStudentInfo(info.data());
+    setStudentInfo(info.data()as any);
   };
 
   const getStudentAppliedBusinessData = async () => {
     const appliedBusinessInfo = await db
       .collection("Students")
-      .doc(router.query.student)
+      .doc(queryStudent)
       .collection("apply")
       .get();
     const _appliedBusinessInfo = [];

diff --git a/src/store/userState.js → src/store/userState.ts b/src/store/userState.js → src/store/userState.ts
@@ -1,6 +1,6 @@
 import { atom } from "recoil";
 
-export const userState = atom({
+export const userState = atom<any>({
   key: "userState",
   default: { uid: "" },
 });