From 0a2f567d49f0f8a33ea5283bad589e13855a887d Mon Sep 17 00:00:00 2001 From: Christian Byrne Date: Fri, 9 May 2025 16:28:49 -0700 Subject: [PATCH] Cherry pick API node fixes (#3839) Co-authored-by: Terry Jia Co-authored-by: Chenlei Hu Co-authored-by: github-actions Co-authored-by: Chenlei Hu Co-authored-by: Comfy Org PR Bot --- public/assets/favicon.ico | Bin 0 -> 15406 bytes public/assets/images/Comfy_Logo_x32.png | Bin 2904 -> 0 bytes public/assets/images/comfy-logo-mono.svg | 9 + public/assets/images/comfy-logo-single.svg | 9 + .../common/NoResultsPlaceholder.vue | 3 +- src/components/common/UserAvatar.test.ts | 106 + src/components/common/UserAvatar.vue | 25 + .../dialog/content/ErrorDialogContent.vue | 1 + .../dialog/content/SignInContent.vue | 217 +- .../dialog/content/setting/UserPanel.vue | 73 +- .../dialog/content/signin/ApiKeyForm.test.ts | 114 + .../dialog/content/signin/ApiKeyForm.vue | 111 + .../dialog/header/ComfyOrgHeader.vue | 7 +- .../templates/TemplateWorkflowCard.vue | 22 +- .../templates/TemplateWorkflowList.vue | 70 + .../templates/TemplateWorkflowView.vue | 82 + .../templates/TemplateWorkflowsContent.vue | 38 +- .../templates/TemplateWorkflowsSideNav.vue | 2 +- src/components/topbar/CurrentUserButton.vue | 18 +- src/components/topbar/CurrentUserPopover.vue | 42 +- src/components/topbar/TopMenubar.vue | 12 +- src/composables/auth/useCurrentUser.ts | 101 + src/composables/setting/useSettingUI.ts | 7 +- src/locales/en/main.json | 177 +- src/locales/en/nodeDefs.json | 2617 +++++++++++++++- src/locales/es/main.json | 169 +- src/locales/es/nodeDefs.json | 2636 ++++++++++++++++- src/locales/fr/main.json | 169 +- src/locales/fr/nodeDefs.json | 2636 ++++++++++++++++- src/locales/ja/main.json | 169 +- src/locales/ja/nodeDefs.json | 2636 ++++++++++++++++- src/locales/ko/main.json | 169 +- src/locales/ko/nodeDefs.json | 2636 ++++++++++++++++- src/locales/ru/main.json | 169 +- src/locales/ru/nodeDefs.json | 2636 ++++++++++++++++- src/locales/zh/main.json | 173 +- src/locales/zh/nodeDefs.json | 2636 ++++++++++++++++- src/schemas/signInSchema.ts | 10 + src/scripts/api.ts | 20 + src/scripts/app.ts | 4 + src/stores/apiKeyAuthStore.ts | 110 + src/stores/firebaseAuthStore.ts | 74 +- src/stores/workflowTemplatesStore.ts | 58 +- src/types/authTypes.ts | 9 + src/types/workflowTemplateTypes.ts | 2 + src/views/layouts/LayoutDefault.vue | 6 + .../tests/store/firebaseAuthStore.test.ts | 4 +- vite.config.mts | 4 + 48 files changed, 20614 insertions(+), 384 deletions(-) create mode 100644 public/assets/favicon.ico delete mode 100644 public/assets/images/Comfy_Logo_x32.png create mode 100644 public/assets/images/comfy-logo-mono.svg create mode 100644 public/assets/images/comfy-logo-single.svg create mode 100644 src/components/common/UserAvatar.test.ts create mode 100644 src/components/common/UserAvatar.vue create mode 100644 src/components/dialog/content/signin/ApiKeyForm.test.ts create mode 100644 src/components/dialog/content/signin/ApiKeyForm.vue create mode 100644 src/components/templates/TemplateWorkflowList.vue create mode 100644 src/components/templates/TemplateWorkflowView.vue create mode 100644 src/composables/auth/useCurrentUser.ts create mode 100644 src/stores/apiKeyAuthStore.ts create mode 100644 src/types/authTypes.ts diff --git a/public/assets/favicon.ico b/public/assets/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..2e66ad0e49e60bcd10eca2566161c3b06aa534ab GIT binary patch literal 15406 zcmeHN3s4nh6ke5)GBgmiFbxnNpr$+m0fR_GU=%@6z#J%tj7Ny^n4lsh1Wm~qNF-2! zP)Z!hOp%u&DFN}66h(Q1Vw6pmre#^D{{Z*S<+|H0_wI79)83gg|L(u{{O3E5|9vQG z6g7s@)}}~lKm}@0lodr$1_lG~#yS+0N$N~Z2fxpzsLII{Wla7_v=vVX3nXNtCmw>?EM=<__4jn z-S4vUzwzmZp#5w6L%hiESeDDmADR{`<(+W56HfTN0LKTZ-eCqS|50BDDL=|Ab2Vk< zk@bDM*+kH})h2CY%Z^RM;>Wh!3Noeq^P0~=e0(s(Zw-cotwC_e-^>oxYTR>SEWBXOm$%ITWerP>;@_A+_C}sY4hul zNGLUOEnHrtC&(CpawKEjf0c&abx`+`5$_nbe-Ow?K4J^bNZ?(5h4Vbl@{L<6c$bf{ zr`OlS2?NeWRm+T(#(?v>O-()+cGtu7-bPNcC9#3=qHKRjj`katOo?nPu|Fs)|FpXW zqkQxQt{b++1wukx&=C40!UwRwDk~rPne6`T_4B;6&xX^|JYT1MQa1i`@PUC(0DH!7w;#A(aJ{~WNh>h+y=Pr zmhIcJ&$y?-@fOMC>NirFd!-y~$=G!;Uv5rZrq`Dcy4`k=sz+rB{7=JLay33!3{XHte$BH|~uC z+<&U7Z>>ABTOs>PbePduJFI(JzV*xwUa1s*y!Sj1=&CaN;~Ch*TdfM~fM+1lNpJIZ zCaQ>k7B-bBj3493wJ;l+Y@QL^2Y7CLc)cUIoXP>KhN6C&-+Wdn?1I;>|E9twEa@@UZfaidU_fOF~Ru)O3TxRm7d#~j9;Jb4{UgS=Olj>sHUA2I(}8xon5{FruBZuiXZ!C@#;ltrvt{2edU*&@Q0^z&$$^%zr<}1 z<%HktLaAD;k>zcJ=gk@q`dD>%n%tunsbLJEKBmOBlKF?J9Cxn=cEzk$yFP&UqmrXp z@#7s1-XW;NK1)7^FwYY2HJEHKskg2z04_O*^6d-#UcGb{Ja_49R{S^*tU|< zuT1)^C_X^qh@U(aw!U=U-T-i2fopgq%z1Vz$WqEL`aKOJvZiLz4P%(ewp{A*-ZnF2 zmEbYNgdg+Cr`&8-Scfqr_c$`;J(ce3ac{!K)=d9#IsF-2w4J6hA7q8N_vdjl;bW_x z)n3g@t{+p3u+?8!JRLlb?*lyJVZ%!I9p^`!C)wl(`Mu#qL$X$iB6*H=FrLg?T6ekz zh>Y==r_V(C*BT({9Y1I@(^V;cA#EeJt$z0@qEAGhh%q3>z(~gcNe>c#q6HMTz`sWf B+Tj2I literal 0 HcmV?d00001 diff --git a/public/assets/images/Comfy_Logo_x32.png b/public/assets/images/Comfy_Logo_x32.png deleted file mode 100644 index a535a4dab3ae82f919e049a1bd4f07b6081dbb39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2904 zcmV-e3#asnP)sm&p5E9c#nbuODW+sYvpi9}LMf6*#xtxZSO%-sLm zSlM>h|F8Yu>w2!4Yp(g;`~IH8{oDe^jRizP^3l_rAY(#A^Nf3>>_8)Yu7UdX2Dn*5Apa)of#u)IKv??t8C9zNGk`Ea>Xh zwt$l-UwCfXRNxpK9BSj@GKxM){x4i&YSoiiIz{PQ+t+4fot0NS{t4e*`~kg;CV?4b z231o#==dzhl;c_Os`(jV9Wo@oYD0WY4Fa>Xn;E(Gk6g7#mLo?XeOA!R?xI{#f*#B;noI($>d0sNfA-|4BlB;<$g&? z=I;kSMPjPF^YBacJM|FnxC+;}eMo=OhT>n_@NI1e?1E#Uytx#8Z?wVqas@_iI0!W> zFA#lO7_5lKw9-nry^ufCCo!P2f-U0q@2e?C(=qU-r z%)@!`D{g`F@yiezOaQS80z3aWdhD-*_MJA2f7}R*5lUr%@|{MA=LCQsHW^xeX%Me@3bNrBkZmtPQd^*TtO-Nc9Yc@F z0bqvOf;D%CQd~Yp+-}8`7jk&kHNtB93G{Idr$i(W4!6OG-G`u=nf*dN`@123etU;y zG3?1Qx$vGG;^Gd70@i{IcY@gc8?cKjzy_3nopTVxj$Y`o4QzZNM5mh2_f!>h)*plF z%n%UMSrB_ALhHa?m=ra^@p(HuAJxGj^9uA9#X)H709AW0h+RD{h|R``--4UE4j|!a zb^L89gm(bZmZQ)dWs9B@SAjTWfVgCXF>-@o;Ak2qieQFVfw-;)xBoswm!;6mtwX=~ z6Hu{R24X%3Li*;tcU*wM^%t$cH`pP%gYh z!LQcC)_)c5ls>?<)K($EmdH!kvCeB_6=EL7gLqEB>p%7)1LgU9a41FoZ=!SL} zW)(o)Ee2$i1cScHgh`VO7H4u~y^Y5?Qn__^Ajwx>u@~gv{bIrBIblrP0oY$@fqg+U zjH6O$D(5LK?*yr+s#Xwq6CF}1@@^Eu(RX;u0nj!Jfscl4`^sF!e5D=$T@nlbxoZtEb6_lA^{qKQWo~Hog zLa#x%rI40jS{DI3ucdzp+}RUVHP4WFE)N0W8=#^;jy`7xm9%2?EN_O^?mTFmx&_Y6 z10vT5XcyE#H6tfdz(_*Yke%f+ep4>UkdLV7{0J`m5|vqVh`xFbQNo$7^mj&I+KAnH zKqkYr!eT58T?ajDhi;RhqCY=OmGl~VXPgbEn=inN zBowuC@fRV`wg79h9kZ52!ar<1l;^L9FnDYCxu;~RpVf5{IGuA5qQMs3|D!h+%B$kh ztMoYqZiUv9R;V5Sp6ZDWX2jw zDZM=T$Ttv9a_@F|XQZEf-G~iM&6qgL_bsrtDU_DQLM^`r>J@VIDyW9)<}Vtr zL|}FNb_Id7jBIc^uT##=m=BfA5@?hF>Q|mZ6toc|>^%_}l>kG#`RJ9LhMv?@aJOH9 zJMkR+ft+SOD&FMvE|?G+&&EFmOLe@n-bS%|VUlth!U+q&$K-$v9oLP3-Mpn}YH6i! zzmSri4)KOBp>$gYm7A}i{OM7;C#=z9_#|8`yr&@g;BhsSBDX>L))R0^=@1^F&A4fI zsq(Hv{A&Wkyv@jh+*Us7io)v=!yphd>I2r6f%~!xLh)*o1EcRygb z*qBT`{zA0oHk}4jFk?OiGvg-MMde_>=m2{H;IgP(=Sack0DLa}zO#s`=PbpVb_-9! z3);ChYm*_QPKsajDFixns;Glj3y6X0xB1X`)DHCrg{2rX2phX#WN7@d;mKpuA3uC|g4hbxikqs>%TcjX6Xl!q#z%M|SR)BaFfpPzVj%_SPMelRE|xKLANY@f|9HrUQ&^(!tH+Ft^kghjRxwt4BbW($ zqZrezQOxkwYXyBrh6yxv`~3By}Qf*aQ*|mybpq@;3!J~0000 + + + + + + + + diff --git a/public/assets/images/comfy-logo-single.svg b/public/assets/images/comfy-logo-single.svg new file mode 100644 index 000000000..482367dca --- /dev/null +++ b/public/assets/images/comfy-logo-single.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/components/common/NoResultsPlaceholder.vue b/src/components/common/NoResultsPlaceholder.vue index 26277f88d..fbf8ca83d 100644 --- a/src/components/common/NoResultsPlaceholder.vue +++ b/src/components/common/NoResultsPlaceholder.vue @@ -5,7 +5,7 @@

{{ title }}

-

+

{{ message }}