diff --git a/public/index.html b/public/index.html
index a7d5d6c..76c7c50 100644
--- a/public/index.html
+++ b/public/index.html
@@ -25,6 +25,7 @@
Learn how to configure a non-root public URL by running `npm run build`.
-->
+
타닥 :: 코딩으로 타자연습!
diff --git a/src/components/Syntax/index.js b/src/components/Syntax/index.js
index c214aad..3ad043b 100644
--- a/src/components/Syntax/index.js
+++ b/src/components/Syntax/index.js
@@ -1,4 +1,5 @@
import styled from "@emotion/styled";
+import { Link } from "react-router-dom";
export const SyntaxSelectContainer = styled.div`
width: 280px;
@@ -89,7 +90,10 @@ export const SyntaxStartButton = styled.button`
// summary="파이썬에서 재사용을 위한 함수를 배웁니다! 함수는 프로그래밍 언어에서 핵심적입니다!"
// />
-function SyntaxSelectComponent({ example, title, level, summary }) {
+function SyntaxSelectComponent({ language, example, title, level, summary }) {
+
+ const linkURL = "/" + language + "/" + level;
+
var stars = [];
for (var i = 0; i < 5; i++) {
if (i < level) {
@@ -108,7 +112,10 @@ function SyntaxSelectComponent({ example, title, level, summary }) {
{stars}
{summary}
- {}}>시작하기!
+
+ 시작하기!
+
+
);
}
diff --git a/src/components/TypeInput/index.js b/src/components/TypeInput/index.js
index 545ed0f..bbe169c 100644
--- a/src/components/TypeInput/index.js
+++ b/src/components/TypeInput/index.js
@@ -31,7 +31,7 @@ function parseNewline(paragraph) {
return newLineIndices;
}
-const TEST_STRING_INDEX = 1;
+const TEST_STRING_INDEX = 5;
const TEST_STRING = MOCKUP_STRING[TEST_STRING_INDEX];
function TypeInput({ timePassed, setCurrentKPM, currentKPM, setIsPlaying }) {
diff --git a/src/components/common/Button/index.js b/src/components/common/Button/index.js
index f8e6b33..279611f 100644
--- a/src/components/common/Button/index.js
+++ b/src/components/common/Button/index.js
@@ -29,10 +29,6 @@ const StyledButton = styled.button`
padding: 16px 12px 16px 16px;
column-gap: 7px;
- // position: absolute;
- width: 129px;
- height: 56px;
-
background: #FFFFFF;
border-radius: 10px;
cursor:pointer;
diff --git a/src/constants/paragraphs.js b/src/constants/paragraphs.js
index 7e7eb0c..81a2ec1 100644
--- a/src/constants/paragraphs.js
+++ b/src/constants/paragraphs.js
@@ -4,4 +4,11 @@ export const MOCKUP_STRING = [
// eslint-disable-next-line no-template-curly-in-string
"${resetCSS}\n* {\n-webkit-tap-highlight-color: transparent;\nbox-sizing: border-box;\ntransition: background-color 0.2s;\nwill-change: background-color\n}",
'\n\n\n \n \n \n Document\n\n\n \n\n',
+ 'import random\nprint("Hello! What is your name?")\nmy_name = input()\nnumber = random.randint(1, 20)\nprint("Well, " + my_name + ", I am thinking of a number between 1 and 20.")',
+ 'year = int(input("Please enter the year:"))\nif year % 4 == 0 and year % 100 != 0:\n print(year, "is a leap year")\nelif year % 400 == 0:\n print(year, "is a leap year")\nelse:\n print(year, "is not a leap year")',
+ `'languages = ['python', 'perl', 'c', 'java']\n\nfor lang in languages:\n if lang in ['pytohn', 'perl']:\n print("%6s need interpreter" % lang)\n elif lang in ['c', 'java']:\n print("%6s need compiler" % lang)\n else:\n print("should not reach here")'`,
+ 'def fibonacci(n):\n if n <= 1:\n return n\n else:\n return(fibonacci(n-1) + fibonacci(n-2))\nnterms = int(input("How many Fibonacci do you want?: "))\nif nterms <= 0:\n print("Error : Please enter a positive number")\nelse:\n print("Fibonacci: ", end="")\n for i in range(nterms):\n print(fibonacci(i), end="")',
+ `import random\nf1 = open('score.txt', 'w')\nfor i in range(5):\n for j in range(5):\n f1.write(str(random.randint(1, 100)) + ' ')\n f1.write('\n')\nf1 = open('score.txt', 'r')\nf2 = open('report.txt', 'w')\nwhile True:\n score = f1.readline()\n if score == '':\n break\n scorelist = score.split()\n sum = 0\n for i in range(5):\n sum += int(scorelist[i])\nf1.close()\nf2.close()`,
+ 'class Caculator:\n def __init__(self, first, second): self.first = first\n self.second = second\n def add(self):\n result = self.first + self.second\n return result\n def sub(self):\n result = self.first - self.second\n return result\n def div(self):\n result = self.first / self.second\n return result\n def mult(self):\n result = self.first * self.second\n return result',
+
];
diff --git a/src/pages/LanguageSelect/style.js b/src/pages/LanguageSelect/style.js
index b755402..ad1b931 100644
--- a/src/pages/LanguageSelect/style.js
+++ b/src/pages/LanguageSelect/style.js
@@ -19,9 +19,20 @@ export const LanguageSelectContainer = styled.div`
export const LanguageSelectTitle = styled.div`
flex: 1 1 0;
- font-style: bold;
- font-size:40px;
- margin: 20px;
+ // font-style: bold;
+ // font-size:40px;
+ // margin: 20px;
+ // font-weight: 700;
+ // font-size: 32px;
+ // line-height: 38px;
+ // margin-top: 24px;
+ // margin-bottom: 40px;
+ // text-align: center;
+ width: 100%;
+ font-size: 32px;
+ font-weight: bold;
+ padding: 24px;
+ text-align: center;
`
export const LanguageCardList = styled.div`
diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index 4640acb..30337ff 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -2,11 +2,12 @@ import React from "react";
import { useCallback } from "react";
import { serverAxios } from "utils/commonAxios";
import { mutate } from "swr";
-import { ButtonDiv, LoginTitle, ToRegister, ToRegisterParagraph } from "./style";
+import { ButtonDiv, LoginForm, LoginTitle, ToRegister, ToRegisterParagraph } from "./style";
import InputEmail from "components/common/Inputs/InputEmail";
import InputPassword from "components/common/Inputs/InputPassword";
import Button from "components/common/Button";
import { useNavigate } from "react-router-dom";
+import { Link } from "react-router-dom";
function Login() {
const navigate = useNavigate();
@@ -51,15 +52,15 @@ function Login() {
return (
<>
로그인하기
-
+
- 회원가입
+ 회원가입
하러 가기
diff --git a/src/pages/Login/style.js b/src/pages/Login/style.js
index b568715..ec26af6 100644
--- a/src/pages/Login/style.js
+++ b/src/pages/Login/style.js
@@ -26,6 +26,13 @@ export const ToRegisterParagraph = styled.p`
`;
+export const LoginForm = styled.form`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+`;
+
export const ToRegister = styled.span`
text-decoration: underline;
`;
\ No newline at end of file
diff --git a/src/pages/Main/index.js b/src/pages/Main/index.js
index 37b4323..65435f2 100644
--- a/src/pages/Main/index.js
+++ b/src/pages/Main/index.js
@@ -18,6 +18,7 @@ import { defaultFadeInUpVariants, staggerOne } from "styles/motions";
import { css } from "@emotion/react";
import InputUserName from "components/common/Inputs/InputUserName";
import DropdownComponent from "components/Dropdown";
+import { Link } from "react-router-dom";
function Main() {
const [gender, setSelected] = useState(undefined);
@@ -55,12 +56,14 @@ function Main() {
-
+
+
+
diff --git a/src/pages/Register/index.js b/src/pages/Register/index.js
index e2130c3..40d78f4 100644
--- a/src/pages/Register/index.js
+++ b/src/pages/Register/index.js
@@ -4,8 +4,9 @@ import InputPasswordAndCheck from "components/common/Inputs/InputPasswordAndChec
import InputUserName from "components/common/Inputs/InputUserName";
import React from "react";
import { useCallback } from "react";
+import { Link } from "react-router-dom";
import { serverAxios } from "utils/commonAxios";
-import { ButtonDiv, RegisterInformation, RegisterTitle, ToLogin, ToLoginParagraph } from "./style";
+import { ButtonDiv, RegisterForm, RegisterInformation, RegisterTitle, ToLogin, ToLoginParagraph } from "./style";
function Register() {
const handleSubmit = useCallback((e) => {
@@ -42,17 +43,17 @@ function Register() {
회원으로 플레이해서 다른 사용자들과 누가 더 빠른지 겨뤄보세요!
나의 기록도 저장할 수 있답니다!
-
+
계정이 이미 있으세요?{" "}
- 로그인
+ 로그인
하러 가기
diff --git a/src/pages/Register/style.js b/src/pages/Register/style.js
index 0012132..a75648f 100644
--- a/src/pages/Register/style.js
+++ b/src/pages/Register/style.js
@@ -34,6 +34,13 @@ export const ToLoginParagraph = styled.p`
`;
+export const RegisterForm = styled.form`
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+`;
+
export const ToLogin = styled.span`
text-decoration: underline;
`;
\ No newline at end of file
diff --git a/src/pages/SyntaxSelect/index.js b/src/pages/SyntaxSelect/index.js
index 2665ec7..94f6beb 100644
--- a/src/pages/SyntaxSelect/index.js
+++ b/src/pages/SyntaxSelect/index.js
@@ -49,6 +49,7 @@ function SyntaxSelect({ language }) {
{SYNTAXES[selectedlanguage].map((element) => (
css`
@@ -34,6 +35,11 @@ export const globalStyles = (theme, isOpen) => css`
a {
${resetAnchorStyle}
}
+
+ input, button {
+ font-family: inherit;
+ }
+
`;
const GlobalStyles = () => {