Merge pull request #486 from uu-plathome/develop/stg

Develop/stg

admin/package.json

@@ -13,56 +13,59 @@
  "start": "next start -p 3002",
  "format": "prettier --write \"**/*.{js,ts,tsx}\"",
  "lint": "eslint . --fix --ext ts --ext tsx --ext js",
- "lint:fix": "npm run lint && npm run format"
+ "lint:fix": "npm run lint && npm run format",
+ "update": "ncu -u",
+ "update:check": "ncu"
  },
  "dependencies": {
- "@bugsnag/js": "^7.14.1",
- "@bugsnag/plugin-react": "^7.14.0",
- "@fortawesome/fontawesome-svg-core": "^1.2.36",
- "@fortawesome/free-brands-svg-icons": "^5.15.4",
- "@fortawesome/free-solid-svg-icons": "^5.15.4",
- "@fortawesome/react-fontawesome": "^0.1.16",
- "axios": "^0.24.0",
- "compressorjs": "^1.1.1",
- "dayjs": "^1.10.7",
- "next": "^12.3.4",
- "react": "^17.0.2",
- "react-datepicker": "^3.8.0",
- "react-dom": "^17.0.2",
- "react-dropzone": "^11.4.2",
+ "@bugsnag/js": "^7.20.0",
+ "@bugsnag/plugin-react": "^7.19.0",
+ "@fortawesome/fontawesome-svg-core": "^6.3.0",
+ "@fortawesome/free-brands-svg-icons": "^6.3.0",
+ "@fortawesome/free-solid-svg-icons": "^6.3.0",
+ "@fortawesome/react-fontawesome": "^0.2.0",
+ "axios": "^1.3.4",
+ "compressorjs": "^1.2.1",
+ "dayjs": "^1.11.7",
+ "next": "^13.2.4",
+ "react": "^18.2.0",
+ "react-datepicker": "^4.10.0",
+ "react-dom": "^18.2.0",
+ "react-dropzone": "^14.2.3",
  "react-loading": "^2.0.3",
- "react-modal": "^3.14.4",
- "react-scroll": "^1.8.4",
- "sass": "^1.45.0",
- "swr": "^1.1.1"
+ "react-modal": "^3.16.1",
+ "react-scroll": "^1.8.9",
+ "sass": "^1.60.0",
+ "swr": "^2.1.1"
  },
  "devDependencies": {
- "@next/eslint-plugin-next": "^12.0.7",
- "@types/gtag.js": "^0.0.8",
- "@types/jest": "^27.0.3",
- "@types/node": "^16.6.1",
- "@types/react": "^17.0.37",
+ "@next/eslint-plugin-next": "^13.2.4",
+ "@types/gtag.js": "^0.0.12",
+ "@types/jest": "^29.5.0",
+ "@types/node": "^18.15.10",
+ "@types/react": "^18.0.29",
  "@types/testing-library__react": "^10.2.0",
- "@typescript-eslint/eslint-plugin": "^5.7.0",
- "@typescript-eslint/parser": "^5.7.0",
- "autoprefixer": "10.4.0",
- "babel-jest": "^27.4.5",
- "babel-loader": "^8.2.3",
+ "@typescript-eslint/eslint-plugin": "^5.56.0",
+ "@typescript-eslint/parser": "^5.56.0",
+ "autoprefixer": "10.4.14",
+ "babel-jest": "^29.5.0",
+ "babel-loader": "^9.1.2",
  "babel-plugin-transform-remove-console": "^6.9.4",
- "eslint": "^8.4.1",
- "eslint-config-next": "^12.0.7",
- "eslint-config-prettier": "^8.3.0",
- "eslint-import-resolver-typescript": "^2.5.0",
- "eslint-plugin-import": "^2.25.3",
- "eslint-plugin-jest": "^25.3.0",
- "eslint-plugin-react": "^7.27.1",
- "eslint-plugin-tailwindcss": "^1.17.2",
- "postcss": "8.4.5",
- "prettier": "^2.5.1",
- "stylelint-config-recommended": "^6.0.0",
- "tailwindcss": "^3.0.6",
- "ts-loader": "9.2.6",
- "typescript": "4.5.4"
+ "eslint": "^8.36.0",
+ "eslint-config-next": "^13.2.4",
+ "eslint-config-prettier": "^8.8.0",
+ "eslint-import-resolver-typescript": "^3.5.3",
+ "eslint-plugin-import": "^2.27.5",
+ "eslint-plugin-jest": "^27.2.1",
+ "eslint-plugin-react": "^7.32.2",
+ "eslint-plugin-tailwindcss": "^3.10.1",
+ "npm-check-updates": "^16.8.0",
+ "postcss": "8.4.21",
+ "prettier": "^2.8.7",
+ "stylelint-config-recommended": "^11.0.0",
+ "tailwindcss": "^3.2.7",
+ "ts-loader": "9.4.2",
+ "typescript": "5.0.2"
  },
  "license": "MIT"
 }

admin/src/components/atoms/buttons/BlueButton.tsx

@@ -3,6 +3,7 @@ import React from 'react'
 type Props = {
  type: 'button' | 'submit' | 'reset'
  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
+ children: React.ReactNode
 }
 const BlueButton: React.FC<Props> = ({ children, onClick, type }) => {
  return (

admin/src/components/atoms/buttons/GrayButton.tsx

@@ -8,6 +8,7 @@ type Props = {
  as?: Url
  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
  href?: LinkProps['href']
+ children: React.ReactNode
 }
 
 const buttonClassName = `

admin/src/components/atoms/buttons/GreenButton.tsx

@@ -8,6 +8,7 @@ type Props = {
  as?: Url
  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
  href?: LinkProps['href']
+ children: React.ReactNode
 }
 
 const GreenButton: React.FC<Props> = ({

admin/src/components/atoms/buttons/OrangeButton.tsx

@@ -5,6 +5,7 @@ type Props = {
  type?: 'button' | 'submit' | 'reset'
  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
  href?: string
+ children: React.ReactNode
 }
 
 const OrangeButton: React.FC<Props> = ({ children, href, onClick, type }) => {

admin/src/components/atoms/buttons/RedButton.tsx

@@ -8,6 +8,7 @@ type Props = {
  as?: Url
  onClick?: (event: React.MouseEvent<HTMLButtonElement>) => void
  href?: LinkProps['href']
+ children: React.ReactNode
 }
 
 const RedButton: React.FC<Props> = ({ children, as, href, onClick, type }) => {

admin/src/components/layouts/BaseContainer.tsx

@@ -1,6 +1,7 @@
-import { FC } from 'react'
+import React from 'react'
 
-const BaseContainer: FC = ({ children }) => {
+type Props = { children: React.ReactNode }
+const BaseContainer: React.FC<Props> = ({ children }) => {
  return (
  <div className="container">
  <div className="mx-auto max-w-screen-lg">{children}</div>

admin/src/components/layouts/BaseWrapper.tsx

@@ -1,4 +1,4 @@
-import { FC } from 'react'
+import React from 'react'
 import { GreenButton } from '../atoms/buttons/GreenButton'
 import { BaseSidebar } from './BaseSidebar'
 
@@ -7,8 +7,9 @@ type Props = {
  actionHref?: string
  actionAs?: string
  actionText?: string
+ children: React.ReactNode
 }
-const BaseWrapper: FC<Props> = ({
+const BaseWrapper: React.FC<Props> = ({
  title,
  actionHref,
  actionAs,

admin/src/components/molecules/list_items/AdvertiseListItem.tsx

@@ -7,7 +7,7 @@ import {
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import Image from 'next/image'
 import Link from 'next/link'
-import { FC, useState } from 'react'
+import React, { useState } from 'react'
 import Modal from 'react-modal'
 import { GrayButton } from '@/src/components/atoms/buttons/GrayButton'
 import { RedButton } from '@/src/components/atoms/buttons/RedButton'
@@ -36,7 +36,7 @@ type DeleteButtonProps = {
  advertise: Advertise
  onDelete(): void
 }
-const DeleteButton: FC<DeleteButtonProps> = ({ advertise, onDelete }) => {
+const DeleteButton: React.FC<DeleteButtonProps> = ({ advertise, onDelete }) => {
  const [isOpen, setIsOpen] = useState(false)
 
  const onClickDeleteButton = () => {
@@ -75,9 +75,10 @@ const DeleteButton: FC<DeleteButtonProps> = ({ advertise, onDelete }) => {
  )
 }
 
-const ListItemTableColumn: FC<{
+const ListItemTableColumn: React.FC<{
  title: string
  lg?: boolean
+ children: React.ReactNode
 }> = ({ children, title, lg }) => {
  const widthClass = lg ? 'w-1/3 lg:w-1/4' : 'w-1/3 lg:w-1/6'
  return (
@@ -89,7 +90,7 @@ const ListItemTableColumn: FC<{
  </div>
  )
 }
-const AdvertiseListItem: FC<Props> = ({ advertise, onDelete }) => {
+const AdvertiseListItem: React.FC<Props> = ({ advertise, onDelete }) => {
  const { isMd } = useMediaQuery()
 
  return (

admin/src/components/molecules/list_items/AnnouncementListItem.tsx

@@ -76,6 +76,7 @@ const DeleteButton: FC<DeleteButtonProps> = ({ announcement, onDelete }) => {
 const ListItemTableColumn: FC<{
  title: string
  lg?: boolean
+ children: React.ReactNode
 }> = ({ children, title, lg }) => {
  const widthClass = lg ? 'w-1/3 lg:w-1/4' : 'w-1/3 lg:w-1/6'
  return (

admin/src/components/molecules/list_items/CircleListItem.tsx

@@ -19,6 +19,7 @@ type Props = {
 
 const CircleListItemTableColumn: FC<{
  title: string
+ children: React.ReactNode
 }> = ({ children, title }) => {
  return (
  <div className="pr-2 mb-2 w-1/3 lg:w-1/6">

admin/src/components/molecules/list_items/CircleNewJoyListItem.tsx

@@ -29,6 +29,7 @@ const CircleListItemTableColumn: FC<{
  title: string
  large?: boolean
  xs?: boolean
+ children: React.ReactNode
 }> = ({ children, title, large, xs }) => {
  let w = 'lg:w-1/6'
  w = large ? 'lg:w-1/4' : w

admin/src/components/molecules/list_items/CircleUserRelationListItem.tsx

@@ -79,6 +79,7 @@ type Props = {
 
 const CircleListItemTableColumn: FC<{
  title: string
+ children: React.ReactNode
 }> = ({ children, title }) => {
  return (
  <div className="pr-2 w-full lg:w-1/6">

admin/src/components/molecules/list_items/DemoCircleNewJoyListItem.tsx

@@ -20,6 +20,7 @@ const CircleListItemTableColumn: FC<{
  title: string
  large?: boolean
  xs?: boolean
+ children: React.ReactNode
 }> = ({ children, title, large, xs }) => {
  let w = 'lg:w-1/6'
  w = large ? 'lg:w-1/4' : w

admin/src/lib/enum/api/AdvertiseType.ts

@@ -17,7 +17,7 @@ export const AdvertiseType = {
 
 export type AdvertiseTypeKey = keyof Omit<typeof AdvertiseType, '_type'>
 export type AdvertiseTypeAllKey = keyof typeof AdvertiseType
-export type AdvertiseType = typeof AdvertiseType[AdvertiseTypeKey]
+export type AdvertiseType = (typeof AdvertiseType)[AdvertiseTypeKey]
 
 /**
  * 広告種類.

admin/src/lib/enum/api/AnnouncementType.ts

@@ -47,7 +47,7 @@ export const AnnouncementType = {
 
 export type AnnouncementTypeKey = keyof Omit<typeof AnnouncementType, '_type'>
 export type AnnouncementTypeAllKey = keyof typeof AnnouncementType
-export type AnnouncementType = typeof AnnouncementType[AnnouncementTypeKey]
+export type AnnouncementType = (typeof AnnouncementType)[AnnouncementTypeKey]
 
 /**
  * お知らせ種類.

admin/src/lib/enum/api/CategorySlugProperty.ts

@@ -16,7 +16,7 @@ export type CategorySlugPropertyKey = keyof Omit<
 >
 export type CategorySlugPropertyAllKey = keyof typeof CategorySlugProperty
 export type CategorySlugProperty =
- typeof CategorySlugProperty[CategorySlugPropertyKey]
+ (typeof CategorySlugProperty)[CategorySlugPropertyKey]
 
 export const getAllCategorySlugProperty = (): CategorySlugProperty[] => {
  const { _type: _, ...data } = CategorySlugProperty

admin/src/lib/enum/api/CircleTagModel.ts

@@ -142,7 +142,7 @@ export const CircleTagModel = {
 
 export type CircleTagModelKey = keyof Omit<typeof CircleTagModel, '_type'>
 export type CircleTagModelAllKey = keyof typeof CircleTagModel
-export type CircleTagModel = typeof CircleTagModel[CircleTagModelKey]
+export type CircleTagModel = (typeof CircleTagModel)[CircleTagModelKey]
 
 /**
  * サークルタグ.

admin/src/lib/enum/api/CircleType.ts

@@ -27,7 +27,7 @@ export const CircleType = {
 
 export type CircleTypeKey = keyof Omit<typeof CircleType, '_type'>
 export type CircleTypeAllKey = keyof typeof CircleType
-export type CircleType = typeof CircleType[CircleTypeKey]
+export type CircleType = (typeof CircleType)[CircleTypeKey]
 
 /**
  * サークル種類.

admin/src/lib/enum/api/DateOfActivity.ts

@@ -17,7 +17,7 @@ export const DateOfActivity = {
 
 export type DateOfActivityKey = keyof Omit<typeof DateOfActivity, '_type'>
 export type DateOfActivityAllKey = keyof typeof DateOfActivity
-export type DateOfActivity = typeof DateOfActivity[DateOfActivityKey]
+export type DateOfActivity = (typeof DateOfActivity)[DateOfActivityKey]
 
 /**
  * 活動日時

admin/src/lib/enum/api/DemoCircleNewjoyType.ts

@@ -26,7 +26,7 @@ export type DemoCircleNewjoyTypeKey = keyof Omit<
 >
 export type DemoCircleNewjoyTypeAllKey = keyof typeof DemoCircleNewjoyType
 export type DemoCircleNewjoyType =
- typeof DemoCircleNewjoyType[DemoCircleNewjoyTypeKey]
+ (typeof DemoCircleNewjoyType)[DemoCircleNewjoyTypeKey]
 
 /**
  * 広告種類.

admin/src/lib/enum/api/Importance.ts

@@ -22,7 +22,7 @@ export const Importance = {
 
 export type ImportanceKey = keyof Omit<typeof Importance, '_type'>
 export type ImportanceAllKey = keyof typeof Importance
-export type Importance = typeof Importance[ImportanceKey]
+export type Importance = (typeof Importance)[ImportanceKey]
 
 /**
  * 重要度.

admin/src/lib/enum/api/PlaceOfActivity.ts

@@ -42,7 +42,7 @@ export const PlaceOfActivity = {
 
 export type PlaceOfActivityKey = keyof Omit<typeof PlaceOfActivity, '_type'>
 export type PlaceOfActivityAllKey = keyof typeof PlaceOfActivity
-export type PlaceOfActivity = typeof PlaceOfActivity[PlaceOfActivityKey]
+export type PlaceOfActivity = (typeof PlaceOfActivity)[PlaceOfActivityKey]
 
 /**
  * 活動場所

admin/src/lib/enum/api/Role.ts

@@ -23,7 +23,7 @@ export const Role = {
 
 export type RoleKey = keyof Omit<typeof Role, '_type'>
 export type RoleAllKey = keyof typeof Role
-export type Role = typeof Role[RoleKey]
+export type Role = (typeof Role)[RoleKey]
 
 /**
  * 権限.

admin/src/lib/enum/api/TagSlugProperty.ts

@@ -63,7 +63,7 @@ export const TagSlugProperty = {
 
 export type TagSlugPropertyKey = keyof Omit<typeof TagSlugProperty, '_type'>
 export type TagSlugPropertyAllKey = keyof typeof TagSlugProperty
-export type TagSlugProperty = typeof TagSlugProperty[TagSlugPropertyKey]
+export type TagSlugProperty = (typeof TagSlugProperty)[TagSlugPropertyKey]
 
 /**
  * /api/circle/tag/{tag}のtagのパス一覧.

admin/src/lib/enum/api/Week.ts

@@ -42,7 +42,7 @@ export const Week = {
 
 export type WeekKey = keyof Omit<typeof Week, '_type'>
 export type WeekAllKey = keyof typeof Week
-export type Week = typeof Week[WeekKey]
+export type Week = (typeof Week)[WeekKey]
 
 /**
  * 曜日.

main/src/components/pages/Circle/Show/Parts/CircleTopInformation.tsx

@@ -68,7 +68,7 @@ const CircleTopInformation: FC<Props> = ({ circle }) => {
 
  <div className="md:flex justify-between items-center px-4 md:px-10 bg-white">
  {/*最終更新日を表示*/}
- <p className="mt-3 text-gray-500">
+ <p className="pt-3 text-gray-500">
  最終更新:{' '}
  {new Date(circle.updatedAt).toLocaleString('ja-JP', {
  year: 'numeric',