From e2cca81f8189ec3b6858bddd2ed830b9308c614a Mon Sep 17 00:00:00 2001 From: RakVhalate Date: Thu, 8 Dec 2022 01:24:35 +1000 Subject: [PATCH] Sdelal formochku sozdaniya treda. --- src/app/app.module.ts | 4 +- .../create-thread/create-thread.component.css | 12 +++++ .../create-thread.component.html | 14 +++++ .../create-thread.component.spec.ts | 23 +++++++++ .../create-thread/create-thread.component.ts | 51 +++++++++++++++++++ .../pages/BoardThreads/op/op.component.html | 2 +- .../pages/BoardThreads/threads.component.html | 8 ++- .../pages/SingleThread/boards.component.css | 3 +- .../SingleThread/post/post.component.css | 8 +++ .../SingleThread/post/post.component.html | 6 +-- .../send-post/send-post.component.css | 2 +- .../send-post/send-post.component.html | 0 .../send-post/send-post.component.spec.ts | 0 .../send-post/send-post.component.ts | 6 +-- src/app/services/api-chat.service.ts | 4 ++ 15 files changed, 131 insertions(+), 12 deletions(-) create mode 100644 src/app/pages/BoardThreads/create-thread/create-thread.component.css create mode 100644 src/app/pages/BoardThreads/create-thread/create-thread.component.html create mode 100644 src/app/pages/BoardThreads/create-thread/create-thread.component.spec.ts create mode 100644 src/app/pages/BoardThreads/create-thread/create-thread.component.ts rename src/app/pages/{ => SingleThread}/send-post/send-post.component.css (91%) rename src/app/pages/{ => SingleThread}/send-post/send-post.component.html (100%) rename src/app/pages/{ => SingleThread}/send-post/send-post.component.spec.ts (100%) rename src/app/pages/{ => SingleThread}/send-post/send-post.component.ts (88%) diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 435ee3b..9f0d7b3 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -11,7 +11,7 @@ import { BoardsComponent } from './pages/SingleThread/boards.component'; import { NotFoundComponent } from './pages/not-found/not-found.component'; import { ApiChatService } from './services/api-chat.service'; import { FormsModule } from '@angular/forms'; -import { SendPostComponent } from './pages/send-post/send-post.component'; +import { SendPostComponent } from './pages/SingleThread/send-post/send-post.component'; import { PostComponent } from './pages/SingleThread/post/post.component' import { ThreadsComponent } from './pages/BoardThreads/threads.component'; import { OPComponent } from './pages/BoardThreads/op/op.component'; @@ -19,6 +19,7 @@ import { AppRoutingModule } from './app-routing.module'; import {MatSidenavModule} from "@angular/material/sidenav"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; import { NavBarComponent } from './pages/nav-bar/nav-bar.component'; +import { CreateThreadComponent } from './pages/BoardThreads/create-thread/create-thread.component'; @@ -34,6 +35,7 @@ import { NavBarComponent } from './pages/nav-bar/nav-bar.component'; ThreadsComponent, OPComponent, NavBarComponent, + CreateThreadComponent, ], imports: [ diff --git a/src/app/pages/BoardThreads/create-thread/create-thread.component.css b/src/app/pages/BoardThreads/create-thread/create-thread.component.css new file mode 100644 index 0000000..551d810 --- /dev/null +++ b/src/app/pages/BoardThreads/create-thread/create-thread.component.css @@ -0,0 +1,12 @@ +.create_thread { + border-width: 1px; + border-color: rgb(190,190,190); + border-style: solid; + background-color: #F0D0B6; + border-radius: 5px; + width: 600px; + word-break: break-word; + word-wrap: break-word; + margin-left: auto; + margin-right: auto; +} diff --git a/src/app/pages/BoardThreads/create-thread/create-thread.component.html b/src/app/pages/BoardThreads/create-thread/create-thread.component.html new file mode 100644 index 0000000..c80f58e --- /dev/null +++ b/src/app/pages/BoardThreads/create-thread/create-thread.component.html @@ -0,0 +1,14 @@ +

Открыть форму постинга

+

Скрыть форму постинга

+
+

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

+
+ +

+ +

+

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

+ + +
Картинка: {{singlePic}}
+
diff --git a/src/app/pages/BoardThreads/create-thread/create-thread.component.spec.ts b/src/app/pages/BoardThreads/create-thread/create-thread.component.spec.ts new file mode 100644 index 0000000..197587e --- /dev/null +++ b/src/app/pages/BoardThreads/create-thread/create-thread.component.spec.ts @@ -0,0 +1,23 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CreateThreadComponent } from './create-thread.component'; + +describe('CreateThreadComponent', () => { + let component: CreateThreadComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [ CreateThreadComponent ] + }) + .compileComponents(); + + fixture = TestBed.createComponent(CreateThreadComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/BoardThreads/create-thread/create-thread.component.ts b/src/app/pages/BoardThreads/create-thread/create-thread.component.ts new file mode 100644 index 0000000..375b79e --- /dev/null +++ b/src/app/pages/BoardThreads/create-thread/create-thread.component.ts @@ -0,0 +1,51 @@ +import {Component, Input, OnInit} from '@angular/core'; +import {ApiChatService} from "../../../services/api-chat.service"; +import {ActivatedRoute} from "@angular/router"; +import * as vars from "../../../const/api"; + +@Component({ + selector: 'app-create-thread', + templateUrl: './create-thread.component.html', + styleUrls: ['./create-thread.component.css'] +}) + + +export class CreateThreadComponent implements OnInit { + + @Input() board: string; + showCreateThread:boolean = false; + progress: number; + OPmessage: string = ''; + OPfilename: string[] = []; + + constructor( + public apiChatService: ApiChatService, + private activatedRoute:ActivatedRoute + ) { + } + + + sendOP(text: string) { + this.apiChatService.createThread(this.OPmessage, this.OPfilename, this.board)//.subscribe( response => { + //response = response.toString(); + //vars.showAlert(response.toString(), "#ff0a36"); + //this.refreshDisplayedThread(); + //}); + this.OPmessage = '0'; + this.OPfilename = []; + } + + + sendPic(event: any) { + //this.apiChatService.sendpic(event.target.files[0]).subscribe( + // response => { + //response = response.value.toString(); + //this.OPfilename.push(response); + //vars.showAlert("Картинка " + response + " добавлена к оп-посту!", "#ff0a36") + //}); + } + + ngOnInit(): void { + } + +} diff --git a/src/app/pages/BoardThreads/op/op.component.html b/src/app/pages/BoardThreads/op/op.component.html index 4003df4..b1ed0ca 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 60ad16c..70aa218 100644 --- a/src/app/pages/BoardThreads/threads.component.html +++ b/src/app/pages/BoardThreads/threads.component.html @@ -1,12 +1,16 @@

Вы находитесь на доске {{boardName}}

+
+ +
 Что это и как это работает?
- Добро пожаловать в список доступных тредов. Выберите подходящий для вас тред, затем введите его номер во вкладке "Тред" выше и нажмите "обновить" чтобы перейти в этот тред. + Добро пожаловать в список доступных тредов. Выберите подходящий для вас тред и нажмите "войти в тред".

diff --git a/src/app/pages/SingleThread/boards.component.css b/src/app/pages/SingleThread/boards.component.css index 957f743..de14865 100644 --- a/src/app/pages/SingleThread/boards.component.css +++ b/src/app/pages/SingleThread/boards.component.css @@ -7,4 +7,5 @@ } .wrapper {width: 800px; margin-left: auto; -margin-right: auto;} +margin-right: auto; +} diff --git a/src/app/pages/SingleThread/post/post.component.css b/src/app/pages/SingleThread/post/post.component.css index bb5bcc8..20a471f 100644 --- a/src/app/pages/SingleThread/post/post.component.css +++ b/src/app/pages/SingleThread/post/post.component.css @@ -11,3 +11,11 @@ word-wrap: break-word; margin-top: 6px; } + +.postText{ + +} + +.postPictures{ + padding: 5px; +} diff --git a/src/app/pages/SingleThread/post/post.component.html b/src/app/pages/SingleThread/post/post.component.html index 831f1eb..25dfb36 100644 --- a/src/app/pages/SingleThread/post/post.component.html +++ b/src/app/pages/SingleThread/post/post.component.html @@ -1,9 +1,9 @@

# {{post.Id}} {{post.Timestamp}}

-

{{post.Text}}

+

{{post.Text}}

diff --git a/src/app/pages/send-post/send-post.component.css b/src/app/pages/SingleThread/send-post/send-post.component.css similarity index 91% rename from src/app/pages/send-post/send-post.component.css rename to src/app/pages/SingleThread/send-post/send-post.component.css index 61c0484..b8517cf 100644 --- a/src/app/pages/send-post/send-post.component.css +++ b/src/app/pages/SingleThread/send-post/send-post.component.css @@ -1,5 +1,5 @@ .send_post { - border-width: 1; + border-width: 1px; border-color: rgb(190,190,190); border-style: solid; background-color: #F0D0B6; diff --git a/src/app/pages/send-post/send-post.component.html b/src/app/pages/SingleThread/send-post/send-post.component.html similarity index 100% rename from src/app/pages/send-post/send-post.component.html rename to src/app/pages/SingleThread/send-post/send-post.component.html diff --git a/src/app/pages/send-post/send-post.component.spec.ts b/src/app/pages/SingleThread/send-post/send-post.component.spec.ts similarity index 100% rename from src/app/pages/send-post/send-post.component.spec.ts rename to src/app/pages/SingleThread/send-post/send-post.component.spec.ts diff --git a/src/app/pages/send-post/send-post.component.ts b/src/app/pages/SingleThread/send-post/send-post.component.ts similarity index 88% rename from src/app/pages/send-post/send-post.component.ts rename to src/app/pages/SingleThread/send-post/send-post.component.ts index c504ee9..87afd2d 100644 --- a/src/app/pages/send-post/send-post.component.ts +++ b/src/app/pages/SingleThread/send-post/send-post.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, } from '@angular/core'; -import { ApiChatService } from '../../services/api-chat.service'; -import { BoardsComponent } from "../SingleThread/boards.component"; -import * as vars from "../../const/api"; +import { ApiChatService } from '../../../services/api-chat.service'; +import { BoardsComponent } from "../boards.component"; +import * as vars from "../../../const/api"; import {ActivatedRoute} from "@angular/router"; diff --git a/src/app/services/api-chat.service.ts b/src/app/services/api-chat.service.ts index 0364ee0..300bfdf 100644 --- a/src/app/services/api-chat.service.ts +++ b/src/app/services/api-chat.service.ts @@ -42,6 +42,10 @@ export class ApiChatService { return this.http.get(globals.api_endpoint + 'Threads/', {params: {board: boardName}}); } + createThread(OPtext: string, OPimgUrl: string[], board: string,){ + return alert("Скоро будет работать!"); + } + sampleBoardList = [ { BoardName: 'b',