diff --git a/packages/nc-gui-v2/assets/style-v2.scss b/packages/nc-gui-v2/assets/style-v2.scss index 3e651f3034..6a3ee6df58 100644 --- a/packages/nc-gui-v2/assets/style-v2.scss +++ b/packages/nc-gui-v2/assets/style-v2.scss @@ -63,4 +63,8 @@ h1, h2, h3, h4, h5, h6 { .nc-icon { @apply color-transition; -} \ No newline at end of file +} + +:root { + --header-height: 64px; +} diff --git a/packages/nc-gui-v2/components.d.ts b/packages/nc-gui-v2/components.d.ts index 9dc4db9d73..f62537956d 100644 --- a/packages/nc-gui-v2/components.d.ts +++ b/packages/nc-gui-v2/components.d.ts @@ -7,6 +7,7 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { + ADivider: typeof import('ant-design-vue/es')['Divider'] ADropdown: typeof import('ant-design-vue/es')['Dropdown'] ALayout: typeof import('ant-design-vue/es')['Layout'] ALayoutContent: typeof import('ant-design-vue/es')['LayoutContent'] @@ -15,6 +16,7 @@ declare module '@vue/runtime-core' { AMenu: typeof import('ant-design-vue/es')['Menu'] AMenuDivider: typeof import('ant-design-vue/es')['MenuDivider'] AMenuItem: typeof import('ant-design-vue/es')['MenuItem'] + AModal: typeof import('ant-design-vue/es')['Modal'] ASubMenu: typeof import('ant-design-vue/es')['SubMenu'] ATable: typeof import('ant-design-vue/es')['Table'] RouterLink: typeof import('vue-router')['RouterLink'] diff --git a/packages/nc-gui-v2/components/cell/Url.vue b/packages/nc-gui-v2/components/cell/Url.vue index 8bd4a68f76..6015aec1c5 100644 --- a/packages/nc-gui-v2/components/cell/Url.vue +++ b/packages/nc-gui-v2/components/cell/Url.vue @@ -3,15 +3,15 @@ import { computed, ref } from '#imports' import { ColumnInj } from '~/components' import { isValidURL } from '~/utils/urlUtils' +interface Props { + modelValue: string +} + const { modelValue: value } = defineProps() const emit = defineEmits(['update:modelValue']) const column = inject(ColumnInj) const editEnabled = inject('editEnabled') -interface Props { - modelValue: string -} - const localState = computed({ get: () => value, set: (val) => { diff --git a/packages/nc-gui-v2/components/dashboard/TreeView.vue b/packages/nc-gui-v2/components/dashboard/TreeView.vue index 93b4f614c6..6d7f02f6a7 100644 --- a/packages/nc-gui-v2/components/dashboard/TreeView.vue +++ b/packages/nc-gui-v2/components/dashboard/TreeView.vue @@ -7,17 +7,17 @@ const { addTab } = useTabs() @@ -25,4 +25,8 @@ const { addTab } = useTabs() .pointer { cursor: pointer; } + +.nc-treeview-container { + height: calc(100vh - var(--header-height)); +} diff --git a/packages/nc-gui-v2/pages/index/index.vue b/packages/nc-gui-v2/pages/index/index.vue index bed513931b..647eb29e73 100644 --- a/packages/nc-gui-v2/pages/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index.vue @@ -1,40 +1,65 @@ diff --git a/packages/nc-gui-v2/pages/index/index/index.vue b/packages/nc-gui-v2/pages/index/index/index.vue index 21b8c7d7e8..e51eb52b5a 100644 --- a/packages/nc-gui-v2/pages/index/index/index.vue +++ b/packages/nc-gui-v2/pages/index/index/index.vue @@ -2,11 +2,11 @@ import type { ProjectType } from 'nocodb-sdk' import { navigateTo } from '#app' import useColors from '~/composables/useColors' -import MdiStarOutline from '~icons/mdi/star-outline' import MdiMenuDown from '~icons/mdi/menu-down' import MdiDeleteOutline from '~icons/mdi/delete-outline' import MdiPlus from '~icons/mdi/plus' import MdiDatabaseOutline from '~icons/mdi/database-outline' +import MdiEditOutline from '~icons/mdi/edit-outline' interface Props { projects: ProjectType[] @@ -14,6 +14,8 @@ interface Props { const { projects } = defineProps() +const emit = defineEmits(['delete-project']) + const { $e } = useNuxtApp() const { getColorByIndex } = useColors(true) @@ -48,10 +50,7 @@ const formatTitle = (title: string) => -
+
{{ $t('activity.createProject') }}
@@ -69,21 +68,25 @@ const formatTitle = (title: string) =>
{{ formatTitle(project.title) }} - - - - -