();
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() {
) : (
<>
- |
+ |
{businessInfo.imageURL && (
-
+
募集状況
@@ -273,7 +279,7 @@ export default function business() {
>
{studentId.map((student, index) => {
diff --git a/src/pages/individual-pages/company/[company].jsx b/src/pages/individual-pages/company/[company].tsx
similarity index 93%
rename from src/pages/individual-pages/company/[company].jsx
rename to src/pages/individual-pages/company/[company].tsx
index 77c538d..095204e 100644
--- a/src/pages/individual-pages/company/[company].jsx
+++ b/src/pages/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();
+ const [companyBusinessInfo, setCompanyBusinessInfo] = useState();
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}
-
+
{business.message}
-
+
{business.location}
-
+
{`${business.reward}/月`}
diff --git a/src/pages/individual-pages/student/[student].jsx b/src/pages/individual-pages/student/[student].tsx
similarity index 96%
rename from src/pages/individual-pages/student/[student].jsx
rename to src/pages/individual-pages/student/[student].tsx
index 2c25667..8e97617 100644
--- a/src/pages/individual-pages/student/[student].jsx
+++ b/src/pages/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();
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 b/src/store/userState.ts
similarity index 68%
rename from src/store/userState.js
rename to src/store/userState.ts
index 0d28534..8ce8b76 100644
--- a/src/store/userState.js
+++ b/src/store/userState.ts
@@ -1,6 +1,6 @@
import { atom } from "recoil";
-export const userState = atom({
+export const userState = atom({
key: "userState",
default: { uid: "" },
});
diff --git a/src/theme.js b/src/theme.ts
similarity index 100%
rename from src/theme.js
rename to src/theme.ts
diff --git a/src/tsconfig.json b/src/tsconfig.json
new file mode 100644
index 0000000..08a5c96
--- /dev/null
+++ b/src/tsconfig.json
@@ -0,0 +1,31 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": false,
+ "forceConsistentCasingInFileNames": true,
+ "noEmit": true,
+ "incremental": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve"
+ },
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx",
+
+ ],
+ "exclude": [
+ "node_modules"
+ ]
+}
diff --git a/tsconfig.json b/tsconfig.json
index e69de29..58e05b8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -0,0 +1,29 @@
+{
+ "compilerOptions": {
+ "target": "es5",
+ "lib": [
+ "dom",
+ "dom.iterable",
+ "esnext"
+ ],
+ "allowJs": true,
+ "skipLibCheck": true,
+ "strict": false,
+ "forceConsistentCasingInFileNames": true,
+ "noEmit": true,
+ "esModuleInterop": true,
+ "module": "esnext",
+ "moduleResolution": "node",
+ "resolveJsonModule": true,
+ "isolatedModules": true,
+ "jsx": "preserve"
+ },
+ "include": [
+ "next-env.d.ts",
+ "**/*.ts",
+ "**/*.tsx"
+ ],
+ "exclude": [
+ "node_modules"
+ ]
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index bb6a59b..0eb912a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7331,6 +7331,11 @@ yargs@^16.1.1:
y18n "^5.0.5"
yargs-parser "^20.2.2"
+yarn@^1.22.17:
+ version "1.22.17"
+ resolved "https://registry.yarnpkg.com/yarn/-/yarn-1.22.17.tgz#bf910747d22497b573131f7341c0e1d15c74036c"
+ integrity sha512-H0p241BXaH0UN9IeH//RT82tl5PfNraVpSpEoW+ET7lmopNC61eZ+A+IDvU8FM6Go5vx162SncDL8J1ZjRBriQ==
+
yocto-queue@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
From 842c41f32820c0bab3f0e74da892ee83103356a4 Mon Sep 17 00:00:00 2001
From: Takagineer <75421119+Takagineer@users.noreply.github.com>
Date: Thu, 16 Dec 2021 20:36:30 +0900
Subject: [PATCH 6/7] =?UTF-8?q?=E3=83=80=E3=83=96=E3=83=AB=E3=82=AF?=
=?UTF-8?q?=E3=82=AA=E3=83=86=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=83=9E?=
=?UTF-8?q?=E3=83=BC=E3=82=AF=E3=81=AE=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
firebaseFunctions.js | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/firebaseFunctions.js b/firebaseFunctions.js
index 39a0746..f48112b 100644
--- 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))
-})
\ No newline at end of file
+ return nextjsServer.prepare().then(() => nextjsHandle(req, res));
+});
From 3b12fd900b543eff01a05950e99e0b4c4d355165 Mon Sep 17 00:00:00 2001
From: Takagineer <75421119+Takagineer@users.noreply.github.com>
Date: Thu, 16 Dec 2021 20:37:53 +0900
Subject: [PATCH 7/7] =?UTF-8?q?=E5=90=84=E3=83=95=E3=82=A1=E3=82=A4?=
=?UTF-8?q?=E3=83=AB=E3=81=AE=E8=A8=98=E8=BF=B0=E4=BF=AE=E6=AD=A3=E5=8F=8A?=
=?UTF-8?q?=E3=81=B3=E7=A2=BA=E8=AA=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/_app.js | 46 +++++++++++++++++++
src/_app.ts | 15 ------
src/{_document.ts => _document.js} | 2 +-
src/{next.config.ts => next.config.js} | 0
.../individual-pages/business/[business].tsx | 2 +-
src/{theme.ts => theme.js} | 0
tsconfig.json | 2 +-
7 files changed, 49 insertions(+), 18 deletions(-)
create mode 100644 src/_app.js
delete mode 100644 src/_app.ts
rename src/{_document.ts => _document.js} (98%)
rename src/{next.config.ts => next.config.js} (100%)
rename src/{theme.ts => theme.js} (100%)
diff --git a/src/_app.js b/src/_app.js
new file mode 100644
index 0000000..294a539
--- /dev/null
+++ b/src/_app.js
@@ -0,0 +1,46 @@
+import * as React from "react";
+import { Container, AppProps } from "next/app";
+import { MuiThemeProvider } from "@material-ui/core/styles";
+import { theme } from "styles/theme";
+
+const App = ({ Component, pageProps }) => {
+ React.useEffect(() => {
+ const jssStyles = document.querySelector("#jss-server-side");
+ if (jssStyles) {
+ jssStyles.parentElement.removeChild(jssStyles);
+ }
+ }, []);
+};
+
+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 (
+// <>
+//
+// MyApp
+//
+//
+//
+//
+//
+//
+//
+// )
+// }
diff --git a/src/_app.ts b/src/_app.ts
deleted file mode 100644
index 6dce8fe..0000000
--- a/src/_app.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from "react";
-import { Container, AppProps } from "next/app";
-import { MuiThemeProvider } from "@material-ui/core/styles";
-import { theme } from "styles/theme";
-
-const App = ({ Component, pageProps }) => {
- React.useEffect(() => {
- const jssStyles = document.querySelector("#jss-server-side");
- if (jssStyles) {
- jssStyles.parentElement.removeChild(jssStyles);
- }
- }, []);
-};
-
-export default App;
diff --git a/src/_document.ts b/src/_document.js
similarity index 98%
rename from src/_document.ts
rename to src/_document.js
index 0b93bf0..3549ddf 100644
--- a/src/_document.ts
+++ 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/next.config.ts b/src/next.config.js
similarity index 100%
rename from src/next.config.ts
rename to src/next.config.js
diff --git a/src/pages/individual-pages/business/[business].tsx b/src/pages/individual-pages/business/[business].tsx
index 033e4d0..a85fed1 100644
--- a/src/pages/individual-pages/business/[business].tsx
+++ b/src/pages/individual-pages/business/[business].tsx
@@ -181,7 +181,7 @@ const queryBusiness:any = router.query.business
) : (
<>
{businessInfo.imageURL && (
| |