diff --git a/package-lock.json b/package-lock.json index 8a14d7ef..c82b1de7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "@ory/client": "^1.21.3", "@ory/elements-react": "^1.0.0-next.41", "@ory/nextjs": "^1.0.0-rc.0", + "@radix-ui/react-accordion": "^1.2.12", "@radix-ui/react-form": "^0.1.3-rc.7", "@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-label": "^2.1.2", @@ -7615,20 +7616,192 @@ } }, "node_modules/@radix-ui/react-accordion": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz", - "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==", + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.12.tgz", + "integrity": "sha512-T4nygeh9YE9dLRPhAHSeOZi7HBXo+0kYIPJXayZfvWOWA0+n3dESrZbjfDPUABkUNym6Hd+f2IR113To8D2GPA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collapsible": "1.1.3", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0" + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-collapsible": "1.1.12", + "@radix-ui/react-collection": "1.1.7", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-direction": "1.1.1", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-controllable-state": "1.2.2" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/primitive": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz", + "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==", + "license": "MIT" + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-collapsible": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.12.tgz", + "integrity": "sha512-Uu+mSh4agx2ib1uIGPP4/CKNULyajb3p92LsVXmH2EHVMTfZWpll88XJ0j4W0z3f8NK1eYl1+Mf/szHPmcHzyA==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.3", + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-id": "1.1.1", + "@radix-ui/react-presence": "1.1.5", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-collection": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz", + "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-context": "1.1.2", + "@radix-ui/react-primitive": "2.1.3", + "@radix-ui/react-slot": "1.2.3" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-compose-refs": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", + "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-context": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", + "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-direction": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz", + "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-id": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", + "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-presence": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz", + "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-compose-refs": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-primitive": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", + "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-slot": "1.2.3" }, "peerDependencies": { "@types/react": "*", @@ -7645,6 +7818,40 @@ } } }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-use-controllable-state": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", + "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-effect-event": "0.0.2", + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-accordion/node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", + "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-alert-dialog": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.6.tgz", @@ -8870,12 +9077,12 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.1.3-rc.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.3-rc.5.tgz", - "integrity": "sha512-WwmUDNOa3qV692WUmWXjBDl5BqH4JEC5N0PR4cXbJIxSkNiKYHsM3p6grTvSfjH/LjYptS46R3+u8Vu6gMTRPQ==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", + "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2-rc.5" + "@radix-ui/react-compose-refs": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -8888,9 +9095,9 @@ } }, "node_modules/@radix-ui/react-slot/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2-rc.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2-rc.5.tgz", - "integrity": "sha512-sA8AapytHc1abpubHOGk8Uij8v1CG+bFnhdf3aw+fbMZP43h8/91Vrzd51fRAX1JyEnxEbqU1owG98YT2x/FQw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", + "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -9163,6 +9370,39 @@ } } }, + "node_modules/@radix-ui/react-use-effect-event": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", + "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", + "license": "MIT", + "dependencies": { + "@radix-ui/react-use-layout-effect": "1.1.1" + }, + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@radix-ui/react-use-effect-event/node_modules/@radix-ui/react-use-layout-effect": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", + "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", + "license": "MIT", + "peerDependencies": { + "@types/react": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@radix-ui/react-use-escape-keydown": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", @@ -21404,6 +21644,37 @@ } } }, + "node_modules/radix-ui/node_modules/@radix-ui/react-accordion": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz", + "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==", + "license": "MIT", + "dependencies": { + "@radix-ui/primitive": "1.1.1", + "@radix-ui/react-collapsible": "1.1.3", + "@radix-ui/react-collection": "1.1.2", + "@radix-ui/react-compose-refs": "1.1.1", + "@radix-ui/react-context": "1.1.1", + "@radix-ui/react-direction": "1.1.0", + "@radix-ui/react-id": "1.1.0", + "@radix-ui/react-primitive": "2.0.2", + "@radix-ui/react-use-controllable-state": "1.1.0" + }, + "peerDependencies": { + "@types/react": "*", + "@types/react-dom": "*", + "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", + "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, "node_modules/radix-ui/node_modules/@radix-ui/react-form": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@radix-ui/react-form/-/react-form-0.1.2.tgz", diff --git a/package.json b/package.json index 9c3d1eb4..92380a89 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "@ory/client": "^1.21.3", "@ory/elements-react": "^1.0.0-next.41", "@ory/nextjs": "^1.0.0-rc.0", + "@radix-ui/react-accordion": "^1.2.12", "@radix-ui/react-form": "^0.1.3-rc.7", "@radix-ui/react-icons": "^1.3.2", "@radix-ui/react-label": "^2.1.2", diff --git a/public/img/dithered-globe.png b/public/img/dithered-globe.png new file mode 100644 index 00000000..7279795a Binary files /dev/null and b/public/img/dithered-globe.png differ diff --git a/public/img/ringsIcon-dark.svg b/public/img/ringsIcon-dark.svg new file mode 100644 index 00000000..2aedd145 --- /dev/null +++ b/public/img/ringsIcon-dark.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/public/img/ringsIcon.svg b/public/img/ringsIcon.svg new file mode 100644 index 00000000..13234d8b --- /dev/null +++ b/public/img/ringsIcon.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/public/logo/logo-dark.svg b/public/logo/logo-dark.svg new file mode 100644 index 00000000..d8fc3acc --- /dev/null +++ b/public/logo/logo-dark.svg @@ -0,0 +1,12 @@ + + + 48 Slice + + + + + + + + + \ No newline at end of file diff --git a/public/logo/logo-light.svg b/public/logo/logo-light.svg new file mode 100644 index 00000000..ee0c9f09 --- /dev/null +++ b/public/logo/logo-light.svg @@ -0,0 +1,12 @@ + + + 48 Slice + + + + + + + + + \ No newline at end of file diff --git a/public/logo/logolockup-dark.svg b/public/logo/logolockup-dark.svg new file mode 100644 index 00000000..ffd742c4 --- /dev/null +++ b/public/logo/logolockup-dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/public/logo/logolockup-light.svg b/public/logo/logolockup-light.svg new file mode 100644 index 00000000..794411f5 --- /dev/null +++ b/public/logo/logolockup-light.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/src/app/[account_id]/IndividualProfilePage.tsx b/src/app/(app)/[account_id]/IndividualProfilePage.tsx similarity index 100% rename from src/app/[account_id]/IndividualProfilePage.tsx rename to src/app/(app)/[account_id]/IndividualProfilePage.tsx diff --git a/src/app/[account_id]/OrganizationProfilePage.tsx b/src/app/(app)/[account_id]/OrganizationProfilePage.tsx similarity index 97% rename from src/app/[account_id]/OrganizationProfilePage.tsx rename to src/app/(app)/[account_id]/OrganizationProfilePage.tsx index cf8c870d..28c3c090 100644 --- a/src/app/[account_id]/OrganizationProfilePage.tsx +++ b/src/app/(app)/[account_id]/OrganizationProfilePage.tsx @@ -1,5 +1,5 @@ import { Container, Box } from "@radix-ui/themes"; -import { OrganizationProfile } from "../../components/features/profiles/OrganizationProfile"; +import { OrganizationProfile } from "@/components/features/profiles/OrganizationProfile"; import { PendingInvitationBanner } from "@/components/features/memberships/PendingInvitationBanner"; import { accountsTable, diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/@readme/loading.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/@readme/loading.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/@readme/loading.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/@readme/loading.tsx diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/@readme/page.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/@readme/page.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/@readme/page.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/@readme/page.tsx diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/layout.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/layout.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/layout.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/layout.tsx diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/loading.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/loading.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/loading.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/loading.tsx diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/page.test.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/page.test.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/page.test.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/page.test.tsx diff --git a/src/app/[account_id]/[product_id]/(product)/[[...path]]/page.tsx b/src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/page.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/(product)/[[...path]]/page.tsx rename to src/app/(app)/[account_id]/[product_id]/(product)/[[...path]]/page.tsx diff --git a/src/app/[account_id]/[product_id]/loading.tsx b/src/app/(app)/[account_id]/[product_id]/loading.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/loading.tsx rename to src/app/(app)/[account_id]/[product_id]/loading.tsx diff --git a/src/app/[account_id]/[product_id]/not-found.tsx b/src/app/(app)/[account_id]/[product_id]/not-found.tsx similarity index 100% rename from src/app/[account_id]/[product_id]/not-found.tsx rename to src/app/(app)/[account_id]/[product_id]/not-found.tsx diff --git a/src/app/[account_id]/loading.tsx b/src/app/(app)/[account_id]/loading.tsx similarity index 100% rename from src/app/[account_id]/loading.tsx rename to src/app/(app)/[account_id]/loading.tsx diff --git a/src/app/[account_id]/not-found.tsx b/src/app/(app)/[account_id]/not-found.tsx similarity index 100% rename from src/app/[account_id]/not-found.tsx rename to src/app/(app)/[account_id]/not-found.tsx diff --git a/src/app/[account_id]/organization/new/layout.tsx b/src/app/(app)/[account_id]/organization/new/layout.tsx similarity index 100% rename from src/app/[account_id]/organization/new/layout.tsx rename to src/app/(app)/[account_id]/organization/new/layout.tsx diff --git a/src/app/[account_id]/organization/new/loading.tsx b/src/app/(app)/[account_id]/organization/new/loading.tsx similarity index 100% rename from src/app/[account_id]/organization/new/loading.tsx rename to src/app/(app)/[account_id]/organization/new/loading.tsx diff --git a/src/app/[account_id]/organization/new/page.tsx b/src/app/(app)/[account_id]/organization/new/page.tsx similarity index 100% rename from src/app/[account_id]/organization/new/page.tsx rename to src/app/(app)/[account_id]/organization/new/page.tsx diff --git a/src/app/[account_id]/page.test.tsx b/src/app/(app)/[account_id]/page.test.tsx similarity index 100% rename from src/app/[account_id]/page.test.tsx rename to src/app/(app)/[account_id]/page.test.tsx diff --git a/src/app/[account_id]/page.tsx b/src/app/(app)/[account_id]/page.tsx similarity index 94% rename from src/app/[account_id]/page.tsx rename to src/app/(app)/[account_id]/page.tsx index 607a24f3..17c3af41 100644 --- a/src/app/[account_id]/page.tsx +++ b/src/app/(app)/[account_id]/page.tsx @@ -12,7 +12,7 @@ import { Metadata } from "next"; import { notFound } from "next/navigation"; -import { OrganizationProfilePage } from "@/app/[account_id]/OrganizationProfilePage"; +import { OrganizationProfilePage } from "@/app/(app)/[account_id]/OrganizationProfilePage"; import { accountsTable, isOrganizationalAccount } from "@/lib/clients/database"; import { IndividualProfilePage } from "./IndividualProfilePage"; import { diff --git a/src/app/edit/account/[account_id]/layout.tsx b/src/app/(app)/edit/account/[account_id]/layout.tsx similarity index 100% rename from src/app/edit/account/[account_id]/layout.tsx rename to src/app/(app)/edit/account/[account_id]/layout.tsx diff --git a/src/app/edit/account/[account_id]/memberships/loading.tsx b/src/app/(app)/edit/account/[account_id]/memberships/loading.tsx similarity index 100% rename from src/app/edit/account/[account_id]/memberships/loading.tsx rename to src/app/(app)/edit/account/[account_id]/memberships/loading.tsx diff --git a/src/app/edit/account/[account_id]/memberships/page.tsx b/src/app/(app)/edit/account/[account_id]/memberships/page.tsx similarity index 100% rename from src/app/edit/account/[account_id]/memberships/page.tsx rename to src/app/(app)/edit/account/[account_id]/memberships/page.tsx diff --git a/src/app/edit/account/[account_id]/page.tsx b/src/app/(app)/edit/account/[account_id]/page.tsx similarity index 100% rename from src/app/edit/account/[account_id]/page.tsx rename to src/app/(app)/edit/account/[account_id]/page.tsx diff --git a/src/app/edit/account/[account_id]/permissions/loading.tsx b/src/app/(app)/edit/account/[account_id]/permissions/loading.tsx similarity index 100% rename from src/app/edit/account/[account_id]/permissions/loading.tsx rename to src/app/(app)/edit/account/[account_id]/permissions/loading.tsx diff --git a/src/app/edit/account/[account_id]/permissions/page.tsx b/src/app/(app)/edit/account/[account_id]/permissions/page.tsx similarity index 100% rename from src/app/edit/account/[account_id]/permissions/page.tsx rename to src/app/(app)/edit/account/[account_id]/permissions/page.tsx diff --git a/src/app/edit/account/[account_id]/profile-picture/loading.tsx b/src/app/(app)/edit/account/[account_id]/profile-picture/loading.tsx similarity index 100% rename from src/app/edit/account/[account_id]/profile-picture/loading.tsx rename to src/app/(app)/edit/account/[account_id]/profile-picture/loading.tsx diff --git a/src/app/edit/account/[account_id]/profile-picture/page.tsx b/src/app/(app)/edit/account/[account_id]/profile-picture/page.tsx similarity index 100% rename from src/app/edit/account/[account_id]/profile-picture/page.tsx rename to src/app/(app)/edit/account/[account_id]/profile-picture/page.tsx diff --git a/src/app/edit/account/[account_id]/profile/loading.tsx b/src/app/(app)/edit/account/[account_id]/profile/loading.tsx similarity index 100% rename from src/app/edit/account/[account_id]/profile/loading.tsx rename to src/app/(app)/edit/account/[account_id]/profile/loading.tsx diff --git a/src/app/edit/account/[account_id]/profile/page.tsx b/src/app/(app)/edit/account/[account_id]/profile/page.tsx similarity index 100% rename from src/app/edit/account/[account_id]/profile/page.tsx rename to src/app/(app)/edit/account/[account_id]/profile/page.tsx diff --git a/src/app/edit/loading.tsx b/src/app/(app)/edit/loading.tsx similarity index 100% rename from src/app/edit/loading.tsx rename to src/app/(app)/edit/loading.tsx diff --git a/src/app/edit/page.tsx b/src/app/(app)/edit/page.tsx similarity index 100% rename from src/app/edit/page.tsx rename to src/app/(app)/edit/page.tsx diff --git a/src/app/edit/product/[account_id]/[product_id]/details/page.tsx b/src/app/(app)/edit/product/[account_id]/[product_id]/details/page.tsx similarity index 100% rename from src/app/edit/product/[account_id]/[product_id]/details/page.tsx rename to src/app/(app)/edit/product/[account_id]/[product_id]/details/page.tsx diff --git a/src/app/edit/product/[account_id]/[product_id]/layout.tsx b/src/app/(app)/edit/product/[account_id]/[product_id]/layout.tsx similarity index 100% rename from src/app/edit/product/[account_id]/[product_id]/layout.tsx rename to src/app/(app)/edit/product/[account_id]/[product_id]/layout.tsx diff --git a/src/app/edit/product/[account_id]/[product_id]/memberships/page.tsx b/src/app/(app)/edit/product/[account_id]/[product_id]/memberships/page.tsx similarity index 100% rename from src/app/edit/product/[account_id]/[product_id]/memberships/page.tsx rename to src/app/(app)/edit/product/[account_id]/[product_id]/memberships/page.tsx diff --git a/src/app/edit/product/[account_id]/[product_id]/not-found.tsx b/src/app/(app)/edit/product/[account_id]/[product_id]/not-found.tsx similarity index 100% rename from src/app/edit/product/[account_id]/[product_id]/not-found.tsx rename to src/app/(app)/edit/product/[account_id]/[product_id]/not-found.tsx diff --git a/src/app/edit/product/[account_id]/[product_id]/page.tsx b/src/app/(app)/edit/product/[account_id]/[product_id]/page.tsx similarity index 100% rename from src/app/edit/product/[account_id]/[product_id]/page.tsx rename to src/app/(app)/edit/product/[account_id]/[product_id]/page.tsx diff --git a/src/app/edit/product/[account_id]/page.tsx b/src/app/(app)/edit/product/[account_id]/page.tsx similarity index 100% rename from src/app/edit/product/[account_id]/page.tsx rename to src/app/(app)/edit/product/[account_id]/page.tsx diff --git a/src/app/email-verified/layout.tsx b/src/app/(app)/email-verified/layout.tsx similarity index 100% rename from src/app/email-verified/layout.tsx rename to src/app/(app)/email-verified/layout.tsx diff --git a/src/app/email-verified/loading.tsx b/src/app/(app)/email-verified/loading.tsx similarity index 100% rename from src/app/email-verified/loading.tsx rename to src/app/(app)/email-verified/loading.tsx diff --git a/src/app/email-verified/page.tsx b/src/app/(app)/email-verified/page.tsx similarity index 100% rename from src/app/email-verified/page.tsx rename to src/app/(app)/email-verified/page.tsx diff --git a/src/app/loading.tsx b/src/app/(app)/featured/loading.tsx similarity index 100% rename from src/app/loading.tsx rename to src/app/(app)/featured/loading.tsx diff --git a/src/app/page.tsx b/src/app/(app)/featured/page.tsx similarity index 94% rename from src/app/page.tsx rename to src/app/(app)/featured/page.tsx index 5deae1a2..368ddd0d 100644 --- a/src/app/page.tsx +++ b/src/app/(app)/featured/page.tsx @@ -18,7 +18,7 @@ export const metadata = { }, }; -export default async function HomePage() { +export default async function FeaturedProductsPage() { // Fetch featured products on the server const result = await getProducts({ featuredOnly: true, diff --git a/src/app/feed.xml/route.ts b/src/app/(app)/feed.xml/route.ts similarity index 100% rename from src/app/feed.xml/route.ts rename to src/app/(app)/feed.xml/route.ts diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx new file mode 100644 index 00000000..c801183c --- /dev/null +++ b/src/app/(app)/layout.tsx @@ -0,0 +1,20 @@ +import { Box, Container, Flex } from "@radix-ui/themes"; +import { Navigation, Footer } from "@/components"; + +interface AppLayoutProps { + children: React.ReactNode; +} + +export default async function AppLayout({ children }: AppLayoutProps) { + return ( + + + + + {children} + + +