Skip to content

Feature/front end #15

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.

Sign up for GitHub

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

Open
joao-pedro01 wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Feature/front end #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88fe19e
feature: conversão em design atomic
Leticiapinheiro1 Dec 2, 2024
c37f1a0
alterações pequenas de css
Leticiapinheiro1 Dec 2, 2024
e0c8d80
Merge branch 'development' into feature/frontEnd
joao-pedro01 Dec 2, 2024
026d361
fix: correções de css
Leticiapinheiro1 Dec 2, 2024
768f8d2
Merge branch 'feature/frontEnd' of https://github.com/EcoVoucher/Web.…
Leticiapinheiro1 Dec 2, 2024
9427247
testes
Leticiapinheiro1 Dec 2, 2024
9b563bb
fix: url
joao-pedro01 Dec 2, 2024
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
152 changes: 149 additions & 3 deletions package-lock.json
View file
Open in desktop

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

Binary file added public/imagem/IMAGEMhome/ods_logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions src/app/globals.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@

@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;500;700&display=swap');

* {
color: #625e5e; /* Cor padrão de texto */
font-family:'Roboto', sans-serif; /* Exemplo de fonte padrão */
font-weight:bold;
}

/* Quando Header e Footer são exibidos */
.layout-body {
display: flex;
Expand Down
40 changes: 5 additions & 35 deletions src/app/home/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,8 @@
// src/app/page.tsx
'use client';
import './style.css';
import Link from 'next/link';

import React from 'react';
import HomePageOrganism from '../../components/UI/organisms/botaohome/botaohome';

export default function HomePage() {
return (
<div>
<div className="principal">
<Link href="/sobre" title="6.CONHEÇA A NOSSA EMPRESA!!" accessKey="6" aria-label="6.CONHEÇA A NOSSA EMPRESA!!">
<button className="botaoredondo">
<img src="imagem/IMAGEMhome/eco-novo.jpeg" alt="ecoVocher" />
</button>
</Link>

<Link href="/pontos" title="7.SAIBA OS PONTOS DE COLETA!!" accessKey="7" aria-label="7.SAIBA OS PONTOS DE COLETA!!">
<button className="botaoredondo">
<img src="imagem/IMAGEMhome/LOC.png" alt="SAIBA OS PONTOS DE COLETA!!" />
</button>
</Link>

<Link href="/pegada" title="8.CALCULE SUA PEGADA ECOLOGICA!!!" accessKey="8" aria-label="8.CALCULE SUA PEGADA ECOLOGICA!!!">
<button className="botaoredondo">
<img src="/imagem/IMAGEMhome/PEGADA ECOLOGICA.jpg" alt="CALCULE SUA PEGADA ECOLOGICA!!!" />
</button>
</Link>

<Link href="/ods" title="9.FAZEMOS PARTE DA ODS!!! VEJA!!" accessKey="9" aria-label="9.FAZEMOS PARTE DA ODS!!! VEJA!!!!!">
<button className="botaoredondo">
<img src="imagem/IMAGEMhome/ODS.jpg" alt="FAZEMOS PARTE DA ODS!!! VEJA!!" />
</button>
</Link>
</div>
<h1>VENHA FAZER PARTE DESTA IDEIA!!!</h1>
</div>
);

}
return <HomePageOrganism />;
}
73 changes: 0 additions & 73 deletions src/app/home/style.css
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { usePathname } from 'next/navigation';
import Header from '@/components/templates/header/header';
import Footer from '@/components/templates/footer/footer';
import './globals.css';
import 'bootstrap/dist/css/bootstrap.min.css?version=5.3.3';

export default function RootLayout({ children }: { children: ReactNode }) {
const pathname = usePathname();
Expand All @@ -18,6 +19,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {

return (
<html lang="pt">

<body className={shouldShowHeaderFooter ? 'layout-body' : 'no-header-footer'}>
{shouldShowHeaderFooter && <Header />}
<main
Expand All @@ -28,7 +30,7 @@ export default function RootLayout({ children }: { children: ReactNode }) {
? 'main-content'
: 'no-header-footer'
}
>
>
{children}
</main>
{shouldShowHeaderFooter && <Footer />}
Expand Down
Loading