From 275dfb6e5e3c3ad0474d75ebf517ab6ce875b8a9 Mon Sep 17 00:00:00 2001 From: RakVhalate Date: Wed, 21 Dec 2022 12:02:56 +0500 Subject: [PATCH] thread previews remade --- src/app/const/api.ts | 4 ++-- src/app/pages/BoardThreads/op/op.component.css | 9 +++++++++ src/app/pages/BoardThreads/op/op.component.html | 4 ++-- .../pages/BoardThreads/threads.component.html | 5 ++++- src/app/pages/BoardThreads/threads.component.ts | 5 +++-- src/app/pages/send-form/send-form.component.html | 7 +++++-- src/app/pages/send-form/send-form.component.ts | 16 +++++++++++----- src/app/services/api-chat.service.ts | 4 ++-- 8 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/app/const/api.ts b/src/app/const/api.ts index 0a733c9..faa0d88 100644 --- a/src/app/const/api.ts +++ b/src/app/const/api.ts @@ -1,2 +1,2 @@ -export const api_endpoint: string = 'http://api.vdk2ch.ru:5000/'; -//export const api_endpoint: string = 'http://localhost:7141/'; +//export const api_endpoint: string = 'http://api.vdk2ch.ru:5000/'; +export const api_endpoint: string = 'http://localhost:7141/'; diff --git a/src/app/pages/BoardThreads/op/op.component.css b/src/app/pages/BoardThreads/op/op.component.css index 06d5517..c130509 100644 --- a/src/app/pages/BoardThreads/op/op.component.css +++ b/src/app/pages/BoardThreads/op/op.component.css @@ -1,4 +1,12 @@ .op { + padding:20px; + width: 500px; + word-break: break-word; + word-wrap: break-word; + margin-top: 6px; +} + +.preview { border-width: 1px; border-color: rgb(190,190,190); border-style: solid; @@ -9,4 +17,5 @@ word-break: break-word; word-wrap: break-word; margin-top: 6px; + margin-left: 7%; } diff --git a/src/app/pages/BoardThreads/op/op.component.html b/src/app/pages/BoardThreads/op/op.component.html index 1036c24..c8930b7 100644 --- a/src/app/pages/BoardThreads/op/op.component.html +++ b/src/app/pages/BoardThreads/op/op.component.html @@ -1,5 +1,5 @@ -
- Зайти в тред {{op.Thread_Id}} +
+ Зайти в тред {{op.Thread_Id}}

# {{op.Id}} {{op.Timestamp}}

diff --git a/src/app/pages/BoardThreads/threads.component.html b/src/app/pages/BoardThreads/threads.component.html index 8d20d31..6ed7090 100644 --- a/src/app/pages/BoardThreads/threads.component.html +++ b/src/app/pages/BoardThreads/threads.component.html @@ -10,7 +10,10 @@

+
+
+
diff --git a/src/app/pages/BoardThreads/threads.component.ts b/src/app/pages/BoardThreads/threads.component.ts index ade5cf8..2f62282 100644 --- a/src/app/pages/BoardThreads/threads.component.ts +++ b/src/app/pages/BoardThreads/threads.component.ts @@ -14,7 +14,7 @@ export class ThreadsComponent implements OnInit { boardName:string = 'b' command: string = ""; response: any; - opsToShow: SinglePost[] = [] + opsToShow: SinglePost[][] showGuide: boolean = false; constructor(public apiChatService: ApiChatService) { @@ -22,7 +22,8 @@ export class ThreadsComponent implements OnInit { refreshOPs(boardName: string) { this.apiChatService.getThreads(boardName).subscribe(response => { - this.opsToShow = response + this.opsToShow = response; + console.log(response); }) } diff --git a/src/app/pages/send-form/send-form.component.html b/src/app/pages/send-form/send-form.component.html index 506ed2f..9113afc 100644 --- a/src/app/pages/send-form/send-form.component.html +++ b/src/app/pages/send-form/send-form.component.html @@ -3,12 +3,15 @@

Создай то, о чем будут говорить многие в /{{board}}/.


- +

- +

Загрузить картинку:

Картинка: {{singlePic}}
+

+ +

\ No newline at end of file diff --git a/src/app/pages/send-form/send-form.component.ts b/src/app/pages/send-form/send-form.component.ts index fe096d5..648f85a 100644 --- a/src/app/pages/send-form/send-form.component.ts +++ b/src/app/pages/send-form/send-form.component.ts @@ -1,7 +1,6 @@ import { Component, Output, EventEmitter, Input, OnInit } from '@angular/core'; import { showAlert } from 'src/app/const/alert'; import { ApiChatService } from 'src/app/services/api-chat.service'; -import * as vars from "../../const/api" @Component({ selector: 'app-send-form', @@ -12,7 +11,7 @@ export class SendFormComponent implements OnInit { @Input() board: string; showForm:boolean = false; - // inputText: string; + inputText: string; inputImages: string[] = []; @Output() sendInfoToCreate = new EventEmitter(); @@ -22,14 +21,15 @@ export class SendFormComponent implements OnInit { constructor( public apiChatService: ApiChatService) { } - create(text:string){ + create(){ var toSend = { - text: text, + text: this.inputText, images: this.inputImages } this.sendInfoToCreate.emit(toSend) toSend.text = ''; toSend.images = []; + this.eraseData(); } sendPic(event: any) { @@ -37,10 +37,16 @@ export class SendFormComponent implements OnInit { response => { response = response.value.toString(); this.inputImages.push(response); - showAlert(`Картинка ${response} добавлена`, "#ff0a36") + showAlert(`Картинка ${response} добавлена`, "#ff0a36"); }); } + eraseData(){ + this.inputImages = []; + this.inputText = ''; + + } + ngOnInit(): void { } diff --git a/src/app/services/api-chat.service.ts b/src/app/services/api-chat.service.ts index 8eb8133..de5d9f4 100644 --- a/src/app/services/api-chat.service.ts +++ b/src/app/services/api-chat.service.ts @@ -38,9 +38,9 @@ export class ApiChatService { return this.http.post(globals.api_endpoint + 'UploadPic', PostPicture) } - getThreads(boardName: string): Observable { + getThreads(boardName: string): Observable { //console.log("Получаю посты и картинки"); - return this.http.get(globals.api_endpoint + 'Threads/', {params: {board: boardName}}); + return this.http.get(globals.api_endpoint + 'Threads/', {params: {board: boardName}}); }