Merge pull request #76 from solun-pm/dev

Updated and Show Version
solun-pm · Jun 22, 2023 · ebbbff3 · ebbbff3
2 parents 0511622 + 13e72ad
commit ebbbff3
Show file tree

Hide file tree

Showing 5 changed files with 410 additions and 328 deletions.
diff --git a/app/not-found.tsx b/app/not-found.tsx
@@ -9,7 +9,7 @@ const NotFound = () => {
   const router = useRouter();
 
   const handleGoBack = () => {
-    router.back();
+    router.push('/');
   };
 
   return (

diff --git a/app/page.tsx b/app/page.tsx
@@ -1,31 +1,28 @@
-import Welcomer from '@/components/welcomer'
-import Services from '@/components/services'
-import WhySolun from '@/components/whySolun'
-import Testimonials from '@/components/testimonials'
-import CTABanner from '@/components/CTABanner'
 import Header from '@/components/header'
 import Footer from '@/components/footer'
 
+import Welcomer from '@/components/welcomer';
+import Services from '@/components/services';
+import WhySolun from '@/components/whySolun';
+import CTABanner from '@/components/CTABanner';
+
 export default function Home() {
   return (
     <>
     <Header />
     <div className="bg-primary min-h-screen">
-      <section>
-        <Welcomer />
-      </section>
-      <section>
-        <Services />
-      </section>
-      <section>
-        <WhySolun />
-      </section>
-      <section>
-        {/* <Testimonials /> */}
-      </section>
-      <section>
-        <CTABanner />
-      </section>
+        <section>
+          <Welcomer />
+        </section>
+        <section>
+          <Services />
+        </section>
+        <section>
+          <WhySolun />
+        </section>
+        <section>
+          <CTABanner />
+        </section>
     </div>
     <Footer />
     </>

diff --git a/components/footer.tsx b/components/footer.tsx
@@ -1,5 +1,6 @@
 import React from 'react';
 import Link from 'next/link';
+const { version } = require('../package.json');
 
 const Footer = () => {
   return (
@@ -11,6 +12,12 @@ const Footer = () => {
             <p className="mt-4">
               E-Mail: contact@solun.pm
             </p>
+            <p>
+              Version: {version}
+            </p>
+            <p>
+              Copyright © {new Date().getFullYear()} Solun
+            </p>
           </div>
           <div className="flex flex-col md:flex-row text-white md:gap-10">
             <div className="mb-8 md:mb-0 md:ml-auto">