Skip to content
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

Jump to bottom

Issue/#149 smtp improves #150

Merged
merged 2 commits into from
May 24, 2024
Merged

Issue/#149 smtp improves #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5abad6f
[#149] fix smtp event open
Kreezag May 24, 2024
8626529
[#149] add active classes to sidebar menu on inner pages
Kreezag May 24, 2024
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
4 changes: 2 additions & 2 deletions pages/smtp/[id].vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useRoute, useRouter, useFetch, useHead, useNuxtApp } from "#app"; // es
import { PageHeader } from "~/src/widgets/ui";
import { useSmtp } from "~/src/entities/smtp";
import type { SMTP } from "~/src/entities/smtp/types";
import { REST_API_URL } from "~/src/shared/lib/io";
import { htmlEncode } from "~/src/shared/lib/helpers";
import { useEvents } from "~/src/shared/lib/use-events";
import type { Attachment, EventId, ServerEvent } from "~/src/shared/types";

Expand Down Expand Up @@ -35,7 +35,7 @@ const event = computed(() =>
const attachments = computed(() => serverAttachments.value);

const html = computed(
() => `<iframe src="${REST_API_URL}/api/smtp/${eventId}/html"/>`
() => `<iframe srcdoc="${htmlEncode(serverEvent.value.payload.html)}"/>`
);

const onDelete = () => {
Expand Down
27 changes: 23 additions & 4 deletions src/widgets/ui/layout-sidebar/layout-sidebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts" setup>
import { storeToRefs } from "pinia";
import { computed, ref } from "vue";
import { useNuxtApp, useRouter } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
import { useNuxtApp, useRoute, useRouter } from "#app"; // eslint-disable-line @conarti/feature-sliced/layers-slices
import { useConnectionStore } from "~/src/shared/stores/connections";
import { useProfileStore } from "~/src/shared/stores/profile";
import type { Profile } from "~/src/shared/types";
Expand Down Expand Up @@ -55,6 +55,8 @@ const logout = () => {
const router = useRouter();
router.push("/login");
};

const { path } = useRoute();
</script>

<template>
Expand All @@ -72,22 +74,38 @@ const logout = () => {
<IconSvg class="layout-sidebar__link-icon" name="events" />
</NuxtLink>

<NuxtLink to="/sentry" title="Sentry logs" class="layout-sidebar__link">
<NuxtLink
to="/sentry"
title="Sentry logs"
class="layout-sidebar__link"
:class="{ 'router-link-active': path.includes('/sentry') }"
>
<IconSvg class="layout-sidebar__link-icon" name="sentry" />
</NuxtLink>

<NuxtLink to="/profiler" title="Profiler" class="layout-sidebar__link">
<NuxtLink
to="/profiler"
title="Profiler"
class="layout-sidebar__link"
:class="{ 'router-link-active': path.includes('/profiler') }"
>
<IconSvg class="layout-sidebar__link-icon" name="profiler" />
</NuxtLink>

<NuxtLink to="/smtp" title="SMTP mails" class="layout-sidebar__link">
<NuxtLink
to="/smtp"
title="SMTP mails"
class="layout-sidebar__link"
:class="{ 'router-link-active': path.includes('/smtp') }"
>
<IconSvg class="layout-sidebar__link-icon" name="smtp" />
</NuxtLink>

<NuxtLink
to="/http-dumps"
title="Http dumps"
class="layout-sidebar__link"
:class="{ 'router-link-active': path.includes('/http-dumps') }"
>
<IconSvg class="layout-sidebar__link-icon" name="http-dumps" />
</NuxtLink>
Expand All @@ -96,6 +114,7 @@ const logout = () => {
to="/inspector"
title="Inspector logs"
class="layout-sidebar__link"
:class="{ 'router-link-active': path.includes('/inspector') }"
>
<IconSvg class="layout-sidebar__link-icon" name="inspector" />
</NuxtLink>
Expand Down
Loading