Merge pull request #2 from stcalica/ps-updates

Ps updates
stcalica · May 2, 2024 · a369781 · a369781
2 parents fe90921 + 7e0d675
commit a369781
Show file tree

Hide file tree

Showing 99 changed files with 822 additions and 4,364 deletions.
diff --git a/.github/workflows/nextjs.yml b/.github/workflows/nextjs.yml
@@ -7,7 +7,7 @@ name: Deploy Next.js site to Pages
 on:
   # Runs on pushes targeting the default branch
   push:
-    branches: ["ps-updates"]
+    branches: ["main"]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:

diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+node_modules
+.next
+next-env.d.ts
diff --git a/app/accommodation/[id]/page.tsx b/app/accommodation/[id]/page.tsx
diff --git a/app/accommodation/page.tsx b/app/accommodation/page.tsx
diff --git a/app/dining/[id]/page.tsx b/app/dining/[id]/page.tsx
diff --git a/app/dining/page.tsx b/app/dining/page.tsx
diff --git a/app/experiences/[id]/page.tsx b/app/experiences/[id]/page.tsx
diff --git a/app/experiences/page.tsx b/app/experiences/page.tsx
diff --git a/app/history/page.tsx b/app/history/page.tsx
diff --git a/app/layout.tsx b/app/layout.tsx
@@ -3,135 +3,135 @@ import { DM_Serif_Display, DM_Sans, Libre_Bodoni } from "next/font/google";
 import "./globals.css";
 
 const dmSerif = DM_Serif_Display({
-    weight: ["400"],
-    subsets: ["latin"],
-    display: "block",
-    variable: "--font-dm-serif",
+  weight: ["400"],
+  subsets: ["latin"],
+  display: "block",
+  variable: "--font-dm-serif",
 });
 
 const dmSans = DM_Sans({
-    weight: ["400", "500", "700"],
-    style: ["normal", "italic"],
-    subsets: ["latin"],
-    display: "block",
-    variable: "--font-dm-sans",
+  weight: ["400", "500", "700"],
+  style: ["normal", "italic"],
+  subsets: ["latin"],
+  display: "block",
+  variable: "--font-dm-sans",
 });
 
 const libreBodoni = Libre_Bodoni({
-    weight: ["700"],
-    subsets: ["latin"],
-    display: "block",
-    variable: "--font-libre-bodoni",
+  weight: ["700"],
+  subsets: ["latin"],
+  display: "block",
+  variable: "--font-libre-bodoni",
 });
 
 export const metadata: Metadata = {
-    title: "Hidden Oasis",
-    description: "Hidden Oasis - Hotel & Resort Website Coded Template",
+  title: "Hidden Oasis",
+  description: "Hidden Oasis - Hotel & Resort Website Coded Template",
 };
 
 export default function RootLayout({
-    children,
+  children,
 }: Readonly<{
-    children: React.ReactNode;
+  children: React.ReactNode;
 }>) {
-    return (
-        <html lang="en">
-            <head>
-                {/* Description no longer than 155 characters */}
-                <meta
-                    name="description"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
+  return (
+    <html lang="en">
+      <head>
+        {/* Description no longer than 155 characters */}
+        <meta
+          name="description"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
 
-                {/* Product Name */}
-                <meta
-                    name="product-name"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
+        {/* Product Name */}
+        <meta
+          name="product-name"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
 
-                {/* Twitter Card data */}
-                <meta name="twitter:card" content="summary" />
-                <meta name="twitter:site" content="@ui8" />
-                <meta
-                    name="twitter:title"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
-                <meta
-                    name="twitter:description"
-                    content="Hotel & Resort Website Template | 90+ High Premium Screens"
-                />
-                <meta name="twitter:creator" content="@ui8" />
-                {/* Twitter Summary card images must be at least 120x120px */}
-                <meta
-                    name="twitter:image"
-                    content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/twitter-card.png"
-                />
+        {/* Twitter Card data */}
+        <meta name="twitter:card" content="summary" />
+        <meta name="twitter:site" content="@ui8" />
+        <meta
+          name="twitter:title"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
+        <meta
+          name="twitter:description"
+          content="Hotel & Resort Website Template | 90+ High Premium Screens"
+        />
+        <meta name="twitter:creator" content="@ui8" />
+        {/* Twitter Summary card images must be at least 120x120px */}
+        <meta
+          name="twitter:image"
+          content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/twitter-card.png"
+        />
 
-                {/* Open Graph data for Facebook */}
-                <meta
-                    property="og:title"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
-                <meta property="og:type" content="Article" />
-                <meta
-                    property="og:url"
-                    content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
-                />
-                <meta
-                    property="og:image"
-                    content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/fb-og-image.png"
-                />
-                <meta
-                    property="og:description"
-                    content="Hotel & Resort Website Template | 90+ High Premium Screens"
-                />
-                <meta
-                    property="og:site_name"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
-                <meta property="fb:admins" content="132951670226590" />
+        {/* Open Graph data for Facebook */}
+        <meta
+          property="og:title"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
+        <meta property="og:type" content="Article" />
+        <meta
+          property="og:url"
+          content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
+        />
+        <meta
+          property="og:image"
+          content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/fb-og-image.png"
+        />
+        <meta
+          property="og:description"
+          content="Hotel & Resort Website Template | 90+ High Premium Screens"
+        />
+        <meta
+          property="og:site_name"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
+        <meta property="fb:admins" content="132951670226590" />
 
-                {/* Open Graph data for LinkedIn */}
-                <meta
-                    property="og:title"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
-                <meta
-                    property="og:url"
-                    content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
-                />
-                <meta
-                    property="og:image"
-                    content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/linkedin-og-image.png"
-                />
-                <meta
-                    property="og:description"
-                    content="Hotel & Resort Website Template | 90+ High Premium Screens"
-                />
+        {/* Open Graph data for LinkedIn */}
+        <meta
+          property="og:title"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
+        <meta
+          property="og:url"
+          content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
+        />
+        <meta
+          property="og:image"
+          content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/linkedin-og-image.png"
+        />
+        <meta
+          property="og:description"
+          content="Hotel & Resort Website Template | 90+ High Premium Screens"
+        />
 
-                {/* Open Graph data for Pinterest */}
-                <meta
-                    property="og:title"
-                    content="Hidden Oasis - Hotel & Resort Website Coded Template"
-                />
-                <meta
-                    property="og:url"
-                    content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
-                />
-                <meta
-                    property="og:image"
-                    content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/pinterest-og-image.png"
-                />
-                <meta
-                    property="og:description"
-                    content="Hotel & Resort Website Template | 90+ High Premium Screens"
-                />
-            </head>
-            <body
-                className={`${dmSans.variable} ${dmSerif.variable} ${libreBodoni.variable} bg-secondary-500 font-sans antialiased text-14r text-n-700`}
-            >
-                {children}
-            </body>
-        </html>
-    );
+        {/* Open Graph data for Pinterest */}
+        <meta
+          property="og:title"
+          content="Hidden Oasis - Hotel & Resort Website Coded Template"
+        />
+        <meta
+          property="og:url"
+          content="https://ui8.net/jos-creative/products/hidden-oasis---hotel--resort-website-coded-template"
+        />
+        <meta
+          property="og:image"
+          content="https://ui8-oasis-9c5d8ffa82b1.herokuapp.com/img/pinterest-og-image.png"
+        />
+        <meta
+          property="og:description"
+          content="Hotel & Resort Website Template | 90+ High Premium Screens"
+        />
+      </head>
+      <body
+        className={`${dmSans.variable} ${dmSerif.variable} ${libreBodoni.variable} font-sans antialiased text-14r text-orange-500`}
+      >
+        {children}
+      </body>
+    </html>
+  );
 }
diff --git a/app/news/[id]/page.tsx b/app/news/[id]/page.tsx
diff --git a/app/request-for-proposal/page.tsx b/app/request-for-proposal/page.tsx
diff --git a/components/AccommodationItem/index.tsx b/components/AccommodationItem/index.tsx