Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"presets": [
[
"next/babel",
{
"preset-react": {
"runtime": "automatic",
"importSource": "@emotion/react"
}
}
]
],
"plugins": ["@emotion/babel-plugin"]
}
10 changes: 7 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# Created by https://www.toptal.com/developers/gitignore/api/macos,react,node,visualstudiocode
# Edit at https://www.toptal.com/developers/gitignore?templates=macos,react,node,visualstudiocode
# Created by https://www.toptal.com/developers/gitignore/api/react,macos,nextjs,visualstudiocode,node
# Edit at https://www.toptal.com/developers/gitignore?templates=react,macos,nextjs,visualstudiocode,node

### macOS ###
# General
Expand Down Expand Up @@ -31,6 +31,10 @@ Network Trash Folder
Temporary Items
.apdisk

### NextJS ###
# Next build dir
.next/

### Node ###
# Logs
logs
Expand Down Expand Up @@ -205,4 +209,4 @@ sketch

# Support for Project snippet scope

# End of https://www.toptal.com/developers/gitignore/api/macos,react,node,visualstudiocode
# End of https://www.toptal.com/developers/gitignore/api/react,macos,nextjs,visualstudiocode,node
16 changes: 13 additions & 3 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,24 @@
const path = require('path');
const setRootPath = (_path) => path.resolve(process.cwd(), _path);

module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/preset-create-react-app',
'@storybook/addon-a11y',
],
framework: '@storybook/react',
core: {
builder: 'webpack5',

webpackFinal: async (config, { configType }) => {
config.resolve.alias = {
...config.resolve.alias,
'@': setRootPath('src'),
'@emotion/core': setRootPath('node_modules/@emotion/react'),
'@emotion/styled': setRootPath('node_modules/@emotion/styled'),
};

return config;
},
};
2 changes: 2 additions & 0 deletions .storybook/preview-body.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<div id="loading-start" aria-live="assertive"></div>
<div id="loading-end" aria-live="assertive"></div>
22 changes: 11 additions & 11 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import ko from 'axe-core/locales/ko.json';
import React from 'react';
import { MemoryRouter } from 'react-router-dom';
import { GlobalStyle } from 'styles/GlobalStyle';
// import React from 'react';
// import { MemoryRouter } from 'react-router-dom';
// import { GlobalStyle } from 'styles/GlobalStyle';

export const decorators = [
(Story) => (
<MemoryRouter>
<GlobalStyle />
<Story />
</MemoryRouter>
),
];
// export const decorators = [
// (Story) => (
// <MemoryRouter>
// <GlobalStyle />
// <Story />
// </MemoryRouter>
// ),
// ];

export const parameters = {
a11y: {
Expand Down
5 changes: 5 additions & 0 deletions next-env.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/basic-features/typescript for more information.
6 changes: 6 additions & 0 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
}

module.exports = nextConfig
92 changes: 27 additions & 65 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,89 +3,51 @@
"version": "0.0.1",
"private": true,
"description": "hanspoon 개선을 위한 TwoSpoon 프로젝트 입니다.",
"scripts": {
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint",
"storybook": "NODE_PATH=src start-storybook -p 6006",
"build-storybook": "build-storybook"
},
"dependencies": {
"@testing-library/jest-dom": "^5.16.2",
"@testing-library/react": "^12.1.3",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.4.1",
"@types/node": "^16.11.26",
"@types/react": "^17.0.39",
"@types/react-dom": "^17.0.13",
"@emotion/react": "^11.8.2",
"@emotion/styled": "^11.8.1",
"emotion-normalize": "^11.0.1",
"firebase": "^9.6.8",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet-async": "^1.2.3",
"next": "12.1.0",
"react": "17.0.2",
"react-dom": "17.0.2",
"react-icons": "^4.3.1",
"react-loading-icons": "^1.0.8",
"react-router-dom": "^6.2.2",
"react-scripts": "5.0.0",
"styled-components": "^5.3.3",
"styled-normalize": "^8.0.7",
"typescript": "^4.6.2",
"web-vitals": "^2.1.4",
"yup": "^0.32.11"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject",
"storybook": "start-storybook -p 6006 -s public",
"build-storybook": "build-storybook -s public"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
],
"overrides": [
{
"files": [
"**/*.stories.*"
],
"rules": {
"import/no-anonymous-default-export": "off"
}
}
]
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
"react-loading-icons": "^1.0.8"
},
"devDependencies": {
"@babel/core": "^7.17.7",
"@emotion/babel-plugin": "^11.7.2",
"@storybook/addon-a11y": "^6.4.19",
"@storybook/addon-actions": "^6.4.19",
"@storybook/addon-essentials": "^6.4.19",
"@storybook/addon-interactions": "^6.4.19",
"@storybook/addon-links": "^6.4.19",
"@storybook/builder-webpack5": "^6.4.19",
"@storybook/manager-webpack5": "^6.4.19",
"@storybook/node-logger": "^6.4.19",
"@storybook/preset-create-react-app": "^4.0.1",
"@storybook/react": "^6.4.19",
"@storybook/testing-library": "^0.0.9",
"@types/styled-components": "^5.1.24",
"@typescript-eslint/eslint-plugin": "^5.13.0",
"@typescript-eslint/parser": "^5.13.0",
"eslint": "^8.10.0",
"@types/node": "17.0.21",
"@types/react": "17.0.40",
"@typescript-eslint/eslint-plugin": "^5.15.0",
"@typescript-eslint/parser": "^5.15.0",
"babel-loader": "^8.2.3",
"eslint": "^8.11.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-next": "12.1.0",
"eslint-config-prettier": "^8.5.0",
"eslint-plugin-import": "^2.25.4",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.29.3",
"eslint-plugin-react": "^7.29.4",
"eslint-plugin-react-hooks": "^4.3.0",
"firebase-tools": "^10.2.2",
"firebase-tools": "^10.3.0",
"prettier": "^2.5.1",
"webpack": "^5.70.0"
"typescript": "4.6.2"
}
}
Binary file removed public/assets/favicon.ico
Binary file not shown.
Binary file removed public/assets/logo192.png
Binary file not shown.
Binary file removed public/assets/logo512.png
Binary file not shown.
Binary file added public/favicon.ico
Binary file not shown.
35 changes: 0 additions & 35 deletions public/index.html

This file was deleted.

25 changes: 0 additions & 25 deletions public/manifest.json

This file was deleted.

3 changes: 0 additions & 3 deletions public/robots.txt

This file was deleted.

4 changes: 4 additions & 0 deletions public/vercel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion src/assets/logo.svg

This file was deleted.

38 changes: 0 additions & 38 deletions src/components/App/App.css

This file was deleted.

34 changes: 0 additions & 34 deletions src/components/App/App.tsx

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/CookingInfo/CookingInfo.styled.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import styled from 'styled-components';
import styled from '@emotion/styled';
import { BsBookmarkHeartFill } from 'react-icons/bs';
import { RiTimerFill } from 'react-icons/ri';
import { pxToRem } from 'utils';
Expand Down
2 changes: 1 addition & 1 deletion src/components/Loading/Loading.styled.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import LoadingIcons from 'react-loading-icons';
import styled from 'styled-components';
import styled from '@emotion/styled';

export const StyledLoadingThreeDots = styled(LoadingIcons.ThreeDots)`
z-index: 400;
Expand Down
Loading