Skip to content

Commit

Permalink
fix: fsd shared layer
Browse files Browse the repository at this point in the history
  • Loading branch information
mnenie committed Dec 18, 2024
1 parent d98105b commit 0f035bb
Show file tree
Hide file tree
Showing 77 changed files with 105 additions and 84 deletions.
2 changes: 1 addition & 1 deletion core/client/src/app/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import i18n from '@/shared/lib/i18n'
import i18n from '@/shared/libs/i18n'
import { createHead } from '@unhead/vue'
import { vTooltip } from 'floating-vue'
import { createApp } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useBreakpoints, useExpanded } from '@/shared/lib/composables'
import { useBreakpoints, useExpanded } from '@/shared/composables'
import { computed } from 'vue'

export function useCharts() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import i18n from '@/shared/lib/i18n'
import i18n from '@/shared/libs/i18n'
import { shallowMount } from '@vue/test-utils'
import { describe, expect, it } from 'vitest'
import { templatesInfo } from '../../model'
import TemplateItem from '../TemplateItem.vue'
import '@/shared/lib/vitest-utils/cookiesI18n-mock'

describe('tests for TemplateItem.vue', () => {
const wrapper = shallowMount(TemplateItem, {
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/features/filter/ui/SearchFilter.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { useExpanded } from '@/shared/lib/composables'
import { useExpanded } from '@/shared/composables'
import { UiBadge, UiButton } from '@/shared/ui'
import { createReusableTemplate, refDebounced } from '@vueuse/core'
import { computed } from 'vue'
Expand Down
14 changes: 10 additions & 4 deletions core/client/src/features/layout/ui/LanguageSelect.vue
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
<script setup lang="ts">
import { useLanguage } from '@/shared/lib/composables'
import { cn } from '@/shared/lib/shadcn/utils'
import { buttonVariants, UiButton } from '@/shared/ui/button'
import { UiSelect, UiSelectContent, UiSelectItem, UiSelectTrigger } from '@/shared/ui/select'
import { useLanguage } from '@/shared/composables'
import { cn } from '@/shared/libs/shadcn/utils'
import {
buttonVariants,
UiButton,
UiSelect,
UiSelectContent,
UiSelectItem,
UiSelectTrigger,
} from '@/shared/ui'
import { computed, reactive, ref } from 'vue'
const locales = reactive([
Expand Down
Empty file.
12 changes: 12 additions & 0 deletions core/client/src/features/workspace/ui/ChooseImg.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<script setup lang="ts">
import { UiInput } from '@/shared/ui'
</script>

<template>
<div class="w-full flex items-center justify-start gap-3">
<div class="w-20 h-20 rounded-md flex items-center justify-center bg-#266df0">
<span i-hugeicons-clipboard class="text-17px text-neutral-200" />
</div>
<UiInput type="file" />
</div>
</template>
2 changes: 1 addition & 1 deletion core/client/src/layouts/ui/DefaultLayout.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { Board } from '@/entities/board'
import { useExpanded } from '@/shared/lib/composables'
import { useExpanded } from '@/shared/composables'
import { AppSidebar, HeaderMain } from '@/widgets/layout'
import { useLocalStorage } from '@vueuse/core'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/pages/analytics.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { useBreakpoints } from '@/shared/lib/composables'
import { useBreakpoints } from '@/shared/composables'
import { UiBadge } from '@/shared/ui'
import { BoardsChart, OnlineChart, SharedSection, TasksChart, UsersChart } from '@/widgets/analytics'
import { useHead } from '@unhead/vue'
Expand Down
9 changes: 9 additions & 0 deletions core/client/src/pages/tasks.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<script setup lang="ts">
import { useHead } from '@unhead/vue'
definePage({
meta: {
requiresAuth: true,
},
})
useHead({
title: 'Jenda | Tasks',
})
</script>

<template>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/alert/UiAlert.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { computed, type HTMLAttributes, ref } from 'vue'
import { alertVariants, type AlertVariants } from '.'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/badge/UiBadge.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { type BadgeVariants, badgeVariants } from '.'
const { variant = 'default', class: badgeClass } = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/button/UiButton.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { createReusableTemplate } from '@vueuse/core'
import { Primitive, type PrimitiveProps } from 'radix-vue'
import { type ButtonVariants, buttonVariants } from '.'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UIDialogDescription.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { DialogDescription, type DialogDescriptionProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UiDialogContent.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DialogClose,
DialogContent,
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UiDialogFooter.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
const props = defineProps<{ class?: HTMLAttributes['class'] }>()
</script>
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UiDialogHeader.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
const props = defineProps<{
class?: HTMLAttributes['class']
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UiDialogScrollContent.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DialogClose,
DialogContent,
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/dialog/UiDialogTitle.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { DialogTitle, type DialogTitleProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DropdownMenuCheckboxItem,
type DropdownMenuCheckboxItemEmits,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DropdownMenuContent,
type DropdownMenuContentEmits,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { DropdownMenuItem, type DropdownMenuItemProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { DropdownMenuLabel, type DropdownMenuLabelProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DropdownMenuSeparator,
type DropdownMenuSeparatorProps,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
const props = defineProps<{
class?: HTMLAttributes['class']
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DropdownMenuSubContent,
type DropdownMenuSubContentEmits,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
DropdownMenuSubTrigger,
type DropdownMenuSubTriggerProps,
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/input/UiInput.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { useVModel } from '@vueuse/core'
const props = defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/pin-input/UiPinInput.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { PinInputRoot, type PinInputRootEmits, type PinInputRootProps, useForwardPropsEmits } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/pin-input/UiPinInputGroup.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { Primitive, type PrimitiveProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/pin-input/UiPinInputInput.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { PinInputInput, type PinInputInputProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectContent.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
SelectContent,
type SelectContentEmits,
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectGroup.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectGroup, type SelectGroupProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectItem.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import {
SelectItem,
SelectItemIndicator,
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectLabel.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import type { HTMLAttributes } from 'vue'
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectLabel, type SelectLabelProps } from 'radix-vue'
const props = defineProps<SelectLabelProps & { class?: HTMLAttributes['class'] }>()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectScrollDownButton, type SelectScrollDownButtonProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectScrollUpButton, type SelectScrollUpButtonProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectSeparator.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectSeparator, type SelectSeparatorProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/select/UiSelectTrigger.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
import { SelectTrigger, type SelectTriggerProps, useForwardProps } from 'radix-vue'
import { computed, type HTMLAttributes } from 'vue'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/shared/ui/shimmer-button/ShimmerButton.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts" setup>
import { cn } from '@/shared/lib/shadcn/utils'
import { cn } from '@/shared/libs/shadcn/utils'
interface ShimmerButtonProps {
shimmerColor?: string
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/widgets/analytics/ui/BoardsChart.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { type Chart, ChartItemWrapper } from '@/entities/chart'
import { useCharts } from '@/entities/chart/model/composables'
import { useExpanded } from '@/shared/lib/composables'
import { useExpanded } from '@/shared/composables'
import { useDark } from '@vueuse/core'
import { computed, markRaw, ref, watch } from 'vue'
import { VueUiStackbar } from 'vue-data-ui'
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/widgets/analytics/ui/UsersChart.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script lang="ts" setup>
import { type Chart, ChartItemWrapper } from '@/entities/chart'
import { useBreakpoints } from '@/shared/lib/composables'
import { useBreakpoints } from '@/shared/composables'
import { useWindowSize } from '@vueuse/core'
import { computed, markRaw, ref } from 'vue'
import { VueUiKpi } from 'vue-data-ui'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import i18n from '@/shared/lib/i18n'
import i18n from '@/shared/libs/i18n'
import { shallowMount } from '@vue/test-utils'
import { describe, expect, it } from 'vitest'
import FooterWelcome from '../AppFooter.vue'
import '@/shared/lib/vitest-utils/cookiesI18n-mock'

describe('tests for FooterWelcome.vue', () => {
const wrapper = shallowMount(FooterWelcome, {
Expand Down
10 changes: 5 additions & 5 deletions core/client/src/widgets/layout/ui/header/BurgerMenu.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<script setup lang="ts">
import type { MenuLink, SectionItem } from '../../model'
import { useScroll } from '@/shared/lib/composables'
import { redirect } from '@/shared/lib/helpers'
import { useScroll } from '@/shared/composables'
import { computed, ref, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { items as _items, menuLinks as _links } from '../../model'
Expand Down Expand Up @@ -43,11 +42,12 @@ const { scrollToEl } = useScroll(items.value.map(i => i.urlPrefix))
/>
<div class="menu bg-main" :class="[isOpen ? 'menu-opened' : '']">
<div class="flex flex-col gap-2.5">
<div
<a
v-for="(link, index) in links"
:key="index"
class="flex items-center justify-between p-3 px-4 rounded-8px border-0.5px border-solid border-transparent cursor-pointer duration-100 ease dark:bg-neutral-700"
@click="redirect(link.url)"
:href="link.url"
target="_blank"
>
<p class="text-lg">
{{ link.title }}
Expand All @@ -56,7 +56,7 @@ const { scrollToEl } = useScroll(items.value.map(i => i.urlPrefix))
i-lucide-arrow-up-right
class="text-neutral-400 text-lg"
/>
</div>
</a>
<div class="sections">
<div
v-for="(i, index) in items"
Expand Down
2 changes: 1 addition & 1 deletion core/client/src/widgets/layout/ui/header/HeaderMain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import type { Board } from '@/entities/board'
import type { ProjectLink } from '@/shared/config/types-shared'
import { type User, UserAvatar } from '@/entities/user'
import { useLayoutPaths } from '@/shared/lib/composables'
import { useLayoutPaths } from '@/shared/composables'
import { HotkeysDialog, ShareDialog } from '@/widgets/dialogs'
import { Icon } from '@iconify/vue'
import { computed, shallowReactive, toRef } from 'vue'
Expand Down
Loading

0 comments on commit 0f035bb

Please sign in to comment.