Redesign
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
RakVhalate 2022-11-18 14:45:51 +10:00
parent c4d718758b
commit 57ef20f293
9 changed files with 46 additions and 35 deletions

View File

@ -2,11 +2,13 @@
<img src="http://static.vdk2ch.ru:15555/test-public/16657431265390.png" alt="свiня" width="150"> <img src="http://static.vdk2ch.ru:15555/test-public/16657431265390.png" alt="свiня" width="150">
<app-send-post></app-send-post>, <app-send-post></app-send-post>,
<h2> {{boardName}} </h2> <h2> {{boardName}} </h2>
<button (click)="refreshPosts('postgres')">Общий раздел</button> <h3> {{displayed_thread_number}}</h3>
<button (click)="refreshPosts(boardName , displayed_thread_number)">Обновить</button>
<input type="number" [(ngModel)]=displayed_thread_number>
<post-single <post-single
*ngFor="let post of postsToShow" [post]="post" *ngFor="let post of postsToShow" [post]="post"
></post-single> ></post-single>
<button (click)="refreshPosts('postgres')">Обновить</button> <button (click)="refreshPosts(boardName , displayed_thread_number)">Обновить</button>
<br> <br>
<div class="hexagon"> <div class="hexagon">
<div class="hexagon-inside"> <div class="hexagon-inside">

View File

@ -2,6 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
import { ApiChatService } from '../services/api-chat.service'; import { ApiChatService } from '../services/api-chat.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { SinglePost } from '../models/post' import { SinglePost } from '../models/post'
import * as vars from '../var/api'
@Component({ @Component({
selector: 'app-boards', selector: 'app-boards',
@ -12,20 +13,22 @@ export class BoardsComponent implements OnInit {
command: string = ""; command: string = "";
response: any; response: any;
postsToShow: SinglePost[] = [] postsToShow: SinglePost[] = []
boardName:string = 'postgres'; boardName:string = 'b';
displayed_thread_number = vars.displayed_thread;
constructor(public apiChatService: ApiChatService) { constructor(public apiChatService: ApiChatService) {
} }
refreshPosts(boardName: string) { refreshPosts(boardName: string , threadId:number) {
this.apiChatService.getPosts(boardName).subscribe(response => { this.apiChatService.getPosts(boardName, threadId).subscribe(response => {
this.postsToShow = response this.postsToShow = response
vars.setDisplayedThread(this.displayed_thread_number);
}) })
} }
ngOnInit(): void { ngOnInit(): void {
this.apiChatService.getPosts('postgres').subscribe(response => { this.apiChatService.getPosts('postgres', vars.displayed_thread).subscribe(response => {
this.postsToShow = response this.postsToShow = response
}) })
} }

View File

@ -1,13 +1,12 @@
.post { .post {
border-width: 1; border-width: 1px;
border-color: rgb(190,190,190); border-color: rgb(190,190,190);
border-style: solid; border-style: solid;
background-color: #F0D0B6; background-color: #F0D0B6;
border-radius: 5px; border-radius: 5px;
padding:20px;
width: 500px; width: 500px;
word-break: break-word; word-break: break-word;
word-wrap: break-word; word-wrap: break-word;
margin-left: auto;
margin-right: auto;
margin-top: 6px; margin-top: 6px;
} }

View File

@ -1,8 +1,9 @@
<div class="post"> <div class="post">
<p> # {{post.Id}} {{post.Timestamp}}</p> <p> # {{post.Id}} {{post.Timestamp}}</p>
<a href="{{post.ImgURL}}" target="_blank"> <div >
<img *ngIf="post.ImgURL != '0'" src="{{post.ImgURL}}" alt="anonpls" width="140"> <a *ngFor="let i of post.ImgURL" [href]="i" target="_blank">
<img [src]="i" style="height:140px">
</a> </a>
<a routerLink = "{{post.ImgURL}}">pic</a> </div>
<p>{{post.Text}}</p> <p>{{post.Text}}</p>
</div> </div>

View File

@ -2,5 +2,7 @@ export interface SinglePost {
Timestamp: string Timestamp: string
Id: number Id: number
Text: string Text: string
ImgURL: string ImgURL: string[]
Thread_Id: number
Is_OP: boolean
} }

View File

@ -1,5 +1,6 @@
<div class="send_post"> <div class="send_post">
<h4>Поведай миру что-нибудь хорошее.</h4> <h4>Поведай миру что-нибудь хорошее.</h4>
<br>
<textarea type="text" rows="8" cols="45" placeholder="Печатать сюда" #textToPost> </textarea> <textarea type="text" rows="8" cols="45" placeholder="Печатать сюда" #textToPost> </textarea>
<p> <p>
<button (click)="sendPost(textToPost.value) ; textToPost.value=''" >Отправить</button> <button (click)="sendPost(textToPost.value) ; textToPost.value=''" >Отправить</button>

View File

@ -2,6 +2,7 @@ import { Component, EventEmitter, OnInit, Output } from '@angular/core';
import { ApiChatService } from '../services/api-chat.service'; import { ApiChatService } from '../services/api-chat.service';
import { MinIoService } from '../services/min-io.service.' import { MinIoService } from '../services/min-io.service.'
import {IPicresponse} from "../models/picResponse"; import {IPicresponse} from "../models/picResponse";
import * as vars from "../var/api";
@Component({ @Component({
selector: 'app-send-post', selector: 'app-send-post',
@ -12,28 +13,25 @@ export class SendPostComponent implements OnInit {
progress: number; progress: number;
message: string; message: string;
filename = '0'; filename: string[] = [];
picResponse: IPicresponse
constructor(public apiChatService: ApiChatService, public minIoService: MinIoService) { constructor(public apiChatService: ApiChatService, public minIoService: MinIoService) {
} }
sendPost(text: string) { sendPost(text: string) {
this.apiChatService.sendPostToApi(text, this.filename).subscribe(); var threadId = vars.displayed_thread;
this.apiChatService.sendPostToApi(text, this.filename, threadId).subscribe();
this.message = '0'; this.message = '0';
this.filename = '0'; this.filename = [];
alert("Сообщение отправлено."); alert("Сообщение отправлено.");
} }
sendPic(event: any) { sendPic(event: any) {
this.apiChatService.sendpic(event.target.files[0]).subscribe( this.apiChatService.sendpic(event.target.files[0]).subscribe(
response => { response => {
this.filename = response.value.toString() response = response.value.toString();
this.filename.push(response);
}); });
//this.filename = this.picResponse.value.toString()
} }
ngOnInit(): void { ngOnInit(): void {

View File

@ -2,6 +2,8 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs'; import { Observable } from 'rxjs';
import { SinglePost } from '../models/post'; import { SinglePost } from '../models/post';
import * as globals from '../var/api';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
@ -10,31 +12,28 @@ export class ApiChatService {
constructor(private http: HttpClient) { constructor(private http: HttpClient) {
} }
getPosts(boardName:string): Observable<SinglePost[]> { getPosts(boardName:string, threadID: number): Observable<SinglePost[]> {
//console.log("Получаю посты и картинки"); //console.log("Получаю посты и картинки");
return this.http.get<SinglePost[]>('http://api.vdk2ch.ru:5000/List/?board=' + boardName); return this.http.get<SinglePost[]>(globals.api_endpoint +'List/', {params:{board: boardName , thread: threadID}}) ;
//return this.http.get<SinglePost[]>('http://localhost:7141/List/?board=' + boardName);
} }
sendPostToApi(text: string, imgUrl: string) { sendPostToApi(text: string, imgUrl: string[], threadId: number,) {
//console.log("Отправляю пост..."); //console.log("Отправляю пост...");
var postToSend = var postToSend =
{ {
Timestamp: text, Timestamp: "time",
Id: 0, Id: 0,
Text: text, Text: text,
ImgURL: imgUrl ImgURL: imgUrl,
Thread_Id: threadId
}
return this.http.post( globals.api_endpoint +'PostTo', postToSend)
} }
//console.log(postToSend)
return this.http.post('http://api.vdk2ch.ru:5000/PostTo', postToSend)
//return this.http.post('http://localhost:7141/PostTo', postToSend)
}
sendpic(picToSend: File):Observable<any> { sendpic(picToSend: File):Observable<any> {
const PostPicture = new FormData(); const PostPicture = new FormData();
PostPicture.append('PostPicture', picToSend); PostPicture.append('PostPicture', picToSend);
//return this.http.post('http://localhost:7141/UploadPic', PostPicture) return this.http.post(globals.api_endpoint +'UploadPic', PostPicture)
return this.http.post('http://api.vdk2ch.ru:5000/UploadPic', PostPicture)
} }
} }

6
src/app/var/api.ts Normal file
View File

@ -0,0 +1,6 @@
//export const api_endpoint: string = 'http://api.vdk2ch.ru:5000/';
export const api_endpoint: string = 'http://localhost:7141/';
export var displayed_thread: number = 2;
export function setDisplayedThread(toset:number){
displayed_thread = toset;
};