Skip to content

Commit e3faa1e

Browse files
authored
Merge pull request #117 from codeit-FE-18-part2/develop
v0.2.0
2 parents 62063b7 + 5c37a8e commit e3faa1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+3516
-732
lines changed

eslint.config.js

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
import js from '@eslint/js'
2-
import globals from 'globals'
3-
import reactHooks from 'eslint-plugin-react-hooks'
4-
import reactRefresh from 'eslint-plugin-react-refresh'
5-
import { defineConfig, globalIgnores } from 'eslint/config'
1+
import js from "@eslint/js";
2+
import globals from "globals";
3+
import reactHooks from "eslint-plugin-react-hooks";
4+
import reactRefresh from "eslint-plugin-react-refresh";
5+
import { defineConfig, globalIgnores } from "eslint/config";
66

77
export default defineConfig([
8-
globalIgnores(['dist']),
8+
globalIgnores(["dist"]),
99
{
10-
files: ['**/*.{js,jsx}'],
10+
files: ["**/*.{js,jsx}"],
1111
extends: [
1212
js.configs.recommended,
13-
reactHooks.configs['recommended-latest'],
13+
reactHooks.configs["recommended-latest"],
1414
reactRefresh.configs.vite,
1515
],
1616
languageOptions: {
1717
ecmaVersion: 2020,
1818
globals: globals.browser,
1919
parserOptions: {
20-
ecmaVersion: 'latest',
20+
ecmaVersion: "latest",
2121
ecmaFeatures: { jsx: true },
22-
sourceType: 'module',
22+
sourceType: "module",
2323
},
2424
},
2525
rules: {
26-
'no-unused-vars': ['error', { varsIgnorePattern: '^[A-Z_]' }],
26+
"no-unused-vars": ["error", { varsIgnorePattern: "^[A-Z_]" }],
2727
},
2828
},
29-
])
29+
]);

index.html

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<!DOCTYPE html>
2-
<html lang="en">
2+
<html lang="ko">
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<link rel="stylesheet" href="/src/styles/global.css" />
76
<link rel="stylesheet" href="/src/styles/colors.css" />
87
<link
98
rel="stylesheet"
@@ -18,11 +17,7 @@
1817
rel="stylesheet"
1918
/>
2019
<link
21-
href="https://fonts.googleapis.com/css2?family=Nanum+Gothic&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap"
22-
rel="stylesheet"
23-
/>
24-
<link
25-
href="https://fonts.googleapis.com/css2?family=Edu+SA+Hand:[email protected]&family=Nanum+Gothic&family=Nanum+Pen+Script&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap"
20+
href="https://fonts.googleapis.com/css2?family=Edu+SA+Hand:[email protected]&family=Nanum+Gothic&family=Nanum+Myeongjo&family=Nanum+Pen+Script&family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap"
2621
rel="stylesheet"
2722
/>
2823
<title>Rolling</title>

0 commit comments

Comments
 (0)