Browse Source

Merge pull request #2832 from nocodb/refactor/cypress-markers

refactor: cypress markers
pull/2840/head
Raju Udava 2 years ago committed by GitHub
parent
commit
76e28ebad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      packages/nc-gui-v2/app.vue
  2. 2
      packages/nc-gui-v2/components/general/Language.vue
  3. 2
      packages/nc-gui-v2/pages/signin.vue
  4. 2
      packages/nc-gui-v2/pages/signup.vue

8
packages/nc-gui-v2/app.vue

@ -36,7 +36,7 @@ const sidebarOpen = computed({
<div class="flex-1" />
<div class="ml-4 flex justify-center flex-1">
<div class="flex items-center gap-2 cursor-pointer" @click="navigateTo('/')">
<div class="flex items-center gap-2 cursor-pointer nc-noco-brand-icon" @click="navigateTo('/')">
<img width="35" src="~/assets/img/icons/512x512-trans.png" />
<span class="prose-xl">NocoDB</span>
</div>
@ -59,14 +59,14 @@ const sidebarOpen = computed({
<template v-if="$state.signedIn.value">
<a-dropdown :trigger="['click']">
<MdiDotsVertical class="md:text-xl cursor-pointer" @click.prevent />
<MdiDotsVertical class="md:text-xl cursor-pointer nc-user-menu" @click.prevent />
<template #overlay>
<a-menu class="!py-0 nc-user-menu min-w-32 dark:(!bg-gray-800) leading-8 !rounded">
<a-menu-item key="0" class="!rounded-t">
<nuxt-link v-t="['c:navbar:user:email']" class="group flex items-center no-underline py-2" to="/user">
<MdiAt class="mt-1 group-hover:text-success" />&nbsp;
<span class="prose group-hover:text-black">{{ email }}</span>
<span class="prose group-hover:text-black nc-user-menu-email">{{ email }}</span>
</nuxt-link>
</a-menu-item>
@ -75,7 +75,7 @@ const sidebarOpen = computed({
<a-menu-item key="1" class="!rounded-b">
<div v-t="['a:navbar:user:sign-out']" class="group flex items-center py-2" @click="signOut">
<MdiLogout class="dark:text-white group-hover:(!text-red-500)" />&nbsp;
<span class="prose font-semibold text-gray-500 group-hover:text-black">{{ $t('general.signOut') }}</span>
<span class="prose font-semibold text-gray-500 group-hover:text-black nc-user-menu-signout">{{ $t('general.signOut') }}</span>
</div>
</a-menu-item>
</a-menu>

2
packages/nc-gui-v2/components/general/Language.vue

@ -36,7 +36,7 @@ onMounted(() => {
<template>
<v-menu class="select-none">
<template #activator="{ props }">
<MaterialSymbolsTranslate class="md:text-xl cursor-pointer" @click="props.onClick" />
<MaterialSymbolsTranslate class="md:text-xl cursor-pointer nc-menu-translate" @click="props.onClick" />
</template>
<v-list class="scrollbar min-w-50 max-h-90vh overflow-auto !py-0 dark:(!bg-gray-800 !text-white)">
<v-list-item

2
packages/nc-gui-v2/pages/signin.vue

@ -74,7 +74,7 @@ const resetError = () => {
ref="formValidator"
:model="form"
layout="vertical"
class="signin h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center"
class="signin h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center nc-form-signin"
@finish="signIn"
>
<div class="h-full w-full flex flex-col flex-wrap items-center pt-[100px]">

2
packages/nc-gui-v2/pages/signup.vue

@ -71,7 +71,7 @@ const resetError = () => {
ref="formValidator"
:model="form"
layout="vertical"
class="signup h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center"
class="signup h-[calc(100%_+_90px)] min-h-[600px] flex justify-center items-center nc-form-signup"
@finish="signUp"
>
<div class="h-full w-full flex flex-col flex-wrap pt-[100px]">

Loading…
Cancel
Save