Merge pull request #296 from NUTFes/dev/issue291

Dev/issue291　Particpantcardコンポーネントの作成

docker-compose.yml

@@ -100,6 +100,9 @@ services:
       - '6006:6006'
     volumes:
       - ./view:/app/next-project
+    environment:
+      SSR_API_URI: 'http://go:1323/api'
+      CSR_API_URI: 'http://localhost:1323'
     command: sh -c 'npm run dev & npm run storybook'
     depends_on:
       - go

go_api/main.go

@@ -2,7 +2,7 @@ package main
 
 import (
 	"net/http"
-	"os"
+	// "os"
 
 	_ "github.com/NUTFes/lottery/go_api/docs"
 	"github.com/NUTFes/lottery/go_api/infrastructure"
@@ -38,6 +38,13 @@ func main() {
 	// DB接続
 	client := infrastructure.ConnectDB()
 
+	// cors設定
+	arrowOrigins := []string{"http://localhost:3000"}
+	e.Use(middleware.Logger())
+	e.Use(middleware.CORSWithConfig(middleware.CORSConfig{
+		AllowOrigins: arrowOrigins,
+	}))
+
 	// 依存の方向：controller -> usecase -> domain <- infrastructure
 	adminInfrastructure := infrastructure.NewAdminInfrastructure(client)
 	eventInfrastructure := infrastructure.NewEventInfrastructure(client)
@@ -60,12 +67,12 @@ func main() {
 	// ルーティング(APIが増えると、server.goが肥大化するので、今後別にファイルに分ける)
 
 	// BasicAuth
-	e.Use(middleware.BasicAuth(func(username string, password string, c echo.Context) (bool, error) {
-		if username == os.Getenv("ADMIN_NAME") && password == os.Getenv("ADMIN_PASS") {
-			return true, nil
-		}
-		return false, nil
-	}))
+	// e.Use(middleware.BasicAuth(func(username string, password string, c echo.Context) (bool, error) {
+	// 	if username == os.Getenv("ADMIN_NAME") && password == os.Getenv("ADMIN_PASS") {
+	// 		return true, nil
+	// 	}
+	// 	return false, nil
+	// }))
 
 	// admins
 	e.GET("/admins", adminController.IndexAdmin)

view/next.config.js

@@ -1,6 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: true,
+  env: {
+    SSR_API_URI: process.env.SSR_API_URI,
+    CSR_API_URI: process.env.CSR_API_URI,
+  }
 }
 
 module.exports = nextConfig

view/src/components/common/Card/EventParticipantCard.stories.tsx

@@ -19,4 +19,4 @@ Default.args = {
   participantType: 'all',
 }
 
-Default.storyName = 'Default'
+Default.storyName = 'デフォルト'

view/src/components/common/Card/EventParticipantCard.tsx

@@ -9,7 +9,7 @@ import CardContent from '@mui/material/CardContent'
 import Typography from '@mui/material/Typography'
 import { CardActionArea } from '@mui/material'
 import { EventParticipantCardProps } from './EventParticipantCard.type'
-import { useMemo } from 'react'
+import { useState, useEffect, useMemo } from 'react'
 
 const EventParticipantCard = (props: EventParticipantCardProps) => {
   const { participantType, participantParsent, participantCount } = props

view/src/components/common/Header/AdminHeader.stories.tsx

@@ -10,4 +10,4 @@ const Template: ComponentStory<typeof AdminHeader> = (args) => <AdminHeader {...
 
 export const Default: ComponentStory<typeof AdminHeader> = Template.bind({})
 
-Default.storyName = 'Default'
+Default.storyName = 'デフォルト'

view/src/components/layout/MainLayout/index.tsx

@@ -0,0 +1 @@
+export { default } from './MainLayout';

view/src/pages/_app.tsx

@@ -1,5 +1,4 @@
 import 'src/styles/globals.css'
-import '/src/styles/globals.css'
 import type { AppProps } from 'next/app'
 
 export default function App({ Component, pageProps }: AppProps) {