Merge branch 'main' into feature/#32

Soongsil-Developers · Sep 7, 2022 · a2584cb · a2584cb
2 parents 4d468c9 + 2b09841
commit a2584cb
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 1 deletion.
diff --git a/front/package.json b/front/package.json
@@ -17,6 +17,7 @@
     "react-dom": "^18.2.0",
     "react-redux": "^8.0.2",
     "react-router-dom": "^6.3.0",
+    "recoil": "^0.7.5",
     "redux": "^4.2.0",
     "redux-actions": "^2.6.5",
     "redux-devtools-extension": "^2.13.9"

diff --git a/front/src/App.jsx b/front/src/App.jsx
@@ -24,6 +24,14 @@ import CreateEditArticle from './components/CreateEditArticle';
 import Profile from './components/Profile';
 import Settings from './components/Settings';
 
+import {
+  RecoilRoot,
+  atom,
+  selector,
+  useRecoilState,
+  useRecoilValue,
+} from 'recoil';
+
 function App() {
   return (
     <RecoilRoot>

diff --git a/front/src/atoms/user.jsx b/front/src/atoms/user.jsx
@@ -36,4 +36,5 @@ export const updateUserState = atom({
 export const updateUserRequestState = atom({
   key: 'src/atoms/User.jsx-updateUserRequestState',
   default: {},
+
 });
diff --git a/front/src/components/Article.jsx b/front/src/components/Article.jsx
@@ -1,4 +1,11 @@
 import React from 'react';
+import ReactDOM from 'react-dom';
+
+const getNumber = () => {
+  return 10;
+};
+
+const a = getNumber();
 
 const Article = () => {
   return (

diff --git a/front/src/components/Signin.jsx b/front/src/components/Signin.jsx
@@ -16,6 +16,7 @@ const Signin = () => {
     }
   }, [isLoggedIn]);
 
+
   return (
     <div>
       <div className="auth-page">
@@ -44,6 +45,7 @@ const Signin = () => {
                 }}
               >
                 <fieldset className="form-group">
+
                   <input
                     className="form-control form-control-lg"
                     type="text"
@@ -59,7 +61,13 @@ const Signin = () => {
                     onChange={(e) => setPassword(e.target.value)}
                   />
                 </fieldset>
-                <button className="btn btn-lg btn-primary pull-xs-right">
+
+                <button
+                  type="button"
+                  class="btn btn-lg btn-primary pull-xs-right"
+                  onClick={onClickSubmitHandler}
+                >
+
                   Sign In
                 </button>
               </form>

diff --git a/front/yarn.lock b/front/yarn.lock
@@ -678,6 +678,11 @@ globals@^11.1.0:
   resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+[email protected]:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/hamt_plus/-/hamt_plus-1.0.2.tgz#e21c252968c7e33b20f6a1b094cd85787a265601"
+  integrity sha512-t2JXKaehnMb9paaYA7J0BX8QQAY8lwfQ9Gjf4pg/mk4krt+cmwmU652HOoWonf+7+EQV97ARPMhhVgU1ra2GhA==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
@@ -915,6 +920,13 @@ react@^18.2.0:
   dependencies:
     loose-envify "^1.1.0"
 
+recoil@^0.7.5:
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/recoil/-/recoil-0.7.5.tgz#9a33a03350cfd99e08bdd5b73bfc8b8b9ee751b9"
+  integrity sha512-GVShsj5+M/2GULWBs5WBJGcsNis/d3YvDiaKjYh3mLKXftjtmk9kfaQ8jwjoIXySCwn8/RhgJ4Sshwgzj2UpFA==
+  dependencies:
+    hamt_plus "1.0.2"
+
 reduce-reducers@^0.4.3:
   version "0.4.3"
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.4.3.tgz#8e052618801cd8fc2714b4915adaa8937eb6d66c"