Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

試作Stories.tsxファイルの追加 #776

Merged
merged 25 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
04ad7ed
[feat]Storybookの導入
Ryotakobayash May 24, 2024
c7c979e
Merge pull request #756 from NUTFes/feat/kobayashi/755-intro-storybook
Kubosaka May 24, 2024
550a641
seedデータの更新
Kubosaka May 20, 2024
eb56ec0
[feat]教師一覧ページの定数の削除
Kubosaka May 20, 2024
ef481f9
[fix]teacherの登録・編集モーダルの学科を定数→dbの値に修正
Kubosaka May 20, 2024
6f81fae
[fix]定数→dbの値に修正
Kubosaka May 20, 2024
97b4177
[delete]DEPARTMENTS定数の削除
Kubosaka May 20, 2024
661c6c3
[fix]募金の編集で委員が局の一番上になるバグ修正
Kubosaka May 20, 2024
cac62c3
formatted by workflow
Kubosaka May 20, 2024
c65b428
[fix]ログ削除
Kubosaka May 20, 2024
e532d97
[fix]seedデータ修正
Kubosaka May 27, 2024
90af7ba
[fix]seedデータの修正
Kubosaka May 27, 2024
b51e79a
[feat]課程idごとにソートして教員データを取得
Kubosaka May 27, 2024
8e05929
[feat]パスワードリセットのリクエスト画面
Kubosaka May 24, 2024
e0aaf7a
[feat]パスワードリセット画面作成
Kubosaka May 24, 2024
753b4b7
linkをコンポーネント化
Kubosaka May 24, 2024
7a22a32
formatted by workflow
Kubosaka May 24, 2024
20d6620
[fix]パスワード変更の文修正
Kubosaka May 27, 2024
0230a2d
[fix]パスワード変更の文修正
Kubosaka May 27, 2024
9bd47b6
[fix]リセットメール送信後の文言修正
Kubosaka May 27, 2024
2caaf32
[add] FinanSuButton.stories.tsx
Ryotakobayash Jun 9, 2024
d3d97de
Merge branch 'develop' into intro-storybook-main
Kubosaka Jun 12, 2024
fa6e97c
[fix]エラーと警告修正
Kubosaka Jun 12, 2024
d95e943
nodeのversionを20.14にあげる、page.tsxのエラー修正
Kubosaka Jun 12, 2024
74c5be5
formatted by workflow
Kubosaka Jun 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion docker-compose.prod.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
cloudflare:
image: "cloudflare/cloudflared:latest"
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
version: "3"
services:
db:
image: mysql:8.0
Expand All @@ -24,6 +23,7 @@ services:
command: sh -c "npm install && npm run dev"
ports:
- "3000:3000"
- "6006:6006"
stdin_open: true
environment:
NEXT_PUBLIC_ENDPOINT: minio
Expand Down
6 changes: 3 additions & 3 deletions prod.view.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Build用 コンテナ
FROM node:16.13.0 AS builder
FROM node:20.14 AS builder
WORKDIR /app/next-project
COPY ./view/next-project /app/next-project
RUN npm install
RUN npm run build

# 本番用 軽量 nodejs16
FROM gcr.io/distroless/nodejs16-debian11:nonroot
# 本番用 軽量 nodejs20.14
FROM node:20.14-slim
WORKDIR /app
LABEL org.opencontainers.image.source="https://github.com/NUTFes/FinanSu"
ENV NODE_ENV production
Expand Down
2 changes: 1 addition & 1 deletion view/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ベースイメージの作成
FROM node:16.13.0
FROM node:20.14
# コンテナ内で作業するディレクトリを指定
WORKDIR /app/next-project
COPY ./ /app
Expand Down
8 changes: 6 additions & 2 deletions view/next-project/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
"eslint:recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/eslint-recommended",
"plugin:import/errors"
"plugin:import/errors",
"plugin:storybook/recommended"
],
"plugins": ["@typescript-eslint", "unused-imports", "import"],
"parser": "@typescript-eslint/parser",
"env": { "node": true, "es6": true },
"env": {
"node": true,
"es6": true
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
Expand Down
22 changes: 22 additions & 0 deletions view/next-project/.storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import type { StorybookConfig } from '@storybook/nextjs';

const config: StorybookConfig = {
stories: [
'../src/**/*.mdx',
'../src/**/*.stories.@(js|jsx|mjs|ts|tsx)',
'../src/components/**/*.stories.@(js|jsx|ts|tsx)',
],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-links',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/nextjs',
options: {},
},
staticDirs: ['../public'],
};
export default config;
15 changes: 15 additions & 0 deletions view/next-project/.storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { Preview } from '@storybook/react';
import '../src/styles/globals.css';

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
Loading