Merge pull request 'development' (!9) from development into master

Reviewed-on: ourworld_web/ourverse_new#9
2024-10-15 14:13:28 +00:00 · 2024-10-15 14:13:28 +00:00 · 4d461ac067
commit 4d461ac067
parent 393977a5df b4287ee530
23 changed files with 64 additions and 55 deletions
--- a/out/index.html
+++ b/out/index.html
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/images/favicon.ico
+++ b/public/images/favicon.ico
--- a/src/components/Abouthero.jsx
+++ b/src/components/Abouthero.jsx
@ -26,7 +26,7 @@ export default function Abouthero() {
          </p>
          <div className="mt-10 pb-8 flex items-center gap-x-6">
            <a
-              href="#"
+              href="https://portal.ourverse.tf" target='_blank' 
              className="rounded-2xl btn-dark text-base font-semibold px-3.5 py-2.5"
            >
              Join OurVerse
--- a/src/components/Banner.jsx
+++ b/src/components/Banner.jsx
@ -4,7 +4,7 @@ export default function Example() {
  return (
    <div className="flex items-center gap-x-6 btn-gradient px-6 py-2.5 sm:px-3.5 sm:before:flex-1">
      <p className="text-sm leading-6 text-white">
-        <a href="/events/versefest.html">
+        <a href="#">
          <strong className="font-semibold">OurVerse FutureFest 2024</strong>
          <svg viewBox="0 0 2 2" aria-hidden="true" className="mx-2 inline h-0.5 w-0.5 fill-current">
            <circle r={1} cx={1} cy={1} />
--- a/src/components/Bottom.jsx
+++ b/src/components/Bottom.jsx
@ -13,9 +13,9 @@ export default function Bottom() {
            </p>
            <div className="mt-10 flex items-center justify-center gap-x-6">
              <a
-                href="https://portal.ourverse.tf"
+                href="https://portal.ourverse.tf" 
+                target='_blank' 
                className="rounded-2xl btn-dark text-base font-semibold text-gray-900"
-                target="_blank"
                rel="noopener noreferrer"c
              >
                Sign Up Now
--- a/src/components/Communhero.jsx
+++ b/src/components/Communhero.jsx
@ -28,7 +28,7 @@ export default function Communhero() {
          </p>
          <div className="mt-10 pb-8 flex items-center gap-x-6">
            <a
-              href="#"
+              href="https://portal.ourverse.tf" target='_blank' 
              className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
            >
              Join OurVerse
--- a/src/components/Event1.jsx
+++ b/src/components/Event1.jsx
@ -37,7 +37,7 @@ export function Event1() {
          </div>
          <div className="mt-10 pb-8 flex items-center gap-x-6">
            <a
-              href="#"
+              href="https://portal.ourverse.tf" target='_blank' 
              className="rounded-xl bg-purple-700 px-6 py-3.5 lg:max-w-4xl max-w-2xl text-base tracking-tight font-semibold btn-gradient-dark2"
            >
              Get Your FREE Ticket  <TicketIcon className="h-5 w-5 mx-0.3 inline-block -mt-0.5" />
--- a/src/components/Eventbanner.jsx
+++ b/src/components/Eventbanner.jsx
@ -26,7 +26,7 @@ export default function Eventbanner() {
                </p>
              </div>
              <a
-                href="/events/versefest.html"
+                href="#"
                className="mt-6 flex flex-shrink-0 items-center justify-center rounded-md btn-dark bg-opacity-0 px-4 py-3 text-base font-medium text-white hover:bg-opacity-10 sm:ml-8 sm:mt-0 lg:ml-0 lg:w-full"
              >
                Register Now
--- a/src/components/Eventhero.jsx
+++ b/src/components/Eventhero.jsx
@ -21,7 +21,7 @@ export default function Eventhero() {
                  </p>
                  <div className="mt-10 flex items-center gap-x-6">
                    <a
-                      href="#"
+                      href="https://portal.ourverse.tf" target='_blank' 
                      className="rounded-2xl font-semibold btn-gradient-dark2"
                    >
                      Get started
--- a/src/components/Eventpage1.jsx
+++ b/src/components/Eventpage1.jsx
@ -6,14 +6,14 @@ const events = [
    date: 'Nov 21-24',
    location: 'OurWorld Verse',
    languages: ['ENG', 'ARABIC'],
-    signupLink: 'https://ourverse.tf/events/versefest.html',
+    signupLink: '#',
  },
  {
    name: 'Freelance Fest 2024',
    date: 'Oct 23-24',
    location: 'OurWorld Verse',
-    languages: ['ARABIC'],
-    signupLink: 'https://ourverse.tf/events/versefest.html',
+    languages: ['ENG', 'ARABIC'],
+    signupLink: '#',
  },
  // More events can be added here...
 ]
--- a/src/components/Events.jsx
+++ b/src/components/Events.jsx
@ -53,7 +53,7 @@ const featuredPost = {
            <div className="mt-4 flex flex-col justify-between gap-6 sm:mt-8 sm:flex-row-reverse sm:gap-8 lg:mt-4 lg:flex-col">
            <div className="mt-4 flex items-center gap-x-6">
                    <a
-                      href="#"
+                      href="https://portal.ourverse.tf" target='_blank' 
                      className="rounded-2xl font-semibold btn-dark text-base leading-6"
                    >
                      Learn More
--- a/src/components/Experiences.jsx
+++ b/src/components/Experiences.jsx
@ -81,14 +81,14 @@ import {
          </div>
        </div>
        <div className="mx-auto lg:mt-12 max-w-7xl px-6 mt-8 mb-12 lg:px-8">
-        <div className="mt-2 grid grid-cols-1 gap-x-8 gap-y-8 grid-cols-2 gap-y-10 lg:grid-cols-3">
+        <div className="mt-2 grid  gap-x-8 gap-y-8 md:grid-cols-2 lg:grid-cols-3">
          {products.map((product) => (
            <div key={product.id} className="group relative">
              <div className="aspect-h-2 aspect-w-3 overflow-hidden rounded-lg bg-purple-100">
                <img alt={product.imageAlt} src={product.imageSrc} className="object-cover object-center" />
                <div aria-hidden="true" className="flex items-end p-4 opacity-100 group-hover:opacity-100">
                  <div className="w-full rounded-md bg-white bg-opacity-75 px-4 py-2 text-center text-sm font-medium text-purple-700 backdrop-blur backdrop-filter">
-                   <a href="#">
+                   <a href="https://portal.ourverse.tf" target='_blank' >
                    <span aria-hidden="true" className="absolute inset-0" />
                    {product.name}
                  </a>
--- a/src/components/Featurehero.jsx
+++ b/src/components/Featurehero.jsx
@ -25,9 +25,8 @@ export default function Featurehero() {
          </p>
          <div className="mt-10 pb-8 flex items-center gap-x-6">
            <a
-              href="https://portal.ourverse.tf"
+              href="https://portal.ourverse.tf" target='_blank'
              className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
-              target="_blank"
              rel="noopener noreferrer"
            >
              Join OurVerse
--- a/src/components/Footer.jsx
+++ b/src/components/Footer.jsx
@ -1,18 +1,22 @@
 import { Container } from '@/components/Container'
 import { Logo } from '@/components/Logo'

-
-
 export function Footer() {
  return (
    <footer className="flex-none py-16">
      <Container className="flex flex-col items-center justify-between md:flex-row">
        <Logo className="h-12 w-auto text-slate-900" />
-        <p className="mt-6 text-base text-slxate-500 md:mt-0">
-          Copyright &copy; {new Date().getFullYear()} Ourworld Holdings, All
-          rights reserved.
+        <p className="mt-6 text-base text-slate-500 md:mt-0">
+          &copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '}
+          <a href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" className="text-purple-500 hover:underline">
+            Terms & Conditions
+          </a>{' '}
+          |{' '}
+          <a href="https://library.threefold.me/info/legal/#/legal__privacypolicy" className="text-purple-500 hover:underline">
+            Privacy Policy
+          </a>
        </p>
      </Container>
    </footer>
  )
-}
+}
--- a/src/components/Footer2.jsx
+++ b/src/components/Footer2.jsx
@ -2,32 +2,31 @@ import { Logo } from '@/components/Logo'

 const navigation = {
  solutions: [
-    { name: 'About', href: '/about.html' },
+    { name: 'OurVerse App', href: 'https://portal.ourverse.tf', target: '_blank', rel: 'noopener noreferrer' },
    { name: 'HeroVerse 3D', href: '/heroverse.html  ' },
    { name: 'Features', href: '/features.html' },
    { name: 'Usecases', href: '/usecases.html' },
-    { name: 'OurVerse App', href: '#' },
+
  ],
  support: [
-    { name: 'Support', href: 'mailto:info@ourworld.tf' },
+    { name: 'Support', href: 'mailto:info@ourverse.tf', target: '_blank', rel: 'noopener noreferrer' },
+    { name: 'About', href: '/about.html' },
    { name: 'Community', href: '/community.html' },
    { name: 'Events', href: '/events.html' },
  ],
  partners: [
-    { name: 'OurWorld', href: 'https://ourworld.tf' },
-    { name: 'ThreeFold', href: 'https://threefold.io' },
-    { name: 'Vindo', href: 'https://vindo.ai' },
-    { name: 'Incubaid', href: 'https://incubaid.com' },
+    { name: 'ThreeFold', href: 'https://threefold.io', target: '_blank', rel: 'noopener noreferrer' },
+    { name: 'Vindo', href: 'https://vindo.ai', target: '_blank', rel: 'noopener noreferrer' },
  ],
-  legal: [
-    { name: 'Claim', href: 'https://threefold.io/tfLabs/' },
-    { name: 'Privacy', href: 'https://library.threefold.me/info/legal/#/legal__privacypolicy' },
-    { name: 'Terms', href: 'https://library.threefold.me/info/legal/#/legal__terms_conditions_websites' },
+  company: [
+    { name: 'About', href: '/about.html' },
+    { name: 'OurWorld', href: 'https://ourworld.tf', target: '_blank', rel: 'noopener noreferrer' },
+
  ],
  social: [
    {
      name: 'Facebook',
-      href: '#',
+      href: 'https://www.facebook.com/profile.php?id=61566233156241',
      icon: (props) => (
        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
          <path
@ -40,7 +39,7 @@ const navigation = {
    },
    {
      name: 'Instagram',
-      href: '#',
+      href: 'https://www.instagram.com/ourversetf/',
      icon: (props) => (
        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
          <path
@ -53,7 +52,7 @@ const navigation = {
    },
    {
      name: 'X',
-      href: '#',
+      href: 'https://x.com/OurVerseTF',
      icon: (props) => (
        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
          <path d="M13.6823 10.6218L20.2391 3H18.6854L12.9921 9.61788L8.44486 3H3.2002L10.0765 13.0074L3.2002 21H4.75404L10.7663 14.0113L15.5685 21H20.8131L13.6819 10.6218H13.6823ZM11.5541 13.0956L10.8574 12.0991L5.31391 4.16971H7.70053L12.1742 10.5689L12.8709 11.5655L18.6861 19.8835H16.2995L11.5541 13.096V13.0956Z" />
@ -61,21 +60,21 @@ const navigation = {
      ),
    },
    {
-      name: 'GitHub',
-      href: '#',
+      name: 'Telegram',
+      href: 'https://t.me/+wLcrJaC_DTw0NTVk',
      icon: (props) => (
        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
          <path
            fillRule="evenodd"
-            d="M12 2C6.477 2 2 6.484 2 12.017c0 4.425 2.865 8.18 6.839 9.504.5.092.682-.217.682-.483 0-.237-.008-.868-.013-1.703-2.782.605-3.369-1.343-3.369-1.343-.454-1.158-1.11-1.466-1.11-1.466-.908-.62.069-.608.069-.608 1.003.07 1.531 1.032 1.531 1.032.892 1.53 2.341 1.088 2.91.832.092-.647.35-1.088.636-1.338-2.22-.253-4.555-1.113-4.555-4.951 0-1.093.39-1.988 1.029-2.688-.103-.253-.446-1.272.098-2.65 0 0 .84-.27 2.75 1.026A9.564 9.564 0 0112 6.844c.85.004 1.705.115 2.504.337 1.909-1.296 2.747-1.027 2.747-1.027.546 1.379.202 2.398.1 2.651.64.7 1.028 1.595 1.028 2.688 0 3.848-2.339 4.695-4.566 4.943.359.309.678.92.678 1.855 0 1.338-.012 2.419-.012 2.747 0 .268.18.58.688.482A10.019 10.019 0 0022 12.017C22 6.484 17.522 2 12 2z"
+            d="M12 0C5.372 0 0 5.373 0 12c0 6.627 5.372 12 12 12s12-5.373 12-12C24 5.373 18.627 0 12 0zm5.92 7.671l-1.802 8.49c-.135.614-.495.767-1.004.477l-2.783-2.055-1.342 1.293c-.148.148-.273.273-.558.273l.2-2.843 5.176-4.672c.224-.2-.05-.312-.348-.113l-6.407 4.025-2.768-.865c-.603-.185-.616-.603.126-.889l10.794-4.171c.506-.185.949.113.784.889z"
            clipRule="evenodd"
          />
        </svg>
      ),
-    },
+    },    
    {
      name: 'YouTube',
-      href: '#',
+      href: 'https://www.youtube.com/channel/UCavIIyki4cYFAUysi0aEDeA',
      icon: (props) => (
        <svg fill="currentColor" viewBox="0 0 24 24" {...props}>
          <path
@ -156,9 +155,9 @@ export default function Footer2() {
                </ul>
              </div>
              <div className="mt-10 md:mt-0">
-                <h3 className="text-sm font-semibold leading-6 text-purple-900">Legal</h3>
+                <h3 className="text-sm font-semibold leading-6 text-purple-900">Company</h3>
                <ul role="list" className="mt-6 space-y-4">
-                  {navigation.legal.map((item) => (
+                  {navigation.company.map((item) => (
                    <li key={item.name}>
                      <a href={item.href} className="text-sm leading-6 text-purple-600 hover:text-purple-900">
                        {item.name}
@ -171,9 +170,16 @@ export default function Footer2() {
          </div>
        </div>
        <div className="mt-16 border-t border-purple-900/10 pt-8 sm:mt-20 lg:mt-24">
-          <p className="text-xs leading-5 text-purple-500">&copy; 2024 Ourworld Holdings, Inc. All rights reserved.</p>
+          <p className="mt-6 text-sm text-slate-500 md:mt-0">&copy; {new Date().getFullYear()} OurWorld Holdings, All rights reserved.{' '}
+            <a href="https://library.threefold.me/info/legal/#/legal__terms_conditions_websites" className="text-purple-500 hover:underline">
+            Terms & Conditions </a>{' '}|{' '}
+            <a href="https://library.threefold.me/info/legal/#/legal__privacypolicy" className="text-purple-500 hover:underline">
+            Privacy Policy
+            </a>
+        </p>
        </div>
      </div>
    </footer>
+
  )
 }
--- a/src/components/Header.jsx
+++ b/src/components/Header.jsx
@ -34,7 +34,7 @@ export function Header() {
              </a>
            ))}
          </div>
-          <Button href="#">Join OurVerse</Button>
+          <Button href="https://portal.ourverse.tf" target='_blank'>Join OurVerse</Button>
        </div>
        <div className="lg:hidden flex items-center bg-gradient3">
          <button
@ -73,7 +73,7 @@ export function Header() {
                {item.name}
              </a>
            ))}
-            <Button href="#" className="mt-4 btn-gradient-dark">
+            <Button href="https://portal.ourverse.tf" target='_blank' className="mt-4 btn-gradient-dark">
              Join OurVerse
            </Button>
          </div>
--- a/src/components/HeroFeature.jsx
+++ b/src/components/HeroFeature.jsx
@ -45,7 +45,7 @@ import {
         </video>
          </div>
        </div>
-        <div className="mt-4 mx-auto lg:mt-16 max-w-5xl px-6 mt-20 md:mt-24 lg:px-8 text-center items-center">
+        <div className="mt-4 mx-auto lg:mt-16 max-w-5xl px-6 lg:px-8 text-center items-center">
        <h2 className="text-intro">Generative AI 3D Tool</h2>
        <p className="mt-4 h3-title text-center">Transform your Imagination into Immersive Reality </p>
        <p className="mt-8 items-center align-center section-text font-display -ct">
@ -60,7 +60,7 @@ import {
        </div>
        <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
            <a
-              href="#"
+              href="https://portal.ourverse.tf" target='_blank' rel="noopener noreferrer" 
              className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold shadow-sm"
            >
              Try Now
--- a/src/components/Heropage.jsx
+++ b/src/components/Heropage.jsx
@ -28,12 +28,12 @@ export function Heropage() {
          </div>
          <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
            <a
-              href="#"
+              href="https://portal.ourverse.tf" target='_blank' 
              className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold shadow-sm"
            >
              Try HeroVerse 3D
            </a>
-            <a href="#" className="text-sm font-semibold leading-6 text-white hover:text-purple-200">
+            <a href="https://portal.ourverse.tf" rel="noopener noreferrer" target='_blank' className="text-sm font-semibold leading-6 text-white hover:text-purple-200">
              Learn more <span aria-hidden="true">→</span>
            </a>
          </div>
--- a/src/components/Homepage.jsx
+++ b/src/components/Homepage.jsx
@ -27,7 +27,7 @@ export function Homepage() {
          </div>
          <div className="mt-10 pb-8 flex items-center justify-center gap-x-6">
            <a
-              href="https://portal.ourverse.tf"
+              href="https://portal.ourverse.tf" 
              target="_blank" 
              rel="noopener noreferrer" 
              className="rounded-2xl btn-dark px-3.5 py-2.5 text-base font-semibold"
--- a/src/components/Layout.jsx
+++ b/src/components/Layout.jsx
@ -1,9 +1,8 @@
-import { Footer } from '@/components/Footer'
 import Bottom from '@/components/Bottom'
 import Banner from '@/components/Banner'
 import { Header } from '@/components/Header'
 import Footer2 from './Footer2'
-
+import Footer from '@/components/Footer'

 export function Layout({ children, showFooter = true }) {
  return (
--- a/src/components/Usecases.jsx
+++ b/src/components/Usecases.jsx
@ -26,7 +26,7 @@ export default function Usecases() {
        
        <div className="mt-10 pb-8 flex items-center gap-x-6">
            <a
-              href="https://portal.ourverse.tf"
+              href="https://portal.ourverse.tf" target='_blank'
              className="rounded-2xl btn-dark font-semibold px-3.5 py-2.5"
              target="_blank"
              rel="noopener noreferrer"
--- a/src/images/favicon.ico
+++ b/src/images/favicon.ico