export generateUUID

browser_tests/tests/mobileViewport.spec.ts

@@ -1,35 +0,0 @@
-import { expect } from '@playwright/test'
-
-import { comfyPageFixture as test } from '../fixtures/ComfyPage'
-
-test.describe('Mobile viewport', () => {
-  test.beforeEach(async ({ comfyPage }) => {
-    await comfyPage.setSetting('Comfy.UseNewMenu', 'Top')
-  })
-
-  test('@mobile App UI is not hidden under mobile browser UI', async ({
-    comfyPage
-  }) => {
-    const viewportSize = await comfyPage.page.viewportSize()
-
-    // Top menu is visible
-    const topMenu = comfyPage.page.locator('.comfyui-menu')
-    await expect(topMenu).toBeVisible()
-
-    // Top menu is not cut off from the top
-    const topMenuBox = await topMenu.boundingBox()
-    expect(topMenuBox?.y).toBeGreaterThanOrEqual(0)
-
-    // Graph is visible
-    const graphView = comfyPage.page.locator('.lgraphcanvas')
-    await expect(graphView).toBeVisible()
-
-    // Graph is not cut off from the bottom
-    const graphViewBox = await graphView.boundingBox()
-    expect(graphViewBox).not.toBeNull()
-    expect(viewportSize).not.toBeNull()
-    expect(graphViewBox!.y + graphViewBox!.height).toBeLessThanOrEqual(
-      viewportSize!.height
-    )
-  })
-})

src/App.vue

@@ -2,7 +2,7 @@
   <router-view />
   <ProgressSpinner
     v-if="isLoading"
-    class="absolute inset-0 flex justify-center items-center h-dvh"
+    class="absolute inset-0 flex justify-center items-center h-screen"
   />
   <GlobalDialog />
   <BlockUI full-screen :blocked="isLoading" />

src/assets/css/style.css

@@ -42,7 +42,7 @@
 
 body {
   width: 100vw;
-  height: 100dvh;
+  height: 100vh;
   margin: 0;
   overflow: hidden;
   background: var(--bg-color) var(--bg-img);

src/components/dialog/content/SignInContent.vue

@@ -79,7 +79,6 @@ import Divider from 'primevue/divider'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 
-import { useErrorHandling } from '@/composables/useErrorHandling'
 import { SignInData, SignUpData } from '@/schemas/signInSchema'
 import { useFirebaseAuthStore } from '@/stores/firebaseAuthStore'
 
@@ -93,32 +92,33 @@ const { onSuccess } = defineProps<{
 }>()
 
 const firebaseAuthStore = useFirebaseAuthStore()
-const { wrapWithErrorHandlingAsync } = useErrorHandling()
 
 const isSignIn = ref(true)
 const toggleState = () => {
   isSignIn.value = !isSignIn.value
 }
 
-const signInWithGoogle = wrapWithErrorHandlingAsync(async () => {
-  await firebaseAuthStore.loginWithGoogle()
+const signInWithGoogle = () => {
+  // Implement Google login
+  console.log(isSignIn.value)
+  console.log('Google login clicked')
   onSuccess()
-})
+}
 
-const signInWithGithub = wrapWithErrorHandlingAsync(async () => {
-  await firebaseAuthStore.loginWithGithub()
+const signInWithGithub = () => {
+  // Implement Github login
+  console.log(isSignIn.value)
+  console.log('Github login clicked')
   onSuccess()
-})
+}
 
-const signInWithEmail = wrapWithErrorHandlingAsync(
-  async (values: SignInData | SignUpData) => {
-    const { email, password } = values
-    if (isSignIn.value) {
-      await firebaseAuthStore.login(email, password)
-    } else {
-      await firebaseAuthStore.register(email, password)
-    }
-    onSuccess()
+const signInWithEmail = async (values: SignInData | SignUpData) => {
+  const { email, password } = values
+  if (isSignIn.value) {
+    await firebaseAuthStore.login(email, password)
+  } else {
+    await firebaseAuthStore.register(email, password)
   }
-)
+  onSuccess()
+}
 </script>

src/scripts/utils.ts

@@ -1,3 +1,4 @@
+import * as formatUtil from '@/utils/formatUtil'
 import { applyTextReplacements as _applyTextReplacements } from '@/utils/searchAndReplace'
 
 import { api } from './api'
@@ -121,3 +122,7 @@ export function setStorageValue(id: string, value: string) {
   }
   localStorage.setItem(id, value)
 }
+
+export function generateUUID() {
+  return formatUtil.generateUUID()
+}

src/stores/firebaseAuthStore.ts

@@ -1,13 +1,10 @@
 import {
   type Auth,
-  GithubAuthProvider,
-  GoogleAuthProvider,
   type User,
   type UserCredential,
   createUserWithEmailAndPassword,
   onAuthStateChanged,
   signInWithEmailAndPassword,
-  signInWithPopup,
   signOut
 } from 'firebase/auth'
 import { defineStore } from 'pinia'
@@ -21,10 +18,6 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
   const currentUser = ref<User | null>(null)
   const isInitialized = ref(false)
 
-  // Providers
-  const googleProvider = new GoogleAuthProvider()
-  const githubProvider = new GithubAuthProvider()
-
   // Getters
   const isAuthenticated = computed(() => !!currentUser.value)
   const userEmail = computed(() => currentUser.value?.email)
@@ -75,16 +68,6 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
       createUserWithEmailAndPassword(authInstance, email, password)
     )
 
-  const loginWithGoogle = async (): Promise<UserCredential> =>
-    executeAuthAction((authInstance) =>
-      signInWithPopup(authInstance, googleProvider)
-    )
-
-  const loginWithGithub = async (): Promise<UserCredential> =>
-    executeAuthAction((authInstance) =>
-      signInWithPopup(authInstance, githubProvider)
-    )
-
   const logout = async (): Promise<void> =>
     executeAuthAction((authInstance) => signOut(authInstance))
 
@@ -111,8 +94,6 @@ export const useFirebaseAuthStore = defineStore('firebaseAuth', () => {
     login,
     register,
     logout,
-    getIdToken,
-    loginWithGoogle,
-    loginWithGithub
+    getIdToken
   }
 })

src/views/GraphView.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="comfyui-body grid h-dvh w-screen overflow-hidden">
+  <div class="comfyui-body grid h-screen w-screen overflow-hidden">
     <div id="comfyui-body-top" class="comfyui-body-top">
       <TopMenubar v-if="useNewMenu === 'Top'" />
     </div>

src/views/layouts/LayoutDefault.vue

@@ -1,5 +1,5 @@
 <template>
-  <main class="w-full min-h-dvh overflow-hidden relative">
+  <main class="w-full min-h-screen overflow-hidden relative">
     <router-view />
   </main>
 </template>

tests-ui/tests/store/firebaseAuthStore.test.ts

@@ -13,10 +13,7 @@ vi.mock('firebase/auth', () => ({
   signInWithEmailAndPassword: vi.fn(),
   createUserWithEmailAndPassword: vi.fn(),
   signOut: vi.fn(),
-  onAuthStateChanged: vi.fn(),
-  signInWithPopup: vi.fn(),
-  GoogleAuthProvider: vi.fn(),
-  GithubAuthProvider: vi.fn()
+  onAuthStateChanged: vi.fn()
 }))
 
 describe('useFirebaseAuthStore', () => {
@@ -275,90 +272,4 @@ describe('useFirebaseAuthStore', () => {
       expect(tokenAfterLogout).toBeNull()
     })
   })
-
-  describe('social authentication', () => {
-    describe('loginWithGoogle', () => {
-      it('should sign in with Google', async () => {
-        const mockUserCredential = { user: mockUser }
-        vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-          mockUserCredential as any
-        )
-
-        const result = await store.loginWithGoogle()
-
-        expect(firebaseAuth.signInWithPopup).toHaveBeenCalledWith(
-          mockAuth,
-          expect.any(firebaseAuth.GoogleAuthProvider)
-        )
-        expect(result).toEqual(mockUserCredential)
-        expect(store.loading).toBe(false)
-        expect(store.error).toBe(null)
-      })
-
-      it('should handle Google sign in errors', async () => {
-        const mockError = new Error('Google authentication failed')
-        vi.mocked(firebaseAuth.signInWithPopup).mockRejectedValue(mockError)
-
-        await expect(store.loginWithGoogle()).rejects.toThrow(
-          'Google authentication failed'
-        )
-
-        expect(firebaseAuth.signInWithPopup).toHaveBeenCalledWith(
-          mockAuth,
-          expect.any(firebaseAuth.GoogleAuthProvider)
-        )
-        expect(store.loading).toBe(false)
-        expect(store.error).toBe('Google authentication failed')
-      })
-    })
-
-    describe('loginWithGithub', () => {
-      it('should sign in with Github', async () => {
-        const mockUserCredential = { user: mockUser }
-        vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-          mockUserCredential as any
-        )
-
-        const result = await store.loginWithGithub()
-
-        expect(firebaseAuth.signInWithPopup).toHaveBeenCalledWith(
-          mockAuth,
-          expect.any(firebaseAuth.GithubAuthProvider)
-        )
-        expect(result).toEqual(mockUserCredential)
-        expect(store.loading).toBe(false)
-        expect(store.error).toBe(null)
-      })
-
-      it('should handle Github sign in errors', async () => {
-        const mockError = new Error('Github authentication failed')
-        vi.mocked(firebaseAuth.signInWithPopup).mockRejectedValue(mockError)
-
-        await expect(store.loginWithGithub()).rejects.toThrow(
-          'Github authentication failed'
-        )
-
-        expect(firebaseAuth.signInWithPopup).toHaveBeenCalledWith(
-          mockAuth,
-          expect.any(firebaseAuth.GithubAuthProvider)
-        )
-        expect(store.loading).toBe(false)
-        expect(store.error).toBe('Github authentication failed')
-      })
-    })
-
-    it('should handle concurrent social login attempts correctly', async () => {
-      const mockUserCredential = { user: mockUser }
-      vi.mocked(firebaseAuth.signInWithPopup).mockResolvedValue(
-        mockUserCredential as any
-      )
-
-      const googleLoginPromise = store.loginWithGoogle()
-      const githubLoginPromise = store.loginWithGithub()
-
-      await Promise.all([googleLoginPromise, githubLoginPromise])
-
-      expect(store.loading).toBe(false)
-    })
-  })
 })