Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from main into production branch (pt 4) #4

Merged
merged 5 commits into from
Nov 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added public/images/favicon/android-chrome-192x192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/favicon/android-chrome-512x512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/favicon/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/favicon/favicon-16x16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/favicon/favicon-32x32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/favicon/favicon.ico
Binary file not shown.
File renamed without changes.
1 change: 1 addition & 0 deletions public/images/favicon/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
Binary file added public/images/logos/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/images/logos/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/logos/logo_compact.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 19 additions & 0 deletions public/images/logos/logo_compact.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/app/[locale]/components/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function Footer() {
<a href="https://github.com/carvalholuigi25" className="ms-2" target='_blank'>
<Image className="image" src="/icons/socialnetworks/github.svg" alt="LCP Github" width={40} height={40} />
</a>
<a href="https://www.instagram.com/luiscardev27/" className="ms-2" target='_blank'>
<a href="https://www.instagram.com/lcp2267/" className="ms-2" target='_blank'>
<Image className="image" src="/icons/socialnetworks/instagram.svg" alt="LCP Instagram" width={40} height={40} />
</a>
</div>
Expand Down
15 changes: 7 additions & 8 deletions src/app/[locale]/components/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,21 @@ export default function Header() {
<div className={styles.header + " " + styles.wave1 + " p-5"}>
<div className="container">
<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} id="mdesc" dir="auto">
<div className="col-12 col-md-6 order-1 order-md-0 headersideleft mt-3 animate__animated animate__fadeInUp">
<p className={styles.desc + " mt-3"} id="mdesc" dir="auto">
{t('desc')}
</p>
<a href="#features" className="btn btn-primary btnSeeMore" id="btnSeeMore" dir="auto">
{t('btnSeeMore')}
</a>
</div>
<div className="col-12 col-md-6 headersideright animate__animated animate__fadeInUp">
<div className="col-12 col-md-6 order-0 order-md-1 headersideright animate__animated animate__fadeInUp">
<Image
className="image mx-auto"
src="/images/setup.svg"
className="image mx-auto logofull"
src="/images/logos/logo.svg"
alt="LCP"
width={530}
height={530}
width={200}
height={200}
priority
/>
</div>
Expand Down
12 changes: 11 additions & 1 deletion src/app/[locale]/components/navbar.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"use client";
import React, { useState } from 'react';
import Image from 'next/image';
import { useLocale, useTranslations } from 'next-intl';

export default function Navbar() {
Expand All @@ -15,7 +16,16 @@ 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={`/${useLocale()}`}>LCP</a>
<a className="navbar-brand" href={`/${useLocale()}`}>
<Image
className="image mx-auto logosmall"
src="/images/logos/logo_compact.svg"
alt="LCP"
width={100}
height={30}
priority
/>
</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>
Expand Down
6 changes: 6 additions & 0 deletions src/app/[locale]/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,12 @@ export default function RootLayout({

return (
<html lang={locale}>
<head>
<link rel="apple-touch-icon" sizes="180x180" href="/images/favicon/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/images/favicon/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/images/favicon/favicon-16x16.png" />
<link rel="manifest" href="/images/favicon/site.webmanifest" />
</head>
<body className={inter.className + " " + `theme theme-${theme ?? 'default'}`} suppressHydrationWarning={true}>
<NextIntlClientProvider locale={locale} messages={useMessages()} timeZone={timeZone} now={useNow()}>
{children}
Expand Down
17 changes: 17 additions & 0 deletions src/app/[locale]/styles/globals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,23 @@ ul, ol, dl {
margin-top: 0;
}

.logosmall {
width: 100px;
height: 30px;
max-width: 100%;
max-height: 100%;
object-fit: cover;
}

.logofull {
display: block;
width: auto;
height: auto;
max-width: 100%;
max-height: 100%;
object-fit: cover;
}

.cwhite { color: white !important; }
.cblack { color: black !important; }

Expand Down
5 changes: 5 additions & 0 deletions src/app/[locale]/templates/email.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/app/[locale]/templates/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './email';
5 changes: 3 additions & 2 deletions src/app/api/sendemail/route.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import { NextResponse } from "next/server";
import { sendMailUtil } from '../../[locale]/utils/sendmailUtils';
import { EmailTemplate } from '../../[locale]/templates';

export async function POST(req: any) {
const body = await req.json();
const dataobj = {
to: process.env.EMAIL_USER,
from: body.email,
from: `"${body.name}" <${body.email}>`,
subject: body.subject,
text: `${body.message}\r\n Sent by ${body.email} (${body.name})`,
html: `<!doctype html><html><head><title>Hello</title></head><body><b>${body.message}</b><p>Sent by: ${body.email} (${body.name})</p></body></html>`
html: EmailTemplate(body)
};

console.log(dataobj);
Expand Down
Binary file removed src/app/favicon.ico
Binary file not shown.
Loading