diff --git a/backend/page_scripts.js b/backend/page_scripts.js index b85a3ef..bf66955 100644 --- a/backend/page_scripts.js +++ b/backend/page_scripts.js @@ -9,7 +9,6 @@ async function getDefaults(req) { let user; if (req.session.user) user = await core.getUser({ user_id: req.session.user.id }); if (user?.success) user = user.data; - console.log(user); return { logged_in_user: user, website_name: core.settings.WEBSITE_NAME || "Yet-Another-Blog", settings: core.settings }; } async function index(request, response) { diff --git a/frontend/views/themes/default/css/generic.css b/frontend/views/themes/default/css/generic.css index f62a0bc..a74af58 100644 --- a/frontend/views/themes/default/css/generic.css +++ b/frontend/views/themes/default/css/generic.css @@ -203,6 +203,40 @@ body { box-sizing: border-box; } +.info .info-blip.visibility-flag { + margin-left: auto; + font-size: 0.9rem; + display: flex; + padding: 0 0.5rem; + border-radius: 5px; + border: 2px solid; +} +.info .info-blip.visibility-flag span { + margin: auto; + color: black; +} +.info .visibility-flag.published { + border-color: #21b525; + background-color: #a0ffa0; +} +.info .visibility-flag.unlisted { + border-color: #bec10f; + background-color: #e8ffa0; +} +.info .visibility-flag.private { + border-color: #c10f0f; + background-color: #ffd7d7; +} +.info .visibility-flag.draft { + border-color: black; + background-color: rgba(0, 0, 0, 0.0588235294); +} +.info .visibility-flag.scheduled { + border-color: #0f77c1; + background-color: #d7e9ff; + margin-left: inherit; +} + @media screen and (max-width: 1280px) { .page-center { width: 95%; diff --git a/frontend/views/themes/default/css/generic.scss b/frontend/views/themes/default/css/generic.scss index e7949a7..38e7865 100644 --- a/frontend/views/themes/default/css/generic.scss +++ b/frontend/views/themes/default/css/generic.scss @@ -217,7 +217,47 @@ body { box-sizing: border-box; } } +.info { + .info-blip.visibility-flag { + margin-left: auto; + font-size: 0.9rem; + display: flex; + padding: 0 0.5rem; + border-radius: 5px; + border: 2px solid; + span { + margin: auto; + color: black; + } + } + + .visibility-flag.published { + border-color: #21b525; + background-color: #a0ffa0; + } + + .visibility-flag.unlisted { + border-color: #bec10f; + background-color: #e8ffa0; + } + + .visibility-flag.private { + border-color: #c10f0f; + background-color: #ffd7d7; + } + + .visibility-flag.draft { + border-color: black; + background-color: #0000000f; + } + + .visibility-flag.scheduled { + border-color: #0f77c1; + background-color: #d7e9ff; + margin-left: inherit; + } +} @media screen and (max-width: 1280px) { .page-center { width: 95%; diff --git a/frontend/views/themes/default/ejs/partials/post.ejs b/frontend/views/themes/default/ejs/partials/post.ejs index b6b8390..23a82e1 100644 --- a/frontend/views/themes/default/ejs/partials/post.ejs +++ b/frontend/views/themes/default/ejs/partials/post.ejs @@ -4,8 +4,17 @@
<%= post.description %>
-
<%= post.publish_date ? post.publish_date.toLocaleString('en-US', { dateStyle:'medium'}) : "Null" %>
+
<%= post.publish_date ? post.publish_date.toLocaleString('en-US', { dateStyle:'medium'}) : "Unknown Publish Date" %>
Null minute read
+ <% if (logged_in_user) { %> + +
<%= post.visibility %>
+ + <% if (new Date(post.publish_date) > new Date() && post.visibility !== 'PRIVATE') {%> +
Scheduled
+ <% } %> + + <% } %>