Merge pull request #98 from tchambard/chore/deploy/disable

chore: disable ci deployment because of nextjs issue
tchambard · Aug 23, 2024 · a6b2d49 · a6b2d49
2 parents 40084f4 + 7944466
commit a6b2d49
Show file tree

Hide file tree

Showing 7 changed files with 1,646 additions and 23 deletions.
diff --git a/.github/workflows/ci_prod.yml b/.github/workflows/ci_prod.yml
@@ -54,14 +54,16 @@ jobs:
             - name: Install Vercel CLI
               run: npm install -g vercel@latest
 
-            - name: Pull Vercel Environment Information
-              run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
-              working-directory: packages/fronts/solidr-front-next
+            # Disable deployment from ci because of issue
+            # https://github.com/vercel/vercel/issues/11097
+            # - name: Pull Vercel Environment Information
+            #   run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }}
+            #   working-directory: packages/fronts/solidr-front-next
 
-            - name: Build Project Artifacts
-              run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
-              working-directory: packages/fronts/solidr-front-next
+            # - name: Build Project Artifacts
+            #   run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }}
+            #   working-directory: packages/fronts/solidr-front-next
 
-            - name: Deploy Project Artifacts Production to Vercel
-              run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
-              working-directory: packages/fronts/solidr-front-next
+            # - name: Deploy Project Artifacts Production to Vercel
+            #   run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }}
+            #   working-directory: packages/fronts/solidr-front-next
diff --git a/packages/fronts/solidr-front-next/src/app/layout.tsx b/packages/fronts/solidr-front-next/src/app/layout.tsx
@@ -1,4 +1,4 @@
-import type { Metadata } from "next";
+import type { Metadata, Viewport } from "next";
 import { NextIntlClientProvider } from 'next-intl';
 import { getLocale, getMessages } from 'next-intl/server';
 import { Inter } from "next/font/google";
@@ -11,6 +11,7 @@ import RecoilContextProvider from '@/providers/recoil/RecoilProvider';
 import { MyThemeProvider } from '@/providers/theme/ThemeProvider';
 import Content from './layout/Content';
 import { getFormats } from '@/services/i18n/locale';
+import { Author, IconDescriptor, ThemeColorDescriptor } from 'next/dist/lib/metadata/types/metadata-types';
 // import { Author, IconDescriptor, ThemeColorDescriptor } from 'next/dist/lib/metadata/types/metadata-types';
 
 const inter = Inter({ subsets: ["latin"] });
@@ -21,21 +22,26 @@ export const metadata: Metadata = {
     generator: "Next.js",
     manifest: "/manifest.json",
     keywords: ["solidr", "sharing expenses", "solana"],
-    themeColor: [{ media: "(prefers-color-scheme: dark)", color: "#1e1e1e" }],
     authors: [
         {
             name: "Teddy Chambard",
             url: "https://www.linkedin.com/in/teddy-chambard/",
         },
     ],
-    viewport:
-        "minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no, viewport-fit=cover",
     icons: [
-        // { rel: "apple-touch-icon", url: "icons/icon-128x128.png" },
-        // { rel: "icon", url: "icons/icon-128x128.png" },
+        { rel: "apple-touch-icon", url: "/favicon.svg" },
+        { rel: "icon", url: "/favicon.svg" },
     ],
 };
 
+export const viewport: Viewport = {
+    minimumScale: 1,
+    initialScale: 1,
+    width: 'device-width',
+    viewportFit: 'cover',
+    themeColor: [{ media: "(prefers-color-scheme: dark)", color: "#1e1e1e" }],
+}
+
 export default async function RootLayout({
     children,
 }: Readonly<{
@@ -47,23 +53,25 @@ export default async function RootLayout({
 
     return (
         <html lang={locale} className={`${inter.className} dark`}>
-            {/* <head>
+            <head>
                 <title>{metadata.title?.toString()}</title>
                 <meta name="description" content={metadata.description?.toString()} />
                 <meta name="generator" content={metadata.generator?.toString()} />
                 <link rel="manifest" href={metadata.manifest?.toString()} />
                 <meta name="keywords" content={(metadata.keywords as string[])?.join(", ")} />
-                {(metadata.themeColor as ThemeColorDescriptor[])?.map(({ media, color }, index) => (
-                    <meta key={index} name="theme-color" media={media} content={color} />
-                ))}
                 {(metadata.authors as Author[])?.map(({ name, url }, index) => (
                     <meta key={index} name="author" content={name} {...(url && { href: url })} />
                 ))}
                 <meta name="viewport" content={metadata.viewport as string} />
                 {(metadata.icons as IconDescriptor[])?.map(({ rel, url }, index) => (
                     <link key={index} rel={rel} href={url as string} />
                 ))}
-            </head> */}
+                <meta property="og:image" content="/logo.png" />
+                <meta property="og:site_name" content={metadata.title as string} />
+                <meta property="og:title" content={metadata.title as string} />
+                <meta property="og:description" content={metadata.description as string} />
+                <meta property="og:url" content="https://solidr.vercel.app" />
+            </head>
             <body suppressHydrationWarning={true} className="bg-lightbg text-black dark:bg-darkbg dark:text-white">
                 <RecoilContextProvider>
                     <MyThemeProvider>

diff --git a/packages/programs/solidr-program/.gitignore b/packages/programs/solidr-program/.gitignore
@@ -1,5 +1,8 @@
 .anchor
-target
+target/
+!target/idl
+!target/types/**/*
+
 **/*.rs.bk
 test-ledger
 .nyc_output
diff --git a/packages/programs/solidr-program/client/SolidrClient.ts b/packages/programs/solidr-program/client/SolidrClient.ts
@@ -5,7 +5,7 @@ import { bs58 } from '@coral-xyz/anchor/dist/cjs/utils/bytes';
 import * as _ from 'lodash';
 
 import { AbstractSolanaClient, ITransactionResult, ProgramInstructionWrapper } from './AbstractSolanaClient';
-import { Solidr } from './types/solidr';
+import { Solidr } from '../target/types/solidr';
 import { generateSessionLinkTokenData } from './TokenHelpers';
 import { HermesClient } from '@pythnetwork/hermes-client';
 

diff --git a/packages/programs/solidr-program/client/index.ts b/packages/programs/solidr-program/client/index.ts
@@ -1,2 +1,2 @@
 export * from './SolidrClient';
-export * from './types/solidr';
+export * from '../target/types/solidr';