Skip to content
Open
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
Binary file modified flask-server/__pycache__/database.cpython-39.pyc
Binary file not shown.
14 changes: 10 additions & 4 deletions flask-server/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
import string
import random



app = Flask(__name__)

DB = DBhandler()
Expand Down Expand Up @@ -153,7 +151,7 @@ def Submit_Review():
##################### Get data from DB #####################
@app.route("/get_registered_store/<storename>")
def get_registered_store(storename):
registered = DB.get_store_byname(storename)
registered = DB.get_store(storename)
print(registered)
registered_json = json.dumps(registered)
return registered_json
Expand Down Expand Up @@ -193,4 +191,12 @@ def list_stores():
@app.route("/StoreListView",methods=['GET','POST'])
def view_storelist(store_id):
return render_template("index.html")
'''
'''


@app.route("/StoreDetail/<storename>", methods=['GET','POST'])
def get_storename_info(storename):
StoreInfo=DB.get_store_info(storename)
# return render_template ("index.html",StoreInfo=StoreInfo)
storeInfojson = json.dumps(StoreInfo)
return render_template("index.html",storeInfojson=storeInfojson)
17 changes: 16 additions & 1 deletion flask-server/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,19 @@ def insert_review(self,name,data,img_path):
self.db.child("REVIEW").child(name).set(review_info)
print(data,img_path)
return True

def get_store_info(self,storename):

storeInfo = self.db.child("STORE").child(storename).get().val

return storeInfo

def get_menu(self, storename):
menudata = self.db.child("MENU").child(storename).get()
if isinstance(menudata.val(), type(None)):
menu=None
return menu
else:
for res in menudata.each():
menuInfo=self.db.child("MENU").child(storename).child(res.key).get()

return menuInfo
Binary file added flask-server/static/img/2022-11-27.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added flask-server/static/img/다운로드 (1).jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added flask-server/static/img/다운로드.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions flask-server/static/react/asset-manifest.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"files": {
"main.css": "/static/react/css/main.8286b51f.css",
"main.js": "/static/react/js/main.625931ab.js",
"main.css": "/static/react/css/main.d01b256b.css",
"main.js": "/static/react/js/main.2d90c10a.js",
"js/787.ec704a7a.chunk.js": "/static/react/js/787.ec704a7a.chunk.js",
"media/symbol-mark.png": "/static/react/media/symbol-mark.8a35bde01c62d01eaa4b.png",
"media/sample.PNG": "/static/react/media/sample.5b41e09dc2adbb809249.PNG",
"media/logo.svg": "/static/react/media/logo.6ce24c58023cc2f8fd88fe9d219db6c6.svg",
"../../templates/index.html": "/static/react/../../templates/index.html",
"main.8286b51f.css.map": "/static/react/css/main.8286b51f.css.map",
"main.625931ab.js.map": "/static/react/js/main.625931ab.js.map",
"main.d01b256b.css.map": "/static/react/css/main.d01b256b.css.map",
"main.2d90c10a.js.map": "/static/react/js/main.2d90c10a.js.map",
"787.ec704a7a.chunk.js.map": "/static/react/js/787.ec704a7a.chunk.js.map"
},
"entrypoints": [
"css/main.8286b51f.css",
"js/main.625931ab.js"
"css/main.d01b256b.css",
"js/main.2d90c10a.js"
]
}
1 change: 0 additions & 1 deletion flask-server/static/react/css/main.8286b51f.css.map

This file was deleted.

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions flask-server/static/react/css/main.d01b256b.css.map

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions flask-server/static/react/js/main.2d90c10a.js

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
*/

/**
* @remix-run/router v1.0.4
* @remix-run/router v1.0.3
*
* Copyright (c) Remix Software Inc.
*
Expand All @@ -62,7 +62,7 @@
*/

/**
* React Router DOM v6.4.4
* React Router DOM v6.4.3
*
* Copyright (c) Remix Software Inc.
*
Expand All @@ -73,7 +73,7 @@
*/

/**
* React Router v6.4.4
* React Router v6.4.3
*
* Copyright (c) Remix Software Inc.
*
Expand Down
1 change: 1 addition & 0 deletions flask-server/static/react/js/main.2d90c10a.js.map

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions flask-server/static/react/js/main.625931ab.js

This file was deleted.

1 change: 0 additions & 1 deletion flask-server/static/react/js/main.625931ab.js.map

This file was deleted.

2 changes: 1 addition & 1 deletion flask-server/templates/index.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/react/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/static/react/logo192.png"/><link rel="manifest" href="/static/react/manifest.json"/><title>맛집 웹사이트</title><script defer="defer" src="/static/react/js/main.625931ab.js"></script><link href="/static/react/css/main.8286b51f.css" rel="stylesheet"></head><body><noscript></noscript><div id="root"></div></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/react/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Web site created using create-react-app"/><link rel="apple-touch-icon" href="/static/react/logo192.png"/><link rel="manifest" href="/static/react/manifest.json"/><title>맛집 웹사이트</title><script defer="defer" src="/static/react/js/main.2d90c10a.js"></script><link href="/static/react/css/main.d01b256b.css" rel="stylesheet"></head><body><noscript></noscript><div id="root"></div></body></html>
104 changes: 104 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@
"jest-resolve": "^27.4.2",
"jest-watch-typeahead": "^1.0.0",
"mini-css-extract-plugin": "^2.4.5",
"net": "^1.0.2",
"path": "^0.12.7",
"postcss": "^8.4.4",
"postcss-flexbugs-fixes": "^5.0.2",
"postcss-loader": "^6.2.1",
Expand All @@ -52,6 +54,7 @@
"sass-loader": "^12.3.0",
"semver": "^7.3.5",
"source-map-loader": "^3.0.0",
"stream-http": "^3.2.0",
"style-loader": "^3.3.1",
"tailwindcss": "^3.0.2",
"terser-webpack-plugin": "^5.2.5",
Expand Down Expand Up @@ -140,4 +143,4 @@
"react-app"
]
}
}
}
7 changes: 4 additions & 3 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,17 @@ function App() {
<Route path="/" element={<Homepage />}></Route>
<Route path="/CreateStore" element={<CreateStore />}></Route>
<Route path="/RegisteredStore/:storename" element={<RegisteredStore />}></Route>
<Route path="/CreateMenu/:id" element={<CreateMenu />}></Route>
<Route path="/CreateReview/:id" element={<CreateReview />}></Route>
<Route path="/CreateMenu/:storename" element={<CreateMenu />}></Route>
<Route path="/CreateReview/:storename" element={<CreateReview />}></Route>
<Route path="/Homepage" element={<Homepage />}></Route>
<Route path="/Login" element={<Login />}></Route>
<Route path="/MyPage" element={<MyPage />}></Route>
<Route path="/MyPageBookmark" element={<MyPageBookmark />}></Route>
<Route path="/MyPageMenu" element={<MyPageMenu />}></Route>
<Route path="/ReviewAll" element={<ReviewAll />}></Route>
<Route path="/SignUp" element={<SignUp />}></Route>
<Route path="/StoreDetail/:id" element={<StoreDetail />}></Route>
<Route path="/StoreDetail/:storename" element={<StoreDetail />}></Route>
<Route path="/CreateMenu/:storename/:menuname" element={<CreateMenu />}></Route>
<Route path="/StoreListView" element={<StoreListView />}></Route>
</Routes>
</BrowserRouter>
Expand Down
Loading