upstream: integrar 0.9.5 en 34 ficheros mas y portar los modulos nuevos
Segunda tanda. Resueltas por merge de tres vias 15 divergencias que no solapaban, y aplicada la version de 0.9.5 en 19 vistas y modelos donde la rama solo arrastraba codigo antiguo (firmas viejas de renderProductForm, renderJobForm, listTags sin search, y el import sin renderSpreadEditWarning). Se preserva la eliminacion de housing donde la rama lo habia descartado: modules_view, blockchain_view, search_model y tags_model. Modulos nuevos del dev portados: blog, data, gallery, mentions, polls, workflows, comments, recurrence y media_gallery, mas contentPdf, pdfDocument y content_favorites. main_views recupera renderEngagement, spreadsFor y renderSpreadEditWarning, que la rama habia eliminado y que las vistas de 0.9.5 necesitan. Sin ellas polls_view lanzaba TypeError al editar. El overlay de i18n pasa de 15 a 41 claves (46 en castellano): incorpora las 9 que upstream tenia en 0.9.1 y elimino en 0.9.5 mientras nuestro codigo las sigue usando (menuBlogs, spreadHint, chatShareUrl, forumFilterHot, publishBlog...) y las 17 de Karvan, que nunca existieron y tiraban de texto de reserva en ingles; ahora estan traducidas al castellano. Verificado con la app arrancada: declara 0.9.5, 0 claves i18n sin resolver (antes 26), 26 rutas responden 200/302, y la interfaz de la rama sale intacta: 10 categorias y 47 modulos en los hexagonos, topbar con Personal/Community y avatar, 7 accesos rapidos en la barra inferior y 0 etiquetas vacias (antes 1, la de Blogs).
This commit is contained in:
SITO
parent
f964e61a1c
commit
82b6c3ae05
43 changed files with 3221 additions and 2416 deletions
179
src/views/blog_view.js
Normal file
179
src/views/blog_view.js
Normal file
|
|
@ -0,0 +1,179 @@
|
|||
const { div, h2, p, section, button, form, a, input, label, span, textarea, br, table, tr, td } = require("../server/node_modules/hyperaxe");
|
||||
const { renderCommentsSection: renderSharedCommentsSection } = require("./comments_view");
|
||||
const { template, i18n, userLink, renderOpinionsVoting, renderEngagement, renderSpreadButton, renderContentActions } = require("./main_views");
|
||||
const moment = require("../server/node_modules/moment");
|
||||
const { config } = require("../server/SSB_server.js");
|
||||
const { renderUrl } = require("../backend/renderUrl");
|
||||
const { renderTextWithStyles } = require("../backend/renderTextWithStyles");
|
||||
const { sanitizeHtml } = require("../backend/sanitizeHtml");
|
||||
|
||||
const userId = config.keys.id;
|
||||
|
||||
const FILTERS = [
|
||||
{ key: "ALL", i18n: "blogFilterAll" },
|
||||
{ key: "MINE", i18n: "blogFilterMine" },
|
||||
{ key: "RECENT", i18n: "blogFilterRecent" },
|
||||
{ key: "FAVORITES", i18n: "blogFilterFavorites" },
|
||||
{ key: "TOP", i18n: "blogFilterTop" }
|
||||
];
|
||||
|
||||
const safeText = (v) => String(v == null ? "" : v).trim();
|
||||
|
||||
const excerpt = (text, max = 420) => {
|
||||
const s = safeText(text);
|
||||
return s.length > max ? s.slice(0, max) + "…" : s;
|
||||
};
|
||||
|
||||
const renderFilterBar = (filter, q, showSearch = true) =>
|
||||
section(
|
||||
div({ class: "filters" },
|
||||
form({ method: "GET", action: "/blogs", class: "ui-toolbar ui-toolbar--filters" },
|
||||
...FILTERS.map(f =>
|
||||
button({ type: "submit", name: "filter", value: f.key, class: filter === f.key ? "filter-btn active" : "filter-btn" }, String(i18n[f.i18n]).toUpperCase())
|
||||
),
|
||||
button({ type: "submit", name: "filter", value: "CREATE", class: "create-button" }, i18n.blogCreateButton)
|
||||
)
|
||||
),
|
||||
showSearch
|
||||
? div({ class: "filters" },
|
||||
form({ method: "GET", action: "/blogs", class: "filter-box" },
|
||||
input({ type: "hidden", name: "filter", value: filter }),
|
||||
input({ type: "text", name: "q", value: q || "", placeholder: i18n.blogSearchPlaceholder, class: "filter-box__input" }),
|
||||
div({ class: "filter-box__controls" },
|
||||
button({ type: "submit", class: "filter-box__button" }, i18n.searchButton)
|
||||
)
|
||||
)
|
||||
)
|
||||
: null
|
||||
);
|
||||
|
||||
const renderBlogCard = (blog, filter, spreadInfo) => {
|
||||
const href = `/blogs/${encodeURIComponent(blog.id)}`;
|
||||
const isOwn = String(blog.author) === String(userId);
|
||||
return div({ class: "trending-card blog-card" + (isOwn ? " own-content" : "") },
|
||||
div({ class: "card-header activity-card-header" },
|
||||
renderContentActions(blog.id, href, { spread: spreadInfo || null, author: blog.author, favKind: 'blogs', isFavorite: blog.isFavorite, reportTitle: blog.subject || blog.text })
|
||||
),
|
||||
div({ class: "card-section blog-card-body" },
|
||||
blog.subject
|
||||
? div({ class: "shop-title-row" },
|
||||
h2({ class: "tribe-card-title" }, a({ href }, blog.subject))
|
||||
)
|
||||
: null,
|
||||
div({ class: "blog-card-text", innerHTML: sanitizeHtml(renderTextWithStyles(excerpt(blog.text))) }),
|
||||
p({ class: "card-footer" },
|
||||
span({ class: "date-link" }, moment(blog.createdAt).format("YYYY/MM/DD HH:mm")),
|
||||
span(" · "),
|
||||
userLink(blog.author)
|
||||
)
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
const renderCreateForm = () =>
|
||||
section(
|
||||
div({ class: "publish-form" },
|
||||
form({ action: "/blogs/create", method: "POST", enctype: "multipart/form-data" },
|
||||
label({ for: "subject" }, i18n.blogSubject),
|
||||
br(),
|
||||
input({ type: "text", name: "subject", id: "subject", maxlength: "150", placeholder: i18n.contentWarningPlaceholder }),
|
||||
br(),
|
||||
br(),
|
||||
label({ for: "text" }, i18n.blogMessage),
|
||||
br(),
|
||||
textarea({ required: true, name: "text", id: "text", rows: "8", class: "publish-textarea", maxlength: "7000", placeholder: i18n.publishWarningPlaceholder }),
|
||||
br(),
|
||||
br(),
|
||||
label({ for: "blob" }, i18n.blogMedia),
|
||||
br(),
|
||||
input({ type: "file", id: "blob", name: "blob", multiple: true, accept: "image/*,video/*,audio/*,application/pdf" }),
|
||||
br(),
|
||||
br(),
|
||||
div({ class: "blog-allow-comments" },
|
||||
input({ type: "hidden", name: "allowComments", value: "0" }),
|
||||
label(
|
||||
input({ type: "checkbox", name: "allowComments", value: "1", checked: true }),
|
||||
" ",
|
||||
i18n.blogAllowComments
|
||||
)
|
||||
),
|
||||
br(),
|
||||
button({ type: "submit" }, i18n.blogPublish)
|
||||
)
|
||||
)
|
||||
);
|
||||
|
||||
const renderCommentsSection = (blog, comments = []) => {
|
||||
const href = `/blogs/${encodeURIComponent(blog.id)}`;
|
||||
return renderSharedCommentsSection({
|
||||
action: `${href}/comments`,
|
||||
comments: comments,
|
||||
returnTo: href,
|
||||
closedNote: blog.allowComments ? null : i18n.blogCommentsClosed
|
||||
});
|
||||
};
|
||||
|
||||
exports.blogView = async (blogs = [], filter = "ALL", params = {}) => {
|
||||
const showForm = String(filter).toUpperCase() === "CREATE";
|
||||
const spreadMap = params.spreadMap instanceof Map ? params.spreadMap : new Map();
|
||||
return template(
|
||||
i18n.blogTitle,
|
||||
section(
|
||||
div({ class: "tags-header" },
|
||||
h2(i18n.blogTitle),
|
||||
p(i18n.blogDescription)
|
||||
)
|
||||
),
|
||||
renderFilterBar(showForm ? "ALL" : filter, params.q, !showForm),
|
||||
showForm
|
||||
? renderCreateForm()
|
||||
: section(
|
||||
blogs.length
|
||||
? div({ class: "jobs-grid" }, ...blogs.map(b => renderBlogCard(b, filter, spreadMap.get(b.id))))
|
||||
: p({ class: "no-content" }, i18n.blogNoItems)
|
||||
)
|
||||
);
|
||||
};
|
||||
|
||||
exports.singleBlogView = async (blog, comments = [], params = {}) => {
|
||||
const href = `/blogs/${encodeURIComponent(blog.id)}`;
|
||||
const isAuthor = String(blog.author) === String(userId);
|
||||
|
||||
const blogSide = div({ class: "tribe-side" },
|
||||
div({ class: "card-header activity-card-header" },
|
||||
renderContentActions(blog.id, null, { spread: params.spreads || null, author: blog.author, favKind: 'blogs', isFavorite: blog.isFavorite, reportTitle: blog.subject || blog.text })
|
||||
),
|
||||
div({ class: "shop-title-row" },
|
||||
h2({ class: "tribe-card-title" }, blog.subject || i18n.blogTitle)
|
||||
),
|
||||
table({ class: "tribe-info-table jobs-info-table" },
|
||||
tr(
|
||||
td({ class: "tribe-info-label" }, i18n.createdAtLabel || "Created at"),
|
||||
td({ class: "tribe-info-value", colspan: "3" }, moment(blog.createdAt).format("YYYY/MM/DD HH:mm"))
|
||||
),
|
||||
tr(
|
||||
td({ class: "tribe-info-value", colspan: "4" }, userLink(blog.author))
|
||||
)
|
||||
),
|
||||
div({ class: "tribe-card-members" },
|
||||
span({ class: "tribe-members-count" }, `${i18n.blogComments}: ${blog.commentCount || 0}`)
|
||||
),
|
||||
);
|
||||
|
||||
const blogMain = div({ class: "tribe-main" },
|
||||
div({ class: "job-section" },
|
||||
div({ class: "blog-detail-text", innerHTML: sanitizeHtml(renderTextWithStyles(blog.text || "")) })
|
||||
),
|
||||
renderEngagement(blog.id,
|
||||
renderOpinionsVoting('/blogs/opinions', blog.id, blog.opinions, href, blog.opinions_inhabitants),
|
||||
renderCommentsSection(blog, comments)
|
||||
)
|
||||
);
|
||||
|
||||
return template(
|
||||
blog.subject || i18n.blogTitle,
|
||||
section(div({ class: "tags-header" }, h2(i18n.blogTitle), p(i18n.blogDescription))),
|
||||
renderFilterBar("ALL", params.q, false),
|
||||
section(div({ class: "tribe-details" }, blogSide, blogMain))
|
||||
);
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue