Merge pull request '更新' (#9 ) from CJR into master

修改PPT
修改设计说明书
32 changed files with 23 additions and 48 deletions
--- a/doc/03_软件需求规格说明书.docx
+++ b/doc/03_软件需求规格说明书.docx
--- a/doc/04_软件设计规格说明书.docx
+++ b/doc/04_软件设计规格说明书.docx
--- a/doc/设计模型_美食天地_陈家儒(v2.0).docx
+++ b/doc/设计模型_美食天地_陈家儒(v2.0).docx
--- a/doc/设计模型_美食天地_陈家儒(v3.0).docx
+++ b/doc/设计模型_美食天地_陈家儒(v3.0).docx
--- a/doc/设计模型_美食天地_陈家儒.docx
+++ b/doc/设计模型_美食天地_陈家儒.docx
--- a/doc/需求模型_美食天地_陈家儒
+++ b/doc/需求模型_美食天地_陈家儒
--- a/doc/需求模型_美食天地_陈家儒(v3.0)
+++ b/doc/需求模型_美食天地_陈家儒(v3.0)
--- a/doc/需求模型_美食天地_陈家儒（v2.0).doc
+++ b/doc/需求模型_美食天地_陈家儒（v2.0).doc
--- a/other/05_开发软件系统实践的汇报.pptx
+++ b/other/05_开发软件系统实践的汇报.pptx
--- a/other/06_软件开发项目的个人自评报告.xlsx
+++ b/other/06_软件开发项目的个人自评报告.xlsx
--- a/other/07_软件开发项目的团队自评报告.xlsx
+++ b/other/07_软件开发项目的团队自评报告.xlsx
--- a/other/08_210340137陈家儒_实践总结报告.docx
+++ b/other/08_210340137陈家儒_实践总结报告.docx
--- a/陈政杨_实践总结报告.docx
+++ b/陈政杨_实践总结报告.docx
--- a/程衍伟-实践总结报告.docx
+++ b/程衍伟-实践总结报告.docx
--- a/other/08_210340141杜鑫伟-实践总结报告.docx
+++ b/other/08_210340141杜鑫伟-实践总结报告.docx
--- a/other/09_系统演示视频.mp4
+++ b/other/09_系统演示视频.mp4
--- a/other/10_系统宣传海报.png
+++ b/other/10_系统宣传海报.png
--- a/other/登录模块代码测试.mp4
+++ b/other/登录模块代码测试.mp4
--- a/other/管理员模块代码测试.mp4
+++ b/other/管理员模块代码测试.mp4
--- a/src/FoodSpace/FoodSpace/pycache/settings.cpython-310.pyc
+++ b/src/FoodSpace/FoodSpace/pycache/settings.cpython-310.pyc
--- a/src/FoodSpace/FoodSpace/pycache/urls.cpython-310.pyc
+++ b/src/FoodSpace/FoodSpace/pycache/urls.cpython-310.pyc
--- a/src/FoodSpace/FoodSpace/settings.py
+++ b/src/FoodSpace/FoodSpace/settings.py
@ -85,7 +85,7 @@ DATABASES = {
        'ENGINE': 'django.db.backends.mysql',
        'NAME': 'menu',
        'USER': 'root',
-        'PASSWORD': "czy20030103@",
+        'PASSWORD': "123456cjR.sT",
        'HOST': 'localhost',
        'PORT': '3306',
    }
--- a/src/FoodSpace/index/pycache/calldata.cpython-310.pyc
+++ b/src/FoodSpace/index/pycache/calldata.cpython-310.pyc
--- a/src/FoodSpace/index/pycache/views.cpython-310.pyc
+++ b/src/FoodSpace/index/pycache/views.cpython-310.pyc
--- a/src/FoodSpace/index/templates/AdminScreen.html
+++ b/src/FoodSpace/index/templates/AdminScreen.html
@ -93,12 +93,8 @@
    <<div class="container">
        <h1>管理员界面</h1>
        <button class="button" onclick="openModal('添加菜品')" data-action="添加菜品">添加菜品</button>
-        <button class="button" onclick="openModal('删除菜品')" data-action="删除菜品">删除菜品</button>
        <button class="button" onclick="openModal('搜索菜品')" data-action="搜索菜品">搜索菜品</button>
-        <button class="button" onclick="openModal('更新菜品')" data-action="更新菜品">更新菜品</button>
-        <button class="button" onclick="openModal('删除用户')" data-action="删除用户">删除用户</button>
        <button class="button" onclick="openModal('搜索用户')" data-action="搜索用户">搜索用户</button>
-        <button class="button" onclick="openModal('更新用户')" data-action="更新用户">更新用户</button>
         </div>
        <div class="table-container">
            <table id="dishTable">
@ -151,9 +147,6 @@
        </div>
    </div>

-
-
-
    <script>
        $.get('/admin/getDishes', function(data) {
            var dishes = data;
--- a/src/FoodSpace/index/templates/LoginScreen.html
+++ b/src/FoodSpace/index/templates/LoginScreen.html
--- a/src/FoodSpace/index/templates/MainScreen.html
+++ b/src/FoodSpace/index/templates/MainScreen.html
--- a/src/FoodSpace/index/templates/UserDefindScreen.html
+++ b/src/FoodSpace/index/templates/UserDefindScreen.html
--- a/src/FoodSpace/index/templates/UserScreen.html
+++ b/src/FoodSpace/index/templates/UserScreen.html
--- a/src/FoodSpace/index/templates/about.html
+++ b/src/FoodSpace/index/templates/about.html
@ -47,49 +47,31 @@
            border-radius: 50%;
            margin-bottom: 10px;
        }
-        .team-members {
-            display: grid;
-            grid-template-columns: repeat(2, 1fr);
-            gap: 20px;
-            margin-top: 40px;
-        }
-
-        .team-member {
-            text-align: center;
-        }
    </style>
 </head>
 <body>
    <header style="text-align: center;">
-        <h1>关于我们</h1>
+        <h1>FoodSpace 关于我们</h1>
    </header>

    <div class="mx-auto max-w-md w-full about-section">
        <p>
-            欢迎来到美食天地，您的美食之旅开始的地方！我们致力于为您提供美味、健康和创意的饮食体验。
+            欢迎来到FoodSpace，您的美食之旅开始的地方！我们致力于为您提供美味、健康和创意的饮食体验。
        </p>

        <p>
-            美食天地是一个由热爱美食的团队创建的应用，我们希望通过这个平台分享烹饪的乐趣，启发您的创意厨艺。
+            FoodSpace是一个由热爱美食的团队创建的应用，我们希望通过这个平台分享烹饪的乐趣，启发您的创意厨艺。
        </p>

        <h2>团队成员</h2>
        <div class="team-members">
            <div class="team-member">
                <img src="{% static "img/team-member1.jpg" %}" alt="Team Member 1">
-                <p>陈家儒</p>
-            </div>
-            <div class="team-member">
-                <img src="{% static "img/team-member2.jpg" %}" alt="Team Member 2">
-                <p>陈政杨</p>
-            </div>
-            <div class="team-member">
-                <img src="{% static "img/team-member2.jpg" %}" alt="Team Member 2">
-                <p>程衍伟</p>
+                <p>John Doe</p>
            </div>
            <div class="team-member">
                <img src="{% static "img/team-member2.jpg" %}" alt="Team Member 2">
-                <p>杜鑫伟</p>
+                <p>Jane Smith</p>
            </div>
            <!-- 可根据需要添加更多团队成员 -->
        </div>
--- a/src/FoodSpace/index/templates/help.html
+++ b/src/FoodSpace/index/templates/help.html
@ -33,22 +33,22 @@
 </head>
 <body>
    <header style="text-align: center;">
-        <h1>美食天地帮助中心</h1>
+        <h1>FoodSpace 帮助中心</h1>
    </header>

    <div class="mx-auto w-full" style="padding: 2rem; text-align: left;">
        <p>
-            欢迎使用美食天地，您的美食世界！以下是一些常见问题的解答：
+            欢迎使用FoodSpace，您的美食世界！以下是一些常见问题的解答：
        </p>

        <h2>如何使用设置中心？</h2>
        <p>
-            要访问设置中心，请点击页面顶部的“设置中心”按钮。在那里，您可以个性化您的账户和应用设置。
+            要访问设置中心，请点击页面顶部的“设置中心”链接。在那里，您可以个性化您的账户和应用设置。
        </p>

        <h2>如何查看我的收藏？</h2>
        <p>
-            转到页面顶部，点击“我的收藏”按钮即可查看您保存的美食收藏。
+            转到页面顶部，点击“我的收藏”链接即可查看您保存的美食收藏。
        </p>

        <h2>需要更多帮助？</h2>
--- a/src/FoodSpace/index/views.py
+++ b/src/FoodSpace/index/views.py
@ -10,11 +10,13 @@ from .models import MainDishList, UserDishList, CollectDishList
 from .models import UserList
 from sklearn.metrics.pairwise import cosine_similarity

+
+
 cnx = Connection(
        host="localhost",
        port=3306,
        user="root",
-        password="czy20030103@"
+        password="123456cjR.sT"
    )
 cnx.select_db("menu")
 cursor = cnx.cursor()
@ -23,11 +25,11 @@ username1 = None
 userid1 = None

 def index(request):
-    return render(request,"login.html")
+    return render(request, "LoginScreen.html")

 def login(request):#登录功能
    if request.method =="GET":
-        return render(request,"login.html")
+        return render(request, "LoginScreen.html")
    elif request.method == "POST":
        post_data = request.POST
        username = post_data.get("user")
@ -89,7 +91,7 @@ def login_user(username, password):# 验证登录

 def mine(request):#“我的”界面
    page_content = "这是用户界面的内容"
-    return render(request, 'mine.html', {'page_content': page_content})
+    return render(request, 'UserScreen.html', {'page_content': page_content})

 def mycollection(request):#收藏菜品展示
    # 获取当前登录用户的信息，假设你已经实现用户登录认证
@ -127,7 +129,7 @@ def mainpage(request):#主界面
    random_dishes = random.sample(list(all_dishes), 6)
    grouped_dishes = [random_dishes[i:i + 3] for i in range(0, len(random_dishes), 3)]
    keywords = ['关键字1', '关键字2', '关键字3', '关键字4', '关键字5', '关键字6', '关键字7', '关键字8']
-    return render(request, 'mainpage.html', {'dishes': random_dishes,'grouped_dishes': grouped_dishes, 'keywords': keywords})
+    return render(request, 'MainScreen.html', {'dishes': random_dishes, 'grouped_dishes': grouped_dishes, 'keywords': keywords})

 def search_results(request):#搜索栏
    query = request.GET.get('q')
@ -208,7 +210,7 @@ def userDefind(request):#自定义菜品
            print(dish.DishName)
            dish_names.append(dish)

-        return render(request, 'userDefind.html', {'dish_list': dish_names})
+        return render(request, 'UserDefindScreen.html', {'dish_list': dish_names})

 def pull_Defind(dishname, description):#拉取数据
    user = UserList.objects.get(UserName=username1)
@ -221,9 +223,6 @@ def pull_Defind(dishname, description):#拉取数据
        print("自定义菜谱传入数据库成功")
    except Connection.Error as err:
        print("自定义菜谱传入数据库发生错误:", err)
-    finally:
-        cursor.close()
-    cnx.close()
    return redirect('/userDefind/')

 def add_main_dish(dish_name, collect_number, like_number, web_link):   #增加菜品
@ -313,7 +312,7 @@ def admin(request):#管理员功能
                # 调用搜索菜品的函数
                dishes = search_main_dish(dish_name)

-                return render(request, 'admin.html', {'dishes': dishes})
+                return render(request, 'AdminScreen.html', {'dishes': dishes})

            elif data_action == '更新菜品':
                # 获取参数值
@ -344,7 +343,7 @@ def admin(request):#管理员功能
                # 调用搜索用户的函数
                users = search_user(user_name)

-                return render(request, 'admin.html', {'users': users})
+                return render(request, 'AdminScreen.html', {'users': users})

            elif data_action == '更新用户':
                # 获取参数值
@ -363,9 +362,9 @@ def admin(request):#管理员功能
        else:
            result = None
    else:
-         return render(request, 'admin.html')
+         return render(request, 'AdminScreen.html')

-    return render(request, 'admin.html', {'result': result})
+    return render(request, 'AdminScreen.html', {'result': result})

 def get_dishes_list(request):#获取菜品列表
    dishes = MainDishList.objects.all() # 假设菜品数据存储在MainDishList模型中
@ -466,3 +465,4 @@ def recommendations(request):#展示个性化推荐
    # 输出推荐菜品列表
    random_dishes = random.sample(list(recommendations), 6)
    return render(request,"recommendedDishes.html",{'dishes':random_dishes})
+
Author	SHA1	Message	Date
pia6ffb7p	2112b1c3dc	Merge pull request '更新' (#9 ) from CJR into master	1 year ago
陈家儒	ce9cd00b0d	修改PPT	1 year ago
陈家儒	a9b23d121e	修改设计说明书	1 year ago
pia6ffb7p	cddff62344	Merge pull request '11' (#8 ) from CJR into master	1 year ago
陈家儒	be693b2bc2	提交ppt	1 year ago
pia6ffb7p	f98c8e1492	Merge pull request '提交部分文档和代码' (#7 ) from CJR into master	1 year ago
陈家儒	f95d306aa9	提交需求和设计说明书	1 year ago
陈家儒	608b51facf	提交源码	1 year ago
pia6ffb7p	01edd34ffe	源码	1 year ago
陈家儒	e57d404db9	提交源码	1 year ago
pia6ffb7p	534207193b	Merge pull request '提交设计模型和需求模型' (#5 ) from CJR into master	1 year ago
陈家儒	a525bfa2da	提交设计模型和修改过的需求模型	1 year ago
pia6ffb7p	12264968bb	Merge pull request '提交需求模型迭代' (#4 ) from CJR into master	1 year ago
陈家儒	72dd32c002	更新迭代模型	1 year ago
陈家儒	a4053b4c2c	提交需求模型第二次迭代	1 year ago
pia6ffb7p	6848e6c06e	设计模型	1 year ago
陈家儒	1cede01350	提交设计模型	1 year ago
pia6ffb7p	c94c27cde6	更新迭代的需求模型文档更新迭代的需求模型文档	1 year ago
陈家儒	9e0b50f411	更新迭代的需求模型	1 year ago
pia6ffb7p	43a767e847	Merge pull request '提交需求模型文档' (#1 ) from CJR into master	2 years ago
陈家儒	912285b0dc	提交需求模型文档	2 years ago