diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 201b009a45..122cb7c56c 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -93,32 +93,30 @@ importers: '@types/react': ^18.0.0 '@types/react-dom': ^18.0.0 '@types/react-typist': ^2.0.3 - astro: ^1.1.0 - astro-robots-txt: ^0.3.8 + astro: ^1.1.1 astro-seo: ^0.6.0 nanostores: ^0.6.0 - react: ^18.0.0 - react-dom: ^18.0.0 + react: 18.0.0 + react-dom: 18.0.0 react-typist: ^2.0.5 dependencies: '@algolia/client-search': 4.14.2 '@docsearch/css': 3.2.1 - '@docsearch/react': 3.2.1_bnoix7udcyfzum3bz5llzjedt4 - '@nanostores/react': 0.3.0_resngft2y545aodfc4fe35fzvu - astro-robots-txt: 0.3.8 + '@docsearch/react': 3.2.1_yfbvrhpbhfpiewzab37lntawvq + '@nanostores/react': 0.3.0_gwdviqdq472dtrt62dkrmuf3uu astro-seo: 0.6.0 nanostores: 0.6.0 - react-typist: 2.0.5_biqbaboplfbrettd7655fr4n2y devDependencies: - '@astrojs/react': 1.1.0_biqbaboplfbrettd7655fr4n2y + '@astrojs/react': 1.1.0_zpnidt7m3osuk7shl3s4oenomq '@astrojs/tailwind': 1.0.0 '@types/node': 18.7.13 '@types/react': 18.0.17 '@types/react-dom': 18.0.6 '@types/react-typist': 2.0.3 astro: 1.1.1 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 + react: 18.0.0 + react-dom: 18.0.0_react@18.0.0 + react-typist: 2.0.5_zpnidt7m3osuk7shl3s4oenomq packages: @@ -312,7 +310,7 @@ packages: prismjs: 1.29.0 dev: true - /@astrojs/react/1.1.0_biqbaboplfbrettd7655fr4n2y: + /@astrojs/react/1.1.0_zpnidt7m3osuk7shl3s4oenomq: resolution: {integrity: sha512-T9/mEE/9yO36X3QeqzQjGMFXRH0f3vcBC9Jhxb3oGm5NlKm2m9Sg9GR52fcCtLRVR3ihc8qAElgEmQAAUTZ3KQ==} engines: {node: ^14.18.0 || >=16.12.0} peerDependencies: @@ -321,8 +319,8 @@ packages: dependencies: '@babel/core': 7.18.13 '@babel/plugin-transform-react-jsx': 7.18.10_@babel+core@7.18.13 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 + react: 18.0.0 + react-dom: 18.0.0_react@18.0.0 transitivePeerDependencies: - supports-color dev: true @@ -971,7 +969,7 @@ packages: resolution: {integrity: sha512-gaP6TxxwQC+K8D6TRx5WULUWKrcbzECOPA2KCVMuI+6C7dNiGUk5yXXzVhc5sld79XKYLnO9DRTI4mjXDYkh+g==} dev: false - /@docsearch/react/3.2.1_bnoix7udcyfzum3bz5llzjedt4: + /@docsearch/react/3.2.1_yfbvrhpbhfpiewzab37lntawvq: resolution: {integrity: sha512-EzTQ/y82s14IQC5XVestiK/kFFMe2aagoYFuTAIfIb/e+4FU7kSMKonRtLwsCiLQHmjvNQq+HO+33giJ5YVtaQ==} peerDependencies: '@types/react': '>= 16.8.0 < 19.0.0' @@ -990,8 +988,8 @@ packages: '@docsearch/css': 3.2.1 '@types/react': 18.0.17 algoliasearch: 4.14.2 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 + react: 18.0.0 + react-dom: 18.0.0_react@18.0.0 transitivePeerDependencies: - '@algolia/client-search' dev: false @@ -1140,7 +1138,7 @@ packages: read-yaml-file: 1.1.0 dev: true - /@nanostores/react/0.3.0_resngft2y545aodfc4fe35fzvu: + /@nanostores/react/0.3.0_gwdviqdq472dtrt62dkrmuf3uu: resolution: {integrity: sha512-gf2vRS2kGxLzLAF20BlUeFxMtBVEHaErk2XQ1YYnTAPtuesBD2nB1ndAOOinL2mSS2zxyQ4jtW3uljvbsGNuIQ==} engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0} peerDependencies: @@ -1149,9 +1147,9 @@ packages: react-dom: '>=18.0.0' dependencies: nanostores: 0.6.0 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 - use-sync-external-store: 1.2.0_react@18.2.0 + react: 18.0.0 + react-dom: 18.0.0_react@18.0.0 + use-sync-external-store: 1.2.0_react@18.0.0 dev: false /@nodelib/fs.scandir/2.1.5: @@ -1759,14 +1757,6 @@ packages: engines: {node: '>=8'} dev: true - /astro-robots-txt/0.3.8: - resolution: {integrity: sha512-rx69T8hd79whl4cmGKZCA5KUgWuSU9EKPPqO6RKfIrvDoFpw7sZ/j7EDXWYmT7f+U94oiISNVLnIafmUEkgC5A==} - dependencies: - deepmerge: 4.2.2 - valid-filename: 4.0.0 - zod: 3.18.0 - dev: false - /astro-seo/0.6.0: resolution: {integrity: sha512-nR+dJlAyQhX6s0oAmbBqPq3KCZax/zVAerFsclGiJQ2znOkS/7L+RGjziS4M9Q3OQxm3FMfqIKHp9Ns73Q81ww==} dev: false @@ -2347,6 +2337,7 @@ packages: /deepmerge/4.2.2: resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==} engines: {node: '>=0.10.0'} + dev: true /defaults/1.0.3: resolution: {integrity: sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==} @@ -3304,11 +3295,6 @@ packages: flat-cache: 3.0.4 dev: true - /filename-reserved-regex/3.0.0: - resolution: {integrity: sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dev: false - /fill-range/7.0.1: resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==} engines: {node: '>=8'} @@ -5018,6 +5004,7 @@ packages: /object-assign/4.1.1: resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==} engines: {node: '>=0.10.0'} + dev: true /object-hash/3.0.0: resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==} @@ -5472,6 +5459,7 @@ packages: loose-envify: 1.4.0 object-assign: 4.1.1 react-is: 16.13.1 + dev: true /property-information/6.1.1: resolution: {integrity: sha512-hrzC564QIl0r0vy4l6MvRLhafmUowhO/O3KgVSoXIbbA2Sz4j8HGpJc6T2cubRVwMwpdiG/vKGfhT4IixmKN9w==} @@ -5504,31 +5492,32 @@ packages: engines: {node: '>=10'} dev: true - /react-dom/18.2.0_react@18.2.0: - resolution: {integrity: sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==} + /react-dom/18.0.0_react@18.0.0: + resolution: {integrity: sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==} peerDependencies: - react: ^18.2.0 + react: ^18.0.0 dependencies: loose-envify: 1.4.0 - react: 18.2.0 - scheduler: 0.23.0 + react: 18.0.0 + scheduler: 0.21.0 /react-is/16.13.1: resolution: {integrity: sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==} + dev: true - /react-typist/2.0.5_biqbaboplfbrettd7655fr4n2y: + /react-typist/2.0.5_zpnidt7m3osuk7shl3s4oenomq: resolution: {integrity: sha512-iZCkeqeegO0TlkTMiH2JD1tvMtY9RrXkRylnAI6m8aCVAUUwNzoWTVF7CKLij6THeOMcUDCznLDDvNp55s+YZA==} peerDependencies: react: ^0.14 || ^15.0 || ^16.0 react-dom: ^^0.14 || ^15.0 || ^16.0 dependencies: prop-types: 15.8.1 - react: 18.2.0 - react-dom: 18.2.0_react@18.2.0 - dev: false + react: 18.0.0 + react-dom: 18.0.0_react@18.0.0 + dev: true - /react/18.2.0: - resolution: {integrity: sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==} + /react/18.0.0: + resolution: {integrity: sha512-x+VL6wbT4JRVPm7EGxXhZ8w8LTROaxPXOqhlGyVSrv0sB1jkyFGgXxJ8LVoPRLvPR6/CIZGFmfzqUa2NYeMr2A==} engines: {node: '>=0.10.0'} dependencies: loose-envify: 1.4.0 @@ -5875,8 +5864,8 @@ packages: suf-log: 2.5.3 dev: true - /scheduler/0.23.0: - resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==} + /scheduler/0.21.0: + resolution: {integrity: sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==} dependencies: loose-envify: 1.4.0 @@ -6875,12 +6864,12 @@ packages: punycode: 2.1.1 dev: true - /use-sync-external-store/1.2.0_react@18.2.0: + /use-sync-external-store/1.2.0_react@18.0.0: resolution: {integrity: sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==} peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 dependencies: - react: 18.2.0 + react: 18.0.0 dev: false /util-deprecate/1.0.2: @@ -6901,13 +6890,6 @@ packages: resolution: {integrity: sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==} dev: true - /valid-filename/4.0.0: - resolution: {integrity: sha512-VEYTpTVPMgO799f2wI7zWf0x2C54bPX6NAfbZ2Z8kZn76p+3rEYCTYVYzMUcVSMvakxMQTriBf24s3+WeXJtEg==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} - dependencies: - filename-reserved-regex: 3.0.0 - dev: false - /validate-npm-package-license/3.0.4: resolution: {integrity: sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==} dependencies: @@ -7242,6 +7224,7 @@ packages: /zod/3.18.0: resolution: {integrity: sha512-gwTm8RfUCe8l9rDwN5r2A17DkAa8Ez4Yl4yXqc5VqeGaXaJahzYYXbTwvhroZi0SNBqTwh/bKm2N0mpCzuw4bA==} + dev: true /zwitch/2.0.2: resolution: {integrity: sha512-JZxotl7SxAJH0j7dN4pxsTV6ZLXoLdGME+PsjkL/DaBrVryK9kTGq06GfKrwcSOqypP+fdXGoCHE36b99fWVoA==} diff --git a/www/astro.config.mjs b/www/astro.config.mjs index 9291c786dc..132964479c 100644 --- a/www/astro.config.mjs +++ b/www/astro.config.mjs @@ -2,23 +2,11 @@ import { defineConfig } from "astro/config"; import react from "@astrojs/react"; import tailwind from "@astrojs/tailwind"; -import robotsTxt from "astro-robots-txt"; /** * @link https://astro.build/config */ export default defineConfig({ site: `https://create.t3.gg`, - integrations: [ - react(), - tailwind(), - robotsTxt({ - transform(content) { - return `# Algolia-Crawler-Verif: 013A1A14AB9EE32B\n\n${content}`; - }, - }), - ], - experimental: { - integrations: true, - }, + integrations: [react(), tailwind()], }); diff --git a/www/package.json b/www/package.json index 8fb9b05c4a..bf072d0bb1 100644 --- a/www/package.json +++ b/www/package.json @@ -15,10 +15,8 @@ "@docsearch/css": "^3.2.1", "@docsearch/react": "^3.2.1", "@nanostores/react": "^0.3.0", - "astro-robots-txt": "^0.3.8", "astro-seo": "^0.6.0", - "nanostores": "^0.6.0", - "react-typist": "^2.0.5" + "nanostores": "^0.6.0" }, "devDependencies": { "@astrojs/react": "^1.1.0", @@ -27,9 +25,9 @@ "@types/react": "^18.0.0", "@types/react-dom": "^18.0.0", "@types/react-typist": "^2.0.3", - "astro": "^1.1.0", - "react": "^18.0.0", - "react-dom": "^18.0.0", + "astro": "^1.1.1", + "react": "18.0.0", + "react-dom": "18.0.0", "react-typist": "^2.0.5" } } diff --git a/www/public/assets/Logo.svg b/www/public/assets/Logo.svg deleted file mode 100644 index 803740be7e..0000000000 --- a/www/public/assets/Logo.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/www/public/default-og-image.png b/www/public/default-og-image.png index 97903207e5..d98efab447 100644 Binary files a/www/public/default-og-image.png and b/www/public/default-og-image.png differ diff --git a/www/public/favicon.ico b/www/public/favicon.ico index 578ad458b8..d3b456c070 100644 Binary files a/www/public/favicon.ico and b/www/public/favicon.ico differ diff --git a/www/public/robots.txt b/www/public/robots.txt new file mode 100644 index 0000000000..70d56124a2 --- /dev/null +++ b/www/public/robots.txt @@ -0,0 +1,5 @@ +# Algolia-Crawler-Verif: 013A1A14AB9EE32B + +User-agent: * +Allow: / +Sitemap: https://create.t3.gg/sitemap-index.xml diff --git a/www/src/LandingPageComponents/Footer/footer.astro b/www/src/LandingPageComponents/Footer/footer.astro deleted file mode 100644 index 785ca50cae..0000000000 --- a/www/src/LandingPageComponents/Footer/footer.astro +++ /dev/null @@ -1,56 +0,0 @@ - diff --git a/www/src/components/footer/avatarList.astro b/www/src/components/blog/avatarList.astro similarity index 100% rename from www/src/components/footer/avatarList.astro rename to www/src/components/blog/avatarList.astro diff --git a/www/src/components/pageContent/pageContent.astro b/www/src/components/blog/pageContent.astro similarity index 96% rename from www/src/components/pageContent/pageContent.astro rename to www/src/components/blog/pageContent.astro index a10d2dcca3..d44e61cc42 100644 --- a/www/src/components/pageContent/pageContent.astro +++ b/www/src/components/blog/pageContent.astro @@ -1,7 +1,7 @@ --- import type { Frontmatter } from "../../config"; -import MoreMenu from "../rightSidebar/moreMenu.astro"; -import TableOfContents from "../rightSidebar/tableOfContents"; +import MoreMenu from "../navigation/moreMenu.astro"; +import TableOfContents from "../navigation/tableOfContents"; import type { MarkdownHeading } from "astro"; export interface Props { diff --git a/www/src/components/footer/footer.astro b/www/src/components/footer/footer.astro index 02dfc2a6d6..d75642a124 100644 --- a/www/src/components/footer/footer.astro +++ b/www/src/components/footer/footer.astro @@ -1,19 +1,66 @@ --- -import AvatarList from "./avatarList.astro"; +import AvatarList from "../blog/avatarList.astro"; export interface Props { path: string; + isBlog: boolean; } -const { path } = Astro.props; +const { path, isBlog } = Astro.props; --- -