Skip to content

Commit

Permalink
fix(nc-gui): review changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@DarkPhoenix2704
DarkPhoenix2704 committed Mar 15, 2024
1 parent c07e613 commit bc71db0
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 19 deletions.
9 changes: 6 additions & 3 deletions packages/nc-gui/components/dlg/share-and-collaborate/ShareBase.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ onMounted(() => {
</div>
<NcTooltip>
<template #title>{{ $t('labels.enterMultipleEmails') }} </template>
<component :is="iconMap.info" />
<component :is="iconMap.info" class="text-gray-700" />
</NcTooltip>
</div>
<div class="flex flex-col">
Expand Down Expand Up @@ -472,8 +472,11 @@ onMounted(() => {
</template>
<div class="border-1 my-4 p-3 border-1 space-y-3 border-gray-200 rounded-lg">
<div class="flex flex-row items-center w-full">
<div class="flex text-gray-700 !w-full font-medium items-center gap-2 px-2">
{{ $t('activity.enablePublicAccess') }}
<div class="flex text-gray-700 !w-full items-center gap-2 px-2">
<span class="font-medium">
{{ $t('activity.enablePublicAccess') }}
</span>

<span class="flex items-center py-1 px-2 h-[1.75rem] gap-2 border-1 rounded-lg border-gray-200 text-md">
<GeneralProjectIcon
:color="parseProp(base.meta).iconColor"
Expand Down
14 changes: 6 additions & 8 deletions packages/nc-gui/components/dlg/share-and-collaborate/SharePage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,8 +352,7 @@ const openManageAccess = async () => {
<NcSelect v-model:value="selectedViewId" class="w-48" size="medium">
<a-select-option v-for="view in viewsInTable" :key="view.id" :value="view.id">
<div class="flex items-center w-full justify-between w-full gap-2">
<GeneralViewIcon :meta="view" class="!text-md" />

<GeneralViewIcon :meta="view" class="!text-md mt-0.5" />
<span class="truncate !w-36 flex-1 capitalize">{{ view.title }}</span>
<component
:is="iconMap.check"
Expand All @@ -378,8 +377,8 @@ const openManageAccess = async () => {
</div>

<div v-if="isPublicShared" class="space-y-3">
<GeneralCopyUrl v-model:url="url" class="w-136" />
<div class="flex items-center justify-between">
<GeneralCopyUrl v-model:url="url" class="w-138" />
<div class="flex items-center h-8 justify-between">
<div class="flex flex-row gap-3 items-center">
<a-switch
v-e="['c:share:view:password:toggle']"
Expand Down Expand Up @@ -435,7 +434,7 @@ const openManageAccess = async () => {
</div>
<NcTooltip>
<template #title>{{ $t('tooltip.surveyFormInfo') }} </template>
<component :is="iconMap.info" />
<component :is="iconMap.info" class="text-gray-700" />
</NcTooltip>
</div>
Expand All @@ -449,7 +448,7 @@ const openManageAccess = async () => {
</a-switch>
<div class="text-black">{{ $t('activity.rtlOrientation') }}</div>
</div>
<div class="flex items-center justify-between">
<div class="flex items-center h-8 justify-between">
<div class="flex items-center gap-3">
<a-switch
v-e="['c:share:view:surver-mode:toggle']"
Expand All @@ -476,7 +475,6 @@ const openManageAccess = async () => {
>
<div class="flex items-center w-full justify-between w-full gap-2">
<div class="truncate flex-1 capitalize">{{ op.label }}</div>
<component
:is="iconMap.check"
v-if="formPreFill.preFilledMode === op.value"
Expand All @@ -489,7 +487,7 @@ const openManageAccess = async () => {
</div>
<NcTooltip>
<template #title>{{ $t('tooltip.preFillFormInfo') }} </template>
<component :is="iconMap.info" />
<component :is="iconMap.info" class="text-gray-700" />
</NcTooltip>
</div>
</template>
Expand Down
29 changes: 21 additions & 8 deletions packages/nc-gui/components/dlg/share-and-collaborate/View.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const activeTab = ref<'base' | 'view'>('base')
const { formStatus, showShareModal } = storeToRefs(useShare())
const { resetData } = useShare()
const highlightStyle = ref({ top: '4px' })
const highlightStyle = ref({ top: isViewToolbar ? '160px' : '4px' })
watch(showShareModal, (val) => {
if (!val) {
Expand Down Expand Up @@ -74,7 +74,7 @@ watch(activeTab, () => {
<div
data-testid="nc-share-base-tab"
:class="{ 'nc-share-active': activeTab === 'base' }"
class="flex flex-col z-1 text-gray-600 font-semibold items-center rounded-lg w-full justify-center h-1/2"
class="flex flex-col z-1 text-gray-600 items-center rounded-lg w-full justify-center h-1/2"
@click="activeTab = 'base'"
>
<GeneralProjectIcon
Expand All @@ -86,15 +86,21 @@ watch(activeTab, () => {
:style="{
filter: activeTab !== 'base' ? 'grayscale(100%) brightness(115%)' : '',
}"
class="nc-view-icon transition-all w-6 h-6 group-hover"
class="nc-view-icon transition-all w-8 h-8 group-hover"
/>

Base
<span
:class="{
'font-semibold': activeTab === 'base',
}"
class="text-base"
>
Base
</span>
</div>
<div
:class="{ 'nc-share-active': activeTab === 'view' }"
data-testid="nc-share-view-tab"
class="flex flex-col items-center text-gray-600 font-semibold z-1 w-full cursor-pointer rounded-lg justify-center h-1/2"
class="flex flex-col items-center text-gray-600 z-1 w-full cursor-pointer rounded-lg justify-center h-1/2"
@click="activeTab = 'view'"
>
<component
Expand All @@ -103,9 +109,16 @@ watch(activeTab, () => {
'text-gray-500': activeTab !== 'view',
}"
:style="{ color: activeTab === 'view' ? viewIcons[view?.type]?.color : '' }"
class="nc-view-icon transition-all !text-2xl group-hover"
class="nc-view-icon transition-all !text-[32px] group-hover"
/>
View
<span
:class="{
'font-semibold': activeTab === 'view',
}"
class="text-base"
>
View
</span>
</div>
</div>
<div class="flex flex-1 h-full flex-col">
Expand Down

1 comment on commit bc71db0

@github-actions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PR changes have been deployed. Please run the following command to verify:

docker run -d -p 8888:8080 nocodb/nocodb-timely:0.204.5-pr-7845-20240315-1726

Please sign in to comment.