Skip to content

Commit

Permalink
[/home] Fix broken function calls
Browse files Browse the repository at this point in the history
  • Loading branch information
dchege711 committed Apr 14, 2024
1 parent 0312257 commit ff0b218
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 36 deletions.
4 changes: 2 additions & 2 deletions src/public/src/AccountPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function closeTrashWindow() {
state.card_container.style.display = "none";
}

function fetchNextCard() {
export function fetchNextCard() {
if (!cardsManager) {
throw new Error("Account page not initialized.");
}
Expand All @@ -102,7 +102,7 @@ function fetchNextCard() {
.catch((err) => { console.error(err); });
}

function fetchPreviousCard() {
export function fetchPreviousCard() {
if (!cardsManager) {
throw new Error("Account page not initialized.");
}
Expand Down
6 changes: 3 additions & 3 deletions src/public/src/BrowseCardsPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export function displayAllSearchResults(abbreviatedCards: Partial<ICard>[]) {
let searchResultsHTML = ``;
for (let card of abbreviatedCards) {
searchResultsHTML += `
<div class="w3-card-4 w3-padding-small w3-margin search-result" onclick="displayFullCard('${card._id}')">
<div class="w3-card-4 w3-padding-small w3-margin search-result" onclick="BrowseCardsPage.displayFullCard('${card._id}')">
<header class="w3-container w3-pale-green"><h4>${card.title}</h4></header>
<div class="w3-container"><p><strong>Tags: </strong><span id="tags${card._id}">${card.tags?.split(/\s/).join(", ")}</span></p></div>
</div>
Expand Down Expand Up @@ -164,7 +164,7 @@ function displayFullCard(cardID: string) {
.catch((err) => { console.error(err); });
}

function fetchPreviousCard() {
export function fetchPreviousCard() {
if (cardsManager === null) {
throw new Error("CardsManager not initialized.");
}
Expand All @@ -174,7 +174,7 @@ function fetchPreviousCard() {
.catch((err) => { console.error(err); });
}

function fetchNextCard() {
export function fetchNextCard() {
if (cardsManager === null) {
throw new Error("CardsManager not initialized.");
}
Expand Down
30 changes: 15 additions & 15 deletions src/public/src/HomePage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,12 @@ async function refreshMinicards() {
}

let minicardsHTML = `
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="displayNewCard()">
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="HomePage.displayNewCard()">
<header class="w3-container w3-pale-blue"><h4><i class="fa fa-plus-square-o fa-fw" aria-hidden="true"></i> Create a New Card</h4></header>
</div>`;
for (let cardKey of cardsManager) {
minicardsHTML += `
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="displayFullCard('${
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="HomePage.displayFullCard('${
cardKey._id
}')">
<header class="w3-container w3-pale-green"><h4>${
Expand All @@ -178,7 +178,7 @@ async function refreshMinicards() {
elementRefs.abbreviatedCardsElement.innerHTML = minicardsHTML;
}

async function displayFullCard(cardID: string) {
export async function displayFullCard(cardID: string) {
if (cardsManager === null) {
throw new Error("Cards manager not initialized.");
}
Expand Down Expand Up @@ -221,23 +221,23 @@ function fetchCard(cardCaller: () => Promise<Partial<ICard> | null>) {
});
}

function fetchPreviousCard() {
export function fetchPreviousCard() {
if (!cardsManager) {
throw new Error("Cards manager not initialized.");
}

fetchCard(cardsManager.previous);
}

function fetchNextCard() {
export function fetchNextCard() {
if (!cardsManager) {
throw new Error("Cards manager not initialized.");
}

fetchCard(cardsManager.next);
}

function toggleOption(element_id: "reviewModeToggle" | "card_is_public_toggle") {
export function toggleOption(element_id: "reviewModeToggle" | "card_is_public_toggle") {
if (!state || !elementRefs) {
throw new Error("State not initialized.");
}
Expand Down Expand Up @@ -393,15 +393,15 @@ function renderCard(card: Partial<ICard> | null) {
});
}

function displayRawCardDescription() {
export function displayRawCardDescription() {
if (!state || !elementRefs) {
throw new Error("State not initialized.");
}
elementRefs.cardDescriptionElement.innerText = state.rawDescription as string;
elementRefs.cardDescriptionElement.setAttribute("contenteditable", "true");
}

function displayNewCard() {
export function displayNewCard() {
if (!state || !elementRefs) {
throw new Error("State not initialized.");
}
Expand Down Expand Up @@ -430,7 +430,7 @@ function displayNewCard() {
elementRefs.cardContainerHolderElement.style.display = "block";
}

function handleInputChange(element_id: string) {
export function handleInputChange(element_id: string) {
if (!state) {
throw new Error("State not initialized.");
}
Expand Down Expand Up @@ -460,7 +460,7 @@ function handleTagsInputChange(event: KeyboardEvent) {
}
}

function suggestNewTags(tagInputElement: HTMLInputElement) {
export function suggestNewTags(tagInputElement: HTMLInputElement) {
if (!state) {
throw new Error("State not initialized.");
}
Expand All @@ -485,7 +485,7 @@ function suggestNewTags(tagInputElement: HTMLInputElement) {
elementRefs.tagsAutocompleteResultsElement.innerHTML = autocompleteHTML;
}

function removeTagSuggestions() {
export function removeTagSuggestions() {
if (!elementRefs) {
throw new Error("Element refs not initialized.");
}
Expand Down Expand Up @@ -543,14 +543,14 @@ function removeTagFromCard(tag: string) {
*
* {@tutorial main.editing_cards}
*/
function insertTabsIfNecessary(event: KeyboardEvent) {
export function insertTabsIfNecessary(event: KeyboardEvent) {
if (event.key == "Tab") {
document.execCommand("insertHTML", false, "&nbsp;&nbsp;&nbsp;&nbsp;");
event.preventDefault();
}
}

function handleCardUrgencyChange() {
export function handleCardUrgencyChange() {
if (!state) {
throw new Error("State not initialized.");
}
Expand All @@ -568,7 +568,7 @@ function handleCardUrgencyChange() {
}
}

function saveCard(renderSavedCard = true) {
export function saveCard(renderSavedCard = true) {
if (!state) {
throw new Error("State not initialized.");
}
Expand Down Expand Up @@ -638,7 +638,7 @@ function saveCard(renderSavedCard = true) {
});
}

function moveCardToTrash() {
export function moveCardToTrash() {
if (!state) {
throw new Error("State not initialized.");
}
Expand Down
2 changes: 1 addition & 1 deletion src/views/pages/browse_cards_page.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
</div>
<% } else { %>
<% for (let i = 0; i < abbreviatedCards.length; i++) { %>
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="displayFullCard('<%= abbreviatedCards[i]._id %>')">
<div class="w3-card-4 w3-padding-small w3-margin minicard_search_result" onclick="BrowserCardsPage.displayFullCard('<%= abbreviatedCards[i]._id %>')">
<header class="w3-container w3-pale-green"><h4><%= abbreviatedCards[i].title %></h4></header>
<div class="w3-container"><p><strong>Tags: </strong><span id='tags<%= abbreviatedCards[i]._id %>'><%= abbreviatedCards[i].tags.split(/\s/).join(", ") %></span></p></div>
</div>
Expand Down
24 changes: 13 additions & 11 deletions src/views/partials/card_template.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
<label class="input-area-padded padding-small w3-twothird w3-left">
<input type="text" id="card_title" name="title"
class="w3-input" style="font-weight:bolder"
onkeydown="handleInputChange('card_title')"/>
onkeydown="HomePage.handleInputChange('card_title')"/>
</label>

<button class="w3-btn w3-hover-white w3-right" onclick="displayNewCard()">
<button class="w3-btn w3-hover-white w3-right" onclick="HomePage.displayNewCard()">
<b><i class="fa fa-plus-square-o fa-fw" aria-hidden="true"></i> Create a New Card</b>
</button>

<button class="w3-btn w3-hover-white w3-right" onClick="displayRawCardDescription()">
<button class="w3-btn w3-hover-white w3-right" onClick="HomePage.displayRawCardDescription()">
<b><i class="w3-right fa fa-pencil fa-fw" aria-hidden="true"></i> Edit Card</b>
</button>
</div>

<div class="w3-container">

<div class="w3-container" id="card_description"
onkeydown="insertTabsIfNecessary(event); handleInputChange('card_description')">
onkeydown="HomePage.insertTabsIfNecessary(event); HomePage.handleInputChange('card_description')">
</div>
<p class="w3-right tooltip">
<i class="fa fa-fw fa-info-circle" aria-hidden="true"></i> Formatting Help
Expand All @@ -47,7 +47,9 @@
<span id="already_set_card_tags"></span>
<div class="dropdown">
<input type="text" id="card_tag_input" placeholder="Add a new tag..."
onkeyup="handleTagsInputChange(event);" onfocus="suggestNewTags(this);" onblur="window.setTimeout(removeTagSuggestions, 300);"
onkeyup="HomePage.handleTagsInputChange(event);"
onfocus="HomePage.suggestNewTags(this);"
onblur="window.setTimeout(HomePage.removeTagSuggestions, 300);"
class="w3-input dropbtn" />
<div class="dropdown-content" id="tags_autocomplete_results"></div>
</div>
Expand All @@ -70,15 +72,15 @@
<strong>Urgency</strong>
<input id="card_urgency" type="range" name="urgency"
class="w3-input" min="0" max="10" step="0.01"
onChange="handleCardUrgencyChange();"
onChange="HomePage.handleCardUrgencyChange();"
/>
</label>
</div>

<div class="w3-quarter w3-right">
<span id="card_urgency_number"><strong></strong></span>
<label class="w3-right switch tooltip">
<input type="checkbox" id="card_is_public_toggle" onchange="toggleOption('card_is_public_toggle');">
<input type="checkbox" id="card_is_public_toggle" onchange="HomePage.toggleOption('card_is_public_toggle');">
<span class="slider round" id="card_is_public_label"></span>
<span class="tooltiptext" id="card_is_public_tooltip">
<a href="/wiki#public_cards" target="_blank">More about public cards</a>
Expand Down Expand Up @@ -113,10 +115,10 @@

<div class="w3-bar" style="padding:2%;">
<div class="w3-third w3-left">
<button class="w3-btn w3-round-xxlarge w3-left w3-red" onClick="moveCardToTrash()">
<button class="w3-btn w3-round-xxlarge w3-left w3-red" onClick="HomePage.moveCardToTrash()">
<b><i class="fa fa-trash-o fa-fw" aria-hidden="true"></i> Delete Card</b>
</button>
<button class="w3-right w3-btn w3-round-xxlarge w3-blue" onClick="fetchPreviousCard()">
<button class="w3-right w3-btn w3-round-xxlarge w3-blue" onClick="HomePage.fetchPreviousCard()">
<b><i class="fa fa-chevron-left"></i> Previous</b>
</button>
</div>
Expand All @@ -129,11 +131,11 @@
</div>

<div class="w3-right w3-third">
<button class="w3-left w3-btn w3-round-xxlarge w3-blue" onClick="fetchNextCard()">
<button class="w3-left w3-btn w3-round-xxlarge w3-blue" onClick="HomePage.fetchNextCard()">
<b><i class="fa fa-chevron-right"></i> Next</b>
</button>

<button class="w3-btn w3-round-xxlarge w3-right w3-green" onClick="saveCard()">
<button class="w3-btn w3-round-xxlarge w3-right w3-green" onClick="HomePage.saveCard()">
<b><i class="fa fa-floppy-o fa-fw" aria-hidden="true"></i> Save Card</b>
</button>
</div>
Expand Down
4 changes: 2 additions & 2 deletions src/views/partials/search_result_card_template.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

<div class="w3-bar w3-padding-16">
<button class="w3-left w3-third w3-btn w3-round-xxlarge"
onClick="fetchPreviousCard()">
onClick="HomePage.fetchPreviousCard()">
<b>
<i class="fa fa-chevron-left"></i> View Similar Cards</b>
</button>
Expand All @@ -49,7 +49,7 @@
</div>
</div>

<button class="w3-right w3-btn w3-third w3-round-xxlarge" onClick="fetchNextCard()">
<button class="w3-right w3-btn w3-third w3-round-xxlarge" onClick="HomePage.fetchNextCard()">
<b>View Similar Cards <i class="fa fa-chevron-right"></i></b>
</button>

Expand Down
4 changes: 2 additions & 2 deletions src/views/partials/trashed_card_template.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</div>

<div class="w3-bar w3-padding-16">
<button class="w3-left w3-third w3-btn w3-round-xxlarge" onClick="fetchPreviousCard()">
<button class="w3-left w3-third w3-btn w3-round-xxlarge" onClick="AccountPage.fetchPreviousCard()">
<b>
<i class="fa fa-chevron-left"></i> Previous</b>
</button>
Expand All @@ -42,7 +42,7 @@
</div>
</div>

<button class="w3-right w3-btn w3-third w3-round-xxlarge" onClick="fetchNextCard()">
<button class="w3-right w3-btn w3-third w3-round-xxlarge" onClick="AccountPage.fetchNextCard()">
<b>
<i class="fa fa-chevron-right"></i> Next</b>
</button>
Expand Down

0 comments on commit ff0b218

Please sign in to comment.