Skip to content
This repository was archived by the owner on Aug 27, 2018. It is now read-only.

Commit b03e69e

Browse files
committed
Fix adding and editing post
1 parent 6cbcda7 commit b03e69e

File tree

6 files changed

+87
-49
lines changed

6 files changed

+87
-49
lines changed

3-panel/src/views/Pages/Gallery/style.scss

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,20 @@
2525

2626
@media (max-width: 455px) {
2727
.page-gallery-container {
28-
max-width: 216px;
28+
max-width: 100%;
29+
margin: 0;
30+
31+
& .page-gallery-category {
32+
width: calc(100% - 16px);
33+
padding-top: calc(100% - 16px);
34+
height: auto;
35+
}
2936
}
3037
}
3138

3239
@media (max-width: 670px) {
3340
.page-gallery-container {
34-
width: 100%;
41+
//width: 100%;
3542
box-shadow: none;
3643
background-color: transparent;
3744
}

3-panel/src/views/Pages/Posts/components/List/index.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ export default class List extends Component {
2323
* @param {Object} posts.
2424
*/
2525
setCells (posts) {
26+
this.items = []
27+
this.cells = []
28+
this.getRoot().innerHTML = ''
29+
2630
for (var i = 0; i < posts.length; i++) {
2731
this.addPost(posts[i])
2832
}
@@ -37,7 +41,7 @@ export default class List extends Component {
3741
const root = this.getRoot()
3842

3943
const cell = (
40-
<Item data={data} getMobileTable={this.getMobileTable} getItem={() => { return this }} />
44+
<Item data={data} getMobileTable={() => { return this }} getItem={() => { return this }} />
4145
)
4246

4347
this.renderComponents(cell, root)

3-panel/src/views/Pages/Posts/components/PostDialog/components/FileInput/index.js

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,7 @@ export default class FileInput extends Component {
2222
* @param {Event}
2323
*/
2424
onButtonClick = (e) => {
25-
const input = this.elements.upload
26-
27-
input.click()
25+
this.elements.upload.click()
2826
}
2927

3028
/**
@@ -33,9 +31,7 @@ export default class FileInput extends Component {
3331
* @param {Event}
3432
*/
3533
onButtonMouseEnter = (e) => {
36-
const tooltip = window.app.elements.tooltipUploadButton
37-
38-
tooltip.toggle(true, this.elements.button.getRoot())
34+
window.app.elements.uploadButtonTooltip.toggle(true, this.elements.button.getRoot())
3935
}
4036

4137
/**
@@ -44,9 +40,7 @@ export default class FileInput extends Component {
4440
* @param {Event}
4541
*/
4642
onButtonMouseLeave = (e) => {
47-
const tooltip = window.app.elements.tooltipUploadButton
48-
49-
tooltip.toggle(false)
43+
window.app.elements.uploadButtonTooltip.toggle(false)
5044
}
5145

5246
/**

3-panel/src/views/Pages/Posts/components/PostDialog/index.js

Lines changed: 61 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export default class PostDialog extends Component {
1414

1515
this.previewToggled = false
1616

17-
this.toggledEditMode = false
17+
this.isEditMode = false
1818
}
1919

2020
/**
@@ -54,7 +54,7 @@ export default class PostDialog extends Component {
5454
}, 150)
5555

5656
if (edit) {
57-
this.toggledEditMode = edit
57+
this.isEditMode = edit
5858

5959
saveButtonRoot.innerHTML = 'ZAPISZ'
6060

@@ -67,8 +67,8 @@ export default class PostDialog extends Component {
6767
saveButtonRoot.innerHTML = 'DODAJ'
6868
}
6969

70-
if (!edit && this.toggledEditMode) {
71-
this.toggledEditMode = false
70+
if (!edit && this.isEditMode) {
71+
this.isEditMode = false
7272

7373
this.clearForm()
7474
}
@@ -310,59 +310,89 @@ export default class PostDialog extends Component {
310310

311311
const app = window.app
312312
const postsPage = app.getPostsPage()
313-
const snackbar = app.elements.addedPostSnackbar
313+
const snackbar = app.elements.addPostSnackbar
314314
const snackbarText = snackbar.elements.text
315315

316316
if (this.verifyData()) {
317317
this.toggle(false)
318318

319-
snackbarText.innerHTML = (!this.toggledEditMode) ? 'Pomyślnie dodano post' : 'Pomyślnie zapisano post'
319+
snackbarText.innerHTML = (!this.isEditMode) ? 'Pomyślnie dodano post' : 'Pomyślnie zapisano post'
320320
snackbar.toggle(true)
321321

322322
const post = postsPage.clickedPost
323323

324324
const title = this.elements.titleTextField.getValue()
325325
const content = this.elements.contentTextField.getValue()
326326

327-
const index = postsPage.postsData.indexOf(post.props.data)
328-
const media = (previewMedia.style.display !== 'none') ? previewMedia.src : null
327+
if (this.isEditMode) {
328+
const index = postsPage.postsData.indexOf(post.props.data)
329+
const media = (previewMedia.style.display !== 'none') ? previewMedia.src : null
329330

330-
if (postsPage.listLoaded) {
331-
const postInList = postsPage.elements.list.items[index]
331+
function updatePost (post, titleElement, contentElement, imgElement, title, content, media) {
332+
titleElement.innerHTML = title
333+
contentElement.innerHTML = content
332334

333-
postInList.elements.title.elements.text.innerHTML = title
334-
postInList.elements.content.elements.text.innerHTML = content
335+
if (imgElement != null) {
336+
imgElement.style.display = (media == null) ? 'none' : 'inline-block'
335337

336-
const img = postInList.elements.picture.elements.text.getElementsByTagName('img')[0]
338+
if (media != null) imgElement.src = media
339+
}
340+
}
337341

338-
if (img != null) {
339-
img.style.display = (media == null) ? 'none' : 'inline-block'
342+
if (postsPage.listLoaded) {
343+
const postInList = postsPage.elements.list.items[index]
344+
const titleElement = postInList.elements.title.elements.text
345+
const contentElement = postInList.elements.content.elements.text
346+
const imgElement = post.elements.picture.elements.text.getElementsByTagName('img')[0]
340347

341-
if (media != null) img.src = media
348+
updatePost(postInList, titleElement, contentElement, imgElement, title, content, media)
342349
}
343-
}
344350

345-
if (postsPage.tableLoaded) {
346-
const postInTable = postsPage.elements.table.cells[index]
351+
if (postsPage.tableLoaded) {
352+
const postInTable = postsPage.elements.table.cells[index]
353+
const titleElement = postInTable.elements.title
354+
const contentElement = postInTable.elements.content
355+
const imgElement = postInTable.elements.picture.getElementsByTagName('img')[0]
356+
357+
updatePost(postInTable, titleElement, contentElement, imgElement, title, content, media)
358+
}
347359

348-
postInTable.elements.title.innerHTML = title
349-
postInTable.elements.content.innerHTML = content
360+
post.elements.title.innerHTML = title
361+
post.elements.content.innerHTML = content
350362

351-
const img = postInTable.elements.picture.getElementsByTagName('img')[0]
363+
postsPage.postsData[index].title = title
364+
postsPage.postsData[index].content = content
365+
postsPage.postsData[index].media = media
366+
} else {
367+
const postData = {
368+
id: 9,
369+
media: 'http://img11.deviantart.net/a66d/i/2015/109/3/b/forest_wallpaper_16_9_by_iorgudesign-d8qa67w.jpg',
370+
title: 'Test',
371+
author: 'Mikołaj Palkiewicz',
372+
content: 'Card with picture test',
373+
date: '14.04.2017 10:38',
374+
avatar: 'https://scontent-waw1-1.xx.fbcdn.net/v/t1.0-9/14581320_549947718524540_5437545186607783553_n.jpg?oh=1d709d8978f80d6887041c3e9583f27f&oe=59994281',
375+
likes: [],
376+
comments: []
377+
}
352378

353-
if (img != null) {
354-
img.style.display = (media == null) ? 'none' : 'inline-block'
379+
const _postsData = []
380+
_postsData.push(postData)
355381

356-
if (media != null) img.src = media
382+
for (var i = 0; i < postsPage.postsData.length; i++) {
383+
_postsData.push(postsPage.postsData[i])
357384
}
358-
}
359385

360-
post.elements.title.innerHTML = title
361-
post.elements.content.innerHTML = content
386+
postsPage.postsData = _postsData
387+
388+
if (postsPage.tableLoaded) {
389+
postsPage.elements.table.setCells(postsPage.postsData)
390+
}
362391

363-
postsPage.postsData[index].title = title
364-
postsPage.postsData[index].content = content
365-
postsPage.postsData[index].media = media
392+
if (postsPage.listLoaded) {
393+
postsPage.elements.list.setCells(postsPage.postsData)
394+
}
395+
}
366396

367397
setTimeout(function () {
368398
self.clearForm()

3-panel/src/views/Pages/Posts/components/Table/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ export default class Table extends Component {
2222
* @param {Object} posts data
2323
*/
2424
setCells (posts) {
25+
this.cells = []
26+
this.elements.tbody.innerHTML = ''
27+
2528
for (var i = 0; i < posts.length; i++) {
2629
this.addPost(posts[i])
2730
}

3-panel/src/views/Pages/Posts/index.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ export default class PostsPage extends Component {
493493
* @param {Event}
494494
*/
495495
onViewClick = (e) => {
496-
const tooltip = window.app.elements.tooltipView
496+
const tooltip = window.app.elements.viewTooltip
497497

498498
if (this.isTable) {
499499
this.switchToList()
@@ -510,7 +510,7 @@ export default class PostsPage extends Component {
510510
* @param {Event}
511511
*/
512512
onViewMouseEnter = (e) => {
513-
const tooltip = window.app.elements.tooltipView
513+
const tooltip = window.app.elements.viewTooltip
514514

515515
const text = (this.isTable) ? 'Przełącz na listę' : 'Przełącz na tabelę'
516516

@@ -524,7 +524,7 @@ export default class PostsPage extends Component {
524524
* @param {Event}
525525
*/
526526
onViewMouseLeave = (e) => {
527-
window.app.elements.tooltipView.toggle(false)
527+
window.app.elements.viewTooltip.toggle(false)
528528
}
529529

530530
/**
@@ -537,7 +537,7 @@ export default class PostsPage extends Component {
537537

538538
const toolbar = app.getToolbar()
539539
const showPicturesIcon = toolbar.elements.showPicturesIcon
540-
const tooltip = app.elements.tooltipShowPictures
540+
const tooltip = app.elements.showPicturesTooltip
541541

542542
const table = this.elements.table
543543
const list = this.elements.list
@@ -561,7 +561,7 @@ export default class PostsPage extends Component {
561561
* @param {Event}
562562
*/
563563
onShowPicturesMouseEnter = (e) => {
564-
const tooltip = window.app.elements.tooltipShowPictures
564+
const tooltip = window.app.elements.showPicturesTooltip
565565

566566
const text = (!this.toggledPictures) ? 'Pokaż zdjęcia' : 'Ukryj zdjęcia'
567567

@@ -575,7 +575,7 @@ export default class PostsPage extends Component {
575575
* @param {Event}
576576
*/
577577
onShowPicturesMouseLeave = (e) => {
578-
window.app.elements.tooltipShowPictures.toggle(false)
578+
window.app.elements.showPicturesTooltip.toggle(false)
579579
}
580580

581581
/**

0 commit comments

Comments
 (0)