diff --git a/apps/client/src/core/components/sidebar/ProjectsList.vue b/apps/client/src/core/components/sidebar/ProjectsList.vue
deleted file mode 100644
index 9ab89442..00000000
--- a/apps/client/src/core/components/sidebar/ProjectsList.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
-
-
-
-
- {{ $t('sidebar.projects') }}
-
-
-
-
-
-
-
-
- {{ project.name }}
-
-
-
-
diff --git a/apps/client/src/main.ts b/apps/client/src/main.ts
index e8503ab0..f5db1dcb 100644
--- a/apps/client/src/main.ts
+++ b/apps/client/src/main.ts
@@ -2,7 +2,6 @@ import { createApp } from 'vue'
import { createHead } from '@unhead/vue'
import { vTooltip } from 'floating-vue'
import Vue3Marquee from 'vue3-marquee'
-import { VueUiRadar } from 'vue-data-ui'
// @ts-expect-error: unresolved type definitions for vue-writer
import VueWriter from 'vue-writer'
@@ -17,7 +16,6 @@ import './styles/index.css'
import '@unocss/reset/tailwind-compat.css'
import 'virtual:uno.css'
import 'floating-vue/dist/style.css'
-import 'vue-data-ui/style.css'
const app = createApp(App)
// head plugin
@@ -31,5 +29,4 @@ app.use(autoAnimatePlugin)
app.use(Vue3Marquee)
app.use(VueWriter)
app.directive('tooltip', vTooltip)
-app.component('VueUiRadar', VueUiRadar)
app.mount('#app')
diff --git a/apps/client/src/modules/calendar/pages/calendar.vue b/apps/client/src/modules/calendar/pages/calendar.vue
new file mode 100644
index 00000000..284fc133
--- /dev/null
+++ b/apps/client/src/modules/calendar/pages/calendar.vue
@@ -0,0 +1,20 @@
+
+
+
+
+ Calendar
+
+
diff --git a/apps/client/src/modules/charts/components/ChartItemWrapper.vue b/apps/client/src/modules/charts/components/ChartItemWrapper.vue
deleted file mode 100644
index 334489b5..00000000
--- a/apps/client/src/modules/charts/components/ChartItemWrapper.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
- {{ $t(`analytics.charts.${chart.key}.name`) }}
-
-
- {{ chart.section }}
-
-
-
-
-
-
-
-
- {{ $t(`analytics.charts.${chart.key}.description`) }}
-
-
diff --git a/apps/client/src/modules/charts/components/SharedSection.vue b/apps/client/src/modules/charts/components/SharedSection.vue
deleted file mode 100644
index f5fa9d6a..00000000
--- a/apps/client/src/modules/charts/components/SharedSection.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
- {{ $t('analytics.share.btn') }}
-
-
- dev
-
-
-
- {{ $t('analytics.share.description') }} 😉
-
diff --git a/apps/client/src/modules/charts/components/charts/BoardsChart.vue b/apps/client/src/modules/charts/components/charts/BoardsChart.vue
deleted file mode 100644
index 16e9e776..00000000
--- a/apps/client/src/modules/charts/components/charts/BoardsChart.vue
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/client/src/modules/charts/components/charts/OnlineChart.vue b/apps/client/src/modules/charts/components/charts/OnlineChart.vue
deleted file mode 100644
index ea207ca8..00000000
--- a/apps/client/src/modules/charts/components/charts/OnlineChart.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/client/src/modules/charts/components/charts/TasksChart.vue b/apps/client/src/modules/charts/components/charts/TasksChart.vue
deleted file mode 100644
index 5b777102..00000000
--- a/apps/client/src/modules/charts/components/charts/TasksChart.vue
+++ /dev/null
@@ -1,114 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/client/src/modules/charts/components/charts/UsersChart.vue b/apps/client/src/modules/charts/components/charts/UsersChart.vue
deleted file mode 100644
index 0b9e7478..00000000
--- a/apps/client/src/modules/charts/components/charts/UsersChart.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
diff --git a/apps/client/src/modules/charts/composables/charts.ts b/apps/client/src/modules/charts/composables/charts.ts
deleted file mode 100644
index b6c6a536..00000000
--- a/apps/client/src/modules/charts/composables/charts.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { computed } from 'vue'
-import { useBreakpoints } from '@/shared/composables/breakpoints'
-import { useExpandedContext } from '@/shared/composables/expanded'
-
-export function useCharts() {
- const { breakpoints } = useBreakpoints()
-
- const { isExpanded } = useExpandedContext()
-
- const isBetweenIntermediateDesktopAnd4K = breakpoints.between(
- 'intermediateDesktop',
- 'desktop4K',
- ).value
-
- const chartOnlineInWorkspaceValue = computed(() => {
- if (isBetweenIntermediateDesktopAnd4K) {
- return isExpanded.value ? 7.7 : 6.5
- }
- return isExpanded.value ? 10 : 8
- })
-
- const chartBoardsValue = computed(() => {
- if (isBetweenIntermediateDesktopAnd4K) {
- return isExpanded.value ? 10 : 9
- }
- return isExpanded.value ? 13 : 11
- })
-
- const chartTasksValue = computed(() =>
- isBetweenIntermediateDesktopAnd4K ? 14 : 18,
- )
-
- return {
- chartOnlineInWorkspaceValue,
- chartBoardsValue,
- chartTasksValue,
- }
-}
diff --git a/apps/client/src/modules/charts/pages/analytics.vue b/apps/client/src/modules/charts/pages/analytics.vue
deleted file mode 100644
index f5a5addb..00000000
--- a/apps/client/src/modules/charts/pages/analytics.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
-
-
-
- {{ $t('analytics.description') }}
-
-
-
-
- {{ badge }}
-
-
-
-
-
diff --git a/apps/client/src/modules/charts/types/index.ts b/apps/client/src/modules/charts/types/index.ts
deleted file mode 100644
index 6644478f..00000000
--- a/apps/client/src/modules/charts/types/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export interface Chart {
- key: 'users' | 'boards' | 'tasks' | 'online'
- section: string
-}
diff --git a/apps/client/src/router/index.ts b/apps/client/src/router/index.ts
index a921315b..c74f77a3 100644
--- a/apps/client/src/router/index.ts
+++ b/apps/client/src/router/index.ts
@@ -10,9 +10,9 @@ export const router = createRouter({
router.beforeEach((to, from) => {
// Needs to add guard auth logic in router
- if (to.meta.requiresAuth === true) {
- return router.push({ name: 'sign-in' })
- }
+ // if (to.meta.requiresAuth === true) {
+ // return router.push({ name: 'sign-in' })
+ // }
})
router.beforeEach(layoutResolverGuard)
diff --git a/apps/client/src/shared/constants/links.ts b/apps/client/src/shared/constants/links.ts
index b4d0cbf7..1ff599e9 100644
--- a/apps/client/src/shared/constants/links.ts
+++ b/apps/client/src/shared/constants/links.ts
@@ -11,9 +11,9 @@ export const links: WorkspaceLink[] = [
},
{
id: 3,
- name: 'analytics',
- pathName: 'analytics',
- icon: 'hugeicons:analytics-01',
+ name: 'calendar',
+ pathName: 'calendar',
+ icon: 'hugeicons:calendar-02',
},
{ id: 4, name: 'members', pathName: 'members', icon: 'hugeicons:user-multiple-02' },
{ id: 5, name: 'settings', pathName: 'settings', icon: 'hugeicons:setting-07' },
diff --git a/apps/client/src/shared/libs/i18n/locales/en-US.ts b/apps/client/src/shared/libs/i18n/locales/en-US.ts
index 3d58de2e..1dcc81c3 100644
--- a/apps/client/src/shared/libs/i18n/locales/en-US.ts
+++ b/apps/client/src/shared/libs/i18n/locales/en-US.ts
@@ -7,7 +7,7 @@ export default {
boards: 'Boards',
notes: 'Notes',
templates: 'Templates',
- analytics: 'Analytics',
+ calendar: 'Calendar',
members: 'Members',
settings: 'Settings',
integrations: 'Integraions',
@@ -98,7 +98,7 @@ export default {
title_tasks: 'Your tasks',
description_tasks: 'Solve and complete the tasks you started',
},
- columns: ['Kanban name', 'Status', 'Labels', 'Participants', 'Tasks', 'Estimate', 'Creation date'],
+ columns: ['Board name', 'Status', 'Labels', 'Participants', 'Tasks', 'Estimate', 'Creation date'],
},
notes: {
create: 'Add note | Add new note',
diff --git a/apps/client/src/shared/libs/i18n/locales/ru-RU.ts b/apps/client/src/shared/libs/i18n/locales/ru-RU.ts
index b493f2aa..2cbd526e 100644
--- a/apps/client/src/shared/libs/i18n/locales/ru-RU.ts
+++ b/apps/client/src/shared/libs/i18n/locales/ru-RU.ts
@@ -4,10 +4,10 @@ export default {
input: 'Поиск',
section: 'воркспейс',
projects: 'проекты',
- boards: 'Канбаны',
+ boards: 'Доски',
templates: 'Шаблоны',
notes: 'Заметки',
- analytics: 'Аналитика',
+ calendar: 'Календарь',
members: 'Участники',
settings: 'Настройки',
integrations: 'Интеграции',
@@ -35,7 +35,7 @@ export default {
share: 'Поделиться',
},
boards: {
- create: 'Добавить канбан | Добавить новый канбан',
+ create: 'Добавить доску | Добавить новую доску',
filters: {
sort: {
title: 'Отсортированно по',
@@ -64,15 +64,15 @@ export default {
title: 'Лейблы',
},
},
- search: 'Найти канбан...',
+ search: 'Найти доску...',
},
forms: {
creating: {
title: 'Создание канбана',
- description: 'Вы можете создать новый канбан чтобы управлять задачами',
+ description: 'Вы можете создать новую доску чтобы управлять задачами',
name: {
label: 'Название',
- placeholder: 'Введите название канбана',
+ placeholder: 'Введите название доски',
},
labels: {
label: 'Лейблы',
@@ -84,8 +84,8 @@ export default {
},
},
empty: {
- title: 'Нет канбанов',
- description: 'Создайте свой первый канбан и начните работать',
+ title: 'Нет досок',
+ description: 'Создайте свою первую доску и начните работать',
},
card: {
date_updated: 'Обновлено',
@@ -97,7 +97,7 @@ export default {
title_tasks: 'Ваши задачи',
description_tasks: 'Решайте и завершайте начатые задачи',
},
- columns: ['Название канбана', 'Статус', 'Лейблы', 'Участники', 'Задачи', 'Оценка', 'Дата создания'],
+ columns: ['Название доски', 'Статус', 'Лейблы', 'Участники', 'Задачи', 'Оценка', 'Дата создания'],
},
notes: {
create: 'Добавить заметку | Добавить новую заметку',
diff --git a/apps/client/src/shared/libs/i18n/locales/zh-CN.ts b/apps/client/src/shared/libs/i18n/locales/zh-CN.ts
index 00166432..483c831e 100644
--- a/apps/client/src/shared/libs/i18n/locales/zh-CN.ts
+++ b/apps/client/src/shared/libs/i18n/locales/zh-CN.ts
@@ -7,7 +7,7 @@ export default {
boards: '看板',
notes: '笔记',
templates: '模板',
- analytics: '分析',
+ calendar: '日历',
members: '成员',
settings: '设置',
integrations: '集成',
diff --git a/apps/client/src/styles/_exceptions.css b/apps/client/src/styles/_exceptions.css
index e2b43f9a..d4509e82 100644
--- a/apps/client/src/styles/_exceptions.css
+++ b/apps/client/src/styles/_exceptions.css
@@ -47,6 +47,16 @@ thead {
}
}
+.echarts > div:first-child {
+ height: 100% !important;
+ width: 100% !important;
+}
+
+canvas {
+ width: 100% !important;
+ height: 100% !important;
+}
+
html.dark {
.v-popper__inner {
@apply bg-neutral-100 text-neutral-800;
diff --git a/apps/client/typed-router.d.ts b/apps/client/typed-router.d.ts
index 7128df59..89220ae8 100644
--- a/apps/client/typed-router.d.ts
+++ b/apps/client/typed-router.d.ts
@@ -20,7 +20,6 @@ declare module 'vue-router/auto-routes' {
export interface RouteNamedMap {
'welcome': RouteRecordInfo<'welcome', '/', Record
, Record>,
'not-found': RouteRecordInfo<'not-found', '/:path(.*)', { path: ParamValue }, { path: ParamValue }>,
- 'analytics': RouteRecordInfo<'analytics', '/analytics', Record, Record>,
'sign-in': RouteRecordInfo<'sign-in', '/auth/sign-in', Record, Record>,
'sign-in-workspace': RouteRecordInfo<'sign-in-workspace', '/auth/sign-in/workspace', Record, Record>,
'sign-up': RouteRecordInfo<'sign-up', '/auth/sign-up', Record, Record>,
@@ -29,6 +28,7 @@ declare module 'vue-router/auto-routes' {
'boards': RouteRecordInfo<'boards', '/boards', Record, Record>,
'board-id': RouteRecordInfo<'board-id', '/boards/:id', { id: ParamValue }, { id: ParamValue }>,
'boards-new': RouteRecordInfo<'boards-new', '/boards/new', Record, Record>,
+ 'calendar': RouteRecordInfo<'calendar', '/calendar', Record, Record>,
'members': RouteRecordInfo<'members', '/members', Record, Record>,
'notes': RouteRecordInfo<'notes', '/notes', Record, Record>,
'notes-slug': RouteRecordInfo<'notes-slug', '/notes/:id/:slug(.*)', { id: ParamValue, slug: ParamValue }, { id: ParamValue, slug: ParamValue }>,
diff --git a/apps/client/vite.config.ts b/apps/client/vite.config.ts
index 8a254091..1d270592 100644
--- a/apps/client/vite.config.ts
+++ b/apps/client/vite.config.ts
@@ -23,12 +23,12 @@ export default defineConfig({
routesFolder: [
'./src/modules/auth/pages',
'./src/modules/members/pages',
+ './src/modules/calendar/pages',
'./src/modules/boards/pages',
'./src/modules/workspace/pages',
'./src/modules/notes/pages',
'./src/modules/settings/pages',
'./src/modules/templates/pages',
- './src/modules/charts/pages',
'./src/modules/welcome/pages',
'./src/core/pages',
],
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b0cd2023..53956745 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -122,6 +122,9 @@ importers:
dayjs:
specifier: 1.11.13
version: 1.11.13
+ echarts:
+ specifier: 5.6.0
+ version: 5.6.0
floating-vue:
specifier: ^5.2.2
version: 5.2.2(vue@3.5.13(typescript@5.4.5))
@@ -155,9 +158,9 @@ importers:
vue:
specifier: ^3.5.8
version: 3.5.13(typescript@5.4.5)
- vue-data-ui:
- specifier: ^2.3.44
- version: 2.4.75
+ vue-echarts:
+ specifier: 7.0.3
+ version: 7.0.3(@vue/runtime-core@3.5.13)(echarts@5.6.0)(vue@3.5.13(typescript@5.4.5))
vue-i18n:
specifier: ^11.0.1
version: 11.0.1(vue@3.5.13(typescript@5.4.5))
@@ -2893,6 +2896,9 @@ packages:
eastasianwidth@0.2.0:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+ echarts@5.6.0:
+ resolution: {integrity: sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==}
+
editorconfig@1.0.4:
resolution: {integrity: sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==}
engines: {node: '>=14'}
@@ -4979,6 +4985,9 @@ packages:
'@swc/wasm':
optional: true
+ tslib@2.3.0:
+ resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
+
tslib@2.8.1:
resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
@@ -5255,8 +5264,16 @@ packages:
vue-component-type-helpers@2.2.0:
resolution: {integrity: sha512-cYrAnv2me7bPDcg9kIcGwjJiSB6Qyi08+jLDo9yuvoFQjzHiPTzML7RnkJB1+3P6KMsX/KbCD4QE3Tv/knEllw==}
- vue-data-ui@2.4.75:
- resolution: {integrity: sha512-szG31wDKyNye1whoGpSHEuzD+gxyhQ46dmYbLJZeoGU2tK6QrQa6JvYARlzQoP33HnIpfbrMlN2l6DZcnlfv/g==}
+ vue-demi@0.13.11:
+ resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
+ engines: {node: '>=12'}
+ hasBin: true
+ peerDependencies:
+ '@vue/composition-api': ^1.0.0-rc.1
+ vue: ^3.0.0-0 || ^2.6.0
+ peerDependenciesMeta:
+ '@vue/composition-api':
+ optional: true
vue-demi@0.14.10:
resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -5274,6 +5291,16 @@ packages:
peerDependencies:
vue: '>=2'
+ vue-echarts@7.0.3:
+ resolution: {integrity: sha512-/jSxNwOsw5+dYAUcwSfkLwKPuzTQ0Cepz1LxCOpj2QcHrrmUa/Ql0eQqMmc1rTPQVrh2JQ29n2dhq75ZcHvRDw==}
+ peerDependencies:
+ '@vue/runtime-core': ^3.0.0
+ echarts: ^5.5.1
+ vue: ^2.7.0 || ^3.1.1
+ peerDependenciesMeta:
+ '@vue/runtime-core':
+ optional: true
+
vue-eslint-parser@9.4.3:
resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
engines: {node: ^14.17.0 || >=16.0.0}
@@ -5487,6 +5514,9 @@ packages:
zod@3.24.1:
resolution: {integrity: sha512-muH7gBL9sI1nciMZV67X5fTKKBLtwpZ5VBp1vsOQzj1MhrBZ4wlVCm3gedKZWLp0Oyel8sIGfeiz54Su+OVT+A==}
+ zrender@5.6.1:
+ resolution: {integrity: sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==}
+
zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
@@ -8121,6 +8151,11 @@ snapshots:
eastasianwidth@0.2.0: {}
+ echarts@5.6.0:
+ dependencies:
+ tslib: 2.3.0
+ zrender: 5.6.1
+
editorconfig@1.0.4:
dependencies:
'@one-ini/wasm': 0.1.1
@@ -10602,6 +10637,8 @@ snapshots:
v8-compile-cache-lib: 3.0.1
yn: 3.1.1
+ tslib@2.3.0: {}
+
tslib@2.8.1: {}
tsx@4.19.2:
@@ -10940,7 +10977,9 @@ snapshots:
vue-component-type-helpers@2.2.0: {}
- vue-data-ui@2.4.75: {}
+ vue-demi@0.13.11(vue@3.5.13(typescript@5.4.5)):
+ dependencies:
+ vue: 3.5.13(typescript@5.4.5)
vue-demi@0.14.10(vue@3.5.13(typescript@5.4.5)):
dependencies:
@@ -10962,6 +11001,16 @@ snapshots:
vue: 3.5.13(typescript@5.4.5)
vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.13(typescript@5.4.5))
+ vue-echarts@7.0.3(@vue/runtime-core@3.5.13)(echarts@5.6.0)(vue@3.5.13(typescript@5.4.5)):
+ dependencies:
+ echarts: 5.6.0
+ vue: 3.5.13(typescript@5.4.5)
+ vue-demi: 0.13.11(vue@3.5.13(typescript@5.4.5))
+ optionalDependencies:
+ '@vue/runtime-core': 3.5.13
+ transitivePeerDependencies:
+ - '@vue/composition-api'
+
vue-eslint-parser@9.4.3(eslint@9.14.0(jiti@2.4.2)):
dependencies:
debug: 4.4.0
@@ -11155,4 +11204,8 @@ snapshots:
zod@3.24.1: {}
+ zrender@5.6.1:
+ dependencies:
+ tslib: 2.3.0
+
zwitch@2.0.4: {}