FilmDraw-app/src/app/tab1/tab1.page.html

@@ -1,17 +1,21 @@
 <ion-header [translucent]="true">
   <ion-toolbar>
     <ion-item lines="none">
-      <!-- 图片 -->
-        <ion-avatar slot="start" class="image-container">
-            <img src="/assets/img/1.png" alt="Your Image" class="header-image">
+      <ion-avatar slot="start" class="image-container">
+        <img src="/assets/img/1.png" alt="Your Image" class="header-image">
       </ion-avatar>
-      <!-- 搜索框 -->
       <ion-searchbar slot="end" expand="with-icon"></ion-searchbar>
+      <ion-buttons slot="end">
+        <ion-button (click)="openPublishModal()">
+            发布+ 
+        </ion-button>
+      </ion-buttons>
     </ion-item>
   </ion-toolbar>
 </ion-header>
- <ion-content [fullscreen]="true">
 
+
+ <ion-content [fullscreen]="true">
 <!-- 包含热门话题区和讨论区的父容器 -->
 
   <div class="content-container">

FilmDraw-app/src/app/tab1/tab1.page.scss

@@ -1,3 +1,36 @@
+<<<<<<< HEAD
+// ion-toolbar {
+//   display: flex;
+//   justify-content: space-between; // 使内容在两侧分开
+//   align-items: center; // 垂直居中对齐
+// }
+
+
+/* 设置搜索框的样式 */
+   ion-searchbar {
+     padding: 10px; /* 内边距 */
+     border-radius: 6px; /* 圆角 */
+     font-size: 16px; /* 字体大小 */
+    }
+    // 设置头像
+    ion-avatar {
+      border-radius: 50%; // 设置头像圆形
+      width: 50px; // 设置头像宽度
+      height: 50px; // 设置头像高度
+    }
+
+  ion-button {
+    --background:#036a99; // 设置按钮背景色
+    --color: white; // 设置按钮文字颜色
+    width:50px;
+    height: 30px;
+    border-radius: 10px;
+  }
+
+
+
+=======
+>>>>>>> fe70b786df2f8f475ffdf23a041efd136b02587f
 .content-container {
   display: flex;
   justify-content: space-between; /* 在主轴上均匀分配空间 */
@@ -52,9 +85,17 @@ ion-label p {
      font-size: 16px; /* 字体大小 */
     }
 
+<<<<<<< HEAD
+
+// ion-header {
+//     background-color: #ffffff; // 设置头部背景色
+//     color: white; // 设置头部文字颜色
+//   }
+=======
 ion-header {
     background-color: #f5f7fc; // 设置头部背景色
   }
+>>>>>>> fe70b786df2f8f475ffdf23a041efd136b02587f
   
 //   ion-card {
 //     margin: 10px; // 设置卡片之间的间距
@@ -87,11 +128,7 @@ ion-header {
 //     border-radius: 5px; // 设置按钮圆角
 //   }
   
-//   ion-avatar {
-//     border-radius: 50%; // 设置头像圆形
-//     width: 50px; // 设置头像宽度
-//     height: 50px; // 设置头像高度
-//   }
+
   
 //   h2 {
 //     font-size: 1em; // 设置二级标题字体大小

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

@@ -2,9 +2,13 @@ import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { 
   IonHeader, IonToolbar, IonTitle, IonContent, 
   IonButton, IonButtons, IonIcon, IonCard, IonCardHeader, IonCardTitle, IonCardContent,
-  IonItem, IonLabel, IonList, IonInput, IonTextarea, IonAvatar, IonSearchbar} from '@ionic/angular/standalone';
+  IonItem, IonLabel, IonList, IonInput, IonTextarea, IonAvatar, IonSearchbar,
+  ModalController} from '@ionic/angular/standalone';
 import { ExploreContainerComponent } from '../explore-container/explore-container.component';
 import { CommonModule } from '@angular/common';
+import { openPostPublisherModal } from 'src/lib/public/post-publisher/post-publisher.component';
+import { CloudUser } from 'src/lib/ncloud';
+import { openUserLoginModal } from 'src/lib/user/modal-user-login/modal-user-login.component';
 
 @Component({
   selector: 'app-tab1',
@@ -23,7 +27,25 @@ import { CommonModule } from '@angular/common';
   schemas: [CUSTOM_ELEMENTS_SCHEMA], 
 })
 export class Tab1Page {
+  currentUser:CloudUser|undefined
+  constructor(private modalCtrl:ModalController){
+    this.currentUser=new CloudUser();
+  }
+
+
+async openPublishModal(){
+
+
+  if(!this.currentUser?.id){
+    openUserLoginModal(this.modalCtrl);
+  }
+if(this.currentUser){
+  openPostPublisherModal(this.modalCtrl);
+}
   
+
+}
+
   onSearch(event: any) {
         const searchTerm = event.target.value; // 获取用户输入的搜索内容
         console.log('搜索内容:', searchTerm);

FilmDraw-app/src/app/tab4/tab4.page.ts

@@ -30,7 +30,7 @@ export class Tab4Page {
     username: 'yi',
     // 其他用户信息字段...
   };
-  avatarUrl: string = 'assets/img/tx.jpg'; // 默认头像路径
+  avatarUrl: string = 'assets/img/1.png'; // 默认头像路径
  
   currentUser:CloudUser|undefined
   constructor(private modalCtrl:ModalController, private navCtrl: NavController) {

FilmDraw-app/src/lib/ncloud.ts

@@ -372,7 +372,28 @@ export class CloudUser extends CloudObject {
         localStorage.setItem("NCloud/dev/User",JSON.stringify(this.data))
         return this;
     }
+}
 
+//CloudPost.ts
+export class CloudPost extends CloudObject {
+    constructor() {
+        super('FilmPosts'); // 调用父类构造函数，指定类名
+    }
 
+    // 设置帖子数据，包括发布者信息
+    setPostData(postData: Record<string, any>, userId: string) {
+        this.set(postData); // 设置帖子内容
+        this.data["author"] = { "__type": "Pointer", "className": "_User", "objectId": userId }; // 设置发布者信息
+    }
 
+    // 更新帖子数据
+    async updatePost(postData: Record<string, any>) {
+        this.set(postData); // 更新帖子内容
+        return await this.save(); // 保存更新
+    }
+
+    // 删除帖子
+    async deletePost() {
+        return await this.destroy(); // 调用父类的 destroy 方法
+    }
 }

FilmDraw-app/src/lib/public/post-publisher/post-publisher.component.html

@@ -0,0 +1,23 @@
+<!-- 发布帖子 -->
+<ion-card>
+  <ion-card-header>
+    <ion-card-title>
+      发布
+    </ion-card-title>
+    <ion-card-subtitle>分享新鲜事</ion-card-subtitle>
+   </ion-card-header>
+ <ion-card-content>
+
+   <ion-item>
+     <ion-input [value]="postData['content']" (ionChange)="postDataChange('content',$event)" label="内容" placeholder="请输入你要分享的内容"></ion-input>
+   </ion-item>
+   <ion-item>
+    <ion-input [value]="postData['label']" (ionChange)="postDataChange('label',$event)" label="话题" placeholder="请输入你讨论的话题"></ion-input>
+  </ion-item>
+
+   <ion-button expand="block" (click)="save()">发布帖子</ion-button>
+   <ion-button expand="block" (click)="cancel()">取消发布</ion-button>
+ 
+
+</ion-card-content>
+</ion-card>

FilmDraw-app/src/lib/public/post-publisher/post-publisher.component.spec.ts

@@ -0,0 +1,22 @@
+import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+
+import { PostPublisherComponent } from './post-publisher.component';
+
+describe('PostPublisherComponent', () => {
+  let component: PostPublisherComponent;
+  let fixture: ComponentFixture<PostPublisherComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [PostPublisherComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(PostPublisherComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

FilmDraw-app/src/lib/public/post-publisher/post-publisher.component.ts

@@ -0,0 +1,67 @@
+import { Component, OnInit } from '@angular/core';
+import { IonHeader, IonToolbar, IonTitle, IonContent, IonCard, IonCardContent, IonButton, 
+  IonCardHeader, IonCardTitle, IonCardSubtitle, ModalController, IonInput, IonItem, 
+  IonSegment, IonSegmentButton, IonLabel } from '@ionic/angular/standalone';
+import { CloudPost, CloudUser } from 'src/lib/ncloud';
+@Component({
+  selector: 'app-post-publisher',
+  templateUrl: './post-publisher.component.html',
+  styleUrls: ['./post-publisher.component.scss'],
+  standalone: true,
+  imports: [IonHeader, IonToolbar, IonTitle, IonContent, 
+    IonCard,IonCardContent,IonButton,IonCardHeader,IonCardTitle,IonCardSubtitle,
+    IonInput,IonItem,
+    IonSegment,IonSegmentButton,IonLabel
+  ],
+})
+export class PostPublisherComponent  implements OnInit {
+ 
+
+  postData:any={
+
+  }
+  userId: string; // 当前用户ID
+  postDataChange(key:string,env:any){
+    this.postData[key] = env.detail.value; // 更新 postData 对象
+ 
+  }
+
+  constructor(private modalCtrl:ModalController) { 
+    this.userId = 'currentUserId';
+  }
+
+  async save(){
+    const post = new CloudPost();
+    post.setPostData(this.postData, this.userId); // 设置帖子数据和用户ID
+
+    try {
+      await post.save(); // 保存帖子
+      this.modalCtrl.dismiss(); // 保存成功后关闭模态框
+    } catch (error) {
+      console.error('保存帖子失败:', error);
+    }
+
+  }
+  cancel(){
+    this.modalCtrl.dismiss(null,"cancel")// 关闭模态框
+
+  }
+
+  ngOnInit() {}
+
+}
+export async function openPostPublisherModal(modalCtrl:ModalController):Promise<CloudUser|null>{
+  const modal = await modalCtrl.create({
+    component: PostPublisherComponent,
+    breakpoints:[0.8,1.0],
+    initialBreakpoint:0.7
+  });
+  modal.present();
+
+  const { data, role } = await modal.onWillDismiss();
+
+  if (role === 'confirm') {
+    return data;
+  }
+  return null
+}

FilmDraw-prod/UML.md

@@ -7,8 +7,10 @@
 1._User表
 objectId: String (默认)
 createdAt: Date (默认)
+userId:String
 age: Number
 gender: String
+avatar:String
 watchHistory: Array<Pointer>
 ratingHistory: Array<Pointer>
 
@@ -98,10 +100,13 @@ objectId: String (默认)
 createdAt: Date (默认)
 user: Pointer
 content: String
+label:String(话题)
 likesCount: Number
-commentsCount: Number
-status: String (例如 "pending", "approved", "rejected")
+status: String (例如 "pending", "approved", "rejected",默认为通过)
+
+
 
+comments：Pointer
 3.FilmComment表
 objectId: String (默认)
 createdAt: Date (默认)