Merge pull request #3 from carvalholuigi25/main

merge from main into production branch (pt 3)
carvalholuigi25 · Nov 1, 2023 · 893f799 · 893f799
2 parents b20e64e + 48bf0ad
commit 893f799
Show file tree

Hide file tree

Showing 29 changed files with 142 additions and 89 deletions.
diff --git a/next.config.js b/next.config.js
@@ -4,6 +4,7 @@
 // module.exports = nextConfig
 
 const withNextIntl = require('next-intl/plugin')('./i18n.ts');
+const defLocale = "en";
 
 module.exports = withNextIntl({
     experimental: {
@@ -15,44 +16,9 @@ module.exports = withNextIntl({
         return [
           {
             source: '/',
-            destination: '/en',
+            destination: '/'+defLocale,
             permanent: true,
-          },
-          {
-            source: '/admin',
-            destination: '/en/admin/dashboard',
-            permanent: true,
-          },
-          {
-            source: '/admin/dashboard',
-            destination: '/en/admin/dashboard',
-            permanent: true,
-          },
-          {
-            source: '/admin/projects',
-            destination: '/en/admin/projects',
-            permanent: true,
-          },
-          {
-            source: '/admin/users',
-            destination: '/en/admin/users',
-            permanent: true,
-          },
-          {
-            source: '/admin/newsletter',
-            destination: '/en/admin/newsletter',
-            permanent: true,
-          },
-          {
-            source: '/admin/subscriptions',
-            destination: '/en/admin/subscriptions',
-            permanent: true,
-          },
-          {
-            source: '/admin/settings',
-            destination: '/en/admin/settings',
-            permanent: true,
-          },
+          }
         ]
     },
 });
diff --git a/public/locales/ae.json b/public/locales/ae.json
@@ -51,7 +51,9 @@
         "contactsMessage": "رسالة",
         "contactsMessageInp": "اكتب الرسالة هنا",
         "contactsReset": "إعادة ضبط",
-        "contactsSubmit": "يُقدِّم"
+        "contactsSubmit": "يُقدِّم",
+        "contactsSendEmail": "هل تواجه مشكلة في التواصل معي؟",
+        "contactsSendEmail2": "انقر هنا لإرسال البريد الإلكتروني لي!"
     },
     "Admin": {
         "Login": {

diff --git a/public/locales/de.json b/public/locales/de.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Nachricht",
     "contactsMessageInp": "Schreiben Sie die Nachricht hier",
     "contactsReset": "Zurücksetzen",
-    "contactsSubmit": "Senden"
+    "contactsSubmit": "Senden",
+    "contactsSendEmail": "Haben Sie Schwierigkeiten, mit mir in Kontakt zu treten?",
+    "contactsSendEmail2": "Klicken Sie hier, um mir eine E-Mail zu senden!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/en-GB.json b/public/locales/en-GB.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Message",
     "contactsMessageInp": "Write the message here",
     "contactsReset": "Reset",
-    "contactsSubmit": "Submit"
+    "contactsSubmit": "Submit",
+    "contactsSendEmail": "Having trouble to contact with me?",
+    "contactsSendEmail2": "Click here to send email to me!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/en-US.json b/public/locales/en-US.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Message",
     "contactsMessageInp": "Write the message here",
     "contactsReset": "Reset",
-    "contactsSubmit": "Submit"
+    "contactsSubmit": "Submit",
+    "contactsSendEmail": "Having trouble to contact with me?",
+    "contactsSendEmail2": "Click here to send email to me!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/en.json b/public/locales/en.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Message",
     "contactsMessageInp": "Write the message here",
     "contactsReset": "Reset",
-    "contactsSubmit": "Submit"
+    "contactsSubmit": "Submit",
+    "contactsSendEmail": "Having trouble to contact with me?",
+    "contactsSendEmail2": "Click here to send email to me!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/es.json b/public/locales/es.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Mensaje",
     "contactsMessageInp": "Escribe el mensaje aquí",
     "contactsReset": "Restablecer",
-    "contactsSubmit": "Enviar"
+    "contactsSubmit": "Enviar",
+    "contactsSendEmail": "¿Tienes problemas para contactar conmigo?",
+    "contactsSendEmail2": "¡Haga clic aquí para enviarme un correo electrónico!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Message",
     "contactsMessageInp": "Écrivez le message ici",
     "contactsReset": "Réinitialiser",
-    "contactsSubmit": "Soumettre"
+    "contactsSubmit": "Soumettre",
+    "contactsSendEmail": "Vous rencontrez des difficultés pour me contacter?",
+    "contactsSendEmail2": "Cliquez ici pour m'envoyer un e-mail!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -51,7 +51,9 @@
     "contactsMessage": "'Ōlelo",
     "contactsMessageInp": "Kākau i ka memo ma ane'i",
     "contactsReset": "Ho'oponopono hou",
-    "contactsSubmit": "Waiho mai"
+    "contactsSubmit": "Waiho mai",
+    "contactsSendEmail": "Loa'a ka pilikia e launa pū me a'u?",
+    "contactsSendEmail2": "Kaomi ma ane'i e ho'ouna i ka leka uila ia'u!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/il.json b/public/locales/il.json
@@ -51,7 +51,9 @@
     "contactsMessage": "הוֹדָעָה",
     "contactsMessageInp": "כתבו את ההודעה כאן",
     "contactsReset": "אִתחוּל",
-    "contactsSubmit": "שלח"
+    "contactsSubmit": "שלח",
+    "contactsSendEmail": "מתקשה ליצור איתי קשר?",
+    "contactsSendEmail2": "לחץ כאן כדי לשלוח לי מייל!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/in.json b/public/locales/in.json
@@ -51,7 +51,9 @@
     "contactsMessage": "संदेश",
     "contactsMessageInp": "संदेश यहां लिखें",
     "contactsReset": "रीसेट",
-    "contactsSubmit": "जमा करना"
+    "contactsSubmit": "जमा करना",
+    "contactsSendEmail": "मुझसे संपर्क करने में परेशानी हो रही है?",
+    "contactsSendEmail2": "मुझे ईमेल भेजने के लिए यहां क्लिक करें!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/it.json b/public/locales/it.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Messaggio",
     "contactsMessageInp": "Scrivi il messaggio qui",
     "contactsReset": "Reimposta",
-    "contactsSubmit": "Invia"
+    "contactsSubmit": "Invia",
+    "contactsSendEmail": "Hai difficoltà a contattarmi?",
+    "contactsSendEmail2": "Clicca qui per inviarmi un'e-mail!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/jp.json b/public/locales/jp.json
@@ -51,7 +51,9 @@
     "contactsMessage": "メッセージ",
     "contactsMessageInp": "ここにメッセージを書いてください",
     "contactsReset": "リセット",
-    "contactsSubmit": "提出する"
+    "contactsSubmit": "提出する",
+    "contactsSendEmail": "私との連絡に問題がありますか?",
+    "contactsSendEmail2": "ここをクリックしてメールを送信してください。"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/pt.json b/public/locales/pt.json
@@ -51,7 +51,9 @@
     "contactsMessage": "Mensagem",
     "contactsMessageInp": "Escreva a mensagem aqui",
     "contactsReset": "Reiniciar",
-    "contactsSubmit": "Enviar"
+    "contactsSubmit": "Enviar",
+    "contactsSendEmail": "Está tendo problemas para entrar em contato comigo?",
+    "contactsSendEmail2": "Clique aqui para me enviar um e-mail!"
   },
   "Admin": {
     "Login": {

diff --git a/public/locales/ua.json b/public/locales/ua.json
@@ -51,7 +51,9 @@
     "contactsMessage": "повідомлення",
     "contactsMessageInp": "Напишіть повідомлення тут",
     "contactsReset": "Скинути",
-    "contactsSubmit": "Надіслати"
+    "contactsSubmit": "Надіслати",
+    "contactsSendEmail": "Виникли проблеми зі мною зв'язатися?",
+    "contactsSendEmail2": "Натисніть тут, щоб надіслати мені електронний лист!"
   },
   "Admin": {
     "Login": {

diff --git a/src/app/[locale]/admin/dashboard/login.tsx b/src/app/[locale]/admin/dashboard/login.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import React, { useEffect, useState } from 'react';
-import { useTranslations } from 'next-intl';
+import { useLocale, useTranslations } from 'next-intl';
 import Link from 'next/link';
 import admstyles from '../../styles/admin/admin.module.scss';
 import { doLogin } from '../../utils/authUtils';
@@ -45,7 +45,7 @@ export default function DashboardLogin() {
                 setIsLoggedIn(true);
                 setIsLoading(false);
 
-                location.href = "/admin/dashboard";
+                location.href = `/${localStorage.getItem("lang")}/admin/dashboard`;
             }
         }).catch((error) => console.error(error)) 
     }
@@ -86,7 +86,7 @@ export default function DashboardLogin() {
                                 </>
                             )}
 
-                            <Link className='btn btn-primary btnBack' id='btnBack' dir="auto" href={"/"}>{t('btnBack')}</Link>
+                            <Link className='btn btn-primary btnBack' id='btnBack' dir="auto" href={"/"+useLocale()}>{t('btnBack')}</Link>
                         </div>
                     </div>
                 </div>

diff --git a/src/app/[locale]/admin/newsletter/page.tsx b/src/app/[locale]/admin/newsletter/page.tsx
@@ -39,7 +39,7 @@ export default function AdminNewsletterPage() {
                   <p className="hidden">{t('welcome', { 'username': username })}</p>
                   <h1 className='mt-3'><i className="bi bi-newspaper me-2"></i>{t('title')}</h1>
                   <p className='mt-3'>Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae dolorem quas, distinctio asperiores mollitia ratione dignissimos cumque omnis reiciendis quos veritatis veniam ipsa. Velit illo adipisci, amet corrupti voluptatem laudantium.</p>
-                  <a href='/admin/dashboard' className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
+                  <a href={`/${localStorage.getItem("lang")}/admin/dashboard`} className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
                 </div>
               </div>
             </div>

diff --git a/src/app/[locale]/admin/projects/page.tsx b/src/app/[locale]/admin/projects/page.tsx
@@ -39,7 +39,7 @@ export default function AdminProjectsPage() {
                   <p className="hidden">{t('welcome', { 'username': username })}</p>
                   <h1 className='mt-3'><i className="bi bi-kanban me-2"></i>{t('title')}</h1>
                   <p className='mt-3'>Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae dolorem quas, distinctio asperiores mollitia ratione dignissimos cumque omnis reiciendis quos veritatis veniam ipsa. Velit illo adipisci, amet corrupti voluptatem laudantium.</p>
-                  <a href='/admin/dashboard' className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
+                  <a href={`/${localStorage.getItem("lang")}/admin/dashboard`} className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
                 </div>
               </div>
             </div>

diff --git a/src/app/[locale]/admin/settings/page.tsx b/src/app/[locale]/admin/settings/page.tsx
@@ -39,7 +39,7 @@ export default function AdminSettingsPage() {
                   <p className="hidden">{t('welcome', { 'username': username })}</p>
                   <h1 className='mt-3'><i className="bi bi-gear me-2"></i>{t('title')}</h1>
                   <p className='mt-3'>Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae dolorem quas, distinctio asperiores mollitia ratione dignissimos cumque omnis reiciendis quos veritatis veniam ipsa. Velit illo adipisci, amet corrupti voluptatem laudantium.</p>
-                  <a href='/admin/dashboard' className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
+                  <a href={`/${localStorage.getItem("lang")}/admin/dashboard`} className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
                 </div>
               </div>
             </div>

diff --git a/src/app/[locale]/admin/subscriptions/page.tsx b/src/app/[locale]/admin/subscriptions/page.tsx
@@ -194,7 +194,7 @@ export default function AdminSubscriptionsPage() {
 
                   <div className="container mx-auto text-center mt-3">
                     <div className="col-12">
-                      <a href='/admin/dashboard' className='btn btn-primary btnback'>{t('btnBack')}</a>
+                      <a href={`/${localStorage.getItem("lang")}/admin/dashboard`} className='btn btn-primary btnback'>{t('btnBack')}</a>
                     </div>
                   </div>
                 </div>

diff --git a/src/app/[locale]/admin/users/page.tsx b/src/app/[locale]/admin/users/page.tsx
@@ -39,7 +39,7 @@ export default function AdminUsersPage() {
                   <p className="hidden">{t('welcome', { 'username': username })}</p>
                   <h1 className='mt-3'><i className="bi bi-people me-2"></i>{t('title')}</h1>
                   <p className='mt-3'>Lorem ipsum dolor sit amet consectetur adipisicing elit. Recusandae dolorem quas, distinctio asperiores mollitia ratione dignissimos cumque omnis reiciendis quos veritatis veniam ipsa. Velit illo adipisci, amet corrupti voluptatem laudantium.</p>
-                  <a href='/admin/dashboard' className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
+                  <a href={`/${localStorage.getItem("lang")}/admin/dashboard`} className='btn btn-primary btnback mt-3'>{t('btnBack')}</a>
                 </div>
               </div>
             </div>

diff --git a/src/app/[locale]/components/admin/navbar.js b/src/app/[locale]/components/admin/navbar.js
@@ -1,6 +1,6 @@
 "use client";
 import React, { useState, useEffect } from 'react';
-import { useTranslations } from 'next-intl';
+import { useLocale, useTranslations } from 'next-intl';
 import { doLogout } from '../../utils/authUtils';
 
 export default function NavbarAdmin() {
@@ -33,7 +33,7 @@ export default function NavbarAdmin() {
             setUserName("");
             setIsLoggedIn(false);
 
-            location.href = "/admin";
+            location.href = `/${localStorage.getItem("lang")}/admin`;
         }).catch((error) => console.error(error));
     };
 
@@ -44,7 +44,7 @@ export default function NavbarAdmin() {
                     <button className="btn" type="button" data-bs-toggle="offcanvas" data-bs-target="#menuAdmDashLinks" aria-controls="menuAdmDashLinks">
                         <i className="bi bi-list"></i>
                     </button>
-                    <a className="navbar-brand ms-3" href="/" dir="auto">LCP</a>
+                    <a className="navbar-brand ms-3" href={`/${useLocale()}`} dir="auto">LCP</a>
                     <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarAdmDash" aria-controls="navbarAdmDash" aria-expanded="false" aria-label="Toggle navigation" onClick={clickNav}>
                         <i className={`bi bi-${isCollapsed ? "x" : "three-dots"}`}></i>
                     </button>

diff --git a/src/app/[locale]/components/admin/sidebar.js b/src/app/[locale]/components/admin/sidebar.js
@@ -5,15 +5,16 @@ import { usePathname } from 'next/navigation';
 import { useTranslations } from 'next-intl';
 
 export default function SidebarAdmin() {
+    const lang = localStorage.getItem("lang");
     const t = useTranslations('Admin.Sidebar');
 
     const pthname = usePathname();
     const aryLinks = [
-        { id: 1, name: t('sbaropt1'), href: "/admin/projects", icon: "bi-kanban" },
-        { id: 2, name: t('sbaropt2'), href: "/admin/users", icon: "bi-people" },
-        { id: 3, name: t('sbaropt3'), href: "/admin/newsletter", icon: "bi-newspaper" },
-        { id: 4, name: t('sbaropt4'), href: "/admin/subscriptions", icon: "bi-inbox" },
-        { id: 5, name: t('sbaropt5'), href: "/admin/settings", icon: "bi-gear" }
+        { id: 1, name: t('sbaropt1'), href: `/${lang}/admin/projects`, icon: "bi-kanban" },
+        { id: 2, name: t('sbaropt2'), href: `/${lang}/admin/users`, icon: "bi-people" },
+        { id: 3, name: t('sbaropt3'), href: `/${lang}/admin/newsletter`, icon: "bi-newspaper" },
+        { id: 4, name: t('sbaropt4'), href: `/${lang}/admin/subscriptions`, icon: "bi-inbox" },
+        { id: 5, name: t('sbaropt5'), href: `/${lang}/admin/settings`, icon: "bi-gear" }
     ];
 
     const [isCollapsed, setIsCollapsed] = useState(false);
@@ -27,7 +28,7 @@ export default function SidebarAdmin() {
         <>
             <div className={`offcanvas offcanvas-start ${!!isCollapsed ? "show sidebarCol" : "hiding"} ${admstyles.menuAdmDashLinks}`} tabIndex={-1} id="menuAdmDashLinks" aria-labelledby="menuAdmDashLinksLabel">
                 <div className="offcanvas-header">
-                    <h5 className="offcanvas-title" id="menuAdmDashLinksLabel" dir="auto"><a href="/admin/dashboard">LCP</a></h5>
+                    <h5 className="offcanvas-title" id="menuAdmDashLinksLabel" dir="auto"><a href={`/${lang}/admin/dashboard`}>LCP</a></h5>
                     <button type="button" className="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
                 </div>
                 <div className="offcanvas-body">

diff --git a/src/app/[locale]/components/contact.js b/src/app/[locale]/components/contact.js
@@ -67,11 +67,11 @@ export default function ContactComponent() {
                 <form action="" method="post" className="container frmcontactus" id="frmcontactus" onSubmit={sendMail}>
                     <h1 className={styles.contactsTitle} dir="auto">{t('contactsTitle')}</h1>
                     <div className="row mt-3">
-                        <div className="col-12 col-md-6">
+                        <div className="col-12 col-md-6 mt-3">
                             <label htmlFor="name" dir="auto">{t('contactsName')}</label>
                             <input type="text" name="name" id="name" dir="auto" value={name} placeholder={t('contactsNameInp')} className="form-control name mt-1" required onChange={handleNameChange} />
                         </div>
-                        <div className="col-12 col-md-6">
+                        <div className="col-12 col-md-6 mt-3">
                             <label htmlFor="email" dir="auto">{t('contactsEmail')}</label>
                             <input type="email" name="email" id="email" dir="auto" value={email} placeholder={t('contactsEmailInp')} className="form-control email mt-1" required onChange={handleEmailChange} />
                         </div>
@@ -94,7 +94,7 @@ export default function ContactComponent() {
                     </div>
                 </form>
                 <div className={"mt-3 mx-auto " + styles.contactmsgblk}>
-                    <p>Cannot contact to me? <a href="mailto:[email protected]">Click here to send email to me!</a></p>
+                    <p>{t('contactsSendEmail')} <a href="mailto:[email protected]" className="cblack">{t('contactsSendEmail2')}</a></p>
                 </div>
             </div>
         </>

diff --git a/src/app/[locale]/components/header.js b/src/app/[locale]/components/header.js
@@ -12,10 +12,10 @@ export default function Header() {
                     <div className="row">
                         <div className="col-12 col-md-6 headersideleft mt-3 animate__animated animate__fadeInUp">
                             <h1 className={styles.mtitle} id="mtitle" dir="auto">LCP</h1>
-                            <p className={styles.desc} dir="auto">
+                            <p className={styles.desc} id="mdesc" dir="auto">
                                 {t('desc')}
                             </p>
-                            <a href="#features" className="btn btn-primary btnSeeMore" dir="auto">
+                            <a href="#features" className="btn btn-primary btnSeeMore" id="btnSeeMore" dir="auto">
                                 {t('btnSeeMore')}
                             </a>
                         </div>

diff --git a/src/app/[locale]/components/navbar.js b/src/app/[locale]/components/navbar.js
@@ -1,6 +1,6 @@
 "use client";
 import React, { useState } from 'react';
-import { useTranslations } from 'next-intl';
+import { useLocale, useTranslations } from 'next-intl';
 
 export default function Navbar() {
     const t = useTranslations('Navbar');
@@ -15,7 +15,7 @@ export default function Navbar() {
         <>
             <nav className="navbar fixed-top navbar-expand-lg bg-body-tertiary mnavbar" id="mnavbar">
                 <div className="container-fluid">
-                    <a className="navbar-brand" href="/">LCP</a>
+                    <a className="navbar-brand" href={`/${useLocale()}`}>LCP</a>
                     <button className="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarLinks" aria-controls="navbarLinks" aria-expanded="false" aria-label="Toggle navigation" onClick={clickNav}>
                         <i className={`bi bi-${isCollapsed ? "x" : "three-dots"}`}></i>
                     </button>