Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion app/(authenticated)/vault/opengraph-image.alt.txt

This file was deleted.

Binary file removed app/(authenticated)/vault/opengraph-image.png
Binary file not shown.
190 changes: 0 additions & 190 deletions app/_components/og-mark.tsx

This file was deleted.

Binary file added app/apple-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 0 additions & 28 deletions app/icon.tsx

This file was deleted.

1 change: 1 addition & 0 deletions app/opengraph-image.alt.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
OpenInstinct
Binary file added app/opengraph-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion proxy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,7 @@ export async function proxy(request: NextRequest) {
}

export const config = {
matcher: ["/((?!_next/static|_next/image|fonts|favicon.ico).*)"],
matcher: [
"/((?!_next/static|_next/image|fonts|favicon.ico|icon\\.svg$|apple-icon\\.png$|opengraph-image\\.png$).*)",
],
};
23 changes: 23 additions & 0 deletions web/auth/tests/proxy.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,29 @@ beforeEach(() => {
});

describe("auth proxy matcher", () => {
it.each([
"/icon.svg",
"/icon.svg?icon.hash.svg",
"/apple-icon.png",
"/apple-icon.png?apple-icon.hash.png",
"/opengraph-image.png",
"/opengraph-image.png?opengraph-image.hash.png",
])("does not match public branding asset %s", (url) => {
expect(unstable_doesMiddlewareMatch({ config, nextConfig: {}, url })).toBe(
false
);
});

it.each([
"/icon.svg/private",
"/apple-icon.png/private",
"/opengraph-image.png/private",
])("continues to match paths beneath a branding filename %s", (url) => {
expect(unstable_doesMiddlewareMatch({ config, nextConfig: {}, url })).toBe(
true
);
});

it("does not match public fonts", () => {
expect(
unstable_doesMiddlewareMatch({
Expand Down
70 changes: 10 additions & 60 deletions web/components/ui/logo.tsx
Original file line number Diff line number Diff line change
@@ -1,76 +1,26 @@
import * as React from "react";

type LogoProps = React.ComponentPropsWithoutRef<"svg">;
type LogoCssProperties = React.CSSProperties & Record<`--${string}`, string>;

const logoThemeStyles = {
"--logo-face-left-opacity": "0.82",
"--logo-face-right-opacity": "0.64",
"--logo-outline": "var(--foreground)",
} satisfies LogoCssProperties;

function Logo({ className, style, ...props }: LogoProps) {
function Logo({ className, ...props }: LogoProps) {
return (
<svg
aria-hidden="true"
className={["size-5 shrink-0", className].filter(Boolean).join(" ")}
data-slot="logo"
fill="none"
style={{ ...logoThemeStyles, ...style }}
viewBox="-118.955 0 1500.07 1500.07"
fill="currentColor"
focusable="false"
viewBox="-85 0 1229 1229"
xmlns="http://www.w3.org/2000/svg"
{...props}
>
<polygon
fill="var(--primary)"
fillOpacity="var(--logo-face-left-opacity)"
points="329.93 573.62 329.93 928.72 631.08 1108.55 631.08 751.17 329.93 573.62"
/>
<polygon
fill="var(--primary)"
points="631.08 393.8 631.08 393.8 329.93 573.62 631.08 751.17 930.02 573.62 631.08 393.8"
/>
<polygon
fill="var(--primary)"
fillOpacity="var(--logo-face-right-opacity)"
points="930.02 573.62 631.08 751.17 631.08 1108.55 631.08 1108.55 930.02 928.72 930.02 573.62"
{/* OpenInstinct's mark with transparent cutouts for every surface. */}
<path
d="M0 170H445V360H614V170H1059V1229H0Z M867 698.5a338.5 338.5 0 1 0-677 0a338.5 338.5 0 1 0 677 0Z"
fillRule="evenodd"
/>
<g fill="none">
<polygon points="312.22 564.99 37.64 402.02 37.64 1093.63 312.22 930.71 312.22 564.99" />
<polygon points="941.31 557.13 1214.81 394.85 637.73 51.75 637.73 377.25 941.31 557.13" />
<polygon points="624.44 377.25 624.44 51.75 49.74 393.43 323.2 555.73 624.44 377.25" />
<polygon points="949.94 929.43 1224.52 1092.39 1224.52 404.85 949.94 567.77 949.94 929.43" />
<polygon points="637.73 1095.49 925.59 924.17 925.59 582.22 637.73 753.02 637.73 1095.49" />
<polygon points="917.64 571.17 631.08 400.63 346.86 569.78 633.38 739.83 917.64 571.17" />
<polygon points="632.81 751.17 632.24 750.15 631.67 751.17 632.81 751.17" />
<polygon points="625.92 751.17 336.58 579.44 336.58 924.17 624.44 1095.49 624.44 751.17 625.92 751.17" />
<polygon points="637.73 1125.1 637.73 1452.87 1221.01 1106.08 945.65 942.65 637.73 1125.1" />
<polygon points="317.6 943.29 42.19 1106.7 624.44 1452.87 624.44 1125.1 317.6 943.29" />
</g>
<g fill="var(--logo-outline)">
<polygon points="925.59 582.22 925.59 924.17 637.73 1095.49 637.73 1125.1 945.65 942.65 937.56 937.85 944.21 926.02 949.94 929.43 949.94 567.77 925.59 582.22" />
<polygon points="631.08 400.63 917.64 571.17 941.31 557.13 637.73 377.25 637.73 389.24 624.44 389.24 624.44 377.25 323.2 555.73 346.86 569.78 631.08 400.63" />
<polygon points="336.58 924.17 336.58 579.44 312.22 564.99 312.22 930.71 324.26 923.57 330.9 935.4 317.6 943.29 624.44 1125.1 624.44 1095.49 336.58 924.17" />
<path d="M631.08,0L0,375.59v748.9l631.08,375.59,631.08-375.59V375.59L631.08,0ZM1244.38,1119.95l-23.37-13.87-583.28,346.79v24.44h-13.29v-24.44L42.19,1106.7l-18.14,10.76-6.64-11.83,20.24-12.01V402.02l-19.13-11.35,6.64-11.83,24.58,14.59L624.44,51.75v-26.71h13.29v26.71l577.08,343.1,25.16-14.93,6.64,11.83-22.08,13.1v687.54l26.5,15.73-6.64,11.83Z" />
<polygon points="631.08 373.31 637.73 377.25 637.73 51.75 631.08 47.8 624.44 51.75 624.44 377.25 631.08 373.31" />
<polygon points="637.73 389.24 637.73 377.25 631.08 373.31 624.44 377.25 624.44 389.24 637.73 389.24" />
<polygon points="637.73 51.75 637.73 25.04 624.44 25.04 624.44 51.75 631.08 47.8 637.73 51.75" />
<polygon points="312.22 940.1 312.22 930.71 37.64 1093.63 37.64 1104 42.19 1106.7 317.6 943.29 312.22 940.1" />
<polygon points="324.26 923.57 312.22 930.71 312.22 940.1 317.6 943.29 330.9 935.4 324.26 923.57" />
<polygon points="37.64 1093.63 17.41 1105.63 24.05 1117.46 42.19 1106.7 37.64 1104 37.64 1093.63" />
<polygon points="1224.52 1092.39 949.94 929.43 949.94 940.1 945.65 942.65 1221.01 1106.08 1224.52 1104 1224.52 1092.39" />
<polygon points="937.56 937.85 945.65 942.65 949.94 940.1 949.94 929.43 944.21 926.02 937.56 937.85" />
<polygon points="1224.52 1104 1221.01 1106.08 1244.38 1119.95 1251.02 1108.12 1224.52 1092.39 1224.52 1104" />
<polygon points="631.08 1129.03 624.44 1125.1 624.44 1452.87 631.08 1456.82 637.73 1452.87 637.73 1125.1 631.08 1129.03" />
<polygon points="631.08 1099.44 624.44 1095.49 624.44 1125.1 631.08 1129.03 637.73 1125.1 637.73 1095.49 631.08 1099.44" />
<polygon points="624.44 1452.87 624.44 1477.31 637.73 1477.31 637.73 1452.87 631.08 1456.82 624.44 1452.87" />
<polygon points="949.94 562.24 949.94 567.77 1224.52 404.85 1224.52 400.63 1214.81 394.85 941.31 557.13 949.94 562.24" />
<polygon points="925.59 575.9 925.59 582.22 949.94 567.77 949.94 562.24 941.31 557.13 917.64 571.17 925.59 575.9" />
<polygon points="1224.52 404.85 1246.6 391.75 1239.96 379.92 1214.81 394.85 1224.52 400.63 1224.52 404.85" />
<polygon points="312.22 562.24 323.2 555.73 49.74 393.43 37.64 400.63 37.64 402.02 312.22 564.99 312.22 562.24" />
<polygon points="336.58 575.9 346.86 569.78 323.2 555.73 312.22 562.24 312.22 564.99 336.58 579.44 336.58 575.9" />
<polygon points="49.74 393.43 25.16 378.84 18.52 390.67 37.64 402.02 37.64 400.63 49.74 393.43" />
</g>
<rect height="170" width="169" x="445" y="0" />
<rect height="523" width="169" x="445" y="360" />
</svg>
);
}
Expand Down
Loading