Skip to content

Commit

Permalink
Tobi develop (#1328)
Browse files Browse the repository at this point in the history
* feat: Introduce schedule management and calendar components

- Add `WorksiteCalendar.vue` to manage worksite schedules with calendar, map, and upcoming view modes
- Implement schedule exporting in CSV, PDF, and ICS formats
- Integrate `@schedule-x` for calendar functionality
- Enable schedule editing and creation for worksite assignments
- Add detailed work type interfaces in `types`

fix: Improve existing components for better integration

- Modify `AjaxTable.vue` to emit `rowClick` and `selectionChanged` events
- Update `WorksiteTable.vue` styling and support passing custom table body styles
- Adjust incident handling in `AddFromList` and `List` components for more consistent query parameters

chore: Update dependencies for calendar integration

- Add `@schedule-x` dependencies to `package.json`

* refactor: remove Vuex ORM integration and simplify team data fetching

- Removed Vuex ORM and related dependencies in `AddScheduleDialog` test setup.
- Replaced Vuex ORM team fetching with direct `axios` call in `AddScheduleDialog.vue`.
- Cleaned up unused test code and adjusted mocking for consistency.

These changes simplify dependencies by removing Vuex ORM, streamlining the team data fetching process, and improving test maintainability.

* feat: enhance "More Links" modal with logout button

- Update modal height from `h-120` to `h-132` for additional content.
- Add a logout button styled as an outlined `base-button` within the "More Links" modal.
- Wrap `AppDownloadLinks` and logout button in a flex container for better alignment.

Overall: Improves user experience by providing a convenient logout option directly within the modal.
  • Loading branch information
tabiodun authored Feb 12, 2025
1 parent 56d1e60 commit 9f0f6a0
Showing 1 changed file with 11 additions and 2 deletions.
13 changes: 11 additions & 2 deletions src/layouts/Authenticated.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<modal
v-if="showingMoreLinks"
data-testid="testShowingMoreLinksModal"
modal-classes="bg-white h-120 shadow p-3"
modal-classes="bg-white h-132 shadow p-3"
closeable
:title="$t('nav.all_links')"
@close="showingMoreLinks = false"
Expand All @@ -51,7 +51,16 @@
{{ r.text || $t(`nav.${r.key}`) }}
</base-link>
</div>
<AppDownloadLinks />
<div class="flex flex-col items-center my-1">
<base-button
:action="logoutApp"
variant="outline"
class="p-1 my-2 w-full"
>
{{ $t('~~Logout') }}
</base-button>
<AppDownloadLinks />
</div>
</modal>
</template>

Expand Down

0 comments on commit 9f0f6a0

Please sign in to comment.