Skip to content

Commit

Permalink
Merge pull request #14 from unb-mds/feature/jose-layout-home
Browse files Browse the repository at this point in the history
📝 layout inicial
  • Loading branch information
joseandre25 authored Oct 24, 2023
2 parents 05b19c2 + f65e4f0 commit f17d0ba
Show file tree
Hide file tree
Showing 8 changed files with 5,141 additions and 432 deletions.
4,739 changes: 4,739 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"autoprefixer": "^10",
"daisyui": "^3.9.3",
"eslint": "^8",
"eslint-config-next": "13.5.6",
"postcss": "^8",
Expand Down
3 changes: 1 addition & 2 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
@tailwind utilities;

body {
color: rgb(var(--foreground-rgb));
padding: 1rem;
margin: 0;
}
2 changes: 1 addition & 1 deletion src/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export default function RootLayout({
children: React.ReactNode
}) {
return (
<html lang="pt-br">
<html lang="pt-br" data-theme="corporate">
<body>{children}</body>
</html>
)
Expand Down
14 changes: 4 additions & 10 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,10 @@
import Footer from '@/components/Footer';
import MainLayout from '../layouts/MainLayout';
import Head from "next/head";
import Footer from "@/components/Footer";

export default function Home() {
return (
<main>
<Head>
<link rel="shortcut icon" href="/favicon.ico" />
</Head>
<MainLayout>
<Footer />
</MainLayout>
</main>
<MainLayout>
<Footer />
</MainLayout>
);
}
28 changes: 6 additions & 22 deletions src/layouts/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,14 @@ export default function MainLayout({
children: React.ReactNode;
}) {
return (
<div className="flex min-h-screen">
{/* Cabeçalho */}
<div className="bg-gray-900 w-full p-4 text-gray-200">
<div className="flex items-center justify-between">
<img
src="../assets/svgs/logobranca.svg"
alt="Logo"
className="h-8 w-8"
/>
<div className="flex space-x-4">
<a href="/" className="text-gray-200">Home</a>
<a href="/sobre" className="text-gray-200">Sobre</a>
<a href="/github" className="text-gray-200">GitHub</a>
</div>
</div>
<div className="flex-col">
<div className="bg-gray-900 h-16 w-screen">
{/* Conteúdo da Barra Superior */}
</div>

{/* Barra Lateral */}
<div className="bg-teal-500 w-48">
{/* Conteúdo da Barra Lateral */}
<div className="bg-teal-500 w-16 h-screen">
{/* Conteúdo da Barra à Esquerda */}
</div>

<div className="flex flex-1 p-4">
{/* Conteúdo da Página */}
<div className="flex-1">
{children}
</div>
</div>
Expand Down
5 changes: 4 additions & 1 deletion tailwind.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ const config: Config = {
},
},
},
plugins: [],
plugins: [require("daisyui")],
daisyui: {
themes: ["corporate"],
},
}
export default config
781 changes: 385 additions & 396 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit f17d0ba

Please sign in to comment.