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

デザインリニューアルのrelease用PR #341

Draft
wants to merge 89 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
7e7d557
:fire: #337 新designへの移行の為、一旦機能の一部を削除
keitakn Aug 17, 2024
45b70be
:fire: #337 Jestは既に利用していないので削除
keitakn Aug 17, 2024
b8bf4ed
:heavy_plus_sign: #337 Tailwind CSSの設定とpackageを追加
keitakn Aug 17, 2024
c9cdb65
:fire: #337 不要になった画像ファイルを削除
keitakn Aug 17, 2024
bd973d7
:art: #337 仮のトップページが見れるだけの最低限の機能を移植、faviconやOGP画像を新しい物に変更
keitakn Aug 17, 2024
e3facf5
:heavy_minus_sign: #337 Tailwid CSSになったので stylelint は削除
keitakn Aug 17, 2024
b2417f8
:heavy_minus_sign: #337 Tailwid CSSになったので happy-css-modules は削除
keitakn Aug 17, 2024
9761fc5
:heavy_minus_sign: #337 Tailwind CSSはリセットCSSが含まれているので ress は削除
keitakn Aug 17, 2024
92ca25b
:wrench: #337 Storybookの設定を最新に更新
keitakn Aug 17, 2024
5fffdc2
:heavy_minus_sign: #337 今後利用するか分からないpackageに関しては一旦削除
keitakn Aug 17, 2024
3cb90f0
:heavy_plus_sign: #337 Tailwind CSS用のESLint Pluginを追加
keitakn Aug 17, 2024
aed9f3b
:bug: #337 import 先が存在しなかったので修正
keitakn Aug 17, 2024
005f766
:bug: #337 以下のエラーが出て Storybookが起動しないので ajv を追加
keitakn Aug 17, 2024
b03e1a8
:heavy_plus_sign: #337 icon を利用する為に react-icon を追加
keitakn Aug 17, 2024
c8978bc
:sparkles: #337 Button用のComponentを仮実装
keitakn Aug 17, 2024
65302bc
Merge pull request #340 from nekochans/feature/issue337/reset-project
keitakn Aug 18, 2024
1714724
:construction: #303
keitakn Aug 18, 2024
3095e5e
:recycle: #303 プロパティ名をより具体的な isPending に変更
keitakn Aug 18, 2024
d651036
:art: #303 汎用的なボタンだと処理が複雑になりすぎるのでアイコン付きのボタンとして再定義した
keitakn Aug 18, 2024
da109d1
:art: #303 Figmaのデザインに合わせてテキストの色を変更
keitakn Aug 18, 2024
5967c5c
:art: #303 Buttonの プロパティ名としては isPressed のほうが分かりやすいのでプロパティ名を変更
keitakn Aug 18, 2024
154b934
:art: #303 いくつかのアイコンを表示できるように変更
keitakn Aug 18, 2024
8493ddf
:heavy_minus_sign: #303 react-icon は利用しなくなったので削除
keitakn Aug 18, 2024
37e13be
:art: #303 外から style を渡せるように変更
keitakn Aug 18, 2024
3a11e14
:art: #303 テキストのフォントサイズをFigmaのデザインに合わせて修正
keitakn Aug 18, 2024
f47d7b9
:sparkles: #303 ボタン風のリンクComponentを追加
keitakn Aug 23, 2024
4e46991
:art: #303 style を直接渡すのは Tailwind CSS のクラスと競合するのでクラス名を受け取るStyleに変更
keitakn Aug 23, 2024
5e35f8e
Merge pull request #342 from nekochans/feature/issue303/button-component
keitakn Aug 23, 2024
595b05b
:construction: #323
keitakn Aug 23, 2024
40c9203
:sparkles: #323 Footer Componentの仮実装を追加
keitakn Aug 24, 2024
a3f8fc7
:art: #323 Footer用のComponentのスタイリングを追加
keitakn Aug 24, 2024
8e00fcb
Merge pull request #345 from nekochans/feature/issue323/add-footer-co…
keitakn Aug 24, 2024
41b27af
:construction: #324
keitakn Aug 26, 2024
a665508
:sparkles: #324 HeaderLogo Componentを仮実装
keitakn Aug 27, 2024
1ec9aea
:art: #324 HeaderLogoにスタイリングを追加
keitakn Sep 4, 2024
451a87f
:art: #324 react-aria-components のText を利用するように変更
keitakn Sep 5, 2024
8226526
:art: #324 Vercelの料金節約なため prefetch false を指定
keitakn Sep 5, 2024
18be132
:recycle: #324 top よりも home のほうが英語圏では一般的なので名前を変更
keitakn Sep 5, 2024
1f7f451
:art: #324 リンク先を変える必要があるので language を受け取るように変更
keitakn Sep 5, 2024
93a87da
:recycle: #324 `LgtmCatIcon` を別のComponentに分離
keitakn Sep 5, 2024
c3b8a8b
:sparkles: #324 HeaderComponentの仮実装
keitakn Sep 21, 2024
480cb7b
:art: #324 HeaderComponentにリンクを追加
keitakn Sep 21, 2024
8b5870c
:art: #324 言語メニューに currentUrlPath を設定するように変更
keitakn Sep 21, 2024
89591ea
:art: #324 言語メニューを react-aria-components を使って実装するように変更
keitakn Sep 21, 2024
1671eb3
:art: #324 ログインボタン用にボタン要素を Link で構成出来るように変更
keitakn Sep 21, 2024
e185f73
:bug: #324 ポリシーの部分をクリックすると出る以下のエラーを修正
keitakn Sep 23, 2024
56ed67e
:sparkles: #324 LoginButton Componentの追加
keitakn Sep 23, 2024
e8da752
:sparkles: #324 RightIcon, DownIcon を追加
keitakn Sep 23, 2024
8c207fc
:sparkles: #324 GlobeIcon を追加
keitakn Sep 23, 2024
b0b03e1
:art: #324 Headerのアイコンを外部からimportするように変更
keitakn Sep 23, 2024
ebd12e2
:art: #324 GlobeIcon, DownIcon, RightIcon, LoginButton を設置するように変更
keitakn Sep 23, 2024
e34c0c7
:art: #324 パディングの調整を実施
keitakn Sep 23, 2024
be274c7
:art: #324 言語メニューとログインボタンをグループ化
keitakn Sep 24, 2024
d0217ba
:art: #324 言語メニューのレイアウトを調整
keitakn Sep 24, 2024
6b0283d
:art: #324 ポリシー部分のドロップダウンメニューのスタイルをFigmaに合わせて変更
keitakn Sep 26, 2024
5fe3555
:art: #324 ポリシー部分のデザインを調整しました
keitakn Sep 26, 2024
813249c
:art: #324 「LGTMeow」のアンダーラインを削除
keitakn Sep 30, 2024
a433326
:recycle: #324 Text Componentを利用するように変更
keitakn Sep 30, 2024
9cfff85
:art: #324 「アップロード、使い方」の単語のi18n対応
keitakn Oct 1, 2024
95e5a5c
:shirt: #324 Tailwind CSSの以下の警告を修正
keitakn Oct 1, 2024
a6ace76
:art: #324 「ポリシー」 のテキストのi18n対応
keitakn Oct 1, 2024
5d97066
:art: #324 ポリシー、言語メニューのテキスト幅が折り返さないように調整
keitakn Oct 3, 2024
03d1b33
:bug: #324 言語メニューのリンク先設定ロジックが間違っていたので修正
keitakn Oct 4, 2024
6dad764
Merge pull request #346 from nekochans/feature/issue324/add-header
keitakn Oct 4, 2024
b69309f
:construction: #349
keitakn Oct 5, 2024
18992e1
:art: #349 GithubIconを別Componentとして分離
keitakn Oct 6, 2024
68859fe
:art: #349 ログイン用のmenuを表示するように変更
keitakn Oct 6, 2024
f2e60b3
:art: #349 GithubIconの色を調整出来るように改修
keitakn Oct 6, 2024
a1ccab9
:recycle: #349 GitHubアイコンmenu展開時のマージンを調整
keitakn Oct 7, 2024
4eba389
:shirt: #349 Formatterを適応
keitakn Oct 7, 2024
ba13b04
:recycle: #349 言語menuとログインボタン or GitHubアイコンmenuのマージンを調整
keitakn Oct 7, 2024
97c30f5
:art: #349 ログイン時のmenuに対してi18n対応を実施
keitakn Oct 7, 2024
3008ecc
Merge pull request #350 from nekochans/feature/issue349/add-loggedin-…
keitakn Oct 7, 2024
ed96c7e
:construction: #351
keitakn Oct 8, 2024
558b135
:green_heart: #351 E2Eテストの為にplaywrightの実行環境を追加
keitakn Oct 8, 2024
a677ae7
:white_check_mark: #351 HeaderとFooterのComponentテストを追加
keitakn Oct 8, 2024
2415530
Merge pull request #352 from nekochans/feature/issue351/add-storybook…
keitakn Oct 9, 2024
23f3c27
:construction: #347
keitakn Oct 9, 2024
28855ff
:heavy_plus_sign: #347 ESLintの設定を @antfu/eslint-config を中心にした構成として pr…
keitakn Oct 10, 2024
0e922f6
:wrench: #347 prettier の実行をしないように変更
keitakn Oct 10, 2024
1d3b2cb
:wrench: #347 tsconfig.json は自動生成される事が多いので差分が分かりやすいように整形しないように変更
keitakn Oct 10, 2024
c98cc2b
:shirt: #347 Formatterの仕様が変わったので再適応
keitakn Oct 10, 2024
d862f97
:shirt: #347 以下のESLintエラーの対応
keitakn Oct 10, 2024
1f69d99
:shirt: #347 以下のESLintエラーの対応
keitakn Oct 10, 2024
2128289
:shirt: #347 以下のESLintの警告に対応
keitakn Oct 10, 2024
3ce8e6f
Merge pull request #353 from nekochans/feature/issue347/change-eslint…
keitakn Oct 10, 2024
931ee07
:construction: #354
keitakn Oct 11, 2024
75d3c38
:art: #354 Headerのマージンを調整
keitakn Oct 15, 2024
7ae16d5
Merge pull request #355 from nekochans/feature/issue354/fix-margin-he…
keitakn Oct 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
with:
node-version: 20
registry-url: 'https://npm.pkg.github.com'
cache: 'npm'
cache: npm
scope: '@nekochans'
- run: npm ci --legacy-peer-deps
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache: npm
registry-url: 'https://npm.pkg.github.com'
scope: '@nekochans'
- run: |
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,8 @@ build-storybook.log

# Stylelint
.stylelintcache
node_modules/
/test-results/
/playwright-report/
/blob-report/
/playwright/.cache/
10 changes: 0 additions & 10 deletions .prettierignore

This file was deleted.

6 changes: 0 additions & 6 deletions .prettierrc.json

This file was deleted.

6 changes: 3 additions & 3 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ const config: StorybookConfig = {
name: '@storybook/nextjs',
options: {},
},
docs: {
autodocs: 'tag',
},
staticDirs: ['../public'],
features: {
experimentalRSC: true,
},
};
export default config;
6 changes: 0 additions & 6 deletions .storybook/preview-head.html

This file was deleted.

6 changes: 2 additions & 4 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import 'ress/ress.css';
import '../src/styles/markdown.css';
import '../src/styles/globals.css';
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
import type { Preview } from '@storybook/react';
import { INITIAL_VIEWPORTS } from '@storybook/addon-viewport';
import { initialize, mswLoader } from 'msw-storybook-addon';
import '../src/app/globals.css';

initialize();

Expand Down
11 changes: 0 additions & 11 deletions .stylelintrc.json

This file was deleted.

164 changes: 30 additions & 134 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -1,154 +1,50 @@
import path from 'node:path';
import { fileURLToPath } from 'node:url';
import { fixupConfigRules, fixupPluginRules } from '@eslint/compat';
import { FlatCompat } from '@eslint/eslintrc';
import js from '@eslint/js';
import typescriptEslint from '@typescript-eslint/eslint-plugin';
import jsxA11Y from 'eslint-plugin-jsx-a11y';
import react from 'eslint-plugin-react';
import reactHooks from 'eslint-plugin-react-hooks';
import storybook from 'eslint-plugin-storybook';
import vitest from 'eslint-plugin-vitest';
import globals from 'globals';
import antfu from '@antfu/eslint-config';
import tailwindcss from 'eslint-plugin-tailwindcss';

Check warning on line 2 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L2

Added line #L2 was not covered by tests

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all,
});

export default [
export default antfu(

Check warning on line 4 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L4

Added line #L4 was not covered by tests
{
react: true,
formatters: {
css: true,
html: true,
markdown: 'prettier',
},
stylistic: {
semi: true,
overrides: {
'semi': ['error', 'always'],
'semi-spacing': ['error', { after: true, before: false }],
'semi-style': ['error', 'last'],
'no-extra-semi': 'error',
'no-unexpected-multiline': 'error',
'no-unreachable': 'error',
},
},
typescript: {
overrides: {
'ts/consistent-type-definitions': ['error', 'type'],
},
},

Check warning on line 27 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L6-L27

Added lines #L6 - L27 were not covered by tests
ignores: [
'**/node_modules/',
'**/.next/',
'**/build/',
'**/coverage/',
'**/.eslintrc.json',
'**/next-env.d.ts',
'test/setupTests.ts',
'**/*.config.js',
'**/*.config.mjs',
'**/__mocks__',
'**/storybook-static/',
'public/mockServiceWorker.js',
'**/*.module.css.d.ts',
'**/*.module.css.d.ts.map',
'**/vitest.config.mts',
'**/vitest.setup.mts',
'next.config.mjs',
'tsconfig.json',

Check warning on line 41 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L40-L41

Added lines #L40 - L41 were not covered by tests
],
},
...fixupConfigRules(
compat.extends(
'eslint:recommended',
'plugin:@typescript-eslint/recommended',
'plugin:@typescript-eslint/recommended-requiring-type-checking',
'standard-with-typescript',
'plugin:jsx-a11y/recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
'prettier',
),
),
{
plugins: {
'@typescript-eslint': fixupPluginRules(typescriptEslint),
'jsx-a11y': fixupPluginRules(jsxA11Y),
react: fixupPluginRules(react),
'react-hooks': fixupPluginRules(reactHooks),
storybook,
vitest,
},

languageOptions: {
globals: {
...globals.browser,
...globals.node,
},

ecmaVersion: 'latest',
sourceType: 'module',

parserOptions: {
tsconfigRootDir: '.',
project: ['./tsconfig.json', './tsconfig.storybook.json'],
},
},

settings: {
react: {
version: 'detect',
},
},

rules: {
'padding-line-between-statements': [
'error',
{
blankLine: 'always',
prev: '*',
next: 'return',
},
],

'@typescript-eslint/consistent-type-definitions': 'off',
'@typescript-eslint/explicit-function-return-type': 'off',
'@typescript-eslint/explicit-module-boundary-types': ['error'],

'@typescript-eslint/no-misused-promises': [
'error',
{
checksVoidReturn: false,
},
],

'@typescript-eslint/no-unused-vars': [
'error',
{
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
},
],

'@typescript-eslint/strict-boolean-expressions': [
'error',
{
allowNullableObject: true,
},
],

'@typescript-eslint/triple-slash-reference': [
'error',
{
types: 'always',
},
],

'import/extensions': [
'error',
{
ignorePackages: true,

pattern: {
js: 'never',
jsx: 'never',
ts: 'never',
tsx: 'never',
},
},
],

'react/display-name': 'off',
},
},
{
files: ['**/*.tsx'],

rules: {
'react/prop-types': 'off',
'node/prefer-global/process': 'off',

Check warning on line 46 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L46

Added line #L46 was not covered by tests
},
},
];
...tailwindcss.configs['flat/recommended'],
);

Check warning on line 50 in eslint.config.mjs

View check run for this annotation

Codecov / codecov/patch

eslint.config.mjs#L49-L50

Added lines #L49 - L50 were not covered by tests
16 changes: 0 additions & 16 deletions jest.config.js

This file was deleted.

Loading
Loading