Skip to content

Commit

Permalink
Merge branch 'main' into chore/restructure-repository-functions
Browse files Browse the repository at this point in the history
  • Loading branch information
devmount authored Apr 19, 2024
2 parents 7b2ac78 + edd3c07 commit 42c9d0c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 12 deletions.
2 changes: 1 addition & 1 deletion backend/src/appointment/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ def cli():

from .routes import commands

app = typer.Typer()
app = typer.Typer(pretty_exceptions_enable=False)
# We don't have too many commands, so just dump them under main for now.
app.add_typer(commands.router, name="main")
app()
File renamed without changes.
23 changes: 12 additions & 11 deletions frontend/src/views/ScheduleView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,20 @@
</div>
<!-- page content -->
<div
class="mt-8 flex flex-col-reverse items-stretch justify-between gap-4 md:flex-row"
class="mt-8 flex flex-col-reverse items-stretch justify-between gap-4 md:flex-row lg:gap-8"
:class="{ 'lg:mt-10': tabActive === calendarViews.month }"
>
<!-- main section: big calendar showing active month, week or day -->
<calendar-qalendar
class="w-full md:w-4/5"
:selected="activeDate"
:appointments="pendingAppointments"
:events="calendarEvents"
:schedules="schedulesPreviews"
@date-change="onDateChange"
/>
<!-- schedule creation dialog -->
<div class="mx-auto mb-10 w-full min-w-[360px] sm:w-1/2 md:mb-0 md:w-1/4">
<div class="mx-auto mb-10 w-full min-w-[310px] sm:w-1/2 md:mb-0 md:w-1/4">
<schedule-creation
v-if="schedulesReady"
:calendars="connectedCalendars"
Expand All @@ -19,15 +28,7 @@
@updated="schedulePreview"
/>
</div>
<!-- main section: big calendar showing active month, week or day -->
<calendar-qalendar
class="w-full"
:selected="activeDate"
:appointments="pendingAppointments"
:events="calendarEvents"
:schedules="schedulesPreviews"
@date-change="onDateChange"
/>

</div>
</template>

Expand Down

0 comments on commit 42c9d0c

Please sign in to comment.