Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions src/core/slack.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,14 @@
from slack_sdk.web.slack_response import SlackResponse
from slack_sdk.errors import SlackApiError

from config import SLACK_API_TOKEN, SLACK_JUMPSTART_MESSAGE, SLACK_DM_TEMPLATE

from config import (
SLACK_API_TOKEN,
SLACK_JUMPSTART_MESSAGE,
SLACK_DM_TEMPLATE,
CALENDAR_TIMEZONE,
)
from datetime import datetime
from zoneinfo import ZoneInfo

logger: Logger = getLogger(__name__)

Expand All @@ -22,7 +28,13 @@
logger.error(f"Failed to initialize Slack client: {e}")

announcements: list[dict[str, str]] = [
{"content": "Welcome to Jumpstart!", "user": "Jumpstart"}
{
"content": "Welcome to Jumpstart!",
"user": "Jumpstart",
"timestamp": datetime.now(ZoneInfo(CALENDAR_TIMEZONE))
.strftime("%I:%M %p")
.lstrip("0"),
}
]


Expand Down Expand Up @@ -177,6 +189,13 @@ def add_announcement(announcement_text: str, username: str) -> None:
logger.warning("Attempted to add empty announcement, skipping!")
return

new_addition: dict[str, str] = {"content": announcement_text, "user": username}
current_time = (
datetime.now(tz=ZoneInfo(CALENDAR_TIMEZONE)).strftime("%I:%M %p").lstrip("0")
)
new_addition: dict[str, str] = {
"content": announcement_text,
"user": username,
"timestamp": current_time,
}

announcements.append(new_addition)
28 changes: 28 additions & 0 deletions src/static/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
--shadow-color: rgb(176,25,126, 0.5); /* Used for the shadow in the calendar */
}

/* b {
display: flex;
align-items: center;
justify-content: center;
} */

.theme-dark {
--panel-header-color: #B0197E;
--panel-header-text-color: #FFFFFF;
Expand Down Expand Up @@ -125,6 +131,17 @@ body{
font-family: 'Courier New', Courier, monospace;
font-size: 20px;
text-align: center;
white-space: pre-line;
}

.announcements-stamp-header{
color: var(--panel-header-text-color);
font-family: 'Courier New', Courier, monospace;
font-size: 20px;
text-align: left;
white-space: pre-line;
display: block;
font-style: italic;
}

.announcements-text-body{
Expand All @@ -145,6 +162,17 @@ body{
font-family: 'Courier New', Courier, monospace;
font-size: 20px;
text-align: center;
white-space: pre-line;
}

.wikithoughts-page-name-header{
color: var(--panel-header-text-color);
font-family: 'Courier New', Courier, monospace;
font-size: 20px;
text-align: left;
white-space: pre-line;
display: block;
font-style: italic;
}

.wikithoughts-text-body{
Expand Down
5 changes: 3 additions & 2 deletions src/static/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,11 @@ async function mediumUpdate() {
]);
const wikiData = await wikiRes.json();
const announcementData = await announcementRes.json();
$("#wikipageheader").text(wikiData.page + " - csh/Wikithoughts")
$("#wikipageheader").text(wikiData.page)
$("#wikipagetext").text(wikiData.content);
$("#announcement").text(announcementData.content.substring(0, 910));
$("#announcement-header").text("Announcements - " + announcementData.user)
$("#announcement-stamp").text(announcementData.user + " - " + announcementData.timestamp)
/*$("#announcement-header").text("Announcements\n" + announcementData.user)*/
} catch (err) {
console.log(err);
}
Expand Down
8 changes: 6 additions & 2 deletions src/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,9 @@
<div class="announcements mt-3">
<div class="panel panel-primary">
<div class="panel-heading">
<b><span class="announcements-text-header" id="announcement-header">Announcements</span></b>
<b><span class="announcements-text-header" id="announcement-header">Recent Announcement:</span></b>
<b><span class="announcements-stamp-header" id="announcement-stamp">N/A/span></b>

</div>
<div class="panel-body">
<div class="plug-body">
Expand Down Expand Up @@ -55,11 +57,13 @@
<div class="wikithoughts">
<div class="panel panel-primary">
<div class="panel-heading">
<b><span class="wikithoughts-text-header" id="wikipageheader">Wiki Page - N/A</span></b>
<b><span class="wikithoughts-text-header" id="wikilabelheader">csh/Wikithoughts:</span></b>
<b><span class="wikithoughts-page-name-header" id="wikipageheader">Page Name</span></b>
</div>
<div class="panel-body">
<div class="plug-body">
<b><span class="wikithoughts-text-body" id="wikipagetext">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</span></b>

</div>
</div>
</div>
Expand Down
Loading