π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
update(auth):new-layout-added
Aswin Asok883f3220c370
diff --git a/web/apps/auth/package.json b/web/apps/auth/package.jsonindex e561031ccc..6f386b2efa 100644--- a/web/apps/auth/package.json+++ b/web/apps/auth/package.json@@ -3,6 +3,9 @@"version": "0.0.0","private": true,"dependencies": {+ "@fontsource-variable/outfit": "5.2.8",+ "@hugeicons/core-free-icons": "1.2.1",+ "@hugeicons/react": "1.1.6","@noble/hashes": "2.2.0","ente-accounts": "*","ente-base": "*",diff --git a/web/apps/auth/public/images/auth-ducky.svg b/web/apps/auth/public/images/auth-ducky.svgnew file mode 100644index 0000000000..e35583b07a--- /dev/null+++ b/web/apps/auth/public/images/auth-ducky.svg@@ -0,0 +1,80 @@+<svg width="2682" height="2825" viewBox="0 0 2682 2825" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M1312.94 2824.5C2038.05 2824.5 2625.87 2786.1 2625.87 2738.73C2625.87 2691.37 2038.05 2652.97 1312.94 2652.97C587.821 2652.97 0 2691.37 0 2738.73C0 2786.1 587.821 2824.5 1312.94 2824.5Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M860.453 1927.62C677.154 2084.79 684.006 2209.56 907.645 2235.04C1131.28 2260.51 1293.31 2218.68 1244.96 2077.22C1196.66 1935.69 860.453 1927.62 860.453 1927.62Z" fill="#6B6B6B" style="fill:#6B6B6B;fill:color(display-p3 0.4208 0.4208 0.4208);fill-opacity:1;"/>+<path d="M1021.13 2260.05C978.805 2260.05 938.078 2256.79 905.584 2253.09C797.716 2240.82 734.277 2206.06 717.035 2149.81C697.473 2086.04 743.008 2004.47 848.666 1913.85C852.092 1910.92 856.458 1909.31 860.934 1909.48C875.191 1909.81 1210.4 1919.65 1262.18 2071.34C1278.59 2119.47 1273.95 2159.98 1248.37 2191.75C1204.88 2245.8 1109.44 2260 1021.19 2260L1021.13 2260.05ZM866.957 1945.95C778.098 2023.43 737.206 2091.9 751.684 2139.14C764.117 2179.7 818.77 2206.62 909.674 2217.01C1067.88 2235.02 1181 2217.56 1220.07 2169.04C1237.59 2147.27 1240.13 2119.14 1227.81 2083.05C1192.44 1979.55 961.84 1949.43 866.957 1945.95Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1745.29 1931.36C1920.58 2097.41 1907.54 2221.69 1682.9 2236.06C1458.27 2250.43 1298.51 2200.58 1353.83 2061.66C1409.09 1922.73 1745.29 1931.36 1745.29 1931.36Z" fill="#6B6B6B" style="fill:#6B6B6B;fill:color(display-p3 0.4208 0.4208 0.4208);fill-opacity:1;"/>+<path d="M1613.41 2256.45C1514.66 2256.45 1392.59 2241.86 1344.73 2175.94C1320.75 2142.89 1318.1 2102.22 1336.94 2054.97C1396.24 1905.99 1731.5 1912.9 1745.7 1913.23C1750.18 1913.34 1754.44 1915.11 1757.7 1918.2C1858.71 2013.91 1900.16 2097.69 1877.45 2160.41C1857.44 2215.72 1792.34 2247.28 1683.98 2254.19C1663.14 2255.51 1639.05 2256.51 1613.36 2256.51L1613.41 2256.45ZM1728.96 1949.26C1629.21 1949.26 1409.83 1969.76 1370.6 2068.34C1356.5 2103.77 1357.66 2132 1374.08 2154.61C1410.66 2205 1522.78 2228.05 1681.71 2217.93C1773 2212.08 1828.93 2187.93 1843.35 2148.03C1860.2 2101.5 1822.74 2031.1 1737.8 1949.31C1734.98 1949.31 1732 1949.26 1728.96 1949.26Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path fill-rule="evenodd" clip-rule="evenodd" d="M1671.29 782.804C1852.76 775.951 2159.57 399.296 2328.72 492.354C2497.87 585.358 2298.33 1244.62 1939.52 1248.54C1580.72 1252.46 1671.29 782.804 1671.29 782.804Z" fill="#F2C63D" style="fill:#F2C63D;fill:color(display-p3 0.9490 0.7765 0.2392);fill-opacity:1;"/>+<path d="M1935.05 1266.72C1842.98 1266.72 1771.09 1236.49 1721.3 1176.81C1605.25 1037.77 1651.45 789.875 1653.49 779.375C1655.1 771.086 1662.17 765.007 1670.63 764.676C1743.35 761.913 1845.25 690.074 1943.78 620.612C2085.08 520.977 2231.19 417.971 2337.51 476.437C2407.97 515.175 2427.31 636.692 2387.96 793.467C2358.78 909.624 2301.48 1024.73 2230.69 1109.17C2145.31 1211.07 2044.68 1265.5 1939.74 1266.66C1938.2 1266.66 1936.65 1266.66 1935.1 1266.66L1935.05 1266.72ZM1686.93 799.656C1679.25 852.098 1658.58 1045.12 1749.21 1153.65C1792.53 1205.49 1856.41 1231.3 1939.3 1230.41C2137.8 1228.26 2297.56 1004.51 2352.76 784.625C2386.86 648.795 2373.71 537.721 2319.99 508.212C2233.56 460.688 2096.85 557.062 1964.67 650.231C1863.43 721.628 1767.44 789.267 1686.93 799.656Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1927.38 1947.59C1755.19 2093.2 1520.83 2122.6 1299.95 2129.4C1090.13 2129.62 858.421 2108.56 692.75 1969.64C552.222 1848.34 520.392 1677.75 526.305 1503.07C529.62 1402.44 545.48 1300.49 560.235 1205.83C567.805 1159.41 574.603 1112.55 581.455 1065.57C584.881 1042.31 588.307 1019.05 591.844 995.725C612.069 863.1 636.273 730.862 684.018 605.973C735.245 474.619 822.777 357.301 941.532 280.654C1050.06 209.313 1181.58 173.946 1312.17 174.885C1401.52 175.438 1490.38 193.011 1571.17 227.604C1854.71 347.298 1928.43 617.633 1982.42 896.754L1982.59 897.749C2005.13 1007.61 2030.17 1116.53 2055.64 1225.61C2119.52 1480.69 2143.23 1758.16 1927.38 1947.59Z" fill="#F2C63D" style="fill:#F2C63D;fill:color(display-p3 0.9490 0.7765 0.2392);fill-opacity:1;"/>+<path opacity="0.21" d="M1412.96 217.813C1886.43 483.451 1888.92 1417.3 1888.92 1417.3H2092.67L2034.03 1162.88L1927.77 665.81L1883.5 545.453L1761.93 516.828L1744.63 483.451L1752.81 348.173L1614.88 227.705L1413.02 174.82V217.813H1412.96Z" fill="#F78426" style="fill:#F78426;fill:color(display-p3 0.9686 0.5176 0.1490);fill-opacity:1;"/>+<path d="M1059.47 1123.77C1120.04 1044.69 1334.28 992.743 1552.73 986.609C1771.17 980.475 1967.68 1079.5 2036.86 1417.36C2106.05 1755.23 1096.55 1546.45 1096.55 1546.45L945.578 1312.81L1059.41 1123.77H1059.47Z" fill="#FFD766" style="fill:#FFD766;fill:color(display-p3 1.0000 0.8431 0.4000);fill-opacity:1;"/>+<path d="M1312.19 174.885C1280.69 190.414 1230.96 209.644 1154.92 233.406C826.835 335.97 732.34 597.297 699.571 744.401C666.801 891.504 646.465 1018.66 646.465 1018.66C637.182 1024.02 626.35 1031.15 614.58 1039.71C604.191 1047.23 593.028 1055.9 581.479 1065.57C508.922 1126.53 421.61 1226.44 414.371 1325.58L395.969 1318.12C393.261 1216.71 460.624 1097.52 591.868 995.725C612.093 863.1 636.297 730.862 684.042 605.973C735.269 474.619 822.801 357.301 941.556 280.654C1050.09 209.313 1181.61 173.946 1312.19 174.885Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1296.5 2147.53C1087.95 2147.53 852.922 2127.58 681.117 1983.57C451.455 1785.29 501.852 1462.46 542.358 1203.07C549.487 1159.58 556.008 1114.98 562.307 1071.88C585.351 914.11 609.224 750.981 667.137 599.512C722.01 458.818 815.953 340.174 931.724 265.406C1117.07 143.557 1370.93 122.116 1578.33 210.919C1869.61 333.874 1946.47 615.316 2000.19 893.111L2000.35 893.995C2023.73 1008.05 2050.25 1122.83 2073.35 1221.47C2132.76 1458.81 2171.27 1757.66 1939.35 1961.19C1759.03 2113.65 1515.28 2140.89 1300.53 2147.47H1296.5V2147.53ZM1307.33 192.794C1181 192.794 1055.01 227.774 951.507 295.8C841.926 366.533 753.012 479.044 700.956 612.608C644.48 760.209 620.939 921.294 598.171 1077.13C591.872 1120.4 585.296 1165.16 578.167 1208.81C539.043 1459.2 490.358 1770.98 704.603 1955.94C867.29 2092.38 1094.58 2111.27 1296.11 2111.27H1299.98C1507.93 2104.92 1744.16 2078.78 1915.69 1933.78C2132.65 1743.4 2095.07 1457.71 2038.1 1230.09C2014.94 1130.9 1988.31 1015.84 1964.88 901.455L1964.71 900.571C1964.71 900.571 1964.71 900.35 1964.65 900.295C1910.61 620.953 1839.32 360.565 1564.18 244.407C1483.5 209.869 1395.36 192.904 1307.39 192.904L1307.33 192.794Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1098.3 671.301C1105.92 659.199 1115.7 648.81 1126.81 640.631C1129.58 638.421 1132.61 636.929 1135.6 634.939C1137.2 634.055 1138.64 633.447 1140.24 632.618C1141.84 631.789 1143.28 631.126 1144.88 630.518C1151.18 627.811 1157.92 626.374 1164.94 625.711C1178.59 624.385 1192.68 627.203 1205.28 633.724C1211.69 636.984 1217.55 641.018 1223.02 645.604C1225.84 648.036 1228.49 650.468 1230.98 653.396C1232.3 654.888 1233.41 656.104 1234.79 657.817C1235.45 658.536 1235.9 659.309 1236.56 660.027C1237.22 660.746 1237.66 661.52 1238.6 662.735C1242.2 667.709 1241.81 675.224 1237.94 679.59C1235.56 682.077 1232.53 683.016 1229.6 682.132L1225.18 680.861C1225.18 680.861 1224.29 680.419 1223.68 679.921L1221.97 678.705C1220.87 677.987 1219.59 677.269 1218.54 676.605C1216.17 675.169 1213.79 673.787 1211.42 672.351C1206.72 669.753 1201.8 667.488 1196.88 665.719C1187.1 662.127 1177.43 660.414 1167.7 660.967C1162.73 661.243 1157.98 661.796 1153.12 663.398C1151.9 663.73 1150.68 664.062 1149.41 664.393C1148.14 664.725 1146.98 665.056 1145.77 665.664C1143.33 666.824 1140.9 667.488 1138.47 668.703C1128.75 673.179 1119.35 679.645 1109.85 686.94H1109.63C1105.65 690.034 1100.34 688.266 1097.97 683.237C1095.87 679.203 1096.2 674.561 1098.3 671.301Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1505.31 633.575C1513.38 621.196 1523.77 610.752 1535.82 602.795C1541.73 598.816 1548.36 595.611 1555.27 593.124C1562.18 590.637 1569.31 589.201 1576.54 588.759C1590.97 587.653 1605.67 590.914 1618.82 597.655C1625.39 600.916 1631.58 605.171 1637.11 610.034C1639.87 612.465 1642.69 615.118 1645.23 617.826C1646.39 619.318 1647.83 620.754 1648.99 622.246L1650.87 624.457C1651.59 625.175 1652.03 625.949 1652.8 627.165C1655.68 631.42 1655.4 637.388 1651.86 640.648C1649.6 642.859 1646.72 643.301 1644.07 642.417L1641.59 641.256C1641.14 641.035 1640.43 640.538 1639.98 640.317L1638.16 639.156C1636.78 638.438 1635.67 637.775 1634.29 637.056C1631.8 635.675 1629.1 634.238 1626.61 633.133C1621.42 630.591 1616 628.601 1610.86 627.054C1600.36 623.794 1589.75 622.578 1579.47 623.462C1574.22 624.015 1569.25 624.844 1564.06 626.446C1562.78 626.778 1561.46 627.109 1560.19 627.717C1558.92 628.325 1557.59 628.656 1556.32 628.988C1553.78 630.149 1551.18 631.088 1548.8 632.249C1538.75 637.001 1528.8 643.522 1518.47 650.595H1518.24C1513.82 653.69 1508.02 651.977 1505.26 646.451C1502.77 641.919 1503.16 637.001 1505.37 633.519L1505.31 633.575Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1413 256.993L1267.72 250.804C1214.89 248.76 1170.46 234.005 1135.54 212.785C1032.42 150.285 1012.25 31.9726 1103.21 21.9705C1128.08 19.2627 1149.24 21.4179 1167.15 26.6123C1236.94 46.8377 1257.72 112.653 1257.72 112.653C1291.43 -10.7437 1402.78 48.7717 1413 256.993Z" fill="#F2C63D" style="fill:#F2C63D;fill:color(display-p3 0.9490 0.7765 0.2392);fill-opacity:1;"/>+<path d="M1172.73 42.9694C1109.23 23.2967 1029.33 105.911 1135.54 212.785C1032.42 150.285 1012.25 31.9726 1103.21 21.9705C1128.08 19.2627 1149.24 21.4179 1167.15 26.6123C1188.98 41.3117 1199.75 51.369 1172.73 42.9694Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1404.59 257.458C1389.67 205.624 1382.54 150.529 1355.24 104.939C1321.86 51.7229 1294.01 61.3936 1275.17 117.428C1270.75 134.061 1246.93 135.166 1240.85 119.362C1224.66 78.1928 1186.53 47.4127 1142.21 42.4945C1139.28 42.3287 1132.98 42.0525 1130.11 41.8314C1122.32 41.0578 1113.48 42.4945 1105.52 42.6603C1046.89 48.4626 1064.07 111.625 1090.38 146.053C1116.9 182.801 1157.41 207.005 1199.79 222.809C1221.46 231.043 1244.22 236.901 1267.99 242.814C1272.46 243.808 1275.22 248.34 1274.12 252.761C1273.29 256.077 1270.53 258.397 1267.38 258.895C1189.74 270.665 1106.68 232.591 1058.16 170.146C993.616 84.161 1022.41 -11.9371 1142.16 1.21488C1202.39 5.85676 1256.44 49.789 1275 107.149L1240.24 107.812C1243.78 92.8369 1248.64 77.6402 1257.87 63.0514C1297.83 1.7675 1361.15 29.8952 1390.22 84.161C1418.85 136.382 1430.56 197.998 1421.44 256.574C1420.01 265.526 1406.91 266.134 1404.64 257.403L1404.59 257.458Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1250.34 745.323C1364.06 664.643 1422.92 655.856 1549.46 726.368C1578.97 742.67 1571.95 771.461 1548.14 783.121C1491.22 811.028 1325.38 824.622 1258.13 806.828C1226.91 798.318 1219.34 767.427 1250.34 745.378V745.323Z" fill="#F78426" style="fill:#F78426;fill:color(display-p3 0.9686 0.5176 0.1490);fill-opacity:1;"/>+<path d="M1423.77 692.788C1355.08 684.941 1250.97 797.175 1250.97 797.175L1233.29 780.099L1241.25 753.187L1382 684.94L1421.12 681.625L1423.83 692.788H1423.77Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1241.99 733.616C1282.5 706.152 1327.7 678.3 1377.16 668.795C1428.33 658.959 1479.78 675.593 1525.48 697.31C1534.93 701.51 1543.99 706.483 1553.16 711.07C1559.63 714.33 1566.7 718.53 1571.9 724.111C1591.07 741.85 1587.65 774.122 1567.7 789.871C1560.24 796.613 1550.68 800.315 1541.56 804.239C1472.32 830.598 1310.13 845.961 1241.99 817.391C1204.47 797.995 1209.61 754.339 1241.99 733.616ZM1258.68 757.047C1240.72 770.033 1241 787.329 1264.37 791.695C1297.97 798.215 1332.95 797.608 1368.21 796.281C1399.71 794.789 1431.31 792.137 1462.37 787.495C1489.67 783.019 1518.24 778.488 1543.44 766.772C1553.05 761.246 1557.09 750.802 1546.59 743.01C1543.27 740.026 1537.47 737.374 1533.33 734.887C1499.89 715.933 1463.2 698.305 1426.01 693.11C1362.74 683.882 1307.86 721.072 1258.68 757.047Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M227.251 1417.37L18.4766 1911.29H481.394L227.251 1417.37Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M481.416 1929.43H18.443C12.3644 1929.43 6.6726 1926.39 3.30171 1921.3C-0.0691833 1916.22 -0.677265 1909.81 1.69894 1904.23L210.473 1410.31C213.236 1403.84 219.481 1399.53 226.499 1399.26C233.572 1399.09 240.093 1402.79 243.298 1409.09L497.441 1903.01C500.315 1908.65 500.094 1915.33 496.778 1920.75C493.463 1926.16 487.605 1929.43 481.305 1929.43H481.416ZM45.8524 1893.12H451.741L228.93 1460.1L45.8524 1893.12Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2398.57 1417.41L2500.52 1911.33H2164.43L2398.57 1417.41Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2500.52 1929.44H2164.42C2158.23 1929.44 2152.43 1926.24 2149.12 1920.99C2145.8 1915.74 2145.41 1909.16 2148.07 1903.52L2382.21 1409.61C2385.52 1402.59 2393.04 1398.44 2400.77 1399.38C2408.51 1400.32 2414.81 1406.07 2416.36 1413.69L2518.31 1907.61C2519.42 1912.97 2518.04 1918.5 2514.61 1922.75C2511.18 1927.01 2505.99 1929.44 2500.57 1929.44H2500.52ZM2193.1 1893.13H2478.25L2391.71 1474.04L2193.05 1893.13H2193.1Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2398.52 1417.37H227.281V2738.7H2398.52V1417.37Z" fill="#8735FC" style="fill:#8735FC;fill:color(display-p3 0.5294 0.2078 0.9882);fill-opacity:1;"/>+<g opacity="0.12">+<path d="M375.091 2738.7H369.565L352.821 2509.81L352.434 2504.29L334.695 2261.53L334.253 2255.95L320.715 2070.44L320.272 2064.91L301.263 1804.69L300.876 1799.11L283.524 1562.04L283.137 1556.51L272.914 1417.37H278.495L288.663 1556.4L289.05 1561.93L306.402 1799L306.789 1804.52L325.798 2064.85L326.241 2070.38L339.779 2256L340.221 2261.53L357.96 2504.34L358.347 2509.81L375.091 2738.7Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M497.729 2510.97L509.334 2738.7H503.808L492.203 2510.92L491.926 2505.45L479.548 2262.19L479.217 2256.66L469.656 2068.45L469.38 2062.92L456.007 1800.54L455.731 1794.96L443.684 1559L443.408 1553.47L436.5 1417.37H442.026L448.934 1553.42L449.21 1558.94L461.257 1794.85L461.533 1800.38L474.906 2062.87L475.182 2068.39L484.743 2256.66L485.074 2262.25L497.453 2505.45L497.729 2510.97Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M729.759 1417.37L727.438 1548.17L727.328 1553.69L723.239 1787.83L723.128 1793.42L718.431 2059.61L718.376 2065.13L714.949 2257.77L714.839 2263.3L710.584 2507.22L710.473 2512.74L706.495 2738.7H700.969L704.947 2512.69L705.058 2507.16L709.313 2263.3L709.423 2257.71L712.794 2065.19L712.905 2059.66L717.602 1793.53L717.713 1788L721.802 1553.81L721.912 1548.28L724.233 1417.37H729.759Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M886.695 1417.37H892.221L891.005 1545.07L890.95 1550.6L888.684 1783.41L888.629 1788.99L886.087 2057.34L886.032 2062.87L884.153 2258.54L884.097 2264.12L881.721 2508.65L881.666 2514.12L879.511 2738.7H873.93L876.14 2514.12L876.195 2508.6L878.516 2264.07L878.571 2258.49L880.45 2062.92L880.506 2057.45L883.103 1789.1L883.158 1783.58L885.424 1550.71L885.479 1545.18L886.695 1417.37Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1148.85 1417.37L1140.23 1540.43L1139.85 1545.96L1123.66 1777.17L1123.27 1782.69L1104.2 2054.41L1103.82 2059.94L1089.84 2259.48L1089.45 2265.06L1072.21 2510.2L1071.82 2515.73L1056.18 2738.7H1050.66L1066.3 2515.67L1066.68 2510.14L1083.87 2265.06L1084.31 2259.48L1098.29 2059.99L1098.68 2054.52L1117.69 1782.86L1118.07 1777.33H1118.13L1134.32 1546.07L1134.71 1540.54L1143.33 1417.37H1148.85Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1265.41 1417.37H1270.94L1269.12 1538L1269 1543.53L1265.52 1773.36L1265.41 1778.88L1261.27 2052.31L1261.16 2057.84L1258.06 2260.31L1258.01 2265.84L1254.19 2511.69L1254.14 2517.22L1250.77 2738.7H1245.24L1248.61 2517.16L1248.72 2511.64L1252.48 2265.84L1252.54 2260.26L1255.63 2057.89L1255.74 2052.37L1259.89 1779.05L1260 1773.52L1263.48 1543.64L1263.59 1538.11L1265.41 1417.37Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1468.54 1417.37L1467.16 1534.3L1467.1 1539.82L1464.34 1768.05L1464.29 1773.58L1461.03 2049.66L1460.91 2055.13L1458.48 2261.25L1458.43 2266.78L1455.5 2513.35L1455.39 2518.88L1452.79 2738.7H1447.27L1449.86 2518.82L1449.92 2513.29L1452.9 2266.78L1452.96 2261.2L1455.39 2055.24L1455.44 2049.71L1458.76 1773.74L1458.81 1768.22L1461.52 1539.94L1461.63 1534.41L1463.01 1417.37H1468.54Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1691.28 2520.81L1703.22 2738.7H1697.69L1685.7 2520.75L1685.37 2515.23L1671.77 2267.83L1671.44 2262.25L1659.89 2052.48L1659.62 2046.95L1644.31 1768.77L1644.03 1763.3L1631.54 1536.73L1631.27 1531.2L1624.97 1417.37H1630.55L1636.79 1531.09L1637.13 1536.62L1649.56 1763.13L1649.89 1768.6L1665.2 2046.9L1665.47 2052.42L1677.02 2262.25L1677.36 2267.83L1690.95 2515.28L1691.28 2520.81Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1845.7 2738.7H1840.18L1833.05 2521.97L1832.83 2516.44L1824.7 2268.55L1824.54 2262.96L1817.52 2050.38L1817.35 2044.85L1808.13 1764.4L1807.91 1758.88L1800.5 1533.52L1800.33 1528L1796.69 1417.37H1802.21L1805.86 1527.94L1806.03 1533.47L1813.43 1758.77L1813.6 1764.24L1822.88 2044.8L1823.05 2050.32L1830.07 2262.96L1830.23 2268.55L1838.41 2516.5L1838.57 2522.03L1845.7 2738.7Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2002.96 2523.35L2012.52 2738.7H2007.05L1997.49 2523.35L1997.22 2517.83L1986.22 2269.26L1985.94 2263.74L1976.38 2048.22L1976.16 2042.75L1963.62 1760.26L1963.4 1754.73L1953.45 1530.65L1953.17 1525.18L1948.42 1417.37H1953.89L1958.7 1525.07L1958.92 1530.6L1968.87 1754.62L1969.14 1760.09L1981.63 2042.64L1981.91 2048.17L1991.47 2263.74L1991.69 2269.32L2002.74 2517.83L2002.96 2523.35Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2192.62 1417.37L2190.96 1520.7L2190.85 1526.23L2187.26 1748.76L2187.15 1754.29L2182.56 2039.99L2182.45 2045.46L2178.92 2264.62L2178.81 2270.2L2174.83 2519.26L2174.72 2524.79L2171.24 2738.7H2165.77L2169.19 2524.73L2169.3 2519.21L2173.28 2270.15L2173.39 2264.57L2176.93 2045.57L2177.04 2040.04L2181.63 1754.4L2181.74 1748.93L2185.33 1526.34L2185.38 1520.81L2187.04 1417.37H2192.62Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2324.52 1417.37L2320.43 1518.27L2320.15 1523.8L2311.14 1745.45L2310.92 1750.98L2299.15 2038.39L2298.93 2043.91L2289.92 2265.12L2289.7 2270.7L2279.48 2520.15L2279.26 2525.67L2270.58 2738.7H2265L2273.73 2525.62L2273.95 2520.09L2284.12 2270.7L2284.34 2265.12L2293.4 2043.97L2293.63 2038.5L2305.34 1751.14L2305.56 1745.61L2314.62 1523.91L2314.85 1518.38L2318.99 1417.37H2324.52Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2311.16 1745.46L2398.52 1743.14V1748.67L2310.94 1750.99L2305.35 1751.15L2187.15 1754.3L2181.63 1754.41L1969.15 1760.11L1963.62 1760.27L1813.59 1764.25L1808.12 1764.42L1649.91 1768.62L1644.33 1768.78L1464.29 1773.59L1458.76 1773.76L1265.41 1778.89L1259.88 1779.06L1123.28 1782.71L1117.69 1782.87L888.639 1789.01L883.113 1789.12L723.134 1793.43L717.608 1793.54L461.531 1800.39L456.005 1800.56L306.801 1804.54L301.275 1804.7L227.281 1806.64V1801.11L300.888 1799.12L306.414 1799.01L455.728 1794.98L461.255 1794.86L717.719 1788.01L723.245 1787.85L883.169 1783.59L888.695 1783.43L1118.08 1777.35H1118.14L1123.66 1777.18L1259.99 1773.53L1265.52 1773.37L1458.82 1768.23L1464.34 1768.06L1644.05 1763.31L1649.58 1763.15L1807.9 1758.89L1813.42 1758.78L1963.4 1754.75L1968.87 1754.63L2181.74 1748.94L2187.26 1748.78L2305.57 1745.63L2311.16 1745.46Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2398.52 1516.79V1522.32L2320.16 1523.81L2314.64 1523.92L2190.85 1526.24L2185.33 1526.35L1958.93 1530.6L1953.45 1530.66L1806.02 1533.48L1800.49 1533.53L1637.14 1536.63L1631.56 1536.74L1467.11 1539.83L1461.53 1539.94L1269 1543.53L1263.47 1543.65L1139.85 1545.97L1134.33 1546.08L890.961 1550.61L885.435 1550.72L727.334 1553.7L721.808 1553.81L449.208 1558.95L443.682 1559.01L289.062 1561.94L283.536 1562.05L227.281 1563.1V1557.57L283.15 1556.52L288.676 1556.41L443.405 1553.48L448.931 1553.43L721.918 1548.29L727.444 1548.18L885.49 1545.19L891.016 1545.08L1134.71 1540.55L1140.24 1540.44L1263.58 1538.12L1269.11 1538.01L1461.64 1534.42L1467.16 1534.31L1631.29 1531.21L1636.81 1531.1L1800.33 1528.01L1805.85 1527.95L1953.18 1525.19L1958.7 1525.08L2185.38 1520.82L2190.96 1520.71L2314.86 1518.39L2320.44 1518.28L2398.52 1516.79Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2289.94 2265.15L2398.52 2265.7V2271.23L2289.72 2270.73H2284.13L2178.81 2270.23L2173.28 2270.18L1991.7 2269.35L1986.22 2269.29L1830.22 2268.57H1824.7L1677.37 2267.85H1671.79L1458.43 2266.8H1452.91L1258 2265.87H1252.47L1089.46 2265.09H1083.88L884.108 2264.15L878.527 2264.1L714.845 2263.32H709.319L485.072 2262.27L479.546 2262.22L340.234 2261.56H334.708L227.281 2261.06V2255.48L334.266 2255.97L339.792 2256.03L479.214 2256.69H484.74L709.43 2257.74L714.956 2257.8L878.582 2258.52L884.163 2258.57L1084.32 2259.51H1089.84L1252.53 2260.28L1258.06 2260.34L1452.96 2261.22L1458.49 2261.28L1671.46 2262.27H1677.04L1824.53 2262.99H1830.06L1985.95 2263.77H1991.47L2173.39 2264.59L2178.92 2264.65L2284.35 2265.15H2289.94Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2398.52 2037.05V2042.58L2298.94 2043.91L2293.42 2043.96L2182.45 2045.45L2176.93 2045.57L1981.91 2048.16L1976.39 2048.22L1823.04 2050.32L1817.51 2050.37L1665.49 2052.42L1659.91 2052.47L1460.92 2055.12L1455.39 2055.24L1261.15 2057.83L1255.62 2057.89L1103.82 2059.93L1098.3 2059.99L886.042 2062.86L880.461 2062.92L718.382 2065.13L712.8 2065.18L475.18 2068.39L469.654 2068.44L326.253 2070.38L320.727 2070.43L227.281 2071.7V2066.18L320.285 2064.91L325.811 2064.85L469.378 2062.92L474.904 2062.86L712.911 2059.66L718.437 2059.6L880.516 2057.45L886.098 2057.34L1098.68 2054.52L1104.21 2054.41L1255.74 2052.36L1261.26 2052.31L1455.45 2049.71L1461.03 2049.65L1659.64 2046.95L1665.22 2046.89L1817.35 2044.85L1822.87 2044.79L1976.17 2042.75L1981.64 2042.64L2177.04 2040.04L2182.56 2039.98L2293.64 2038.49L2299.17 2038.38L2398.52 2037.05Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2398.52 2521.09V2526.62L2279.27 2525.68L2273.74 2525.62L2174.72 2524.79L2169.19 2524.74L2002.97 2523.36H1997.5L1838.57 2522.03L1833.04 2521.98L1691.3 2520.82L1685.72 2520.76L1455.39 2518.88L1449.87 2518.83L1254.13 2517.22L1248.61 2517.17L1071.83 2515.73L1066.3 2515.68L881.677 2514.13H876.151L710.479 2512.75L704.953 2512.69L497.726 2510.98L492.2 2510.92L358.359 2509.82H352.833L227.281 2508.77V2503.24L352.447 2504.29L357.973 2504.35L491.924 2505.45H497.45L705.064 2507.17L710.59 2507.22L876.206 2508.6L881.732 2508.66L1066.69 2510.15L1072.22 2510.21L1248.72 2511.64L1254.19 2511.7L1449.92 2513.3L1455.5 2513.35L1685.39 2515.23L1690.97 2515.29L1832.82 2516.45L1838.4 2516.5L1997.22 2517.83H2002.75L2169.3 2519.21L2174.83 2519.27L2273.97 2520.1L2279.49 2520.15L2398.52 2521.09Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+</g>+<path d="M463.962 1457.6H256.072V2738.7L227.281 2736.6V1417.37H417.322L463.962 1457.6Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M636.609 1546.45C935.624 1602.98 1337.2 1467.65 1337.2 1467.65L1690.59 1457.59L1826.04 1426.31H1271.77L793.549 1493.84L636.609 1546.45Z" fill="#702CDB" style="fill:#702CDB;fill:color(display-p3 0.4392 0.1725 0.8588);fill-opacity:1;"/>+<path d="M2398.54 2756.89H227.297C217.295 2756.89 209.172 2748.77 209.172 2738.77V1417.38C209.172 1407.37 217.295 1399.25 227.297 1399.25H2398.54C2408.54 1399.25 2416.67 1407.37 2416.67 1417.38V2738.77C2416.67 2748.77 2408.54 2756.89 2398.54 2756.89ZM245.423 2720.58H2380.36V1435.45H245.423V2720.58Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1380.33 1265.6L891.672 1472.82L932.188 1568.36L1420.84 1361.14L1380.33 1265.6Z" fill="#6B6B6B" style="fill:#6B6B6B;fill:color(display-p3 0.4208 0.4208 0.4208);fill-opacity:1;"/>+<path d="M932.094 1585.31C925.628 1585.31 919.494 1581.5 916.842 1575.2L876.336 1479.65C874.623 1475.62 874.567 1471.03 876.225 1466.94C877.883 1462.85 881.088 1459.59 885.122 1457.88L1373.79 1250.65C1382.25 1247.06 1391.97 1250.98 1395.51 1259.44L1436.01 1354.98C1437.73 1359.02 1437.78 1363.6 1436.13 1367.69C1434.47 1371.78 1431.26 1375.04 1427.23 1376.76L938.559 1583.98C936.459 1584.87 934.249 1585.31 932.094 1585.31ZM913.305 1481.97L940.88 1547.01L1399.05 1352.77L1371.47 1287.73L913.305 1481.97Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M806.444 1545.12C686.032 1551.53 593.028 1535.12 526.329 1503.12C440.509 1462.01 397.959 1395.25 395.969 1318.16C393.261 1216.76 460.624 1097.56 591.868 995.774C595.791 992.679 599.77 989.696 603.804 986.656L614.58 1039.76L640.884 1169.51C641.768 1168.91 642.597 1168.3 643.481 1167.63C779.311 1071.92 959.406 1066.29 1101.59 1152.27C1387.62 1325.35 1267.37 1520.64 806.444 1545.12Z" fill="#F2C63D" style="fill:#F2C63D;fill:color(display-p3 0.9490 0.7765 0.2392);fill-opacity:1;"/>+<path d="M678.523 1165.3C897.3 1060.19 1212.62 1241.67 1212.62 1241.67L1144.43 1168.89L992.845 1100.53L819.88 1079.26L701.235 1131.04L678.523 1165.35V1165.3Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M618.835 1036.72C608.446 1044.24 593.028 1055.95 581.479 1065.62C508.922 1126.58 421.61 1226.49 414.371 1325.62L395.969 1318.16C393.261 1216.76 460.624 1097.56 591.868 995.774C595.791 992.679 599.77 989.696 603.804 986.656L618.835 1036.72Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M757.186 1564.61C564.106 1564.61 431.701 1501.17 390.477 1387.28C344.777 1260.95 424.241 1097.99 592.896 972.106C601.904 965.365 615.166 968.293 620.25 979.069C623.953 986.916 621.079 996.31 614.116 1001.5C458.834 1117.55 384.453 1264.1 424.517 1374.96C463.421 1482.44 602.235 1537.81 805.373 1527.09C1095.16 1511.67 1217.23 1431.16 1234.8 1360.92C1249.78 1301.13 1199.1 1232.6 1092.06 1167.84C955.571 1085.28 797.305 1081.3 667.553 1172.76L665.73 1174.03C657.883 1179.61 647.052 1177.9 641.249 1170.22L640.752 1169.5C635.005 1161.37 636.994 1150.1 645.228 1144.52L647.825 1142.75C789.348 1043.01 962.037 1046.76 1110.8 1136.78C1232.59 1210.44 1289.12 1293.17 1269.95 1369.71C1242.71 1478.51 1074.05 1549.08 807.252 1563.28C790.121 1564.22 773.322 1564.67 757.02 1564.67L757.186 1564.61Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1575.99 1475.68C1714.06 1475.68 1825.99 1363.76 1825.99 1225.69C1825.99 1087.62 1714.06 975.688 1575.99 975.688C1437.92 975.688 1325.99 1087.62 1325.99 1225.69C1325.99 1363.76 1437.92 1475.68 1575.99 1475.68Z" fill="#CCCCCC" style="fill:#CCCCCC;fill:color(display-p3 0.8000 0.8000 0.8000);fill-opacity:1;"/>+<path d="M1627.52 993.82C1416.87 985.807 1315.52 1192.76 1360 1333.62C1404.49 1474.48 1357.52 1333.62 1357.52 1333.62L1316.73 1230.45L1356.3 1096.99L1463.78 1000.01L1556.45 976.523L1627.52 993.82Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1576.01 1493.89C1428.13 1493.89 1307.88 1373.59 1307.88 1225.71C1307.88 1077.83 1428.19 957.586 1576.01 957.586C1723.83 957.586 1844.19 1077.89 1844.19 1225.71C1844.19 1373.53 1723.88 1493.89 1576.01 1493.89ZM1576.01 993.837C1448.13 993.837 1344.13 1097.84 1344.13 1225.71C1344.13 1353.58 1448.13 1457.58 1576.01 1457.58C1703.88 1457.58 1807.88 1353.58 1807.88 1225.71C1807.88 1097.84 1703.88 993.837 1576.01 993.837Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1733.59 1225.68C1733.59 1236.46 1732.48 1246.96 1730.44 1257.07C1726.4 1277.18 1718.5 1295.86 1707.56 1312.38C1687.67 1342.56 1657.66 1365.49 1622.35 1376.32C1607.7 1380.8 1592.18 1383.23 1576.04 1383.23C1489.06 1383.23 1418.49 1312.72 1418.49 1225.68C1418.49 1187.22 1432.25 1152.02 1455.24 1124.66C1475.63 1100.24 1503.37 1082.11 1535.04 1073.6C1548.08 1070.07 1561.84 1068.19 1576.04 1068.19C1580.41 1068.19 1584.77 1068.35 1589.03 1068.8C1669.98 1075.32 1733.59 1143.07 1733.59 1225.68Z" fill="#F4D682" style="fill:#F4D682;fill:color(display-p3 0.9569 0.8392 0.5098);fill-opacity:1;"/>+<path d="M1730.43 1257.03L1589.02 1068.76C1669.98 1075.28 1733.58 1143.03 1733.58 1225.64C1733.58 1236.42 1732.48 1246.92 1730.43 1257.03Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1707.55 1312.35C1687.66 1342.52 1657.65 1365.46 1622.34 1376.29L1455.23 1124.63C1475.63 1100.21 1503.37 1082.08 1535.03 1073.57L1707.55 1312.35Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M1576.02 1394.27C1483.07 1394.27 1407.42 1318.62 1407.42 1225.67C1407.42 1132.72 1483.07 1057.07 1576.02 1057.07C1668.97 1057.07 1744.62 1132.72 1744.62 1225.67C1744.62 1318.62 1668.97 1394.27 1576.02 1394.27ZM1576.02 1079.23C1495.23 1079.23 1429.53 1144.93 1429.53 1225.73C1429.53 1306.52 1495.23 1372.22 1576.02 1372.22C1656.81 1372.22 1722.52 1306.52 1722.52 1225.73C1722.52 1144.93 1656.81 1079.23 1576.02 1079.23Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2663.13 309.459L2636.44 534.59C2629.75 591.011 2578.53 631.406 2522.11 624.665L1834.67 543.211C1815.05 540.89 1797.37 533.209 1782.94 521.825C1755.86 500.329 1740.17 465.68 1744.54 428.877L1771.23 203.745C1777.91 147.269 1829.14 106.929 1885.56 113.615L2550.23 192.417L2573 195.125C2596.65 197.943 2617.49 208.553 2633.24 224.136C2635.61 226.402 2637.88 228.889 2639.98 231.486C2657.44 252.43 2666.61 280.226 2663.13 309.459Z" fill="#CCCCCC" style="fill:#CCCCCC;fill:color(display-p3 0.8000 0.8000 0.8000);fill-opacity:1;"/>+<path d="M2657.33 233.31C2657.33 233.31 2651.14 232.646 2639.98 231.486C2544.82 221.484 2086.54 173.131 1987.02 160.421C1875.78 146.164 1810.9 148.042 1802.89 236.404C1794.88 324.766 1746.64 461.922 1797.92 516.907L1782.94 521.825C1755.86 500.329 1740.17 465.68 1744.54 428.877L1771.23 203.745C1777.91 147.269 1829.14 106.929 1885.56 113.615L2550.23 192.417L2633.24 224.136L2657.33 233.31Z" fill="white" style="fill:white;fill-opacity:1;"/>+<path d="M2534.26 643.548C2529.51 643.548 2524.75 643.272 2519.95 642.719L1832.51 561.21C1800.4 557.397 1771.66 541.316 1751.66 515.896C1731.66 490.477 1722.7 458.812 1726.52 426.706L1753.21 201.574C1761.05 135.262 1821.4 87.6822 1887.71 95.5845L2575.15 177.094C2607.26 180.907 2635.99 196.988 2656 222.408C2676 247.828 2684.96 279.492 2681.14 311.598L2654.45 536.729C2647.16 598.179 2594.77 643.548 2534.31 643.548H2534.26ZM2524.2 606.689C2570.68 612.215 2612.9 578.893 2618.42 532.475L2645.11 307.343C2647.76 284.852 2641.52 262.637 2627.48 244.843C2613.45 227.05 2593.33 215.776 2570.84 213.124L1883.4 131.614C1836.98 126.088 1794.71 159.411 1789.18 205.829L1762.49 430.961C1759.84 453.452 1766.08 475.667 1780.12 493.461C1794.15 511.254 1814.27 522.528 1836.76 525.18L2524.2 606.689Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1959.73 400.028C1990.44 400.028 2015.32 375.139 2015.32 344.436C2015.32 313.733 1990.44 288.844 1959.73 288.844C1929.03 288.844 1904.14 313.733 1904.14 344.436C1904.14 375.139 1929.03 400.028 1959.73 400.028Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2124.66 421.083C2155.36 421.083 2180.25 396.193 2180.25 365.491C2180.25 334.788 2155.36 309.898 2124.66 309.898C2093.96 309.898 2069.07 334.788 2069.07 365.491C2069.07 396.193 2093.96 421.083 2124.66 421.083Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2284.48 438.981C2315.19 438.981 2340.07 414.092 2340.07 383.389C2340.07 352.686 2315.19 327.797 2284.48 327.797C2253.78 327.797 2228.89 352.686 2228.89 383.389C2228.89 414.092 2253.78 438.981 2284.48 438.981Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2444.92 459.426C2475.62 459.426 2500.51 434.537 2500.51 403.834C2500.51 373.132 2475.62 348.242 2444.92 348.242C2414.22 348.242 2389.33 373.132 2389.33 403.834C2389.33 434.537 2414.22 459.426 2444.92 459.426Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1115.15 1671.39H433.069C385.306 1671.39 346.586 1710.11 346.586 1757.87V1939.51C346.586 1987.28 385.306 2026 433.069 2026H1115.15C1162.91 2026 1201.63 1987.28 1201.63 1939.51V1757.87C1201.63 1710.11 1162.91 1671.39 1115.15 1671.39Z" fill="#9B5CFF" style="fill:#9B5CFF;fill:color(display-p3 0.6078 0.3608 1.0000);fill-opacity:1;"/>+<path d="M1115.12 2037.02H433.043C379.274 2037.02 335.508 1993.26 335.508 1939.49V1757.85C335.508 1704.08 379.274 1660.31 433.043 1660.31H1115.12C1168.89 1660.31 1212.66 1704.08 1212.66 1757.85V1939.49C1212.66 1993.26 1168.89 2037.02 1115.12 2037.02ZM433.098 1682.42C391.487 1682.42 357.667 1716.24 357.667 1757.85V1939.49C357.667 1981.1 391.487 2014.92 433.098 2014.92H1115.18C1156.79 2014.92 1190.61 1981.1 1190.61 1939.49V1757.85C1190.61 1716.24 1156.79 1682.42 1115.18 1682.42H433.098Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2157.23 2150.69L1478.44 2217.6C1430.91 2222.29 1396.17 2264.62 1400.86 2312.15L1418.68 2492.92C1423.36 2540.45 1465.7 2575.18 1513.23 2570.5L2192.02 2503.58C2239.55 2498.9 2274.29 2456.57 2269.6 2409.03L2251.78 2228.27C2247.1 2180.74 2204.76 2146 2157.23 2150.69Z" fill="#9B5CFF" style="fill:#9B5CFF;fill:color(display-p3 0.6078 0.3608 1.0000);fill-opacity:1;"/>+<path d="M1504.94 2581.6C1455.42 2581.6 1412.87 2543.91 1407.9 2493.62L1390.05 2312.87C1384.75 2259.32 1424.04 2211.52 1477.53 2206.21L2156.29 2139.24C2209.84 2133.99 2257.64 2173.22 2262.95 2226.71L2280.79 2407.47C2283.34 2433.39 2275.66 2458.75 2259.13 2478.92C2242.61 2499.09 2219.23 2511.58 2193.32 2514.12L1514.55 2581.1C1511.29 2581.43 1508.09 2581.6 1504.94 2581.6ZM2166.02 2160.9C2163.53 2160.9 2161.04 2161.01 2158.56 2161.29L1479.79 2228.26C1438.4 2232.35 1408.07 2269.38 1412.1 2310.77L1429.95 2491.52C1434.04 2532.91 1471.01 2563.36 1512.45 2559.22L2191.22 2492.24C2211.28 2490.25 2229.35 2480.58 2242.11 2465C2254.88 2449.41 2260.85 2429.8 2258.86 2409.74L2241.01 2228.98C2237.19 2190.08 2204.26 2160.95 2165.96 2160.95L2166.02 2160.9Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M625.827 1777.18H484.139C472.999 1777.18 463.969 1786.21 463.969 1797.35V1812.21C463.969 1823.35 472.999 1832.38 484.139 1832.38H625.827C636.966 1832.38 645.997 1823.35 645.997 1812.21V1797.35C645.997 1786.21 636.966 1777.18 625.827 1777.18Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M756.573 1876.05H481.486C471.812 1876.05 463.969 1883.89 463.969 1893.56V1913.73C463.969 1923.41 471.812 1931.25 481.486 1931.25H756.573C766.248 1931.25 774.091 1923.41 774.091 1913.73V1893.56C774.091 1883.89 766.248 1876.05 756.573 1876.05Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2045.15 2269.91L1518.91 2321.79C1507.82 2322.88 1499.72 2332.75 1500.81 2343.84L1502.27 2358.63C1503.37 2369.72 1513.24 2377.82 1524.32 2376.73L2050.56 2324.85C2061.65 2323.76 2069.75 2313.88 2068.66 2302.8L2067.2 2288C2066.1 2276.92 2056.23 2268.82 2045.15 2269.91Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1939.61 2379.62L1525.95 2420.4C1516.32 2421.35 1509.29 2429.92 1510.23 2439.55L1512.21 2459.62C1513.16 2469.25 1521.74 2476.29 1531.36 2475.34L1945.03 2434.56C1954.66 2433.61 1961.69 2425.04 1960.74 2415.41L1958.76 2395.33C1957.82 2385.71 1949.24 2378.67 1939.61 2379.62Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M1981.64 881.789C2024.91 1122.73 2152.17 1156.1 2152.17 1156.1L2055.69 1225.62L1981.7 881.789H1981.64Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2034 588.593C2248.19 615.56 2377.5 712.763 2377.5 712.763L2384.08 607.326L2040.25 567.594L2033.95 588.593H2034Z" fill="#232323" style="fill:#232323;fill:color(display-p3 0.1375 0.1375 0.1375);fill-opacity:1;"/>+<path d="M2174.2 1636.26C2175.43 1635.53 2176.87 1635.35 2178.25 1635.08C2190.69 1632.75 2204.31 1630.18 2216.92 1627.8C2231.29 1625.06 2243.68 1622.94 2257.66 1620.07C2261.79 1619.16 2265.96 1617.79 2269.62 1615.91C2288.38 1606.53 2292.55 1586.63 2284.22 1566.72C2272.32 1537.27 2243.99 1515.23 2211.85 1512.57C2169.21 1508.61 2126.01 1533.45 2112.81 1574.41C2107.67 1589.26 2107.05 1607.58 2110.48 1623.82C2120 1673.11 2165.36 1703.84 2215.19 1696.77C2234.83 1694.36 2254.1 1687.37 2268.94 1674.73C2279.77 1665.76 2291.54 1653.87 2285.8 1638.85C2281.21 1626.66 2268.74 1620.35 2256.6 1626.18C2252.71 1627.95 2249.38 1630.74 2246.12 1633.33C2241.69 1636.82 2236.94 1640.34 2231.88 1643.14C2218.65 1650.36 2196.14 1654.38 2181.59 1648.44C2178.63 1647.18 2173.43 1644.48 2172.16 1641.53C2171.32 1639.6 2172.4 1637.29 2174.17 1636.26L2174.19 1636.26L2174.2 1636.26ZM2165.47 1592.48C2163.68 1592.23 2162.12 1590.91 2161.79 1589.12C2161.48 1587.68 2161.81 1586.12 2162.22 1584.71C2166.27 1570.79 2179.37 1561.77 2194.55 1559.4C2207.95 1556.97 2222.81 1560.65 2231.48 1572.45C2232.06 1573.26 2232.56 1574.1 2232.85 1574.97C2233.15 1575.86 2233.22 1576.79 2232.97 1577.65C2232.35 1579.68 2230.48 1580.78 2228.52 1581.08C2212.67 1584.15 2185.15 1589.2 2168.41 1592.36C2167.45 1592.53 2166.51 1592.65 2165.49 1592.49L2165.48 1592.5L2165.47 1592.48Z" fill="#9B5CFF" style="fill:#9B5CFF;fill:color(display-p3 0.6078 0.3608 1.0000);fill-opacity:1;"/>+</svg>diff --git a/web/apps/auth/public/images/auth-frame-curves.svg b/web/apps/auth/public/images/auth-frame-curves.svgnew file mode 100644index 0000000000..215389c5c0--- /dev/null+++ b/web/apps/auth/public/images/auth-frame-curves.svg@@ -0,0 +1,3 @@+<svg width="1357" height="715" viewBox="0 0 1357 715" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M170.065 -10.9783C252.3 109.821 131.817 230.62 68.0684 324.18C4.32028 417.74 -36.4785 570.516 47.0315 558.673C130.542 546.83 263.138 -33.4801 602.278 -51.2447C941.418 -69.0093 367.685 49.4213 455.657 242.463C543.63 435.505 778.223 133.51 999.429 4.42031C1220.63 -124.669 833.684 276.811 539.805 546.832C245.926 816.854 404.021 1065.56 608.015 812.117C812.009 558.673 1136.49 390.504 1281.2 728.031C1425.9 1065.56 1567.42 1109.38 1434.83 861.858C1302.23 614.338 1081.66 -18.0815 1272.27 -41.7676C1462.88 -65.4537 1509.41 -103.351 1571.25 480.511C1633.09 1064.37 1484.55 908.045 1420.17 655.788C1355.78 403.531 1490.93 139.431 1523.44 728.031C1555.95 1316.63 10.0578 1117.67 200.027 896.202C389.997 674.737 261.225 273.258 73.8059 728.031" stroke="#fff" style="stroke:#fff;stroke-opacity:.18;"/>+</svg>diff --git a/web/apps/auth/public/images/auth-surface-noise.svg b/web/apps/auth/public/images/auth-surface-noise.svgnew file mode 100644index 0000000000..be4224b491--- /dev/null+++ b/web/apps/auth/public/images/auth-surface-noise.svg@@ -0,0 +1,8 @@+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:svgjs="http://svgjs.dev/svgjs" viewBox="0 0 700 700" width="700" height="700"><defs><filter id="nnnoise-filter" x="-20%" y="-20%" width="140%" height="140%" filterUnits="objectBoundingBox" primitiveUnits="userSpaceOnUse" color-interpolation-filters="linearRGB">+ <feTurbulence type="fractalNoise" baseFrequency="0.079" numOctaves="4" seed="15" stitchTiles="stitch" x="0%" y="0%" width="100%" height="100%" result="turbulence"></feTurbulence>+ <feSpecularLighting surfaceScale="14" specularConstant="0.6" specularExponent="20" lighting-color="#a9a9a9" x="0%" y="0%" width="100%" height="100%" in="turbulence" result="specularLighting">+ <feDistantLight azimuth="3" elevation="111"></feDistantLight>+ </feSpecularLighting>++</filter></defs><rect width="700" height="700" fill="#9610d600"></rect><rect width="700" height="700" fill="#a9a9a9" filter="url(#nnnoise-filter)"></rect></svg>+diff --git a/web/apps/auth/src/components/AuthShell.tsx b/web/apps/auth/src/components/AuthShell.tsxnew file mode 100644index 0000000000..5ee8e59204--- /dev/null+++ b/web/apps/auth/src/components/AuthShell.tsx@@ -0,0 +1,482 @@+import { Tick02Icon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { GlobalStyles, keyframes, styled } from "@mui/material";+import { EnteLogo } from "ente-base/components/EnteLogo";+import { t } from "i18next";+import type React from "react";+import {+ authAboveMobileMediaQuery,+ authColorVariables,+ authDisplayFontFamily,+ authMobileMediaQuery,+} from "./auth/styles";++interface AuthShellProps extends React.PropsWithChildren {+ contentWidth?: 400 | 420;+}++export const AuthShell: React.FC<AuthShellProps> = ({+ children,+ contentWidth = 400,+}) => (+ <PageRoot>+ <GlobalStyles styles={authColorVariables} />+ <FrameCurves />+ <PageCard>+ <DesktopBrandSlot>+ <BrandPanel+ headline={t("authenticator_auth_headline")}+ size="desktop"+ />+ </DesktopBrandSlot>+ <TabletBrandSlot>+ <BrandPanel+ headline={t("authenticator_auth_headline")}+ size="tablet"+ />+ </TabletBrandSlot>+ <MobileBrandSlot>+ <BrandPanel+ headline={t("authenticator_auth_headline")}+ size="mobile"+ />+ </MobileBrandSlot>+ <ContentSheet>+ <SheetHandle />+ <ContentColumn contentWidth={contentWidth}>+ {children}+ </ContentColumn>+ </ContentSheet>+ </PageCard>+ </PageRoot>+);++const shellReveal = keyframes({+ from: { opacity: 0, transform: "translateY(18px)" },+ to: { opacity: 1, transform: "translateY(0)" },+});++const brandCopyReveal = keyframes({+ from: { opacity: 0, transform: "translateY(12px)" },+ to: { opacity: 1, transform: "translateY(0)" },+});++const illustrationReveal = keyframes({+ from: { opacity: 0, transform: "translateY(18px) scale(0.98)" },+ to: { opacity: 1, transform: "translateY(0) scale(1)" },+});++const cameraSparkle = keyframes({+ from: {+ opacity: 0,+ transform: "translate(-50%, -50%) scale(0) rotate(-20deg)",+ },+ "35%": {+ opacity: 1,+ transform: "translate(-50%, -50%) scale(1) rotate(0)",+ },+ "70%": {+ opacity: 0.85,+ transform: "translate(-50%, -50%) scale(0.72) rotate(24deg)",+ },+ to: {+ opacity: 0,+ transform: "translate(-50%, -50%) scale(1.3) rotate(45deg)",+ },+});++const brandCurvesDrift = keyframes({+ "0%, 100%": { backgroundPosition: "calc(50% - 6px) calc(50% + 4px)" },+ "50%": { backgroundPosition: "calc(50% + 6px) calc(50% - 4px)" },+});++const brandCopyAnimation = {+ animation: `${brandCopyReveal} 520ms cubic-bezier(0.22, 1, 0.36, 1) both`,+ "@media (prefers-reduced-motion: reduce)": { animation: "none" },+};++interface BrandPanelProps {+ headline: string;+ size: "desktop" | "tablet" | "mobile";+}++const BrandPanel: React.FC<BrandPanelProps> = ({ headline, size }) => (+ <BrandPanelRoot size={size}>+ <Wordmark size={size}>+ <EnteLogo />+ </Wordmark>+ <PanelCopy size={size}>+ <PanelHeadline size={size}>{headline}</PanelHeadline>+ {size !== "mobile" && (+ <PanelSubtitle size={size}>+ {t("photos_auth_subtitle")}+ </PanelSubtitle>+ )}+ {size === "desktop" && (+ <BulletList>+ {[+ t("authenticator_auth_free"),+ t("photos_auth_no_ads_no_spying"),+ t("auth_independently_audited"),+ ].map((bullet) => (+ <Bullet key={bullet}>+ <CheckCircle aria-hidden="true">+ <HugeiconsIcon+ icon={Tick02Icon}+ size={12}+ strokeWidth={3}+ />+ </CheckCircle>+ <span>{bullet}</span>+ </Bullet>+ ))}+ </BulletList>+ )}+ </PanelCopy>+ <IllustrationClip size={size}>+ <img src="/images/auth-ducky.svg" alt="" />+ </IllustrationClip>+ </BrandPanelRoot>+);++const PageRoot = styled("main")(({ theme }) => ({+ width: "100%",+ height: "100svh",+ minHeight: "100svh",+ display: "flex",+ position: "relative",+ overflow: "hidden",+ boxSizing: "border-box",+ backgroundColor: "#f4f4f4",+ ...theme.applyStyles("dark", { backgroundColor: "#0a0a0a" }),+ [authAboveMobileMediaQuery]: { padding: "40px" },+ "@media (min-width: 1024px)": {+ padding: 0,+ alignItems: "center",+ justifyContent: "center",+ },+}));++const FrameCurves = styled("div")(({ theme }) => ({+ display: "none",+ opacity: 0.3,+ ...theme.applyStyles("dark", { opacity: 0.02 }),+ [authAboveMobileMediaQuery]: {+ display: "block",+ position: "absolute",+ inset: 0,+ backgroundImage: 'url("/images/auth-frame-curves.svg")',+ backgroundRepeat: "no-repeat",+ backgroundSize: "cover",+ backgroundPosition: "center",+ pointerEvents: "none",+ },+}));++const PageCard = styled("div")(({ theme }) => ({+ width: "100%",+ height: "100%",+ minHeight: 0,+ display: "flex",+ flexDirection: "column",+ position: "relative",+ overflow: "hidden",+ backgroundColor: "#fff",+ animation: `${shellReveal} 620ms cubic-bezier(0.22, 1, 0.36, 1) both`,+ ...theme.applyStyles("dark", { backgroundColor: "#252525" }),+ "@media (prefers-reduced-motion: reduce)": { animation: "none" },+ [authAboveMobileMediaQuery]: { borderRadius: "24px" },+ "@media (min-width: 1024px)": {+ width: "1032px",+ height: "min(780px, 100%)",+ flexDirection: "row",+ },+ "@media (min-width: 1600px)": {+ width: "1240px",+ height: "min(900px, 100%)",+ },+}));++const DesktopBrandSlot = styled("div")({+ display: "none",+ "@media (min-width: 1024px)": {+ display: "block",+ flex: "0 0 440px",+ height: "100%",+ },+ "@media (min-width: 1600px)": { flexBasis: "496px" },+});++const TabletBrandSlot = styled("div")({+ display: "none",+ [`${authAboveMobileMediaQuery} and (max-width: 1023px)`]: {+ display: "block",+ // Grows with the copy when it wraps at narrow widths; the band's+ // 268px design height is enforced as a minimum by BrandPanelRoot.+ flex: "0 0 auto",+ position: "relative",+ overflow: "hidden",+ },+});++const MobileBrandSlot = styled("div")({+ display: "block",+ flex: "0 0 196px",+ minHeight: 0,+ position: "relative",+ overflow: "hidden",+ [authAboveMobileMediaQuery]: { display: "none" },+});++const ContentSheet = styled("section")(({ theme }) => ({+ flex: 1,+ minHeight: 0,+ marginTop: "-28px",+ padding: "40px 24px 24px",+ display: "flex",+ flexDirection: "column",+ gap: "24px",+ position: "relative",+ zIndex: 1,+ overflowY: "auto",+ boxSizing: "border-box",+ borderRadius: "24px 24px 0 0",+ backgroundColor: "#fff",+ ...theme.applyStyles("dark", { backgroundColor: "#252525" }),+ [authAboveMobileMediaQuery]: {+ marginTop: "-32px",+ padding: "16px 48px 48px",+ },+ "@media (min-width: 1024px)": {+ width: "592px",+ marginTop: 0,+ padding: "48px 96px",+ alignItems: "center",+ justifyContent: "center",+ borderRadius: 0,+ },+ "@media (min-width: 1600px)": { width: "744px", padding: "56px 172px" },+}));++const SheetHandle = styled("div")({+ width: "36px",+ height: "4px",+ flexShrink: 0,+ alignSelf: "center",+ borderRadius: "999px",+ backgroundColor: "var(--auth-app-fill-active)",+ [authMobileMediaQuery]: { display: "none" },+ "@media (min-width: 1024px)": { display: "none" },+});++const ContentColumn = styled("div", {+ shouldForwardProp: (prop) => prop !== "contentWidth",+})<{ contentWidth: 400 | 420 }>(({ contentWidth }) => ({+ width: "100%",+ minHeight: "min-content",+ display: "flex",+ flexDirection: "column",+ gap: "24px",+ [authMobileMediaQuery]: { flexGrow: 1 },+ [authAboveMobileMediaQuery]: {+ width: "440px",+ maxWidth: "100%",+ marginBlock: "auto",+ alignSelf: "center",+ },+ "@media (min-width: 1024px)": { width: `${contentWidth}px` },+ "@media (min-width: 1600px)": { gap: "28px" },+}));++const BrandPanelRoot = styled("div", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ width: "100%",+ height: size === "tablet" ? "auto" : "100%",+ ...(size === "tablet" && { minHeight: "268px", rowGap: "24px" }),+ padding:+ size === "desktop"+ ? "44px"+ : size === "tablet"+ ? "40px 40px 60px"+ : "18px 16px 40px",+ display: "flex",+ flexDirection: "column",+ justifyContent: size === "desktop" ? "flex-start" : "space-between",+ position: "relative",+ overflow: "hidden",+ boxSizing: "border-box",+ color: "#fff",+ backgroundColor: "var(--auth-app-primary)",+ backgroundImage: 'url("/images/auth-surface-noise.svg")',+ backgroundRepeat: "repeat",+ backgroundPosition: "0 0",+ backgroundSize: "auto",+ "&::before": {+ content: '""',+ position: "absolute",+ inset: 0,+ pointerEvents: "none",+ backgroundImage: 'url("/images/auth-frame-curves.svg")',+ backgroundRepeat: "no-repeat",+ backgroundPosition: "center",+ backgroundSize: "cover",+ maskImage:+ "linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.55) 42%, #000 100%)",+ WebkitMaskImage:+ "linear-gradient(to bottom, rgba(0, 0, 0, 0.2), rgba(0, 0, 0, 0.55) 42%, #000 100%)",+ animation: `${brandCurvesDrift} 20s ease-in-out infinite`,+ },+ "@media (prefers-reduced-motion: reduce)": {+ "&::before": { animation: "none" },+ },+}));++const Wordmark = styled("div", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ width: size === "desktop" ? "83px" : size === "tablet" ? "77px" : "64px",+ height: size === "desktop" ? "26px" : size === "tablet" ? "24px" : "20px",+ flexShrink: 0,+ margin: size === "mobile" ? "8px 0 0 8px" : 0,+ lineHeight: 0,+ position: "relative",+ zIndex: 1,+ "& > svg": { width: "100%", height: "100%" },+}));++const PanelCopy = styled("div", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ marginTop: size === "desktop" ? "36px" : 0,+ marginLeft: size === "mobile" ? "8px" : 0,+ // On the tablet band the ducky is anchored to the right edge, so keep+ // the copy from running underneath it at narrow widths.+ ...(size === "tablet" && { maxWidth: "calc(100% - 245px)" }),+ position: "relative",+ zIndex: 1,+}));++const PanelHeadline = styled("h1", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ maxWidth:+ size === "desktop" ? "300px" : size === "tablet" ? "380px" : "188px",+ margin: 0,+ fontFamily: authDisplayFontFamily,+ fontSize: size === "desktop" ? "42px" : size === "tablet" ? "34px" : "26px",+ fontWeight: 600,+ lineHeight:+ size === "desktop" ? "50px" : size === "tablet" ? "42px" : "34px",+ letterSpacing: "-0.02em",+ textWrap: "pretty",+ ...brandCopyAnimation,+ animationDelay: "80ms",+}));++const PanelSubtitle = styled("p", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ margin: 0,+ marginTop: size === "desktop" ? "14px" : "10px",+ fontSize: size === "desktop" ? "20px" : "17px",+ fontWeight: 500,+ lineHeight: size === "desktop" ? "28px" : "24px",+ color: "rgba(255, 255, 255, 0.88)",+ ...brandCopyAnimation,+ animationDelay: "170ms",+}));++const BulletList = styled("ul")({+ margin: "34px 0 0",+ padding: 0,+ display: "flex",+ flexDirection: "column",+ gap: "14px",+ listStyle: "none",+});++const Bullet = styled("li")({+ display: "flex",+ alignItems: "center",+ gap: "12px",+ fontSize: "17px",+ fontWeight: 500,+ lineHeight: "24px",+ ...brandCopyAnimation,+ "&:nth-of-type(1)": { animationDelay: "280ms" },+ "&:nth-of-type(2)": { animationDelay: "350ms" },+ "&:nth-of-type(3)": { animationDelay: "420ms" },+});++const CheckCircle = styled("span")({+ width: "24px",+ height: "24px",+ flex: "0 0 24px",+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ borderRadius: "50%",+ backgroundColor: "rgba(255, 255, 255, 0.14)",+});++const IllustrationClip = styled("div", {+ shouldForwardProp: (prop) => prop !== "size",+})<{ size: BrandPanelProps["size"] }>(({ size }) => ({+ width: size === "desktop" ? "313px" : size === "tablet" ? "237px" : "175px",+ height:+ size === "desktop" ? "245px" : size === "tablet" ? "185px" : "137px",+ flexShrink: 0,+ position: "relative",+ overflow: "hidden",+ zIndex: 0,+ ...(size !== "tablet" && {+ animation: `${illustrationReveal} 500ms cubic-bezier(0.22, 1, 0.36, 1) ${size === "desktop" ? "840ms" : "130ms"} both`,+ "@media (prefers-reduced-motion: reduce)": { animation: "none" },+ }),+ ...(size === "desktop"+ ? {+ marginTop: "auto",+ alignSelf: "center",+ "@media (min-width: 1600px)": { width: "355px", height: "278px" },+ }+ : {+ position: "absolute",+ right: size === "tablet" ? "28px" : "-4px",+ // Sit clear of the content sheet, which overlaps the band's+ // bottom edge by 32px (tablet) / 28px (mobile).+ bottom: size === "tablet" ? "44px" : "38px",+ }),+ "&::after": {+ content: '""',+ width:+ size === "desktop" ? "34px" : size === "tablet" ? "26px" : "20px",+ aspectRatio: "1",+ position: "absolute",+ left: "67%",+ top: size === "desktop" ? "59%" : "57%",+ zIndex: 1,+ pointerEvents: "none",+ backgroundColor: "#fff",+ clipPath:+ "polygon(50% 0%, 59% 39%, 100% 50%, 59% 61%, 50% 100%, 41% 61%, 0% 50%, 41% 39%)",+ filter: "drop-shadow(0 0 7px rgba(255, 245, 168, 0.95))",+ animation: `${cameraSparkle} 520ms ease-out ${size === "desktop" ? "1400ms" : size === "tablet" ? "740ms" : "690ms"} both`,+ "@media (prefers-reduced-motion: reduce)": { display: "none" },+ },+ "& > img": {+ display: "block",+ width: "473.694px",+ height: "370px",+ transformOrigin: "top left",+ transform:+ size === "desktop"+ ? "scale(0.66)"+ : size === "tablet"+ ? "scale(0.5)"+ : "scale(0.37)",+ ...(size === "desktop" && {+ "@media (min-width: 1600px)": { transform: "scale(0.75)" },+ }),+ },+}));diff --git a/web/apps/auth/src/components/auth/AuthDialog.tsx b/web/apps/auth/src/components/auth/AuthDialog.tsxnew file mode 100644index 0000000000..444512f212--- /dev/null+++ b/web/apps/auth/src/components/auth/AuthDialog.tsx@@ -0,0 +1,111 @@+import {+ Dialog,+ GlobalStyles,+ Slide,+ styled,+ type ModalProps,+} from "@mui/material";+import type { TransitionProps } from "@mui/material/transitions";+import React, { forwardRef } from "react";+import {+ authBodyTypography,+ authColorVariables,+ authDisplayFontFamily,+ authMobileMediaQuery,+} from "./styles";++interface AuthDialogProps extends React.PropsWithChildren {+ open: boolean;+ onClose: ModalProps["onClose"];+ ariaLabelledby?: string;+}++const SlideUpTransition = forwardRef(function SlideUpTransition(+ props: TransitionProps & { children: React.ReactElement },+ ref: React.Ref<unknown>,+) {+ return <Slide direction="up" ref={ref} {...props} />;+});++export const AuthDialog: React.FC<AuthDialogProps> = ({+ open,+ onClose,+ ariaLabelledby,+ children,+}) => (+ <DialogRoot+ open={open}+ onClose={onClose}+ slots={{ transition: SlideUpTransition }}+ slotProps={{+ backdrop: { sx: { backgroundColor: "rgba(0, 0, 0, 0.4)" } },+ }}+ maxWidth={false}+ aria-labelledby={ariaLabelledby}+ >+ <GlobalStyles styles={authColorVariables} />+ <SheetHandle />+ {children}+ </DialogRoot>+);++export const AuthDialogHeader = styled("div")({+ display: "flex",+ flexDirection: "column",+ gap: "6px",+});++export const AuthDialogTitle = styled("h2")({+ margin: 0,+ fontFamily: authDisplayFontFamily,+ fontSize: "22px",+ fontWeight: 600,+ lineHeight: "30px",+ color: "var(--auth-app-text)",+ [authMobileMediaQuery]: { fontSize: "20px", lineHeight: "28px" },+});++export const AuthDialogText = styled("p")({+ ...authBodyTypography,+ margin: 0,+ color: "var(--auth-app-text-muted)",+ textWrap: "pretty",+});++const DialogRoot = styled(Dialog)(({ theme }) => ({+ "& .MuiDialog-paper": {+ width: "456px",+ maxWidth: "calc(100% - 32px)",+ margin: "16px",+ padding: "32px",+ boxSizing: "border-box",+ borderRadius: "24px",+ backgroundColor: "#fff",+ backgroundImage: "none",+ boxShadow: "0 4px 16px rgba(0, 0, 0, 0.14)",+ ...theme.applyStyles("dark", { backgroundColor: "#252525" }),+ },+ [authMobileMediaQuery]: {+ "& .MuiDialog-container": { alignItems: "flex-end" },+ "& .MuiDialog-paper": {+ width: "100%",+ maxWidth: "100%",+ margin: 0,+ padding: "12px 24px 28px",+ borderRadius: "24px 24px 0 0",+ },+ },+}));++const SheetHandle = styled("div")({+ display: "none",+ [authMobileMediaQuery]: {+ display: "block",+ width: "36px",+ height: "4px",+ flexShrink: 0,+ margin: "0 auto 20px",+ borderRadius: "999px",+ backgroundColor: "var(--auth-app-fill-active)",+ },+});diff --git a/web/apps/auth/src/components/auth/Button.tsx b/web/apps/auth/src/components/auth/Button.tsxnew file mode 100644index 0000000000..dbec644ed8--- /dev/null+++ b/web/apps/auth/src/components/auth/Button.tsx@@ -0,0 +1,144 @@+import { CircularProgress, styled } from "@mui/material";+import type React from "react";+import {+ authBodyTypography,+ authFocusRing,+ authTransientProps,+} from "./styles";++export type ButtonVariant = "primary" | "secondary";++export interface ButtonProps extends Omit<+ React.ButtonHTMLAttributes<HTMLButtonElement>,+ "color" | "children"+> {+ variant?: ButtonVariant;+ fullWidth?: boolean;+ loading?: boolean;+ loadingMessage?: React.ReactNode;+ children: React.ReactNode;+}++export function Button({+ variant = "primary",+ fullWidth = false,+ loading = false,+ loadingMessage,+ disabled,+ type = "button",+ children,+ ...buttonProps+}: ButtonProps): React.JSX.Element {+ return (+ <ButtonRoot+ type={type}+ disabled={disabled || loading}+ aria-busy={loading || undefined}+ $variant={variant}+ $fullWidth={fullWidth}+ $loading={loading}+ {...buttonProps}+ >+ {loading && loadingMessage ? (+ <LoadingContent>+ <CircularProgress size={20} color="inherit" />+ <span>{loadingMessage}</span>+ </LoadingContent>+ ) : (+ <>+ <ButtonLabel $loading={loading}>{children}</ButtonLabel>+ {loading && <CircularProgress size={20} color="inherit" />}+ </>+ )}+ </ButtonRoot>+ );+}++interface ButtonRootProps {+ $variant: ButtonVariant;+ $fullWidth: boolean;+ $loading: boolean;+}++const ButtonRoot = styled(+ "button",+ authTransientProps,+)<ButtonRootProps>(({ $variant, $fullWidth, $loading }) => ({+ ...authBodyTypography,+ width: $fullWidth ? "100%" : "auto",+ height: "52px",+ padding: "14px 24px",+ border: 0,+ borderRadius: "20px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ position: "relative",+ boxSizing: "border-box",+ fontFamily: "inherit",+ color: $variant === "primary" ? "#fff" : "var(--auth-app-text)",+ backgroundColor:+ $variant === "primary"+ ? "var(--auth-app-primary)"+ : "var(--auth-app-button-secondary)",+ boxShadow:+ $variant === "primary"+ ? "inset 0 0 0 1px var(--auth-app-button-primary-stroke)"+ : "inset 0 0 0 1px var(--auth-app-button-secondary-stroke)",+ cursor: $loading ? "default" : "pointer",+ transition:+ "background-color 160ms ease, box-shadow 160ms ease, transform 180ms cubic-bezier(0.22, 1, 0.36, 1)",+ "&:hover:not(:disabled)": {+ backgroundColor:+ $variant === "primary"+ ? "var(--auth-app-primary-hover)"+ : "var(--auth-app-button-secondary-hover)",+ boxShadow:+ $variant === "primary"+ ? "inset 0 0 0 1px var(--auth-app-button-primary-stroke-hover)"+ : "inset 0 0 0 1px var(--auth-app-button-secondary-stroke-hover)",+ transform: "translateY(-2px)",+ },+ "&:active:not(:disabled)": {+ backgroundColor:+ $variant === "primary"+ ? "var(--auth-app-primary-active)"+ : "var(--auth-app-button-secondary-active)",+ boxShadow:+ $variant === "primary"+ ? "inset 0 0 0 1px var(--auth-app-button-primary-stroke-active)"+ : "inset 0 0 0 1px var(--auth-app-button-secondary-stroke-active)",+ transform: "translateY(0) scale(0.985)",+ },+ "&:focus-visible": authFocusRing,+ "&:disabled": $loading+ ? { cursor: "default" }+ : {+ color: "var(--auth-app-text-disabled)",+ backgroundColor: "var(--auth-app-fill-hover)",+ boxShadow: "none",+ cursor: "not-allowed",+ },+ "& > .MuiCircularProgress-root": { position: "absolute" },+ "@media (prefers-reduced-motion: reduce)": {+ transition: "background-color 120ms ease",+ "&:hover:not(:disabled), &:active:not(:disabled)": {+ transform: "none",+ },+ },+}));++const ButtonLabel = styled(+ "span",+ authTransientProps,+)<{ $loading: boolean }>(({ $loading }) => ({ opacity: $loading ? 0 : 1 }));++const LoadingContent = styled("span")({+ minWidth: 0,+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ gap: "8px",+ whiteSpace: "nowrap",+ "& > .MuiCircularProgress-root": { flexShrink: 0 },+});diff --git a/web/apps/auth/src/components/auth/Checkbox.tsx b/web/apps/auth/src/components/auth/Checkbox.tsxnew file mode 100644index 0000000000..37a887b4b8--- /dev/null+++ b/web/apps/auth/src/components/auth/Checkbox.tsx@@ -0,0 +1,103 @@+import { Tick02Icon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { styled } from "@mui/material";+import type React from "react";+import {+ authBodyTypography,+ authFocusRing,+ authTransientProps,+} from "./styles";++export interface CheckboxProps extends Omit<+ React.InputHTMLAttributes<HTMLInputElement>,+ "checked" | "children" | "onChange" | "type"+> {+ checked: boolean;+ onChange: (checked: boolean) => void;+ label?: React.ReactNode;+}++export function Checkbox({+ checked,+ onChange,+ disabled,+ label,+ ...inputProps+}: CheckboxProps): React.JSX.Element {+ function handleChange(event: React.ChangeEvent<HTMLInputElement>) {+ onChange(event.target.checked);+ }++ return (+ <CheckboxRoot $disabled={Boolean(disabled)}>+ <CheckboxInput+ type="checkbox"+ checked={checked}+ onChange={handleChange}+ disabled={disabled}+ {...inputProps}+ />+ <CheckboxMark aria-hidden="true">+ {checked && (+ <HugeiconsIcon+ icon={Tick02Icon}+ size={11}+ strokeWidth={3}+ />+ )}+ </CheckboxMark>+ {label && <CheckboxLabelText>{label}</CheckboxLabelText>}+ </CheckboxRoot>+ );+}++const CheckboxRoot = styled(+ "label",+ authTransientProps,+)<{ $disabled: boolean }>(({ $disabled }) => ({+ display: "inline-flex",+ alignItems: "flex-start",+ gap: "8px",+ position: "relative",+ cursor: $disabled ? "not-allowed" : "pointer",+}));++const CheckboxInput = styled("input")({+ width: "1px",+ height: "1px",+ margin: 0,+ padding: 0,+ position: "absolute",+ overflow: "hidden",+ clip: "rect(0 0 0 0)",+ clipPath: "inset(50%)",+ whiteSpace: "nowrap",+});++const CheckboxMark = styled("span")({+ width: "16px",+ height: "16px",+ flex: "0 0 16px",+ marginTop: "2px",+ borderRadius: "4px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ boxSizing: "border-box",+ color: "#fff",+ backgroundColor: "var(--auth-app-primary)",+ "input:disabled + &": { backgroundColor: "var(--auth-app-text-disabled)" },+ "input:not(:checked) + &": {+ backgroundColor: "transparent",+ boxShadow: "inset 0 0 0 1px var(--auth-app-text-faint)",+ },+ "input:not(:checked):disabled + &": {+ boxShadow: "inset 0 0 0 1px var(--auth-app-text-disabled)",+ },+ "input:focus-visible + &": authFocusRing,+});++const CheckboxLabelText = styled("span")({+ ...authBodyTypography,+ color: "var(--auth-app-text)",+});diff --git a/web/apps/auth/src/components/auth/CredentialsForm.tsx b/web/apps/auth/src/components/auth/CredentialsForm.tsxnew file mode 100644index 0000000000..0a41367a7a--- /dev/null+++ b/web/apps/auth/src/components/auth/CredentialsForm.tsx@@ -0,0 +1,113 @@+import { styled } from "@mui/material";+import type { VerifyMasterPasswordPresentationProps } from "ente-accounts/components/VerifyMasterPasswordForm";+import type { CredentialsPresentationProps } from "ente-accounts/pages/credentials";+import { t } from "i18next";+import type React from "react";+import { Trans } from "react-i18next";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { ScreenHeader } from "./ScreenHeader";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function CredentialsForm({+ userEmail,+ host,+ passwordForm,+ onRecover,+ onChangeEmail,+}: CredentialsPresentationProps): React.JSX.Element {+ return (+ <>+ <ScreenHeader+ title={t("enter_password")}+ subtitle={+ <Trans+ i18nKey="auth_signing_in_as"+ components={{ a: <Email /> }}+ values={{ email: userEmail }}+ />+ }+ />+ {passwordForm}+ <FormFooter>+ <FooterLinks>+ <TextLink onClick={onRecover}>+ {t("forgot_password")}+ </TextLink>+ <TextLink onClick={onChangeEmail}>+ {t("change_email")}+ </TextLink>+ </FooterLinks>+ <Host>{host ?? ""}</Host>+ </FormFooter>+ </>+ );+}++export function PasswordForm({+ userEmail,+ password,+ passwordError,+ isSubmitting,+ submitButtonTitle,+ onPasswordChange,+ onSubmit,+}: VerifyMasterPasswordPresentationProps): React.JSX.Element {+ return (+ <Form onSubmit={onSubmit}>+ <HiddenEmail+ name="email"+ type="email"+ autoComplete="username"+ value={userEmail}+ readOnly+ tabIndex={-1}+ />+ <FormFields>+ <TextField+ name="password"+ value={password}+ onChange={onPasswordChange}+ type="password"+ autoComplete="current-password"+ label={t("password")}+ showPasswordToggle+ autoFocus+ disabled={isSubmitting}+ error={Boolean(passwordError)}+ helperText={passwordError}+ />+ </FormFields>+ <FormFooter>+ <Button fullWidth type="submit" loading={isSubmitting}>+ {submitButtonTitle}+ </Button>+ </FormFooter>+ </Form>+ );+}++const HiddenEmail = styled("input")({ display: "none" });++const Email = styled("strong")({+ color: "var(--auth-app-text)",+ wordBreak: "break-word",+});++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});++const Host = styled("div")({+ minHeight: "16px",+ textAlign: "center",+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+ color: "var(--auth-app-text-faint)",+});diff --git a/web/apps/auth/src/components/auth/DevSettingsDialog.tsx b/web/apps/auth/src/components/auth/DevSettingsDialog.tsxnew file mode 100644index 0000000000..17ff0a551f--- /dev/null+++ b/web/apps/auth/src/components/auth/DevSettingsDialog.tsx@@ -0,0 +1,136 @@+import { InformationCircleIcon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { CircularProgress, styled } from "@mui/material";+import type { DevSettingsPresentationProps } from "ente-new/photos/components/DevSettings";+import { t } from "i18next";+import type React from "react";+import {+ AuthDialog,+ AuthDialogHeader,+ AuthDialogText,+ AuthDialogTitle,+} from "./AuthDialog";+import { Button } from "./Button";+import {+ authBodyTypography,+ authDialogContentLayout,+ authFocusRing,+} from "./styles";+import { TextField } from "./TextField";++export function DevSettingsDialog({+ open,+ onDialogClose,+ value,+ onChange,+ onBlur,+ error,+ isChecking,+ canSave,+ onSubmit,+ onClose,+}: DevSettingsPresentationProps): React.JSX.Element {+ return (+ <AuthDialog+ open={open}+ onClose={onDialogClose}+ ariaLabelledby="developer-settings-title"+ >+ <FormRoot onSubmit={onSubmit}>+ <AuthDialogHeader>+ <AuthDialogTitle id="developer-settings-title">+ {t("developer_settings")}+ </AuthDialogTitle>+ <AuthDialogText>+ {t("auth_developer_settings_subtitle")}+ </AuthDialogText>+ </AuthDialogHeader>+ <TextField+ name="apiOrigin"+ label={t("server_endpoint")}+ value={value}+ onChange={onChange}+ onBlur={onBlur}+ placeholder="https://api.example.org"+ autoFocus+ disabled={isChecking}+ error={Boolean(error)}+ helperText={+ error == "Invalid endpoint"+ ? t("auth_endpoint_invalid_url")+ : error+ ? t("auth_endpoint_unreachable")+ : undefined+ }+ trailing={+ <InfoLink+ href="https://ente.com/help/self-hosting/installation/post-install/#step-6-configure-apps-to-use-your-server"+ target="_blank"+ rel="noopener"+ aria-label={t("more_information")}+ >+ <HugeiconsIcon+ icon={InformationCircleIcon}+ size={20}+ strokeWidth={2}+ aria-hidden="true"+ />+ </InfoLink>+ }+ />+ {isChecking && (+ <StatusPill role="status">+ <CircularProgress+ size={18}+ sx={{ color: "var(--auth-app-primary)" }}+ />+ <span>{t("auth_endpoint_checking")}</span>+ </StatusPill>+ )}+ <ButtonRow>+ <Button+ type="submit"+ variant="primary"+ fullWidth+ disabled={!canSave}+ >+ {t("save")}+ </Button>+ <Button variant="secondary" fullWidth onClick={onClose}>+ {t("cancel")}+ </Button>+ </ButtonRow>+ </FormRoot>+ </AuthDialog>+ );+}++const FormRoot = styled("form")(authDialogContentLayout);++const InfoLink = styled("a")({+ width: "20px",+ height: "20px",+ flex: "0 0 20px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ borderRadius: "4px",+ color: "var(--auth-app-text-faint)",+ "&:hover": { color: "var(--auth-app-text-muted)" },+ "&:focus-visible": authFocusRing,+});++const StatusPill = styled("div")({+ ...authBodyTypography,+ display: "flex",+ alignItems: "center",+ gap: "10px",+ padding: "12px 14px",+ borderRadius: "20px",+ backgroundColor: "var(--auth-app-button-secondary)",+ boxShadow: "inset 0 0 0 1px var(--auth-app-stroke)",+ color: "var(--auth-app-text-muted)",+ "& > svg, & > .MuiCircularProgress-root": { flexShrink: 0 },+});++const ButtonRow = styled("div")({ display: "flex", gap: "12px" });diff --git a/web/apps/auth/src/components/auth/Form.tsx b/web/apps/auth/src/components/auth/Form.tsxnew file mode 100644index 0000000000..bf9395fefb--- /dev/null+++ b/web/apps/auth/src/components/auth/Form.tsx@@ -0,0 +1,20 @@+import { styled } from "@mui/material";+import type React from "react";+import { authMobileMediaQuery } from "./styles";++export interface FormProps extends React.FormHTMLAttributes<HTMLFormElement> {+ children: React.ReactNode;+}++export function Form({ children, ...formProps }: FormProps): React.JSX.Element {+ return <FormRoot {...formProps}>{children}</FormRoot>;+}++const FormRoot = styled("form")({+ width: "100%",+ minHeight: "min-content",+ display: "flex",+ flexDirection: "column",+ gap: "24px",+ [authMobileMediaQuery]: { flex: 1 },+});diff --git a/web/apps/auth/src/components/auth/FormFields.tsx b/web/apps/auth/src/components/auth/FormFields.tsxnew file mode 100644index 0000000000..5b6098e1c5--- /dev/null+++ b/web/apps/auth/src/components/auth/FormFields.tsx@@ -0,0 +1,16 @@+import { styled } from "@mui/material";+import type React from "react";++export function FormFields({+ children,+}: React.PropsWithChildren): React.JSX.Element {+ return <FormFieldsRoot>{children}</FormFieldsRoot>;+}++const FormFieldsRoot = styled("div")({+ "--auth-app-message-gap": "16px",+ width: "100%",+ display: "flex",+ flexDirection: "column",+ gap: "16px",+});diff --git a/web/apps/auth/src/components/auth/FormFooter.tsx b/web/apps/auth/src/components/auth/FormFooter.tsxnew file mode 100644index 0000000000..f59919ed4d--- /dev/null+++ b/web/apps/auth/src/components/auth/FormFooter.tsx@@ -0,0 +1,17 @@+import { styled } from "@mui/material";+import type React from "react";+import { authMobileMediaQuery } from "./styles";++export function FormFooter({+ children,+}: React.PropsWithChildren): React.JSX.Element {+ return <FormFooterRoot>{children}</FormFooterRoot>;+}++const FormFooterRoot = styled("div")({+ width: "100%",+ display: "flex",+ flexDirection: "column",+ gap: "16px",+ [authMobileMediaQuery]: { marginTop: "auto" },+});diff --git a/web/apps/auth/src/components/auth/LoginForm.tsx b/web/apps/auth/src/components/auth/LoginForm.tsxnew file mode 100644index 0000000000..df505e62f9--- /dev/null+++ b/web/apps/auth/src/components/auth/LoginForm.tsx@@ -0,0 +1,107 @@+import { Input, styled } from "@mui/material";+import type { LoginPresentationProps } from "ente-accounts/components/LoginContents";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { ScreenHeader } from "./ScreenHeader";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function LoginForm({+ email,+ emailError,+ host,+ isSubmitting,+ isJoinAlbumContext,+ isEnsu,+ onEmailChange,+ onSubmit,+ onSignUp,+ onCancel,+}: LoginPresentationProps): React.JSX.Element {+ return (+ <>+ <ScreenHeader+ title={+ isJoinAlbumContext+ ? t("login_to_join_album")+ : t("auth_welcome_back")+ }+ subtitle={t("auth_login_subtitle")}+ />+ <Form onSubmit={onSubmit}>+ <FormFields>+ <TextField+ name="email"+ value={email}+ onChange={onEmailChange}+ type="email"+ autoComplete="username"+ label={t("auth_email_label")}+ placeholder={t("auth_email_placeholder")}+ autoFocus+ disabled={isSubmitting}+ error={Boolean(emailError)}+ helperText={emailError}+ />+ <Input+ sx={{ display: "none" }}+ type="password"+ value=""+ readOnly+ />+ </FormFields>+ <FormFooter>+ <Button fullWidth type="submit" loading={isSubmitting}>+ {t("login")}+ </Button>+ <AccountActions>+ {isEnsu ? (+ <TextLink onClick={onCancel}>+ {t("cancel")}+ </TextLink>+ ) : (+ <AccountPrompt>+ <span>{t("auth_new_account_prompt")}</span>+ <TextLink regular onClick={onSignUp}>+ {t("sign_up")}+ </TextLink>+ </AccountPrompt>+ )}+ <Host>{host ?? ""}</Host>+ </AccountActions>+ </FormFooter>+ </Form>+ </>+ );+}++const AccountActions = styled("div")({+ display: "flex",+ flexDirection: "column",+ alignItems: "center",+ gap: "10px",+ textAlign: "center",+});++const AccountPrompt = styled("div")({+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ gap: "6px",+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+ color: "var(--auth-app-text-muted)",+});++const Host = styled("div")({+ minHeight: "16px",+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+ color: "var(--auth-app-text-faint)",+});diff --git a/web/apps/auth/src/components/auth/Message.tsx b/web/apps/auth/src/components/auth/Message.tsxnew file mode 100644index 0000000000..857159b7df--- /dev/null+++ b/web/apps/auth/src/components/auth/Message.tsx@@ -0,0 +1,121 @@+import {+ Alert02Icon,+ AlertCircleIcon,+ InformationCircleIcon,+ Tick02Icon,+} from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { styled } from "@mui/material";+import type React from "react";+import { useEffect, useRef } from "react";+import { authMiniTypography, authTransientProps } from "./styles";++export type MessageKind = "error" | "warning" | "success" | "info";++export interface MessageProps {+ children: React.ReactNode;+ kind?: MessageKind;+ note?: boolean;+ visible?: boolean;+ id?: string;+}++export function Message({+ children,+ kind = "info",+ note = false,+ visible,+ id,+}: MessageProps): React.JSX.Element {+ const isVisible = visible ?? true;+ const lastVisibleContent = useRef({ children, kind });+ const displayedContent = isVisible+ ? { children, kind }+ : lastVisibleContent.current;++ useEffect(() => {+ if (isVisible) lastVisibleContent.current = { children, kind };+ }, [children, isVisible, kind]);++ return (+ <MessageRoot+ id={id}+ role={displayedContent.kind === "error" ? "alert" : "status"}+ aria-hidden={!isVisible || undefined}+ $kind={displayedContent.kind}+ $animated={visible !== undefined}+ $visible={isVisible}+ >+ <MessageContent $note={note}>+ <HugeiconsIcon+ icon={messageIcons[displayedContent.kind]}+ size={14}+ strokeWidth={2}+ aria-hidden="true"+ />+ <span>{displayedContent.children}</span>+ </MessageContent>+ </MessageRoot>+ );+}++const messageIcons = {+ error: AlertCircleIcon,+ warning: Alert02Icon,+ success: Tick02Icon,+ info: InformationCircleIcon,+} as const;++const MessageRoot = styled(+ "span",+ authTransientProps,+)<{ $kind: MessageKind; $animated: boolean; $visible: boolean }>(({+ $kind,+ $animated,+ $visible,+}) => {+ const delay = $visible ? "40ms" : "0ms";++ return {+ ...authMiniTypography,+ display: "inline-grid",+ gridTemplateRows: $visible ? "1fr" : "0fr",+ marginTop:+ $animated && !$visible+ ? "calc(-1 * var(--auth-app-message-gap, 8px))"+ : 0,+ opacity: $visible ? 1 : 0,+ transform: $visible ? "translateY(0)" : "translateY(-4px)",+ visibility: $visible ? "visible" : "hidden",+ color:+ $kind === "error"+ ? "var(--auth-app-warning)"+ : $kind === "warning"+ ? "var(--auth-app-caution)"+ : $kind === "success"+ ? "var(--auth-app-success)"+ : "var(--auth-app-text-muted)",+ ...($animated && {+ overflow: "hidden",+ transition: [+ `grid-template-rows 360ms cubic-bezier(0.22, 1, 0.36, 1) ${delay}`,+ `margin-top 360ms cubic-bezier(0.22, 1, 0.36, 1) ${delay}`,+ `opacity 360ms cubic-bezier(0.22, 1, 0.36, 1) ${delay}`,+ `transform 360ms cubic-bezier(0.22, 1, 0.36, 1) ${delay}`,+ `visibility 0s linear ${$visible ? "0ms" : "360ms"}`,+ ].join(", "),+ "@media (prefers-reduced-motion: reduce)": { transition: "none" },+ }),+ };+});++const MessageContent = styled(+ "span",+ authTransientProps,+)<{ $note: boolean }>(({ $note }) => ({+ minHeight: 0,+ display: "inline-flex",+ alignItems: $note ? "flex-start" : "center",+ gap: $note ? "8px" : "4px",+ "& > svg": { flexShrink: 0 },+}));diff --git a/web/apps/auth/src/components/auth/OTPField.tsx b/web/apps/auth/src/components/auth/OTPField.tsxnew file mode 100644index 0000000000..7e2724e8af--- /dev/null+++ b/web/apps/auth/src/components/auth/OTPField.tsx@@ -0,0 +1,265 @@+import { styled } from "@mui/material";+import { t } from "i18next";+import type React from "react";+import { useEffect, useRef } from "react";+import {+ authDisplayFontFamily,+ authMiniTypography,+ authTransientProps,+} from "./styles";++export interface OTPFieldProps {+ id?: string;+ name?: string;+ label?: React.ReactNode;+ value: string;+ onChange: (value: string) => void;+ length?: number;+ error?: boolean;+ disabled?: boolean;+ autoFocus?: boolean;+ ariaLabel?: string;+ ariaDescribedBy?: string;+}++export function OTPField({+ id,+ name,+ label,+ value,+ onChange,+ length = 6,+ error = false,+ disabled = false,+ autoFocus,+ ariaLabel,+ ariaDescribedBy,+}: OTPFieldProps): React.JSX.Element {+ const inputRefs = useRef<(HTMLInputElement | null)[]>([]);+ const wasDisabled = useRef(disabled);+ const hadError = useRef(error);++ useEffect(() => {+ if (autoFocus && value.length === 0) inputRefs.current[0]?.focus();+ }, [autoFocus, value]);++ function isInputValueValid(input: string) {+ return !isNaN(Number(input)) && input.trim().length === 1;+ }++ function focusInput(index: number) {+ const nextIndex = Math.max(Math.min(length - 1, index), 0);+ const input = inputRefs.current[nextIndex];+ if (input) {+ input.focus();+ input.select();+ }+ }++ useEffect(() => {+ const shouldRestoreFocus =+ error && !disabled && (wasDisabled.current || !hadError.current);++ wasDisabled.current = disabled;+ hadError.current = error;++ if (shouldRestoreFocus) {+ const index = Math.max(+ Math.min(value.trimEnd().length - 1, length - 1),+ 0,+ );+ const input = inputRefs.current[index];+ input?.focus();+ input?.select();+ }+ }, [disabled, error, length, value]);++ function updateDigit(index: number, digit: string) {+ const otp = value.padEnd(length, " ").slice(0, length).split("");+ otp[index] = digit || " ";+ onChange(otp.join(""));+ }++ function handleChange(+ index: number,+ event: React.ChangeEvent<HTMLInputElement>,+ ) {+ const input = event.currentTarget.value;+ if (isInputValueValid(input)) {+ updateDigit(index, input);+ focusInput(index + 1);+ }+ }++ function handleInput(+ index: number,+ event: React.SyntheticEvent<HTMLInputElement, InputEvent>,+ ) {+ const nativeEvent = event.nativeEvent;+ const input = event.currentTarget.value;+ if (!isInputValueValid(input)) {+ if (+ input.length === length &&+ !input.split("").some((digit) => !isInputValueValid(digit))+ ) {+ onChange(input);+ focusInput(length - 1);+ }++ if (+ nativeEvent.data === null &&+ nativeEvent.inputType === "deleteContentBackward"+ ) {+ event.preventDefault();+ updateDigit(index, "");+ focusInput(index - 1);+ }++ event.currentTarget.value = "";+ }+ }++ function handleKeyDown(+ index: number,+ event: React.KeyboardEvent<HTMLInputElement>,+ ) {+ const otp = value.padEnd(length, " ").slice(0, length).split("");+ if ([event.code, event.key].includes("Backspace")) {+ event.preventDefault();+ updateDigit(index, "");+ focusInput(index - 1);+ } else if (event.code === "Delete") {+ event.preventDefault();+ updateDigit(index, "");+ } else if (event.code === "ArrowLeft") {+ event.preventDefault();+ focusInput(index - 1);+ } else if (event.code === "ArrowRight") {+ event.preventDefault();+ focusInput(index + 1);+ } else if (event.code === "Spacebar" || event.code === "Space") {+ event.preventDefault();+ } else if (event.key === otp[index]) {+ event.preventDefault();+ focusInput(index + 1);+ } else if (event.code === "ArrowUp" || event.code === "ArrowDown") {+ event.preventDefault();+ }+ }++ function handlePaste(+ index: number,+ event: React.ClipboardEvent<HTMLInputElement>,+ ) {+ event.preventDefault();+ const otp = value.padEnd(length, " ").slice(0, length).split("");+ const pastedData = event.clipboardData+ .getData("text/plain")+ .slice(0, length - index)+ .split("");++ if (pastedData.some((digit) => !isInputValueValid(digit))) return;++ pastedData.forEach((digit, offset) => {+ otp[index + offset] = digit;+ });++ focusInput(index + pastedData.length);+ onChange(otp.join(""));+ }++ const inputAriaLabel = ariaLabel ?? t("verification_code");++ return (+ <OTPFieldRoot>+ {label && <OTPLabel>{label}</OTPLabel>}+ <OTPRoot $disabled={disabled}>+ {Array.from({ length }, (_, index) => (+ <OTPInput+ key={index}+ ref={(element) => {+ inputRefs.current[index] = element;+ }}+ id={index === 0 ? id : undefined}+ name={index === 0 ? name : undefined}+ type="tel"+ value={value[index]?.trim() ?? ""}+ onChange={(event) => handleChange(index, event)}+ onFocus={(event) => event.currentTarget.select()}+ onInput={(event) => handleInput(index, event)}+ onKeyDown={(event) => handleKeyDown(index, event)}+ onPaste={(event) => handlePaste(index, event)}+ disabled={disabled}+ autoFocus={autoFocus && index === 0}+ inputMode="numeric"+ pattern="[0-9]*"+ autoComplete={index === 0 ? "one-time-code" : "off"}+ aria-label={`${inputAriaLabel} ${index + 1}`}+ aria-describedby={ariaDescribedBy}+ aria-invalid={error || undefined}+ $error={error}+ />+ ))}+ </OTPRoot>+ </OTPFieldRoot>+ );+}++const OTPFieldRoot = styled("div")({+ width: "100%",+ display: "flex",+ flexDirection: "column",+ gap: "16px",+ "&:focus-within > span": { color: "var(--auth-app-text)" },+});++const OTPLabel = styled("span")({+ ...authMiniTypography,+ color: "var(--auth-app-text-muted)",+ transition: "color 100ms ease-in",+ "@media (prefers-reduced-motion: reduce)": { transition: "none" },+});++const OTPRoot = styled(+ "div",+ authTransientProps,+)<{ $disabled: boolean }>(({ $disabled }) => ({+ width: "100%",+ display: "flex",+ gap: "8px",+ position: "relative",+ containerType: "inline-size",+ cursor: $disabled ? "not-allowed" : "text",+}));++const OTPInput = styled(+ "input",+ authTransientProps,+)<{ $error: boolean }>(({ $error }) => ({+ aspectRatio: "44 / 52",+ minWidth: 0,+ flex: "1 1 0",+ padding: 0,+ border: 0,+ borderRadius: "16px",+ boxSizing: "border-box",+ fontFamily: authDisplayFontFamily,+ fontSize: "clamp(20px, 6.6cqi, 30px)",+ fontWeight: 600,+ lineHeight: 1,+ textAlign: "center",+ color: "var(--auth-app-text)",+ backgroundColor: "var(--auth-app-field)",+ boxShadow: `inset 0 0 0 1px ${+ $error ? "var(--auth-app-warning)" : "var(--auth-app-stroke)"+ }`,+ outline: 0,+ cursor: "text",+ transition: "box-shadow 0.2s ease",+ "&:focus": {+ boxShadow: `inset 0 0 0 1px ${+ $error ? "var(--auth-app-warning)" : "var(--auth-app-primary)"+ }`,+ },+ "&:disabled": { cursor: "not-allowed" },+}));diff --git a/web/apps/auth/src/components/auth/PasswordStrengthMessage.tsx b/web/apps/auth/src/components/auth/PasswordStrengthMessage.tsxnew file mode 100644index 0000000000..c4eb537f5e--- /dev/null+++ b/web/apps/auth/src/components/auth/PasswordStrengthMessage.tsx@@ -0,0 +1,29 @@+import type { PasswordStrength } from "ente-accounts/utils/password";+import { t } from "i18next";+import type React from "react";+import { Message, type MessageKind } from "./Message";++interface PasswordStrengthMessageProps {+ strength?: PasswordStrength;+ visible: boolean;+}++export function PasswordStrengthMessage({+ strength,+ visible,+}: PasswordStrengthMessageProps): React.JSX.Element {+ const displayedStrength = strength ?? "weak";++ const kind: MessageKind =+ displayedStrength === "weak"+ ? "error"+ : displayedStrength === "moderate"+ ? "warning"+ : "success";++ return (+ <Message kind={kind} visible={visible}>+ {t("password_strength", { context: displayedStrength })}+ </Message>+ );+}diff --git a/web/apps/auth/src/components/auth/RecoveryForm.tsx b/web/apps/auth/src/components/auth/RecoveryForm.tsxnew file mode 100644index 0000000000..a28b6526ae--- /dev/null+++ b/web/apps/auth/src/components/auth/RecoveryForm.tsx@@ -0,0 +1,177 @@+import { styled } from "@mui/material";+import type { RecoverAccountPresentationProps } from "ente-accounts/pages/recover";+import type { TwoFactorRecoverPresentationProps } from "ente-accounts/pages/two-factor/recover";+import log from "ente-base/log";+import { useFormik } from "formik";+import { t } from "i18next";+import React, { useState } from "react";+import {+ AuthDialog,+ AuthDialogHeader,+ AuthDialogText,+ AuthDialogTitle,+} from "./AuthDialog";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { ScreenHeader } from "./ScreenHeader";+import { authDialogContentLayout } from "./styles";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function RecoverAccountForm(+ props: RecoverAccountPresentationProps,+): React.JSX.Element {+ const [showNoRecoveryKey, setShowNoRecoveryKey] = useState(false);++ return (+ <>+ <RecoveryForm+ {...props}+ onNoRecoveryKey={() => setShowNoRecoveryKey(true)}+ title={t("recover_account")}+ subtitle={t("auth_recover_account_subtitle")}+ />+ <AuthDialog+ open={showNoRecoveryKey}+ onClose={() => setShowNoRecoveryKey(false)}+ ariaLabelledby="no-recovery-key-title"+ >+ <DialogContent>+ <AuthDialogHeader>+ <AuthDialogTitle id="no-recovery-key-title">+ {t("sorry")}+ </AuthDialogTitle>+ <AuthDialogText>+ {t("no_recovery_key_message")}+ </AuthDialogText>+ </AuthDialogHeader>+ <Button+ variant="secondary"+ fullWidth+ autoFocus+ onClick={() => setShowNoRecoveryKey(false)}+ >+ {t("ok")}+ </Button>+ </DialogContent>+ </AuthDialog>+ </>+ );+}++const DialogContent = styled("div")(authDialogContentLayout);++export function RecoverTwoFactorForm(+ props: TwoFactorRecoverPresentationProps,+): React.JSX.Element {+ return (+ <RecoveryForm+ {...props}+ title={t("recover_two_factor")}+ subtitle={t("auth_recover_two_factor_subtitle")}+ />+ );+}++interface RecoveryFormProps extends RecoverAccountPresentationProps {+ title: React.ReactNode;+ subtitle: React.ReactNode;+}++function RecoveryForm({+ title,+ subtitle,+ onSubmit,+ onNoRecoveryKey,+ onBack,+}: RecoveryFormProps): React.JSX.Element {+ const formik = useFormik({+ initialValues: { recoveryKey: "" },+ onSubmit: async ({ recoveryKey }, { setFieldError }) => {+ function setRecoveryKeyError(message: string) {+ setFieldError("recoveryKey", message);+ }++ if (!recoveryKey) {+ setRecoveryKeyError(t("required"));+ return;+ }++ try {+ await onSubmit(recoveryKey, setRecoveryKeyError);+ } catch (error) {+ log.error("Failed to submit recovery key", error);+ setRecoveryKeyError(t("generic_error"));+ }+ },+ });++ function handleRecoveryKeyDown(+ event: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>,+ ) {+ if (+ event.key === "Enter" &&+ !event.shiftKey &&+ !event.nativeEvent.isComposing+ ) {+ event.preventDefault();+ void formik.submitForm();+ }+ }++ return (+ <>+ <ScreenHeader title={title} subtitle={subtitle} />+ <Form onSubmit={formik.handleSubmit}>+ <FormFields>+ <TextField+ name="recoveryKey"+ label={t("recovery_key")}+ placeholder={t("auth_recovery_key_placeholder")}+ value={formik.values.recoveryKey}+ onChange={formik.handleChange}+ onKeyDown={handleRecoveryKeyDown}+ autoComplete="off"+ multiline+ rows={5}+ autoFocus+ disabled={formik.isSubmitting}+ error={Boolean(formik.errors.recoveryKey)}+ helperText={formik.errors.recoveryKey}+ />+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={formik.isSubmitting}+ >+ {t("recover")}+ </Button>+ <FooterLinks>+ <TextLink+ onClick={onNoRecoveryKey}+ disabled={formik.isSubmitting}+ >+ {t("no_recovery_key_title")}+ </TextLink>+ <TextLink+ onClick={onBack}+ disabled={formik.isSubmitting}+ >+ {t("go_back")}+ </TextLink>+ </FooterLinks>+ </FormFooter>+ </Form>+ </>+ );+}++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});diff --git a/web/apps/auth/src/components/auth/RecoveryKeyForm.tsx b/web/apps/auth/src/components/auth/RecoveryKeyForm.tsxnew file mode 100644index 0000000000..c8fb835db8--- /dev/null+++ b/web/apps/auth/src/components/auth/RecoveryKeyForm.tsx@@ -0,0 +1,107 @@+import ContentCopyIcon from "@mui/icons-material/ContentCopy";+import DoneIcon from "@mui/icons-material/Done";+import { CircularProgress, styled } from "@mui/material";+import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";+import { useClipboardCopy } from "ente-base/components/utils/hooks";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { ScreenHeader } from "./ScreenHeader";+import { authFocusRing } from "./styles";++export function RecoveryKeyForm({+ recoveryKey,+ onClose,+ onSave,+}: RecoveryKeyPresentationProps): React.JSX.Element {+ const [copied, handleCopy] = useClipboardCopy(recoveryKey ?? "");+ const CopyIcon = copied ? DoneIcon : ContentCopyIcon;++ return (+ <>+ <ScreenHeader+ title={t("auth_recovery_key_title")}+ subtitle={t("recovery_key_description")}+ />+ <RecoveryKeyBox>+ {recoveryKey ? (+ <>+ <RecoveryKeyText>{recoveryKey}</RecoveryKeyText>+ <CopyButton+ type="button"+ onClick={handleCopy}+ aria-label={+ copied+ ? t("copied")+ : t("auth_copy_recovery_key")+ }+ >+ <CopyIcon fontSize="small" />+ </CopyButton>+ </>+ ) : (+ <CircularProgress+ size={24}+ sx={{ color: "var(--auth-app-primary)" }}+ />+ )}+ </RecoveryKeyBox>+ <Message note>{t("key_not_stored_note")}</Message>+ <FormFooter>+ <Actions>+ <Button fullWidth variant="secondary" onClick={onClose}>+ {t("do_this_later")}+ </Button>+ <Button fullWidth onClick={onSave} disabled={!recoveryKey}>+ {t("save_key")}+ </Button>+ </Actions>+ </FormFooter>+ </>+ );+}++const RecoveryKeyBox = styled("div")({+ minHeight: "128px",+ padding: "20px",+ borderRadius: "16px",+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ position: "relative",+ boxSizing: "border-box",+ backgroundColor: "var(--auth-app-field)",+ boxShadow: "inset 0 0 0 1px var(--auth-app-stroke)",+});++const RecoveryKeyText = styled("p")({+ margin: 0,+ paddingRight: "28px",+ fontSize: "15px",+ fontWeight: 500,+ lineHeight: "24px",+ wordBreak: "break-word",+ color: "var(--auth-app-text)",+});++const CopyButton = styled("button")({+ width: "32px",+ height: "32px",+ padding: 0,+ border: 0,+ borderRadius: "8px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ position: "absolute",+ top: "12px",+ right: "12px",+ backgroundColor: "transparent",+ color: "var(--auth-app-text-muted)",+ cursor: "pointer",+ "&:focus-visible": authFocusRing,+});++const Actions = styled("div")({ display: "flex", gap: "12px" });diff --git a/web/apps/auth/src/components/auth/ScreenHeader.tsx b/web/apps/auth/src/components/auth/ScreenHeader.tsxnew file mode 100644index 0000000000..906d448809--- /dev/null+++ b/web/apps/auth/src/components/auth/ScreenHeader.tsx@@ -0,0 +1,48 @@+import { styled } from "@mui/material";+import type React from "react";+import { authDisplayFontFamily, authMobileMediaQuery } from "./styles";++export interface ScreenHeaderProps {+ title: React.ReactNode;+ subtitle?: React.ReactNode;+}++export function ScreenHeader({+ title,+ subtitle,+}: ScreenHeaderProps): React.JSX.Element {+ return (+ <ScreenHeaderRoot>+ <ScreenTitle>{title}</ScreenTitle>+ {subtitle && <ScreenSubtitle>{subtitle}</ScreenSubtitle>}+ </ScreenHeaderRoot>+ );+}++const ScreenHeaderRoot = styled("div")({+ display: "flex",+ flexDirection: "column",+ gap: "8px",+});++const ScreenTitle = styled("h1")({+ margin: 0,+ fontFamily: authDisplayFontFamily,+ fontSize: "30px",+ fontWeight: 600,+ lineHeight: "38px",+ textWrap: "pretty",+ color: "var(--auth-app-text)",+ [authMobileMediaQuery]: { fontSize: "26px", lineHeight: "34px" },+ "@media (min-width: 1600px)": { fontSize: "32px", lineHeight: "40px" },+});++const ScreenSubtitle = styled("p")({+ margin: 0,+ fontSize: "16px",+ fontWeight: 500,+ lineHeight: "24px",+ textWrap: "pretty",+ color: "var(--auth-app-text-muted)",+ [authMobileMediaQuery]: { fontSize: "13px", lineHeight: "20px" },+});diff --git a/web/apps/auth/src/components/auth/SecondFactorChoiceDialog.tsx b/web/apps/auth/src/components/auth/SecondFactorChoiceDialog.tsxnew file mode 100644index 0000000000..475264a817--- /dev/null+++ b/web/apps/auth/src/components/auth/SecondFactorChoiceDialog.tsx@@ -0,0 +1,61 @@+import { styled } from "@mui/material";+import type { SecondFactorChoicePresentationProps } from "ente-accounts/components/SecondFactorChoice";+import { t } from "i18next";+import type React from "react";+import {+ AuthDialog,+ AuthDialogHeader,+ AuthDialogText,+ AuthDialogTitle,+} from "./AuthDialog";+import { Button } from "./Button";+import { authDialogContentLayout } from "./styles";++export function SecondFactorChoiceDialog({+ open,+ onDialogClose,+ onSelect,+}: SecondFactorChoicePresentationProps): React.JSX.Element {+ return (+ <AuthDialog+ open={open}+ onClose={onDialogClose}+ ariaLabelledby="second-factor-choice-title"+ >+ <ContentRoot>+ <AuthDialogHeader>+ <AuthDialogTitle id="second-factor-choice-title">+ {t("two_factor")}+ </AuthDialogTitle>+ <AuthDialogText>+ {t("auth_second_factor_choice_subtitle")}+ </AuthDialogText>+ </AuthDialogHeader>+ <ButtonStack>+ <Button+ variant="primary"+ fullWidth+ onClick={() => onSelect("totp")}+ >+ {t("totp_login")}+ </Button>+ <Button+ variant="secondary"+ fullWidth+ onClick={() => onSelect("passkey")}+ >+ {t("passkey_login")}+ </Button>+ </ButtonStack>+ </ContentRoot>+ </AuthDialog>+ );+}++const ContentRoot = styled("div")(authDialogContentLayout);++const ButtonStack = styled("div")({+ display: "flex",+ flexDirection: "column",+ gap: "12px",+});diff --git a/web/apps/auth/src/components/auth/SetPasswordForm.tsx b/web/apps/auth/src/components/auth/SetPasswordForm.tsxnew file mode 100644index 0000000000..52ec9c8547--- /dev/null+++ b/web/apps/auth/src/components/auth/SetPasswordForm.tsx@@ -0,0 +1,119 @@+import { styled } from "@mui/material";+import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { PasswordStrengthMessage } from "./PasswordStrengthMessage";+import { ScreenHeader } from "./ScreenHeader";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function SetPasswordForm({+ userEmail,+ password,+ confirmPassword,+ passwordError,+ confirmPasswordError,+ passwordStrength,+ isSubmitting,+ isSubmitDisabled,+ submitButtonTitle,+ onBack,+ onPasswordChange,+ onConfirmPasswordChange,+ onSubmit,+}: NewPasswordPresentationProps): React.JSX.Element {+ return (+ <>+ <ScreenHeader+ title={submitButtonTitle}+ subtitle={t("auth_password_recovery_warning")}+ />+ <Form onSubmit={onSubmit}>+ <HiddenEmail+ name="email"+ type="email"+ autoComplete="username"+ value={userEmail}+ readOnly+ tabIndex={-1}+ />+ <FormFields>+ <PasswordField>+ <TextField+ name="password"+ label={t("password")}+ placeholder={t("auth_strong_password_placeholder")}+ autoComplete="new-password"+ showPasswordToggle+ value={password}+ onChange={onPasswordChange}+ error={Boolean(passwordError)}+ helperText={passwordError}+ disabled={isSubmitting}+ autoFocus+ />+ <PasswordStrengthMessage+ strength={passwordStrength}+ visible={Boolean(password)}+ />+ </PasswordField>+ <TextField+ name="confirmPassword"+ label={t("confirm_password")}+ placeholder={t("auth_repeat_password_placeholder")}+ autoComplete="new-password"+ showPasswordToggle+ value={confirmPassword}+ onChange={onConfirmPasswordChange}+ error={Boolean(confirmPasswordError)}+ helperText={confirmPasswordError}+ disabled={isSubmitting}+ />+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={isSubmitting}+ disabled={isSubmitDisabled}+ >+ {submitButtonTitle}+ </Button>+ {isSubmitting ? (+ <SubmittingMessage>+ <Message>{t("key_generation_in_progress")}</Message>+ </SubmittingMessage>+ ) : null}+ {onBack ? (+ <BackAction>+ <TextLink onClick={onBack} disabled={isSubmitting}>+ {t("go_back")}+ </TextLink>+ </BackAction>+ ) : null}+ </FormFooter>+ </Form>+ </>+ );+}++const HiddenEmail = styled("input")({ display: "none" });++const PasswordField = styled("div")({+ "--auth-app-message-gap": "8px",+ display: "flex",+ flexDirection: "column",+ gap: "8px",+});++const SubmittingMessage = styled("div")({+ display: "flex",+ justifyContent: "center",+});++const BackAction = styled("div")({ display: "flex", justifyContent: "center" });diff --git a/web/apps/auth/src/components/auth/SignUpForm.tsx b/web/apps/auth/src/components/auth/SignUpForm.tsxnew file mode 100644index 0000000000..0245840e8b--- /dev/null+++ b/web/apps/auth/src/components/auth/SignUpForm.tsx@@ -0,0 +1,215 @@+import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";+import { styled, Tooltip } from "@mui/material";+import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";+import { t } from "i18next";+import type React from "react";+import { Trans } from "react-i18next";+import { Button } from "./Button";+import { Checkbox } from "./Checkbox";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { PasswordStrengthMessage } from "./PasswordStrengthMessage";+import { ScreenHeader } from "./ScreenHeader";+import { TextField } from "./TextField";+import { TextLink } from "./TextLink";++export function SignUpForm({+ email,+ password,+ confirmPassword,+ referral,+ acceptedTerms,+ emailError,+ passwordError,+ confirmPasswordError,+ passwordStrength,+ isSubmitting,+ isSubmitDisabled,+ isJoinAlbumContext,+ host,+ onEmailChange,+ onPasswordChange,+ onConfirmPasswordChange,+ onReferralChange,+ onAcceptedTermsChange,+ onSubmit,+ onLogin,+}: SignUpPresentationProps): React.JSX.Element {+ return (+ <>+ <ScreenHeader+ title={+ isJoinAlbumContext+ ? t("signup_to_join_album")+ : t("auth_create_account")+ }+ subtitle={t("auth_signup_subtitle")}+ />+ <Form onSubmit={onSubmit}>+ <FormFields>+ <TextField+ name="email"+ label={t("auth_email_label")}+ placeholder={t("auth_email_placeholder")}+ type="email"+ autoComplete="username"+ value={email}+ onChange={onEmailChange}+ autoFocus+ error={Boolean(emailError)}+ helperText={emailError}+ disabled={isSubmitting}+ />+ <PasswordField>+ <TextField+ name="password"+ label={t("password")}+ placeholder={t("auth_password_placeholder")}+ autoComplete="new-password"+ showPasswordToggle+ value={password}+ onChange={onPasswordChange}+ error={Boolean(passwordError)}+ helperText={passwordError}+ disabled={isSubmitting}+ />+ <PasswordStrengthMessage+ strength={passwordStrength}+ visible={Boolean(passwordStrength)}+ />+ </PasswordField>+ <TextField+ name="confirmPassword"+ label={t("confirm_password")}+ placeholder={t("auth_confirm_password_placeholder")}+ autoComplete="new-password"+ showPasswordToggle+ value={confirmPassword}+ onChange={onConfirmPasswordChange}+ error={Boolean(confirmPasswordError)}+ helperText={confirmPasswordError}+ disabled={isSubmitting}+ />+ <TextField+ name="referral"+ label={+ <ReferralLabel>+ {t("referral_source_hint")}+ <Tooltip title={t("referral_source_info")}>+ <InfoOutlinedIcon+ fontSize="inherit"+ tabIndex={0}+ aria-label={t("referral_source_info")}+ />+ </Tooltip>+ </ReferralLabel>+ }+ placeholder={t("auth_optional")}+ value={referral}+ onChange={onReferralChange}+ disabled={isSubmitting}+ />+ </FormFields>+ <Checkbox+ name="acceptedTerms"+ checked={acceptedTerms}+ onChange={onAcceptedTermsChange}+ disabled={isSubmitting}+ label={+ <TermsText>+ <Trans+ i18nKey="terms_and_conditions"+ components={{+ a: (+ <TermsLink+ href="https://ente.com/terms"+ target="_blank"+ />+ ),+ b: (+ <TermsLink+ href="https://ente.com/privacy"+ target="_blank"+ />+ ),+ }}+ />+ </TermsText>+ }+ />+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={isSubmitting}+ loadingMessage={t("key_generation_in_progress")}+ disabled={isSubmitDisabled}+ >+ {t("create_account")}+ </Button>+ <AccountPrompt>+ <span>{t("auth_existing_account_prompt")}</span>+ <TextLink regular onClick={onLogin}>+ {t("login")}+ </TextLink>+ </AccountPrompt>+ {host ? <Host>{host}</Host> : null}+ </FormFooter>+ </Form>+ </>+ );+}++const PasswordField = styled("div")({+ "--auth-app-message-gap": "8px",+ display: "flex",+ flexDirection: "column",+ gap: "8px",+});++const ReferralLabel = styled("span")({+ display: "inline-flex",+ alignItems: "center",+ gap: "4px",+ "& > svg": { fontSize: "14px" },+});++const TermsText = styled("span")({+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+ color: "var(--auth-app-text-muted)",+});++const TermsLink = styled("a")({+ color: "var(--auth-app-text)",+ textDecoration: "none",+ "&:hover": { textDecoration: "underline" },+ "&:focus-visible": {+ borderRadius: "4px",+ outline: "2px solid var(--auth-app-accent)",+ outlineOffset: "2px",+ },+});++const AccountPrompt = styled("div")({+ display: "flex",+ alignItems: "center",+ justifyContent: "center",+ gap: "6px",+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+ textAlign: "center",+ color: "var(--auth-app-text-muted)",+});++const Host = styled("div")({+ minHeight: "16px",+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+ textAlign: "center",+ color: "var(--auth-app-text-faint)",+});diff --git a/web/apps/auth/src/components/auth/TextField.tsx b/web/apps/auth/src/components/auth/TextField.tsxnew file mode 100644index 0000000000..69a823ecd7--- /dev/null+++ b/web/apps/auth/src/components/auth/TextField.tsx@@ -0,0 +1,277 @@+import { ViewIcon, ViewOffSlashIcon } from "@hugeicons/core-free-icons";+import { HugeiconsIcon } from "@hugeicons/react";+import { styled } from "@mui/material";+import { t } from "i18next";+import type React from "react";+import { useId, useState } from "react";+import { Message } from "./Message";+import {+ authBodyTypography,+ authFocusRing,+ authMiniTypography,+ authTransientProps,+} from "./styles";++export interface TextFieldProps {+ id?: string;+ label?: React.ReactNode;+ value: string;+ onChange: (+ event: React.ChangeEvent<HTMLInputElement | HTMLTextAreaElement>,+ ) => void;+ onKeyDown?: (+ event: React.KeyboardEvent<HTMLInputElement | HTMLTextAreaElement>,+ ) => void;+ onBlur?: (+ event: React.FocusEvent<HTMLInputElement | HTMLTextAreaElement>,+ ) => void;+ type?: React.HTMLInputTypeAttribute;+ placeholder?: string;+ required?: boolean;+ disabled?: boolean;+ error?: boolean;+ helperText?: React.ReactNode;+ autoFocus?: boolean;+ autoComplete?: string;+ name?: string;+ showPasswordToggle?: boolean;+ multiline?: boolean;+ rows?: number;+ inputMode?: React.HTMLAttributes<HTMLInputElement>["inputMode"];+ ariaLabel?: string;+ trailing?: React.ReactNode;+}++export function TextField({+ id,+ label,+ value,+ onChange,+ onKeyDown,+ onBlur,+ type = "text",+ placeholder,+ required,+ disabled,+ error,+ helperText,+ autoFocus,+ autoComplete,+ name,+ showPasswordToggle,+ multiline,+ rows = 5,+ inputMode,+ ariaLabel,+ trailing,+}: TextFieldProps): React.JSX.Element {+ const generatedID = useId();+ const inputID = id ?? generatedID;+ const helperID = `${inputID}-helper`;+ const hasHelper = Boolean(helperText);+ const [isPasswordVisible, setIsPasswordVisible] = useState(false);+ const inputType = showPasswordToggle+ ? isPasswordVisible+ ? "text"+ : "password"+ : type;++ function handleInputChange(event: React.ChangeEvent<HTMLInputElement>) {+ onChange(event);+ }++ function handleTextAreaChange(+ event: React.ChangeEvent<HTMLTextAreaElement>,+ ) {+ onChange(event);+ }++ function handlePasswordToggle() {+ setIsPasswordVisible((isVisible) => !isVisible);+ }++ function handlePasswordToggleMouseDown(+ event: React.MouseEvent<HTMLButtonElement>,+ ) {+ event.preventDefault();+ }++ const sharedControlProps = {+ id: inputID,+ value,+ placeholder,+ required,+ disabled,+ autoFocus,+ autoComplete,+ name,+ onBlur,+ "aria-label": ariaLabel,+ "aria-invalid": error || undefined,+ "aria-describedby": hasHelper ? helperID : undefined,+ };++ return (+ <FieldRoot>+ {label && (+ <FieldLabel htmlFor={inputID}>+ {label}+ {required && (+ <RequiredMark aria-hidden="true"> *</RequiredMark>+ )}+ </FieldLabel>+ )}+ <FieldBox+ $error={Boolean(error)}+ $disabled={Boolean(disabled)}+ $multiline={Boolean(multiline)}+ >+ {multiline ? (+ <TextAreaControl+ {...sharedControlProps}+ rows={rows}+ onChange={handleTextAreaChange}+ onKeyDown={onKeyDown}+ />+ ) : (+ <TextInputControl+ {...sharedControlProps}+ type={inputType}+ inputMode={inputMode}+ onChange={handleInputChange}+ onKeyDown={onKeyDown}+ />+ )}+ {showPasswordToggle && !multiline && (+ <PasswordToggle+ type="button"+ aria-label={t("show_or_hide_password")}+ aria-controls={inputID}+ aria-pressed={isPasswordVisible}+ disabled={disabled}+ onClick={handlePasswordToggle}+ onMouseDown={handlePasswordToggleMouseDown}+ >+ <HugeiconsIcon+ icon={+ isPasswordVisible ? ViewOffSlashIcon : ViewIcon+ }+ size={20}+ strokeWidth={2}+ aria-hidden="true"+ />+ </PasswordToggle>+ )}+ {trailing}+ </FieldBox>+ <Message+ id={helperID}+ kind={error ? "error" : "info"}+ visible={hasHelper}+ >+ {helperText}+ </Message>+ </FieldRoot>+ );+}++const FieldRoot = styled("div")({+ "--auth-app-message-gap": "9px",+ width: "100%",+ display: "flex",+ flexDirection: "column",+ gap: "9px",+ "&:focus-within > label": { color: "var(--auth-app-text)" },+});++const FieldLabel = styled("label")({+ ...authMiniTypography,+ color: "var(--auth-app-text-muted)",+ transition: "color 100ms ease-in",+ "@media (prefers-reduced-motion: reduce)": { transition: "none" },+});++const RequiredMark = styled("span")({ color: "var(--auth-app-warning)" });++interface FieldBoxProps {+ $error: boolean;+ $disabled: boolean;+ $multiline: boolean;+}++const FieldBox = styled(+ "div",+ authTransientProps,+)<FieldBoxProps>(({ $error, $disabled, $multiline }) => ({+ width: "100%",+ height: $multiline ? "auto" : "52px",+ minHeight: $multiline ? "112px" : undefined,+ padding: $multiline ? "16px" : "0 16px",+ borderRadius: "16px",+ display: "flex",+ alignItems: $multiline ? "flex-start" : "center",+ gap: "8px",+ boxSizing: "border-box",+ backgroundColor: $disabled+ ? "var(--auth-app-fill-hover)"+ : "var(--auth-app-field)",+ boxShadow: $disabled+ ? "none"+ : `inset 0 0 0 1px ${+ $error ? "var(--auth-app-warning)" : "var(--auth-app-stroke)"+ }`,+ "&:focus-within": $disabled+ ? undefined+ : {+ boxShadow: `inset 0 0 0 1px ${+ $error ? "var(--auth-app-warning)" : "var(--auth-app-primary)"+ }`,+ },+}));++const controlStyles = {+ ...authBodyTypography,+ width: "100%",+ minWidth: 0,+ flex: 1,+ padding: 0,+ border: 0,+ outline: 0,+ background: "transparent",+ fontFamily: "inherit",+ color: "var(--auth-app-text)",+ "&::placeholder": { color: "var(--auth-app-text-faint)", opacity: 1 },+ "&:disabled": {+ color: "var(--auth-app-text-disabled)",+ WebkitTextFillColor: "var(--auth-app-text-disabled)",+ cursor: "not-allowed",+ },+};++const TextInputControl = styled("input")({ ...controlStyles });++const TextAreaControl = styled("textarea")({+ ...controlStyles,+ minHeight: "80px",+ resize: "none",+});++const PasswordToggle = styled("button")({+ width: "20px",+ height: "20px",+ flex: "0 0 20px",+ padding: 0,+ border: 0,+ borderRadius: "4px",+ display: "inline-flex",+ alignItems: "center",+ justifyContent: "center",+ background: "transparent",+ color: "var(--auth-app-text-faint)",+ cursor: "pointer",+ "&:focus-visible": authFocusRing,+ "&:disabled": {+ color: "var(--auth-app-text-disabled)",+ cursor: "not-allowed",+ },+});diff --git a/web/apps/auth/src/components/auth/TextLink.tsx b/web/apps/auth/src/components/auth/TextLink.tsxnew file mode 100644index 0000000000..1d9c4996d0--- /dev/null+++ b/web/apps/auth/src/components/auth/TextLink.tsx@@ -0,0 +1,55 @@+import { styled } from "@mui/material";+import type React from "react";+import {+ authBodyTypography,+ authFocusRing,+ authTransientProps,+} from "./styles";++export interface TextLinkProps extends Omit<+ React.ButtonHTMLAttributes<HTMLButtonElement>,+ "color" | "children"+> {+ regular?: boolean;+ children: React.ReactNode;+}++export function TextLink({+ regular = false,+ type = "button",+ children,+ ...buttonProps+}: TextLinkProps): React.JSX.Element {+ return (+ <TextLinkRoot type={type} $regular={regular} {...buttonProps}>+ {children}+ </TextLinkRoot>+ );+}++const TextLinkRoot = styled(+ "button",+ authTransientProps,+)<{ $regular: boolean }>(({ $regular }) => ({+ ...authBodyTypography,+ display: "inline-flex",+ alignItems: "center",+ gap: "4px",+ padding: 0,+ border: 0,+ background: "transparent",+ fontFamily: "inherit",+ fontWeight: $regular ? 500 : 600,+ color: "var(--auth-app-text)",+ textDecoration: "none",+ cursor: "pointer",+ "&:hover:not(:disabled)": {+ textDecoration: "underline",+ textUnderlineOffset: "3px",+ },+ "&:focus-visible": { ...authFocusRing, borderRadius: "4px" },+ "&:disabled": {+ color: "var(--auth-app-text-disabled)",+ cursor: "not-allowed",+ },+}));diff --git a/web/apps/auth/src/components/auth/TwoFactorForm.tsx b/web/apps/auth/src/components/auth/TwoFactorForm.tsxnew file mode 100644index 0000000000..caec794e12--- /dev/null+++ b/web/apps/auth/src/components/auth/TwoFactorForm.tsx@@ -0,0 +1,115 @@+import { styled } from "@mui/material";+import type { TwoFactorVerifyPresentationProps } from "ente-accounts/pages/two-factor/verify";+import { isHTTP401Error } from "ente-base/http";+import log from "ente-base/log";+import { useFormik } from "formik";+import { t } from "i18next";+import type React from "react";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { OTPField } from "./OTPField";+import { ScreenHeader } from "./ScreenHeader";+import { TextLink } from "./TextLink";++const completeCodePattern = /^\d{6}$/;++export function TwoFactorForm({+ onSubmit,+ onRecover,+ onChangeEmail,+}: TwoFactorVerifyPresentationProps): React.JSX.Element {+ const formik = useFormik({+ initialValues: { otp: "" },+ validateOnBlur: false,+ validateOnChange: false,+ onSubmit: async ({ otp }, { setFieldError, resetForm }) => {+ if (!completeCodePattern.test(otp)) {+ setFieldError("otp", t("required"));+ return;+ }++ try {+ await onSubmit(otp);+ resetForm();+ } catch (error) {+ log.error("Failed to submit 2FA code", error);+ resetForm();+ setFieldError(+ "otp",+ isHTTP401Error(error)+ ? t("incorrect_code")+ : t("generic_error"),+ );+ }+ },+ });++ function handleCodeChange(otp: string) {+ const shouldAutoSubmit =+ !completeCodePattern.test(formik.values.otp) &&+ completeCodePattern.test(otp);++ void formik.setFieldValue("otp", otp).then(() => {+ if (shouldAutoSubmit && !formik.isSubmitting) {+ void formik.submitForm();+ }+ });+ }++ return (+ <>+ <ScreenHeader+ title={t("two_factor")}+ subtitle={t("enter_two_factor_otp")}+ />+ <Form onSubmit={formik.handleSubmit}>+ <FormFields>+ <OTPField+ name="otp"+ value={formik.values.otp}+ onChange={handleCodeChange}+ error={Boolean(formik.errors.otp)}+ disabled={formik.isSubmitting}+ autoFocus+ />+ <Message kind="error" visible={Boolean(formik.errors.otp)}>+ {formik.errors.otp}+ </Message>+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={formik.isSubmitting}+ disabled={!completeCodePattern.test(formik.values.otp)}+ >+ {t("verify")}+ </Button>+ <FooterLinks>+ <TextLink+ onClick={onRecover}+ disabled={formik.isSubmitting}+ >+ {t("lost_2fa_device")}+ </TextLink>+ <TextLink+ onClick={onChangeEmail}+ disabled={formik.isSubmitting}+ >+ {t("change_email")}+ </TextLink>+ </FooterLinks>+ </FormFooter>+ </Form>+ </>+ );+}++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});diff --git a/web/apps/auth/src/components/auth/VerifyEmailForm.tsx b/web/apps/auth/src/components/auth/VerifyEmailForm.tsxnew file mode 100644index 0000000000..d6aa3b2a98--- /dev/null+++ b/web/apps/auth/src/components/auth/VerifyEmailForm.tsx@@ -0,0 +1,127 @@+import { styled } from "@mui/material";+import type { VerifyEmailPresentationProps } from "ente-accounts/pages/verify";+import log from "ente-base/log";+import { useFormik } from "formik";+import { t } from "i18next";+import type React from "react";+import { Trans } from "react-i18next";+import { Button } from "./Button";+import { Form } from "./Form";+import { FormFields } from "./FormFields";+import { FormFooter } from "./FormFooter";+import { Message } from "./Message";+import { OTPField } from "./OTPField";+import { ScreenHeader } from "./ScreenHeader";+import { TextLink } from "./TextLink";++const completeCodePattern = /^\d{6}$/;++export function VerifyEmailForm({+ email,+ resend,+ onSubmit,+ onResend,+ onChangeEmail,+}: VerifyEmailPresentationProps): React.JSX.Element {+ const formik = useFormik({+ initialValues: { code: "" },+ onSubmit: async ({ code }, { setFieldError }) => {+ function setCodeError(message: string) {+ setFieldError("code", message);+ }++ if (!completeCodePattern.test(code)) {+ setCodeError(t("required"));+ return;+ }++ try {+ await onSubmit(code, setCodeError);+ } catch (error) {+ log.error("Failed to submit email verification code", error);+ setCodeError(t("generic_error"));+ }+ },+ });++ function handleCodeChange(code: string) {+ const shouldAutoSubmit =+ !completeCodePattern.test(formik.values.code) &&+ completeCodePattern.test(code);++ void formik.setFieldValue("code", code).then(() => {+ if (shouldAutoSubmit && !formik.isSubmitting) {+ void formik.submitForm();+ }+ });+ }++ const resendLabel =+ resend === "sending"+ ? t("status_sending")+ : resend === "sent"+ ? t("status_sent")+ : t("resend_code");++ return (+ <>+ <ScreenHeader+ title={t("auth_check_inbox")}+ subtitle={+ <Trans+ i18nKey="auth_verification_code_sent_to"+ components={{ a: <Email /> }}+ values={{ email }}+ />+ }+ />+ <Form onSubmit={formik.handleSubmit}>+ <FormFields>+ <OTPField+ name="code"+ label={t("verification_code")}+ value={formik.values.code}+ onChange={handleCodeChange}+ error={Boolean(formik.errors.code)}+ disabled={formik.isSubmitting}+ autoFocus+ />+ <Message kind="error" visible={Boolean(formik.errors.code)}>+ {formik.errors.code}+ </Message>+ </FormFields>+ <FormFooter>+ <Button+ fullWidth+ type="submit"+ loading={formik.isSubmitting}+ >+ {t("verify")}+ </Button>+ <FooterLinks>+ <TextLink+ onClick={onResend}+ disabled={resend !== "enable"}+ >+ {resendLabel}+ </TextLink>+ <TextLink onClick={onChangeEmail}>+ {t("change_email")}+ </TextLink>+ </FooterLinks>+ </FormFooter>+ </Form>+ </>+ );+}++const Email = styled("strong")({+ color: "var(--auth-app-text)",+ wordBreak: "break-word",+});++const FooterLinks = styled("div")({+ display: "flex",+ justifyContent: "space-between",+ gap: "16px",+});diff --git a/web/apps/auth/src/components/auth/styles.ts b/web/apps/auth/src/components/auth/styles.tsnew file mode 100644index 0000000000..00a7304c0c--- /dev/null+++ b/web/apps/auth/src/components/auth/styles.ts@@ -0,0 +1,82 @@+export const authColorVariables = {+ ":where(:root)": {+ "--auth-app-primary": "#9610d6",+ "--auth-app-accent": "#9610d6",+ "--auth-app-primary-hover": "#8e0fcb",+ "--auth-app-primary-active": "#750ca8",+ "--auth-app-success": "#069d1e",+ "--auth-app-warning": "#f63a3a",+ "--auth-app-caution": "#f08a1e",+ "--auth-app-text": "#000",+ "--auth-app-text-muted": "#666",+ "--auth-app-text-faint": "#969696",+ "--auth-app-text-disabled": "#d6d6d6",+ "--auth-app-field": "#fff",+ "--auth-app-fill": "#eaeaea",+ "--auth-app-fill-hover": "#dedede",+ "--auth-app-fill-active": "#d2d2d2",+ "--auth-app-stroke": "#e0e0e0",+ "--auth-app-button-secondary": "#eaeaea",+ "--auth-app-button-secondary-hover": "#dedede",+ "--auth-app-button-secondary-active": "#d2d2d2",+ "--auth-app-button-secondary-stroke": "transparent",+ "--auth-app-button-secondary-stroke-hover": "transparent",+ "--auth-app-button-secondary-stroke-active": "transparent",+ "--auth-app-button-primary-stroke": "rgba(255, 255, 255, 0.14)",+ "--auth-app-button-primary-stroke-hover": "rgba(255, 255, 255, 0.32)",+ "--auth-app-button-primary-stroke-active": "rgba(255, 255, 255, 0.2)",+ },+ "*:where(.dark)": {+ "--auth-app-accent": "#c76cff",+ "--auth-app-success": "#08c225",+ "--auth-app-text": "#fff",+ "--auth-app-text-muted": "#999",+ "--auth-app-text-disabled": "#808080",+ "--auth-app-field": "#1a1a1a",+ "--auth-app-fill": "#0a0a0a",+ "--auth-app-fill-hover": "#1a1a1a",+ "--auth-app-fill-active": "#292929",+ "--auth-app-stroke": "#3e3e3e",+ "--auth-app-button-secondary": "#1e1e1e",+ "--auth-app-button-secondary-hover": "#1a1a1a",+ "--auth-app-button-secondary-active": "#161616",+ "--auth-app-button-secondary-stroke": "rgba(255, 255, 255, 0.07)",+ "--auth-app-button-secondary-stroke-hover": "rgba(255, 255, 255, 0.18)",+ "--auth-app-button-secondary-stroke-active":+ "rgba(255, 255, 255, 0.12)",+ },+};++const authMobileCutoffPx = 640;+export const authMobileMediaQuery = `@media (max-width: ${authMobileCutoffPx - 0.05}px)`;+export const authAboveMobileMediaQuery = `@media (min-width: ${authMobileCutoffPx}px)`;++export const authTransientProps = {+ shouldForwardProp: (prop: string) => !prop.startsWith("$"),+};++export const authDisplayFontFamily = '"Outfit Variable", sans-serif';++export const authFocusRing = {+ outline: "1px solid var(--auth-app-accent)",+ outlineOffset: "2px",+};++export const authBodyTypography = {+ fontSize: "14px",+ fontWeight: 500,+ lineHeight: "20px",+};++export const authMiniTypography = {+ fontSize: "12px",+ fontWeight: 500,+ lineHeight: "16px",+};++export const authDialogContentLayout = {+ display: "flex",+ flexDirection: "column",+ gap: "24px",+ [authMobileMediaQuery]: { gap: "20px" },+} as const;diff --git a/web/apps/auth/src/featureFlags.ts b/web/apps/auth/src/featureFlags.tsnew file mode 100644index 0000000000..0eb2488c7e--- /dev/null+++ b/web/apps/auth/src/featureFlags.ts@@ -0,0 +1,3 @@+export const featureFlags: Record<"enableNewAuthFlow", boolean> = {+ enableNewAuthFlow: true,+};diff --git a/web/apps/auth/src/pages/_app.tsx b/web/apps/auth/src/pages/_app.tsxindex 7733f17857..6c76c26a62 100644--- a/web/apps/auth/src/pages/_app.tsx+++ b/web/apps/auth/src/pages/_app.tsx@@ -1,4 +1,5 @@import "@fontsource-variable/inter";+import "@fontsource-variable/outfit";import { CssBaseline } from "@mui/material";import { ThemeProvider } from "@mui/material/styles";import { savedLocalUser } from "ente-accounts/services/accounts-db";diff --git a/web/apps/auth/src/pages/change-password.tsx b/web/apps/auth/src/pages/change-password.tsxindex 0e494377ee..09aae08eb9 100644--- a/web/apps/auth/src/pages/change-password.tsx+++ b/web/apps/auth/src/pages/change-password.tsx@@ -1 +1,30 @@-export { default } from "ente-accounts/pages/change-password";+import { SetPasswordForm } from "@/components/auth/SetPasswordForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";+import AccountsChangePasswordPage from "ente-accounts/pages/change-password";+import type React from "react";++function ResetPasswordPresentation(+ props: NewPasswordPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <SetPasswordForm {...props} />+ </AuthShell>+ );+}++function ChangePasswordPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsChangePasswordPage />;+ }++ return (+ <AccountsChangePasswordPage+ resetPresentation={ResetPasswordPresentation}+ />+ );+}++export default ChangePasswordPage;diff --git a/web/apps/auth/src/pages/credentials.tsx b/web/apps/auth/src/pages/credentials.tsxindex 9b8df2e13d..76351090b3 100644--- a/web/apps/auth/src/pages/credentials.tsx+++ b/web/apps/auth/src/pages/credentials.tsx@@ -1 +1,37 @@-export { default } from "ente-accounts/pages/credentials";+import {+ CredentialsForm,+ PasswordForm,+} from "@/components/auth/CredentialsForm";+import { SecondFactorChoiceDialog } from "@/components/auth/SecondFactorChoiceDialog";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsCredentialsPage, {+ type CredentialsPresentationProps,+} from "ente-accounts/pages/credentials";+import type React from "react";++function CredentialsPresentation(+ props: CredentialsPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <CredentialsForm {...props} />+ </AuthShell>+ );+}++function CredentialsPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsCredentialsPage />;+ }++ return (+ <AccountsCredentialsPage+ presentation={CredentialsPresentation}+ passwordPresentation={PasswordForm}+ secondFactorChoicePresentation={SecondFactorChoiceDialog}+ />+ );+}++export default CredentialsPage;diff --git a/web/apps/auth/src/pages/generate.tsx b/web/apps/auth/src/pages/generate.tsxindex 670ed3e823..f364077dcc 100644--- a/web/apps/auth/src/pages/generate.tsx+++ b/web/apps/auth/src/pages/generate.tsx@@ -1 +1,43 @@-export { default } from "ente-accounts/pages/generate";+import { RecoveryKeyForm } from "@/components/auth/RecoveryKeyForm";+import { SetPasswordForm } from "@/components/auth/SetPasswordForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import type { NewPasswordPresentationProps } from "ente-accounts/components/NewPasswordForm";+import type { RecoveryKeyPresentationProps } from "ente-accounts/components/RecoveryKey";+import AccountsGeneratePage from "ente-accounts/pages/generate";+import type React from "react";++function RecoveryKeyPresentation(+ props: RecoveryKeyPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <RecoveryKeyForm {...props} />+ </AuthShell>+ );+}++function SetPasswordPresentation(+ props: NewPasswordPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <SetPasswordForm {...props} />+ </AuthShell>+ );+}++function GeneratePage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsGeneratePage />;+ }++ return (+ <AccountsGeneratePage+ passwordPresentation={SetPasswordPresentation}+ recoveryKeyPresentation={RecoveryKeyPresentation}+ />+ );+}++export default GeneratePage;diff --git a/web/apps/auth/src/pages/login.tsx b/web/apps/auth/src/pages/login.tsxindex 846da93856..a88a1f1394 100644--- a/web/apps/auth/src/pages/login.tsx+++ b/web/apps/auth/src/pages/login.tsx@@ -1,5 +1,12 @@+import { DevSettingsDialog } from "@/components/auth/DevSettingsDialog";+import { LoginForm } from "@/components/auth/LoginForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";import { Paper, Stack, styled } from "@mui/material";-import { LoginContents } from "ente-accounts/components/LoginContents";+import {+ LoginContents,+ type LoginPresentationProps,+} from "ente-accounts/components/LoginContents";import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";import { CenteredFill } from "ente-base/components/containers";import { EnteLogo } from "ente-base/components/EnteLogo";@@ -8,7 +15,7 @@ import { NavbarBase } from "ente-base/components/Navbar";import { customAPIHost } from "ente-base/origins";import { DevSettings } from "ente-new/photos/components/DevSettings";import { useRouter } from "next/router";-import React, { useCallback, useEffect, useState } from "react";+import React, { useCallback, useEffect, useRef, useState } from "react";const AccountsPagePaper = styled(Paper)(({ theme }) => ({marginBlock: theme.spacing(2),@@ -23,11 +30,19 @@ const AccountsPagePaper = styled(Paper)(({ theme }) => ({borderRadius: "20px",}));-const Page: React.FC = () => {+function LoginPresentation(props: LoginPresentationProps): React.JSX.Element {+ return (+ <AuthShell>+ <LoginForm {...props} />+ </AuthShell>+ );+}++const LoginPage: React.FC = () => {const [loading, setLoading] = useState(true);const [host, setHost] = useState<string | undefined>(undefined);const [showDevSettings, setShowDevSettings] = useState(false);- const [tapCount, setTapCount] = useState(0);+ const tapCount = useRef(0);const router = useRouter();@@ -44,18 +59,33 @@ const Page: React.FC = () => {const onSignUp = useCallback(() => void router.push("/signup"), [router]);- const handleBackgroundClick: React.MouseEventHandler = (event) => {- if (!shouldAllowChangingAPIOrigin()) return;+ const countDevSettingsTap = () => {+ tapCount.current += 1;+ if (tapCount.current == 7) {+ tapCount.current = 0;+ setShowDevSettings(true);+ }+ };+ const handleLegacyBackgroundClick: React.MouseEventHandler = (event) => {+ if (!shouldAllowChangingAPIOrigin()) return;if (event.target !== event.currentTarget) return;-if (showDevSettings) return;+ countDevSettingsTap();+ };- setTapCount(tapCount + 1);- if (tapCount + 1 == 7) {- setTapCount(0);- setShowDevSettings(true);+ const handleNewAuthBackgroundClick: React.MouseEventHandler = (event) => {+ if (!shouldAllowChangingAPIOrigin()) return;+ if (showDevSettings) return;+ if (+ event.target instanceof Element &&+ event.target.closest(+ 'button, a, input, textarea, select, [role="button"]',+ )+ ) {+ return;}+ countDevSettingsTap();};const handleClose = () => {@@ -63,9 +93,25 @@ const Page: React.FC = () => {refreshHost();};- return loading ? (- <LoadingIndicator />- ) : (+ if (loading) return <LoadingIndicator />;++ if (featureFlags.enableNewAuthFlow) {+ return (+ <NewAuthRoot onClick={handleNewAuthBackgroundClick}>+ <LoginContents+ {...{ host, onSignUp }}+ presentation={LoginPresentation}+ />+ <DevSettings+ open={showDevSettings}+ onClose={handleClose}+ presentation={DevSettingsDialog}+ />+ </NewAuthRoot>+ );+ }++ return (<Stacksx={[{ minHeight: "100svh", bgcolor: "secondary.main" },@@ -85,7 +131,7 @@ const Page: React.FC = () => {<EnteLogo /></NavbarBase><CenteredFill- onClick={handleBackgroundClick}+ onClick={handleLegacyBackgroundClick}sx={[{ bgcolor: "secondary.main" },(theme) =>@@ -103,7 +149,9 @@ const Page: React.FC = () => {);};-export default Page;+export default LoginPage;++const NewAuthRoot = styled("div")({ width: "100%", minHeight: "100svh" });const shouldAllowChangingAPIOrigin = () => {const hostname = new URL(window.location.origin).hostname;diff --git a/web/apps/auth/src/pages/passkeys/recover.tsx b/web/apps/auth/src/pages/passkeys/recover.tsxindex 972142211c..d13153dc6b 100644--- a/web/apps/auth/src/pages/passkeys/recover.tsx+++ b/web/apps/auth/src/pages/passkeys/recover.tsx@@ -1,5 +1,32 @@-import Page_ from "ente-accounts/pages/two-factor/recover";+import { RecoverTwoFactorForm } from "@/components/auth/RecoveryForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsTwoFactorRecoverPage, {+ type TwoFactorRecoverPresentationProps,+} from "ente-accounts/pages/two-factor/recover";+import type React from "react";-const Page = () => <Page_ twoFactorType="passkey" />;+function RecoverTwoFactorPresentation(+ props: TwoFactorRecoverPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell contentWidth={420}>+ <RecoverTwoFactorForm {...props} />+ </AuthShell>+ );+}-export default Page;+function PasskeyRecoverPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsTwoFactorRecoverPage twoFactorType="passkey" />;+ }++ return (+ <AccountsTwoFactorRecoverPage+ twoFactorType="passkey"+ presentation={RecoverTwoFactorPresentation}+ />+ );+}++export default PasskeyRecoverPage;diff --git a/web/apps/auth/src/pages/recover.tsx b/web/apps/auth/src/pages/recover.tsxindex eb6a74c593..46b41ac57d 100644--- a/web/apps/auth/src/pages/recover.tsx+++ b/web/apps/auth/src/pages/recover.tsx@@ -1 +1,27 @@-export { default } from "ente-accounts/pages/recover";+import { RecoverAccountForm } from "@/components/auth/RecoveryForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsRecoverPage, {+ type RecoverAccountPresentationProps,+} from "ente-accounts/pages/recover";+import type React from "react";++function RecoverAccountPresentation(+ props: RecoverAccountPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell contentWidth={420}>+ <RecoverAccountForm {...props} />+ </AuthShell>+ );+}++function RecoverPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsRecoverPage />;+ }++ return <AccountsRecoverPage presentation={RecoverAccountPresentation} />;+}++export default RecoverPage;diff --git a/web/apps/auth/src/pages/signup.tsx b/web/apps/auth/src/pages/signup.tsxindex fa3c32852a..6f26a73082 100644--- a/web/apps/auth/src/pages/signup.tsx+++ b/web/apps/auth/src/pages/signup.tsx@@ -1 +1,24 @@-export { default } from "ente-accounts/pages/signup";+import { SignUpForm } from "@/components/auth/SignUpForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import type { SignUpPresentationProps } from "ente-accounts/components/SignUpContents";+import AccountsSignUpPage from "ente-accounts/pages/signup";+import type React from "react";++function SignUpPresentation(props: SignUpPresentationProps): React.JSX.Element {+ return (+ <AuthShell>+ <SignUpForm {...props} />+ </AuthShell>+ );+}++function SignUpPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsSignUpPage />;+ }++ return <AccountsSignUpPage presentation={SignUpPresentation} />;+}++export default SignUpPage;diff --git a/web/apps/auth/src/pages/two-factor/recover.tsx b/web/apps/auth/src/pages/two-factor/recover.tsxindex 201393276a..ea0b41e151 100644--- a/web/apps/auth/src/pages/two-factor/recover.tsx+++ b/web/apps/auth/src/pages/two-factor/recover.tsx@@ -1,5 +1,32 @@-import Page_ from "ente-accounts/pages/two-factor/recover";+import { RecoverTwoFactorForm } from "@/components/auth/RecoveryForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsTwoFactorRecoverPage, {+ type TwoFactorRecoverPresentationProps,+} from "ente-accounts/pages/two-factor/recover";+import type React from "react";-const Page = () => <Page_ twoFactorType="totp" />;+function RecoverTwoFactorPresentation(+ props: TwoFactorRecoverPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell contentWidth={420}>+ <RecoverTwoFactorForm {...props} />+ </AuthShell>+ );+}-export default Page;+function TwoFactorRecoverPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsTwoFactorRecoverPage twoFactorType="totp" />;+ }++ return (+ <AccountsTwoFactorRecoverPage+ twoFactorType="totp"+ presentation={RecoverTwoFactorPresentation}+ />+ );+}++export default TwoFactorRecoverPage;diff --git a/web/apps/auth/src/pages/two-factor/verify.tsx b/web/apps/auth/src/pages/two-factor/verify.tsxindex f3f3c99656..79d31b434b 100644--- a/web/apps/auth/src/pages/two-factor/verify.tsx+++ b/web/apps/auth/src/pages/two-factor/verify.tsx@@ -1 +1,27 @@-export { default } from "ente-accounts/pages/two-factor/verify";+import { TwoFactorForm } from "@/components/auth/TwoFactorForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsTwoFactorVerifyPage, {+ type TwoFactorVerifyPresentationProps,+} from "ente-accounts/pages/two-factor/verify";+import type React from "react";++function TwoFactorPresentation(+ props: TwoFactorVerifyPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <TwoFactorForm {...props} />+ </AuthShell>+ );+}++function TwoFactorVerifyPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsTwoFactorVerifyPage />;+ }++ return <AccountsTwoFactorVerifyPage presentation={TwoFactorPresentation} />;+}++export default TwoFactorVerifyPage;diff --git a/web/apps/auth/src/pages/verify.tsx b/web/apps/auth/src/pages/verify.tsxindex 7ec623fac9..6be3bcb2a3 100644--- a/web/apps/auth/src/pages/verify.tsx+++ b/web/apps/auth/src/pages/verify.tsx@@ -1 +1,33 @@-export { default } from "ente-accounts/pages/verify";+import { SecondFactorChoiceDialog } from "@/components/auth/SecondFactorChoiceDialog";+import { VerifyEmailForm } from "@/components/auth/VerifyEmailForm";+import { AuthShell } from "@/components/AuthShell";+import { featureFlags } from "@/featureFlags";+import AccountsVerifyPage, {+ type VerifyEmailPresentationProps,+} from "ente-accounts/pages/verify";+import type React from "react";++function VerifyEmailPresentation(+ props: VerifyEmailPresentationProps,+): React.JSX.Element {+ return (+ <AuthShell>+ <VerifyEmailForm {...props} />+ </AuthShell>+ );+}++function VerifyPage(): React.JSX.Element {+ if (!featureFlags.enableNewAuthFlow) {+ return <AccountsVerifyPage />;+ }++ return (+ <AccountsVerifyPage+ presentation={VerifyEmailPresentation}+ secondFactorChoicePresentation={SecondFactorChoiceDialog}+ />+ );+}++export default VerifyPage;diff --git a/web/apps/locker/src/components/LockerAuthShell.tsx b/web/apps/locker/src/components/LockerAuthShell.tsxindex 0e7c09da61..8ecc6c7e07 100644--- a/web/apps/locker/src/components/LockerAuthShell.tsx+++ b/web/apps/locker/src/components/LockerAuthShell.tsx@@ -117,7 +117,7 @@ const BrandPanel: React.FC<BrandPanelProps> = ({ headline, size }) => ({[t("locker_auth_free_files"),t("photos_auth_no_ads_no_spying"),- t("photos_auth_open_source_audited"),+ t("auth_independently_audited"),].map((bullet) => (<Bullet key={bullet}><CheckCircle aria-hidden="true">diff --git a/web/apps/locker/src/components/auth/SetPasswordForm.tsx b/web/apps/locker/src/components/auth/SetPasswordForm.tsxindex 46db1cd97d..4c95b7968f 100644--- a/web/apps/locker/src/components/auth/SetPasswordForm.tsx+++ b/web/apps/locker/src/components/auth/SetPasswordForm.tsx@@ -31,7 +31,7 @@ export function SetPasswordForm({<><ScreenHeadertitle={submitButtonTitle}- subtitle={t("locker_auth_password_recovery_warning")}+ subtitle={t("auth_password_recovery_warning")}/><Form onSubmit={onSubmit}><HiddenEmaildiff --git a/web/apps/photos/src/components/PhotosAuthShell.tsx b/web/apps/photos/src/components/PhotosAuthShell.tsxindex d6ffe83fd3..4ce6094f67 100644--- a/web/apps/photos/src/components/PhotosAuthShell.tsx+++ b/web/apps/photos/src/components/PhotosAuthShell.tsx@@ -119,7 +119,7 @@ const BrandPanel: React.FC<BrandPanelProps> = ({ headline, size }) => ({[t("photos_auth_free_storage"),t("photos_auth_no_ads_no_spying"),- t("photos_auth_open_source_audited"),+ t("auth_independently_audited"),].map((bullet) => (<Bullet key={bullet}><CheckCircle aria-hidden="true">diff --git a/web/package-lock.json b/web/package-lock.jsonindex 2bc4cded69..7b6c304e4e 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -109,6 +109,9 @@"apps/auth": {"version": "0.0.0","dependencies": {+ "@fontsource-variable/outfit": "5.2.8",+ "@hugeicons/core-free-icons": "1.2.1",+ "@hugeicons/react": "1.1.6","@noble/hashes": "2.2.0","ente-accounts": "*","ente-base": "*",diff --git a/web/packages/base/locales/en-US/translation.json b/web/packages/base/locales/en-US/translation.jsonindex e2c0091211..c013618489 100644--- a/web/packages/base/locales/en-US/translation.json+++ b/web/packages/base/locales/en-US/translation.json@@ -887,10 +887,11 @@"photos_auth_subtitle": "End-to-end encrypted. Cross-platform. Open-source.","photos_auth_free_storage": "10 GB free forever","photos_auth_no_ads_no_spying": "No ads, no spying",- "photos_auth_open_source_audited": "Open source, independently audited",+ "auth_independently_audited": "Independently audited","locker_auth_headline": "Safe home for your important files","locker_auth_free_files": "100 files free forever",- "locker_auth_password_recovery_warning": "We don't store your password. If you forget it, the only way back to your files is your recovery key.",+ "authenticator_auth_headline": "Safe home for your 2FA codes",+ "authenticator_auth_free": "Free forever","auth_recover_account_subtitle": "Enter the recovery key you saved when you created your account.","auth_recover_two_factor_subtitle": "Enter your recovery key to regain access to your account.","auth_recovery_key_placeholder": "Paste your 24-word recovery key",@@ -920,7 +921,7 @@"auth_welcome_back": "Welcome back","auth_login_subtitle": "Enter your details to continue.","auth_new_account_prompt": "Don't have an account?",- "auth_password_recovery_warning": "We don't store your password. If you forget it, the only way back to your photos is your recovery key.",+ "auth_password_recovery_warning": "We don't store your password. If you forget it, the only way back to your account is your recovery key.","auth_strong_password_placeholder": "Choose a strong password","auth_repeat_password_placeholder": "Type it once more","auth_check_inbox": "Check your inbox",