Skip to content

date logic changed #358

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chanabyte wants to merge 13 commits into
base: stage
Choose a base branch
from
Open

date logic changed #358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
29d7c55
date logic changed
chanabyte Jun 8, 2026
fd90ea7
Potential fix for pull request finding
chanabyte Jun 8, 2026
d94e84f
All relevant date logic abstracted to app/utils/dateLogic.ts, will te…
AidanLoran Jul 8, 2026
82e8f42
Merge branch 'main' of https://github.com/UTDallasEPICS/Reading-MLK i…
AidanLoran Jul 8, 2026
f6d52d7
remove builder.css dupe
AidanLoran Jul 8, 2026
d57233c
regex and validity checks for selectedDates in server/api/admin/class…
chanabyte Jul 11, 2026
35697db
day js formatted for param in checks
chanabyte Jul 11, 2026
c13982b
changed to regex test
chanabyte Jul 11, 2026
4a05cf3
selectedDate check added
chanabyte Jul 11, 2026
1400ac8
changes in yaml file
chanabyte Jul 11, 2026
f1fcf54
added regex.test() for datelogic
chanabyte Jul 15, 2026
329c6d0
added isvalid check from dayjs
chanabyte Jul 15, 2026
de672d9
lockfile fix
AidanLoran Jul 15, 2026
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
419 changes: 222 additions & 197 deletions app/composables/useAdmin.ts
View file
Open in desktop
Comment thread
AidanLoran marked this conversation as resolved.

Large diffs are not rendered by default.

229 changes: 190 additions & 39 deletions app/pages/admin/builder.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,48 @@
<script setup lang="ts">
definePageMeta({ ssr: false, layout: "admin" })

import dayjs from 'dayjs'
import isoWeek from 'dayjs/plugin/isoWeek'
import utc from 'dayjs/plugin/utc'

dayjs.extend(isoWeek)
dayjs.extend(utc)

const builderSectionRef = ref<HTMLElement | null>(null)

const {
builderSubTab, formTitle, editingFormId, questions,
formWeekStart, formDays, historyWeekStart, historyStatusSelection, historyGroupStartDate, historyGroupEndDate, toggleHistoryStatus, getLastMonday,
getCalculatedDate, formatDate, defaultQuestions,
filteredPublishedForms, selectedFormDetails, viewFormDetails,
formWeekStart, formDays, historyWeekStart, historyKeywordQuery, historyAdvancedFiltersOpen,
historyStatusSelection, historyGroupStartDate, historyGroupEndDate, emptyFormPromptOpen,
toggleHistoryStatus, resetHistoryAdvancedFilters, resetHistoryFilters, formatDate, defaultQuestions,
filteredPublishedForms, selectedFormDetails, viewFormDetails, publishSuccessInfo,
draggedIdx, dragStart, onDrop,
addQuestion, publishForm, editPublishedForm, toggleFormPublish, loadPublishedForms,
addQuestion, publishForm, saveEmptyFormDraft, editPublishedForm, toggleFormPublish, deleteStoredForm, loadPublishedForms,
} = useAdmin()

const dayLabels = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']

const getWeekStartLabel = (weekStart: string) => {
if (!weekStart) return ''

return dayjs.utc(weekStart).startOf('isoWeek').format('YYYY-MM-DD')
}

const previewDates = computed(() => {
if (!formDays.value.length) return []
const weekStart = getLastMonday(formWeekStart.value || '')
const weekStart = getWeekStartLabel(formWeekStart.value || '')
if (!weekStart) return []
return formDays.value.map(day => `${day}: ${getCalculatedDate(weekStart, day)}`)
return formDays.value
.map((day) => {
const index = dayLabels.indexOf(day)

if (index === -1) {
return ''
}

return `${day}: ${dayjs.utc(weekStart).add(index, 'day').format('dddd, MMM D, YYYY')}`
})
.filter(Boolean)
})

const questionTypeLabel = (type: string) => {
Expand Down Expand Up @@ -76,6 +102,23 @@ const removeQuestion = (index: number) => {
questions.value.splice(index, 1)
}

const resetBuilderForm = () => {
editingFormId.value = null
formTitle.value = ''
formDays.value = ['Monday']
questions.value = defaultQuestions()
emptyFormPromptOpen.value = false
builderSubTab.value = 'history'
}

const deleteEmptyForm = async () => {
if (editingFormId.value) {
await deleteStoredForm({ id: editingFormId.value, title: formTitle.value }, true)
}

resetBuilderForm()
}

const handleBuilderEnter = (event: KeyboardEvent) => {
const currentTarget = event.target as HTMLElement | null

Expand Down Expand Up @@ -124,6 +167,35 @@ onBeforeUnmount(() => {
<template>
<div class="builder-wrap">

<!-- ══════════════════════════════════════════ -->
<!-- FORM DETAILS MODAL -->
<!-- ══════════════════════════════════════════ -->
<Transition name="fade">
<div v-if="emptyFormPromptOpen" class="modal-backdrop">
Comment thread
chanabyte marked this conversation as resolved.
<div class="modal-overlay" @click="emptyFormPromptOpen = false" />
<div class="modal-box">
<div class="modal-header">
<div>
<h3 class="modal-title">You cannot publish because its empty.</h3>
Comment thread
AidanLoran marked this conversation as resolved.
<p class="modal-meta">It's empty — do you still want to save or delete?</p>
</div>
</div>

<div class="modal-body">
<p class="empty-form-copy">
Save this form as an unpublished draft, or delete it and start over.
</p>
</div>

<div class="modal-footer success-footer">
<button class="btn-indigo" @click="saveEmptyFormDraft()">Save</button>
<button class="btn-dark" @click="deleteEmptyForm()">Delete</button>
<button class="btn-ghost" @click="emptyFormPromptOpen = false">Cancel</button>
</div>
</div>
</div>
</Transition>

<!-- ══════════════════════════════════════════ -->
<!-- FORM DETAILS MODAL -->
<!-- ══════════════════════════════════════════ -->
Expand Down Expand Up @@ -172,6 +244,45 @@ onBeforeUnmount(() => {
</div>
</Transition>

<!-- ══════════════════════════════════════════ -->
<!-- PUBLISH SUCCESS MODAL -->
<!-- ══════════════════════════════════════════ -->
<Transition name="fade">
<div v-if="publishSuccessInfo" class="modal-backdrop">
<div class="modal-overlay" @click="publishSuccessInfo = null" />
<div class="modal-box success-modal">

<div class="modal-header success-header">
<div class="success-icon">✓</div>
<div>
<h3 class="modal-title">{{ publishSuccessInfo.isUpdate ? 'Form Updated Successfully' : 'Form Published Successfully' }}</h3>
<p class="modal-meta">{{ publishSuccessInfo.title }}</p>
</div>
</div>

<div class="modal-body success-body">
<div class="success-info-block">
<div class="info-row">
<span class="info-label">📅 Week Starting:</span>
<span class="info-value">{{ publishSuccessInfo.weekStart }}</span>
</div>
<div v-if="publishSuccessInfo.publishedDates && publishSuccessInfo.publishedDates.length > 0" class="info-row">
<span class="info-label">📆 Dates:</span>
<div class="date-list">
<span v-for="date in publishSuccessInfo.publishedDates" :key="date" class="date-tag">{{ date }}</span>
</div>
</div>
</div>
</div>

<div class="modal-footer success-footer">
<button class="btn-indigo" @click="publishSuccessInfo = null; builderSubTab = 'history';">View in History</button>
Comment thread
AidanLoran marked this conversation as resolved.
<button class="btn-dark" @click="publishSuccessInfo = null">Close</button>
</div>
</div>
</div>
</Transition>

<!-- ══════════════════════════════════════════ -->
<!-- CREATION SUB-TAB -->
<!-- ══════════════════════════════════════════ -->
Expand All @@ -194,7 +305,7 @@ onBeforeUnmount(() => {
<div class="week-row">
<div>
<p class="field-hint">Selected Week</p>
<h4 class="week-label">{{ formWeekStart ? 'Week of ' + getLastMonday(formWeekStart) : 'Select a week' }}</h4>
<h4 class="week-label">{{ formWeekStart ? 'Week of ' + getWeekStartLabel(formWeekStart) : 'Select a week' }}</h4>
</div>
<div>
<label class="field-label">Change Week Starting (Mon)</label>
Expand Down Expand Up @@ -397,48 +508,87 @@ onBeforeUnmount(() => {
>+ Create New Form</button>
</div>

<!-- Filters -->
<div class="section-card">
<div class="history-filters-grid">
<div>
<label class="field-label">Weekly Date (Find Matching Form Group)</label>
<div class="section-card history-toolbar">
<div class="history-toolbar-main">
<div class="history-toolbar-field">
<label class="field-label">Weekly Date</label>
<input v-model="historyWeekStart" type="date" class="input-base" />
</div>

<div>
<label class="field-label">Status</label>
<div class="status-filter-btns">
<button
class="status-filter-btn"
:class="historyStatusSelection.includes('published') ? 'active' : ''"
@click="toggleHistoryStatus('published')"
>Published</button>
<button
class="status-filter-btn"
:class="historyStatusSelection.includes('unpublished') ? 'active' : ''"
@click="toggleHistoryStatus('unpublished')"
>Unpublished</button>
</div>
<div class="history-toolbar-field history-search-field">
<label class="field-label">Keyword Search</label>
<input
v-model="historyKeywordQuery"
type="search"
class="input-base"
placeholder="Search titles, dates, questions, or answers"
/>
</div>
</div>
<button class="btn-ghost" @click="resetHistoryFilters()">Reset</button>
<button class="btn-indigo history-advanced-btn" @click="historyAdvancedFiltersOpen = true">
Advanced Filter Options
</button>
</div>

<div>
<label class="field-label">Form Group Start (From)</label>
<input v-model="historyGroupStartDate" type="date" class="input-base" />
</div>
<Transition name="drawer">
<div
v-if="historyAdvancedFiltersOpen"
class="history-drawer-backdrop"
@click.self="historyAdvancedFiltersOpen = false"
>
<aside class="history-drawer">
<div class="history-drawer-header">
<div>
<h4 class="history-drawer-title">Advanced Filter Options</h4>
<p class="history-drawer-subtitle">Refine history by status and exact date range.</p>
</div>
<button class="history-drawer-close" @click="historyAdvancedFiltersOpen = false">×</button>
</div>

<div>
<label class="field-label">Form Group Start (To)</label>
<input v-model="historyGroupEndDate" type="date" class="input-base" />
</div>
<div class="history-drawer-body">
<div>
<label class="field-label">Status</label>
<div class="status-filter-btns history-status-stack">
<button
class="status-filter-btn"
:class="historyStatusSelection.includes('published') ? 'active' : ''"
@click="toggleHistoryStatus('published')"
>Published</button>
<button
class="status-filter-btn"
:class="historyStatusSelection.includes('unpublished') ? 'active' : ''"
@click="toggleHistoryStatus('unpublished')"
>Unpublished</button>
</div>
</div>

<div>
<label class="field-label">Form Date (From)</label>
<input v-model="historyGroupStartDate" type="date" class="input-base" />
</div>

<div>
<label class="field-label">Form Date (To)</label>
<input v-model="historyGroupEndDate" type="date" class="input-base" />
</div>
</div>

<div class="history-drawer-footer">
<button class="btn-ghost" @click="resetHistoryAdvancedFilters()">Reset Filters</button>
<button class="btn-indigo history-advanced-btn" @click="historyAdvancedFiltersOpen = false">Done</button>
</div>
</aside>
</div>
</div>
</Transition>

<!-- Form rows -->
<div class="space-y-3">
<div
v-for="form in filteredPublishedForms" :key="form.id"
class="form-row"
class="form-row cursor-pointer hover:shadow-lg transition-shadow"
:class="form.status === 'Unpublished' ? 'opacity-60' : ''"
@click="viewFormDetails(form)"
>
<!-- Week/day badge -->
<div class="week-badge">
Expand All @@ -457,12 +607,13 @@ onBeforeUnmount(() => {

<div class="form-row-actions">
<span class="status-pill" :class="form.status === 'Active' ? 'active' : 'inactive'">{{ form.status }}</span>
<button class="btn-sm-indigo" @click="viewFormDetails(form)">Details</button>
<button class="btn-sm-indigo" @click="editPublishedForm(form)">Edit</button>
<button class="btn-sm-indigo" @click.stop="viewFormDetails(form)">Details</button>
<button class="btn-sm-indigo" @click.stop="editPublishedForm(form)">Edit</button>
<button class="btn-sm danger" @click.stop="deleteStoredForm(form)">Delete</button>
<button
class="btn-sm"
:class="form.status === 'Active' ? 'danger' : 'success'"
@click="toggleFormPublish(form)"
@click.stop="toggleFormPublish(form)"
>{{ form.status === 'Active' ? 'Unpublish' : 'Republish' }}</button>
</div>
</div>
Expand Down
13 changes: 9 additions & 4 deletions app/pages/admin/raffle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
<script setup lang="ts">
definePageMeta({ ssr: false, layout: "admin" })

const {
getLastMonday, formatDate,
} = useAdmin()
import dayjs from 'dayjs'
import isoWeek from 'dayjs/plugin/isoWeek'
import utc from 'dayjs/plugin/utc'

dayjs.extend(isoWeek)
dayjs.extend(utc)

const { formatDate } = useAdmin()

const {loadRaffleData, raffleWeekStart, raffleWinner, raffleFormGroup, raffleSubmissions, spinRaffle, spinCount} = useRaffleSpin()

Expand Down Expand Up @@ -34,7 +39,7 @@ onMounted(() => {
<div class="week-row">
<div>
<p class="field-hint">Selected Week</p>
<h4 class="week-label">{{ raffleWeekStart ? 'Week of ' + getLastMonday(raffleWeekStart.toLocaleString()) : 'Select a week' }}</h4>
<h4 class="week-label">{{ raffleWeekStart ? 'Week of ' + dayjs.utc(raffleWeekStart).startOf('isoWeek').format('YYYY-MM-DD') : 'Select a week' }}</h4>
</div>
<div>
<label class="field-label">Change Week Starting (Mon)</label>
Expand Down
Loading