diff --git a/flask-server/app.py b/flask-server/app.py index 072c1d4..9d418d3 100644 --- a/flask-server/app.py +++ b/flask-server/app.py @@ -210,10 +210,10 @@ def signup(): @app.route("/SignUp_post", methods=['POST']) def register_user(): data=request.form - pw=request.form['pw'] - pw_hash = hashlib.sha256(pw.encode('utf-8')).hexdigest() - if DB.insert_user(data,pw_hash): - return render_template("index.html") + pwd=request.form['pwd'] + pwd_hash = hashlib.sha256(pwd.encode('utf-8')).hexdigest() + if DB.insert_user(data,pwd_hash): + return redirect(url_for('index')) else: flash("user id already exist!") return render_template("index.html") @@ -225,12 +225,12 @@ def login(): return render_template("index.html") @app.route("/login_confirm", methods=['POST']) def login_user(): - id_=request.form['id'] - pw=request.form['pw'] - pw_hash = hashlib.sha256(pw.encode('utf-8')).hexdigest() - if DB.find_user(id_,pw_hash): - session['id']=id_ - return redirect(url_for('list_restaurants')) + email_=request.form['email'] + pwd=request.form['pwd'] + pwd_hash = hashlib.sha256(pwd.encode('utf-8')).hexdigest() + if DB.find_user(email_,pwd_hash): + session['email']=email_ + return redirect(url_for('index')) else: flash("Wrong ID or PW!") return render_template("login.html") @@ -248,4 +248,4 @@ def view_storelist(store_id): ''' if __name__ == "__main__": - app.run(host='0.0.0.0', debug=True) \ No newline at end of file + app.run(host='0.0.0.0', debug=True) diff --git a/flask-server/database.py b/flask-server/database.py index 16cd20d..9be72ab 100644 --- a/flask-server/database.py +++ b/flask-server/database.py @@ -10,19 +10,20 @@ def __init__(self): self.db = firebase.database() firebaseEmailAuth = firebase.auth() - #회원가입 + + #회원가입 def insert_user(self, data, pwd): user_info = { - "ID" : data['ID'], - "pwd" : pwd, - "nickname" : data['nickname'] + "nickname" : data['nickname'], + "email" : data['email'], + "pwd" : pwd } - if self.user_duplicate_check(str(data['ID'])): - self.db.child("user").push(user_info) - print(data) - return True - else: - return False + # if self.user_duplicate_check(str(data['email'])): + self.db.child("user").push(user_info) + print(data) + return True + # else: + # return False def user_duplicate_check(self, id_string): users = self.db.child("user").get() @@ -32,20 +33,21 @@ def user_duplicate_check(self, id_string): else: for res in users.each(): value = res.val() - if value['ID'] == id_string: + if value['email'] == id_string: return False return True #로그인 부분 - def find_user(self, ID_, pwd_): + def find_user(self, email_, pwd_): users = self.db.child("user").get() target_value=[] for res in users.each(): value = res.val() - if value['ID'] == ID_ and value['pwd'] == pwd_: + if value['email'] == email_ and value['pwd'] == pwd_: return True return False + #평균 평점 계산하고 push해주는 함수 def AverageScore(self,storename): count = 0 diff --git a/flask-server/static/react/js/787.ec704a7a.chunk.js b/flask-server/static/react/js/787.ec704a7a.chunk.js deleted file mode 100644 index a2dea2b..0000000 --- a/flask-server/static/react/js/787.ec704a7a.chunk.js +++ /dev/null @@ -1,2 +0,0 @@ -"use strict";(self.webpackChunkproject=self.webpackChunkproject||[]).push([[787],{787:function(e,t,n){n.r(t),n.d(t,{getCLS:function(){return y},getFCP:function(){return g},getFID:function(){return C},getLCP:function(){return P},getTTFB:function(){return D}});var i,r,a,o,u=function(e,t){return{name:e,value:void 0===t?-1:t,delta:0,entries:[],id:"v2-".concat(Date.now(),"-").concat(Math.floor(8999999999999*Math.random())+1e12)}},c=function(e,t){try{if(PerformanceObserver.supportedEntryTypes.includes(e)){if("first-input"===e&&!("PerformanceEventTiming"in self))return;var n=new PerformanceObserver((function(e){return e.getEntries().map(t)}));return n.observe({type:e,buffered:!0}),n}}catch(e){}},f=function(e,t){var n=function n(i){"pagehide"!==i.type&&"hidden"!==document.visibilityState||(e(i),t&&(removeEventListener("visibilitychange",n,!0),removeEventListener("pagehide",n,!0)))};addEventListener("visibilitychange",n,!0),addEventListener("pagehide",n,!0)},s=function(e){addEventListener("pageshow",(function(t){t.persisted&&e(t)}),!0)},m=function(e,t,n){var i;return function(r){t.value>=0&&(r||n)&&(t.delta=t.value-(i||0),(t.delta||void 0===i)&&(i=t.value,e(t)))}},v=-1,p=function(){return"hidden"===document.visibilityState?0:1/0},d=function(){f((function(e){var t=e.timeStamp;v=t}),!0)},l=function(){return v<0&&(v=p(),d(),s((function(){setTimeout((function(){v=p(),d()}),0)}))),{get firstHiddenTime(){return v}}},g=function(e,t){var n,i=l(),r=u("FCP"),a=function(e){"first-contentful-paint"===e.name&&(f&&f.disconnect(),e.startTime-1&&e(t)},r=u("CLS",0),a=0,o=[],v=function(e){if(!e.hadRecentInput){var t=o[0],i=o[o.length-1];a&&e.startTime-i.startTime<1e3&&e.startTime-t.startTime<5e3?(a+=e.value,o.push(e)):(a=e.value,o=[e]),a>r.value&&(r.value=a,r.entries=o,n())}},p=c("layout-shift",v);p&&(n=m(i,r,t),f((function(){p.takeRecords().map(v),n(!0)})),s((function(){a=0,T=-1,r=u("CLS",0),n=m(i,r,t)})))},E={passive:!0,capture:!0},w=new Date,L=function(e,t){i||(i=t,r=e,a=new Date,F(removeEventListener),S())},S=function(){if(r>=0&&r1e12?new Date:performance.now())-e.timeStamp;"pointerdown"==e.type?function(e,t){var n=function(){L(e,t),r()},i=function(){r()},r=function(){removeEventListener("pointerup",n,E),removeEventListener("pointercancel",i,E)};addEventListener("pointerup",n,E),addEventListener("pointercancel",i,E)}(t,e):L(t,e)}},F=function(e){["mousedown","keydown","touchstart","pointerdown"].forEach((function(t){return e(t,b,E)}))},C=function(e,t){var n,a=l(),v=u("FID"),p=function(e){e.startTimeperformance.now())return;n.entries=[t],e(n)}catch(e){}},"complete"===document.readyState?setTimeout(t,0):addEventListener("load",(function(){return setTimeout(t,0)}))}}}]); -//# sourceMappingURL=787.ec704a7a.chunk.js.map \ No newline at end of file diff --git a/flask-server/static/react/js/787.ec704a7a.chunk.js.map b/flask-server/static/react/js/787.ec704a7a.chunk.js.map deleted file mode 100644 index 5ba3916..0000000 --- a/flask-server/static/react/js/787.ec704a7a.chunk.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"js/787.ec704a7a.chunk.js","mappings":"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","sources":["../node_modules/web-vitals/dist/web-vitals.js"],"sourcesContent":["var e,t,n,i,r=function(e,t){return{name:e,value:void 0===t?-1:t,delta:0,entries:[],id:\"v2-\".concat(Date.now(),\"-\").concat(Math.floor(8999999999999*Math.random())+1e12)}},a=function(e,t){try{if(PerformanceObserver.supportedEntryTypes.includes(e)){if(\"first-input\"===e&&!(\"PerformanceEventTiming\"in self))return;var n=new PerformanceObserver((function(e){return e.getEntries().map(t)}));return n.observe({type:e,buffered:!0}),n}}catch(e){}},o=function(e,t){var n=function n(i){\"pagehide\"!==i.type&&\"hidden\"!==document.visibilityState||(e(i),t&&(removeEventListener(\"visibilitychange\",n,!0),removeEventListener(\"pagehide\",n,!0)))};addEventListener(\"visibilitychange\",n,!0),addEventListener(\"pagehide\",n,!0)},u=function(e){addEventListener(\"pageshow\",(function(t){t.persisted&&e(t)}),!0)},c=function(e,t,n){var i;return function(r){t.value>=0&&(r||n)&&(t.delta=t.value-(i||0),(t.delta||void 0===i)&&(i=t.value,e(t)))}},f=-1,s=function(){return\"hidden\"===document.visibilityState?0:1/0},m=function(){o((function(e){var t=e.timeStamp;f=t}),!0)},v=function(){return f<0&&(f=s(),m(),u((function(){setTimeout((function(){f=s(),m()}),0)}))),{get firstHiddenTime(){return f}}},d=function(e,t){var n,i=v(),o=r(\"FCP\"),f=function(e){\"first-contentful-paint\"===e.name&&(m&&m.disconnect(),e.startTime-1&&e(t)},f=r(\"CLS\",0),s=0,m=[],v=function(e){if(!e.hadRecentInput){var t=m[0],i=m[m.length-1];s&&e.startTime-i.startTime<1e3&&e.startTime-t.startTime<5e3?(s+=e.value,m.push(e)):(s=e.value,m=[e]),s>f.value&&(f.value=s,f.entries=m,n())}},h=a(\"layout-shift\",v);h&&(n=c(i,f,t),o((function(){h.takeRecords().map(v),n(!0)})),u((function(){s=0,l=-1,f=r(\"CLS\",0),n=c(i,f,t)})))},T={passive:!0,capture:!0},y=new Date,g=function(i,r){e||(e=r,t=i,n=new Date,w(removeEventListener),E())},E=function(){if(t>=0&&t1e12?new Date:performance.now())-e.timeStamp;\"pointerdown\"==e.type?function(e,t){var n=function(){g(e,t),r()},i=function(){r()},r=function(){removeEventListener(\"pointerup\",n,T),removeEventListener(\"pointercancel\",i,T)};addEventListener(\"pointerup\",n,T),addEventListener(\"pointercancel\",i,T)}(t,e):g(t,e)}},w=function(e){[\"mousedown\",\"keydown\",\"touchstart\",\"pointerdown\"].forEach((function(t){return e(t,S,T)}))},L=function(n,f){var s,m=v(),d=r(\"FID\"),p=function(e){e.startTimeperformance.now())return;n.entries=[t],e(n)}catch(e){}},\"complete\"===document.readyState?setTimeout(t,0):addEventListener(\"load\",(function(){return setTimeout(t,0)}))};export{h as getCLS,d as getFCP,L as getFID,F as getLCP,P as getTTFB};\n"],"names":["e","t","n","i","r","name","value","delta","entries","id","concat","Date","now","Math","floor","random","a","PerformanceObserver","supportedEntryTypes","includes","self","getEntries","map","observe","type","buffered","o","document","visibilityState","removeEventListener","addEventListener","u","persisted","c","f","s","m","timeStamp","v","setTimeout","firstHiddenTime","d","disconnect","startTime","push","window","performance","getEntriesByName","requestAnimationFrame","p","l","h","hadRecentInput","length","takeRecords","T","passive","capture","y","g","w","E","entryType","target","cancelable","processingStart","forEach","S","L","b","F","once","P","getEntriesByType","timing","max","navigationStart","responseStart","readyState"],"sourceRoot":""} \ No newline at end of file diff --git a/flask-server/static/react/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg b/flask-server/static/react/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg deleted file mode 100644 index 9dfc1c0..0000000 --- a/flask-server/static/react/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/flask-server/static/react/media/sample.5b41e09dc2adbb809249.PNG b/flask-server/static/react/media/sample.5b41e09dc2adbb809249.PNG deleted file mode 100644 index 18c8150..0000000 Binary files a/flask-server/static/react/media/sample.5b41e09dc2adbb809249.PNG and /dev/null differ diff --git a/flask-server/static/react/media/symbol-mark.8a35bde01c62d01eaa4b.png b/flask-server/static/react/media/symbol-mark.8a35bde01c62d01eaa4b.png deleted file mode 100644 index ca8eb21..0000000 Binary files a/flask-server/static/react/media/symbol-mark.8a35bde01c62d01eaa4b.png and /dev/null differ diff --git a/flask-server/templates/index.html b/flask-server/templates/index.html index 700a6ab..08946cd 100644 --- a/flask-server/templates/index.html +++ b/flask-server/templates/index.html @@ -1 +1 @@ -맛집 웹사이트
\ No newline at end of file +맛집 웹사이트
diff --git a/src/App.js b/src/App.js index 480d34e..3513cb4 100644 --- a/src/App.js +++ b/src/App.js @@ -37,6 +37,8 @@ function App() {
+ }> + }> }> }> }> @@ -44,7 +46,6 @@ function App() { {/* }> */} }> }> - }> }> }> }> diff --git a/src/css/SignUp.module.css b/src/css/SignUp.module.css index 27f864d..f6d6dc1 100644 --- a/src/css/SignUp.module.css +++ b/src/css/SignUp.module.css @@ -1,68 +1,62 @@ -.SignIn { - float: center; - margin: 0; -} - -.SignIn-logo { - float: left; -} - -.SignIn-div-Headline { - float: center; - display: flex; - text-align: center; -} - -.SignIn-table-Th1 { - width: 20%; - background-color: rgba(217, 217, 217, 0.8); - border-bottom: 1px solid rgba(0, 0, 0, 0.24); -} - -.SignIn-table-tr { - width: 100%; -} - -#lastLine { - border-bottom: none; -} - -.SignIn-table-input { - background-color: rgba(217, 217, 217, 0.21); - border: 1px solid #000000; - box-shadow: inset 0px 2px 4px rgba(0, 0, 0, 0.25); - border-radius: 10px; - position: absolute; - width: 806px; - height: 56px; - left: 470px; - -} - -.SignIn-table-input.withButton { - width: 615px; -} - -.SignIn-table-Th1-p { - font-size: 24px; - left: 470px; -} - -.SignIn-table-button { - background-color: #00462A; - color: white; - position: absolute; - width: 171px; - height: 343px; - left: 1100px; -} - -#black_button { - background-color: black; - position: absolute; - width: 337.97px; - height: 81px; - left: 551px; - top: 877px; - font-size: 30px; -} \ No newline at end of file +.loginregister{ + width : 900px; + margin-left:auto; + margin-right:auto; +} + + + + + #table { + display: table; + width: 500px; + margin-top: 50px; + margin-left:auto; + margin-right:auto; + + border-radius: 3px; + vertical-align: middle; + } + + + .cell { + display: table-cell; + padding: 3px; + /* border-bottom: 1px solid #DDD; */ + text-align: left; + + font-weight: 600; + font-size: 16px; + + } + + .row { + position: relative; + + /* left:80px; */ + /* top :20px; */ + + } + + .col1 { + position: relative; + /* top:10px; */ + left: 40px; + width: 180px; + height: 50px; + font-size : larger; + text-align : center; + vertical-align: middle; + background-color : #bcbcbc;; + box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.25); + } + + .col2 { + position: relative; + /* top:10px; */ + left: 40px; + width: 150px; + height: 25px; + vertical-align: middle; + background-color : #dcdcdc; + } \ No newline at end of file diff --git a/src/pages/Login.js b/src/pages/Login.js index f3fcdec..1e6a38c 100644 --- a/src/pages/Login.js +++ b/src/pages/Login.js @@ -2,71 +2,22 @@ import React, { useState } from "react"; import Header from "../component/header"; import styles from "../css/Login.module.css"; import { Link } from 'react-router-dom'; -import NavBar from "../component/NavBar"; -import { - createUserWithEmailAndPassword, - onAuthStateChanged, - signInWithEmailAndPassword, - signOut -} from "firebase/auth"; -import { auth } from "./firebase"; -const Login = () => { - const [registerEmail, setRegisterEmail] = useState(""); - const [registerPassword, setRegisterPassword] = useState(""); - - const [loginEmail, setLoginEmail] = useState(""); // 코드 추가 - const [loginPassword, setLoginPassword] = useState(""); // 코드 추가 - const [user, setUser] = useState({}); // 코드 추가 - - onAuthStateChanged(auth, (currentUser) => { - setUser(currentUser); - }); - - - //로그인 - const login = async () => { - try { - const user = await signInWithEmailAndPassword( - auth, - loginEmail, - loginPassword - ); - console.log(user); - } catch (error) { - console.log(error.message); - } - }; - - //로그아웃 - const logout = async () => { - await signOut(auth); - }; +function Login() { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + + return ( -
- -
- {/* 로그인 */} -

Login

- { - setLoginEmail(e.target.value); - }} - /> - { - setLoginPassword(e.target.value); - }} - /> - -
User Logged In:
-
{user?.email}
- -
+
+
+
+
+
+
- ); -}; -export default Login; + ); + } + + export default Login; diff --git a/src/pages/MyPage.js b/src/pages/MyPage.js index ed5231f..f64a5f1 100644 --- a/src/pages/MyPage.js +++ b/src/pages/MyPage.js @@ -1,41 +1,23 @@ -import React from "react"; +import React, { useState } from "react"; import styles from "../css/MyPage.module.css"; import { Link } from 'react-router-dom'; +import { getAuth, onAuthStateChanged } from "firebase/auth"; -export default function MyPage() { - return ( -
-
-
- -
이화연
-
-

- -
-
-
- -

- - -

- - -
- -
- - - -


-
*비밀번호는 영문과 숫자, 특수기호를 포함한 10~15자리로 설정해주세요
- -
-
-
+function MyPage({ user }) { + const { email, pwd, name } = user || {}; + return ( + <> +

Profile

+
Email
+
{email}
+
Password
+
{pwd}
+
Name
+
{name}
+ ); } +export default MyPage; diff --git a/src/pages/SignUp.js b/src/pages/SignUp.js index e331e4f..888079c 100644 --- a/src/pages/SignUp.js +++ b/src/pages/SignUp.js @@ -4,8 +4,7 @@ import Header from "../component/header"; import { Link } from 'react-router-dom'; import styles from '../css/SignUp.module.css'; import NavBar from "../component/NavBar"; -import { createUserWithEmailAndPassword } from "firebase/auth"; -import { auth } from "./firebase"; + function SignUp() { const [name, setName] = useState("") @@ -22,17 +21,34 @@ function SignUp() { // const onPasswordHandler = (event) => { // setPassword(event.currentTarget.value) // } + + return (
-
-
-
-
-
+ +
+
+ 이름 + +
+
+ 이메일 + +
+
+ 비밀번호 + +
+ {/*
+ +
*/} +
+
+ +
); } - export default SignUp; \ No newline at end of file diff --git a/src/pages/firebase.js b/src/pages/firebase.js deleted file mode 100644 index 92891a1..0000000 --- a/src/pages/firebase.js +++ /dev/null @@ -1,17 +0,0 @@ -import { initializeApp } from "firebase/app"; -import { getAuth } from "firebase/auth"; - - -const firebaseConfig = { - "apiKey": "AIzaSyANcW4W-7NcHf_1VfQYoX8pZKfMzPkr_0o", - "authDomain": "ewha-osp-yahak.firebaseapp.com", - "databaseURL": "https://ewha-osp-yahak-default-rtdb.firebaseio.com", - "projectId": "ewha-osp-yahak", - "storageBucket": "ewha-osp-yahak.appspot.com", - "messagingSenderId": "918941450246", - "appId": "1:918941450246:web:98951a7cbbde67bae28387", - "measurementId": "G-3ZG5KPCBDL" -}; - -const app = initializeApp(firebaseConfig); -export const auth = getAuth(app); \ No newline at end of file