Merge pull request #420 from api-platform/staging

MEP

Author: ginifizz

.github/workflows/deploy.yml

@@ -123,8 +123,9 @@ jobs:
             --set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
             --set=pwa.image.tag=${{ inputs.docker-images-version }} \
             --set=pwa.image.pullPolicy=Always \
-            --set=pwa.resources.requests.cpu=200m \
-            --set=pwa.resources.requests.memory=700Mi \
+            --set=pwa.resources.requests.cpu=500m \
+            --set=pwa.resources.requests.memory=1400Mi \
+            --set=pwa.resources.limits.memory=1400Mi \
             --set=bucket.s3Upstream=storage.googleapis.com \
             --set=bucket.s3Name=api-platform-website-v3 \
             --set=service.type=NodePort \
@@ -167,8 +168,9 @@ jobs:
             --set=pwa.image.repository=eu.gcr.io/${{ secrets.gke-project }}/website/pwa \
             --set=pwa.image.tag=${{ inputs.docker-images-version }} \
             --set=pwa.image.pullPolicy=Always \
-            --set=pwa.resources.requests.cpu=200m \
-            --set=pwa.resources.requests.memory=700Mi \
+            --set=pwa.resources.requests.cpu=500m \
+            --set=pwa.resources.requests.memory=1400Mi \
+            --set=pwa.resources.limits.memory=1400Mi \
             --set=php.corsAllowOrigin="^$(echo "${{ join(fromJSON(env.CORS), '|') }}" | sed 's/\./\\./g')$" \
             --set=github.key=${{ secrets.gh-key }} \
             --set=next.rootUrl=${{ env.URL }} \

helm/api-platform/values.yaml

@@ -27,8 +27,10 @@ pwa:
     tag: ""
   resources: 
     requests:
-      memory: 700Mi
-      cpu: 250m
+      memory: 1400Mi
+      cpu: 500m
+    limits:
+      memory: 1400Mi      
 
 
 next: 

pwa/app/(common)/community/contributors/page.tsx

@@ -21,6 +21,8 @@ export async function generateMetadata(): Promise<Metadata> {
   };
 }
 
+export const revalidate = 86400; // revalidate the contributors ranking every day
+
 export default async function Page() {
   const contributors = await getAllContributors();
   return (

pwa/app/(common)/components/timeline/CodeBlock.tsx

@@ -22,7 +22,7 @@ export default function CodeBlock({ title, children }: CodeBlockProps) {
   return (
     <div
       ref={animation}
-      className="dark bg-blue-black dark:bg-blue-darkest rounded-2xl p-6 w-full flex flex-col shadow-xl my-4 | sm:my-8 md:absolute md:right-[calc(100%+3rem)] md:w-full md:max-w-lg md:my-0"
+      className="dark text-left bg-blue-black dark:bg-blue-darkest rounded-2xl p-6 w-full flex flex-col shadow-xl my-4 | sm:my-8 md:absolute md:right-[calc(100%+3rem)] md:w-full md:max-w-lg md:my-0"
     >
       <div className="flex flew-row items-center gap-2">
         <div className="rounded-full w-3 h-3 bg-[#ed6a5d]" />

pwa/app/(common)/components/timeline/Install.mdx

@@ -1,5 +1,5 @@
 ```bash
-gh repo create –template api-platform/api-platform my-api
+gh repo create --clone --template api-platform/api-platform my-api --public # or --private
 cd my-api
 docker compose up
 open https://localhost

pwa/app/(common)/not-found.tsx

@@ -5,7 +5,7 @@ export default async function NotFound() {
   return (
     <div
       className={classNames(
-        "h-screen pt-16 bg-blue text-white flex flex-col items-center justify-center md:flex-row",
+        "h-screen pt-16 bg-blue-light text-white flex flex-col items-center justify-center md:flex-row after:absolute after:w-full after:h-80 after:top-full after:left-0 after:bg-blue-light",
         "dark:text-blue-black"
       )}
     >

pwa/components/docs/MobileSidebar.tsx

@@ -52,7 +52,7 @@ export default function MobileSideBar({
           />
         </svg>
       </button>
-      <div className="pl-4 flex flex-row gap-1 items-center justify-center leading-none text-sm font-light text-text-secondary">
+      <div className="pl-4 flex flex-row gap-1 items-center justify-center leading-none text-sm font-light text-text-secondary dark:text-white/70">
         {breadCrumbs.map((docLink, index) => (
           <Fragment key={docLink.title}>
             {docLink.link ? (
@@ -67,7 +67,7 @@ export default function MobileSideBar({
               <span
                 className={`${
                   index === breadCrumbs.length - 1 &&
-                  "font-bold text-text-primary text-ellipsis whitespace-nowrap overflow-hidden"
+                  "font-bold text-text-primary text-ellipsis whitespace-nowrap overflow-hidden dark:text-white/50"
                 }`}
               >
                 {docLink.title}

pwa/i18n/dictionaries/fr.json

@@ -146,7 +146,7 @@
   "or_follow_us": "ou suivez-nous sur nos réseaux",
   "partners": { "title": "Nos <strong>partenaires</strong>" },
   "pricing": {
-    "certificate_needed": "Un justificafif sera demandé",
+    "certificate_needed": "Un justificatif sera demandé",
     "conference": {
       "offers": {
         "on_site": "Billet 2 jours",

pwa/middleware.tsx

@@ -11,7 +11,10 @@ function getLocale(request: NextRequest): string | undefined {
   // Use negotiator and intl-localematcher to get best locale
   const languages = new Negotiator({ headers: negotiatorHeaders }).languages();
   const locales = [...i18n.locales];
-  return matchLocale(languages, locales, i18n.defaultLocale);
+  const locale = matchLocale(languages, locales, i18n.defaultLocale);
+  return ([...i18n.locales] as string[]).includes(locale)
+    ? locale
+    : i18n.defaultLocale;
 }
 
 export async function middleware(request: NextRequest) {

pwa/package.json

@@ -28,7 +28,7 @@
     "marked": "^5.0.4",
     "marked-highlight": "^2.0.1",
     "negotiator": "^0.6.3",
-    "next": "13.4.7-canary.1",
+    "next": "13.4.8-canary.8",
     "next-themes": "npm:@wits/next-themes@^0.2.16",
     "octokit": "^2.0.19",
     "prettier": "^2.8.8",