Merge pull request #1 from umka-co/dev

Dev to Main
umka-co · Feb 7, 2024 · 6d96b8d · 6d96b8d
2 parents 9ce7561 + 1e7081b
commit 6d96b8d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/public/ads.txt b/public/ads.txt
@@ -1 +1,2 @@
+TODO: put real adsense code here
 google.com, pub-xxxx, DIRECT, f1xxxxxx
diff --git a/src/app/(main)/layout.tsx b/src/app/(main)/layout.tsx
@@ -13,7 +13,7 @@ export const metadata: Metadata = {
 
  // TODO: put your texts here
  title: APP_NAME, // 'Some Public Website',
- description: 'Cool description for the website, this is used for SEO, so make it good!',
+ description: 'TODO: Cool description for the website, this is used for SEO, so make it good!',
 };
 
 export const viewport: Viewport = {

diff --git a/src/app/(main)/legal/terms-conditions/page.tsx b/src/app/(main)/legal/terms-conditions/page.tsx
@@ -1,4 +1,4 @@
-import { APP_NAME, PUBLIC_URL } from '@/config';
+import { APP_NAME, APP_SHORT_NAME, PUBLIC_URL } from '@/config';
 import { Link, Typo, Wrapper } from '@/components';
 
 /**
@@ -11,9 +11,9 @@ const TermsAndConditionsPage = () => {
  <Typo variant="header1">Terms and Conditions</Typo>
 
  <Typo variant="paragraph">
- Welcome to the <strong>DOMAIN-NAME.COM</strong> website (&quot;Site&quot;). This Site is a property of{' '}
+ Welcome to the <strong>TODO: DOMAIN-NAME.COM</strong> website (&quot;Site&quot;). This Site is a property of{' '}
  <strong>
- <Link href="https://other-domain.com">COMPANY OR OWNER</Link>
+ <Link href="https://other-domain.com">TODO: COMPANY OR OWNER</Link>
  </strong>{' '}
  (&quot;Owner&quot;). By accessing the Site, you agree to follow and be bound by the following terms and
  conditions concerning your use of the Site and <Link href="/legal/privacy-policy"> our privacy policy</Link>.
@@ -57,8 +57,9 @@ const TermsAndConditionsPage = () => {
 
  <Typo variant="header2">Trademarks</Typo>
  <Typo variant="paragraph">
- &quot;{APP_NAME}&quot;, &quot;XXX&quot;, &quot;YYY&quot; are trademarks or registered trademarks of Owner. All
- other trademarks appearing on the Site are the sole property of their respective owners.
+ &quot;{APP_NAME}&quot;, &quot;{APP_SHORT_NAME}&quot; &quot;TODO: Other trademarks here&quot; are trademarks or
+ registered trademarks of Owner. All other trademarks appearing on the Site are the sole property of their
+ respective owners.
  </Typo>
 
  <Typo variant="header2">Disclaimer</Typo>

diff --git a/src/components/ContactForm/ContactForm.tsx b/src/components/ContactForm/ContactForm.tsx
@@ -48,7 +48,7 @@ const ContactForm = () => {
  }
 
  try {
- const result = await emailjs.send('default_service', 'template_xxx', {
+ const result = await emailjs.send('default_service', 'TODO: template_xxx', {
  email,
  message,
  });

diff --git a/src/layout/components/Footer/Footer.tsx b/src/layout/components/Footer/Footer.tsx
@@ -20,6 +20,8 @@ const Footer = () => {
  [onMobile]
  );
 
+ const copyrightHolder = useMemo(() => <Link href="https://domain-name.com">TODO: Add company name</Link>, []);
+
  return (
  <footer className={className} id="footer">
  <div className={styles.logo}>
@@ -29,7 +31,7 @@ const Footer = () => {
  <span className={styles.text}>
  {APP_NAME}
  <br />
- by <Link href="https://domain-name.com">TODO: Add company name</Link>
+ by {copyrightHolder}
  </span>
  )}
  </div>
@@ -48,8 +50,7 @@ const Footer = () => {
  // Desktop version of the footer with copyright
  <div className={styles.copyright}>
  <div>
- Copyright &copy; 2020-{new Date().getFullYear()}{' '}
- <Link href="https://domain-name.com">TODO: Add company name</Link>
+ Copyright &copy; 2020-{new Date().getFullYear()} {copyrightHolder}
  </div>
  </div>
  )}