Merge branch 'master' of http://git.fmode.cn:3000/15879006906/s202226701040

smarteat-app/angular.json

@@ -18,6 +18,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            
             "outputPath": "www",
             "index": "src/index.html",
             "main": "src/main.ts",

smarteat-app/deploy.ps1

@@ -1,6 +1,6 @@
 # 打包项目，携带应用前缀（index.html中相对路径将自动修复为/dev/jxnu/<学号>前缀）
 # /dev/ 项目测试版上传路径
-# /dev/jxnu/<学号> nova-crm项目预留路径
+# /dev/jxnu/202226701038 nova-crm项目预留路径
 set NODE_OPTIONS=–max_old_space_size=16000
 node ./node_modules/@angular/cli/bin/ng build --base-href="/dev/jxnu/202226701038/"
 
@@ -15,7 +15,6 @@ obsutil sync ./www obs://nova-cloud/dev/jxnu/202226701038  -i=XSUWJSVMZNHLWFAINR
 obsutil chattri obs://nova-cloud/dev/jxnu/<学号> -r -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com" -acl=public-read
 
 # 列举对象
-obsutil ls obs://nova-cloud/dev/jxnu/agent  -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
 
 obsutil cp W05.ttf obs://nova-cloud/dev/jxnu/202226701038/W05.ttf -f -i=XSUWJSVMZNHLWFAINRZ1 -k=P4TyfwfDovVNqz08tI1IXoLWXyEOSTKJRVlsGcV6 -e="obs.cn-south-1.myhuaweicloud.com"
 # 删除指定文件：/dev/jxnu/<学号>/key.extend

smarteat-app/src/app/tab1/tab1.page.ts

@@ -12,7 +12,7 @@ import { Image1PopupComponent } from '../image-popup/image1-popup/image1-popup.c
 import { Image2PopupComponent } from '../image-popup/image2-popup/image2-popup.component';
 import { Image3PopupComponent } from '../image-popup/image3-popup/image3-popup.component';
 import { Image4PopupComponent } from '../image-popup/image4-popup/image4-popup.component';
-import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
+import { openUserLoginModal } from '../modal-user-login/modal-user-login.component';
 import { CloudQuery, CloudUser } from 'src/lib/ncloud';
 import { CloudSeMealPlan } from 'src/lib/cloudplans';
 import { MealService } from '../meal/meal.service';

smarteat-app/src/app/tab2/tab2.page.ts

@@ -5,7 +5,7 @@ import { CloudSeUser } from 'src/lib/cloudSeuser'; // 引入 CloudSeUser 类
 
 import { AlertController, IonButton, IonContent, IonHeader, IonInput, IonSelect, IonSelectOption, IonTextarea, IonTitle, IonToolbar, ModalController } from '@ionic/angular/standalone';
 import { CloudUser } from 'src/lib/ncloud';
-import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
+import { openUserLoginModal } from '../modal-user-login/modal-user-login.component';
 import { PageEditComponent } from '../page-edit/page-edit.component';
 @Component({
 selector: 'app-tab2',

smarteat-app/src/app/tab3/tab3.page.ts

@@ -4,7 +4,7 @@ import { IonAvatar, IonCardTitle, IonItem, IonLabel, IonSearchbar, NavController
 import { PageEditComponent } from '../page-edit/page-edit.component';
 import { CloudUser } from 'src/lib/ncloud';
 import { CloudSeUser } from 'src/lib/cloudSeuser';
-import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
+import { openUserLoginModal } from '../modal-user-login/modal-user-login.component';
 import { ModalController } from '@ionic/angular/standalone';
 import { IonButton, IonCard, IonCardContent, IonCardHeader, IonCol, IonContent, IonGrid, IonHeader, IonIcon, IonInput, IonRow, IonTextarea, IonTitle, IonToolbar } from '@ionic/angular/standalone';
 import { PagePlansComponent } from '../page-plans/page-plans.component';

smarteat-prod/README.md

@@ -194,15 +194,76 @@ stop
 
 ```plantuml
 @startuml
-start
-:打开应用程序;
-:选择“注册”选项;
-:输入个人信息（用户名、密码）;
-:二次输入密码;
-:提交注册信息;
 
-:返回登录页面;
-stop
+@startuml
+
+' Define CloudObject as a base class
+class CloudObject {
+    +String id
+    +Date createdAt
+    +Date updatedAt
+    +set(data: Record<String, Any>)
+    +save(): Promise<CloudObject>
+    +destroy(): Promise<Boolean>
+}
+
+' Define CloudUser class (user entity)
+class CloudUser {
+    +String objectId
+    +String username
+    +String sessionToken
+    +current(): Promise<CloudUser>
+    +login(username: String, password: String): Promise<CloudUser>
+    +logout(): Promise<Boolean>
+    +signUp(username: String, password: String, additionalData: Record<String, Any>): Promise<CloudUser>
+}
+
+' Define CloudSeUser class (user data entity)
+class CloudSeUser {
+    +String objectId
+    +String userName
+    +String email
+    +String gender
+    +CloudUser user
+    +saveUserInfo(userData: Record<String, Any>): Promise<CloudObject>
+    +updateUserInfo(updatedData: Record<String, Any>): Promise<CloudObject>
+    +deleteUserInfo(): Promise<Boolean>
+}
+
+' Define CloudSeMealPlan class (meal plan entity)
+class CloudSeMealPlan {
+    +String objectId
+    +Integer No
+    +String mealType
+    +String mealDescription
+    +CloudUser user
+    +saveMealPlan(mealPlanData: Record<String, Any>): Promise<CloudObject>
+    +updateMealPlan(updatedData: Record<String, Any>, mealPlanId: String): Promise<CloudObject>
+    +deleteMealPlan(mealPlanId: String): Promise<Boolean>
+}
+
+' Define CloudShipu class (recipe entity)
+class CloudShipu {
+    +String objectId
+    +String title
+    +String ingredients
+    +String instructions
+    +CloudUser user
+    +saveShipuInfo(shipuData: Record<String, Any>): Promise<CloudObject>
+    +updateShipuInfo(id: String, updatedData: Record<String, Any>): Promise<CloudObject>
+    +deleteShipuInfo(id: String): Promise<Boolean>
+}
+
+' Relationships
+CloudUser "1" -- "0..*" CloudSeUser : manages
+CloudUser "1" -- "0..*" CloudSeMealPlan : manages
+CloudUser "1" -- "0..*" CloudShipu : manages
+
+CloudSeUser "1" -- "1" CloudUser : refers to
+CloudSeMealPlan "1" -- "1" CloudUser : refers to
+CloudShipu "1" -- "1" CloudUser : refers to
+
 @enduml
 
+
 ```