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

feat(logotypes): Create a component that contains only the logos. #48

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
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
158 changes: 158 additions & 0 deletions app/components/BoxLogotypes.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
import logoPhp from 'assets/image/new-php-logo.svg';
import logoJavaScript from 'assets/image/javascript-logo.svg';
import logoReact from 'assets/image/react.svg';
import logoLaravel from 'assets/image/logo-laravel.svg';
import logoCss from 'assets/image/logo-css.svg';
import logoFrame from 'assets/image/Frame.svg';
import logoCypress from 'assets/image/logo-cypress-atual.svg';
import logoReactNative from 'assets/image/logo-react-native.svg';
import logoNest from 'assets/image/logo-nest-atual.svg';
import logoDocker from 'assets/image/logo-docker.svg';
import logoAws from 'assets/image/logo-aws-atual.svg';
import logoCiCd from 'assets/image/logo-ci-cd.svg';
import Logotypes from '@/components/Logotypes';

export default function BoxLogotypes() {
const allLogos = [
{
logo: logoPhp,
logoName: 'logo-php',
logoClass: 'bg-inherit',
width: 190,
height: 190,
column: 1,
key: 1,
},
{
logo: logoJavaScript,
logoName: 'logo-javascript',
logoClass: 'bg-inherit',
width: 100,
height: 100,
column: 1,
key: 2,
},
{
logo: logoCss,
logoName: 'logo-css',
logoClass: 'bg-inherit',
width: 70,
height: 75,
column: 1,
key: 5,
},
{
logo: logoFrame,
logoName: 'logo-frame',
logoClass: 'bg-inherit',
width: 55,
height: 55,
column: 1,
key: 6,
},
{
logo: logoLaravel,
logoName: 'logo-laravel',
logoClass: 'bg-inherit max-w-none',
width: 150,
height: 150,
size: true,
column: 2,
key: 4,
},
{
logo: logoReact,
logoName: 'logo-react',
logoClass: 'bg-inherit',
width: 50,
height: 50,
column: 2,
key: 3,
},
{
logo: logoNest,
logoName: 'logo-nest',
logoClass: 'bg-inherit max-w-none',
width: 150,
height: 150,
column: 2,
key: 9,
},
{
logo: logoCypress,
logoName: 'logo-cypress',
logoClass: 'pr-4 bg-inherit max-w-none',
width: 170,
height: 170,
column: 2,
key: 7,
},
{
logo: logoReactNative,
logoName: 'logo-react-native',
logoClass: 'bg-inherit',
width: 200,
height: 200,
column: 2,
key: 8,
},
{
logo: logoDocker,
logoName: 'logo-docker',
logoClass: 'flex-[1_1_50%] max-w-none bg-inherit',
width: 100,
height: 100,
size: true,
column: 3,
key: 10,
},
{
logo: logoCiCd,
logoName: 'logo-ci-cd',
logoClass: 'bg-inherit max-w-none',
width: 100,
height: 100,
size: true,
column: 3,
key: 11,
},
{
logo: logoAws,
logoName: 'logo-aws',
logoClass: 'bg-inherit',
width: 100,
height: 100,
size: true,
column: 3,
key: 11,
},
];

const renderCol = (column: number) =>
allLogos
.filter((logoItem) => logoItem.column === column)
.map((item) => (
<Logotypes
logo={item.logo}
logoName={item.logoName}
logoClass={item.logoClass}
key={item.key}
width={item.width}
height={item.height}
/>
));

return (
<div className="flex flex-col items-center mt-32 gap-8 lg:flex-row lg:justify-evenly lg:gap-0 lg:mt-40 xl:max-w-[1300px] xl:m-auto xl:mt-40">
<div className="flex flex-wrap gap-4 justify-center w-64">
{renderCol(1)}
</div>
<div className="flex flex-wrap gap-8 justify-center w-96">
{renderCol(2)}
</div>
<div className="flex flex-wrap justify-center w-56 gap-8">
{renderCol(3)}
</div>
</div>
);
}
40 changes: 24 additions & 16 deletions app/components/MultiTechnology.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import logoReact from 'assets/image/react.svg';
import logoLaravel from 'assets/image/logo-laravel.svg';
import logoCss from 'assets/image/logo-css.svg';
import logoFrame from 'assets/image/Frame.svg';
import logoCypress from 'assets/image/logo-cypress.svg';
import logoCypress from 'assets/image/logo-cypress-atual.svg';
import logoReactNative from 'assets/image/logo-react-native.svg';
import logoNest from 'assets/image/logo-nest.svg';
import logoNest from 'assets/image/logo-nest-atual.svg';
import logoDocker from 'assets/image/logo-docker.svg';
import logoAws from 'assets/image/logo-aws.svg';
import logoAws from 'assets/image/logo-aws-atual.svg';
import logoCiCd from 'assets/image/logo-ci-cd.svg';
import Logotypes from './Logotypes';

export default function MultiTechnology() {
Expand All @@ -17,8 +18,8 @@ export default function MultiTechnology() {
logo: logoPhp,
logoName: 'logo-php',
logoClass: 'flex',
width: 150,
height: 150,
width: 120,
height: 120,
size: true,
key: 1,
line: 1,
Expand All @@ -42,6 +43,7 @@ export default function MultiTechnology() {
{
logo: logoLaravel,
logoName: 'logo-laravel',
logoClass: 'max-w-none',
width: 150,
height: 150,
size: true,
Expand All @@ -68,8 +70,8 @@ export default function MultiTechnology() {
{
logo: logoCypress,
logoName: 'logo-cypress',
width: 150,
height: 150,
width: 170,
height: 170,
size: true,
key: 7,
line: 2,
Expand All @@ -85,8 +87,9 @@ export default function MultiTechnology() {
{
logo: logoNest,
logoName: 'logo-nest',
width: 90,
height: 90,
logoClass: 'max-w-none',
width: 100,
height: 100,
key: 9,
line: 2,
},
Expand All @@ -103,6 +106,16 @@ export default function MultiTechnology() {
{
logo: logoAws,
logoName: 'logo-aws',
width: 100,
height: 100,
size: true,
key: 11,
line: 3,
},
{
logo: logoCiCd,
logoName: 'logo-ci-cd',
logoClass: 'max-w-none',
width: 150,
height: 150,
size: true,
Expand Down Expand Up @@ -130,19 +143,14 @@ export default function MultiTechnology() {
<div className="flex flex-col justify-center my-60 w-screen p-8 h-404 xl:flex-row lg:gap-8 xl:w-full">
<div className="flex flex-col pb-12 relative items-center lg:justify-center xl:items-start xl:pr-20">
<h1 className="text-lightBlue font-semibold text-4xl pb-6">Trabalho</h1>
<h1 className="technology-text w-96 text-4xl font-extrabold uppercase lg:text-5xl">
<h1 className="technology-text w-96 text-4xl text-center font-extrabold uppercase lg:text-5xl xl:text-start">
Múltiplas Tecnologias
</h1>
</div>
<div className="flex flex-col justify-evenly gap-8">
<div className="flex justify-center gap-4">{renderRow(1)}</div>
<div className="flex justify-center gap-4">{renderRow(2)}</div>
<div className="flex justify-center gap-4">
{renderRow(3)}
<div className="flex justify-center items-center w-52 h-28 bg-grayScale ">
<h1 className="text-white text-4xl uppercase">Ci/Cd</h1>
</div>
</div>
<div className="flex justify-center gap-4">{renderRow(3)}</div>
</div>
</div>
);
Expand Down
10 changes: 6 additions & 4 deletions app/servicos/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import PageTitle from '../components/PageTitle';
import PreContentText from '../components/PreContentText';
import TeamInformation from '../components/TeamInformation';
import TextWithBox from '../components/TextWithBox';
import BoxLogotypes from '@/components/BoxLogotypes';
import PageTitle from '@/components/PageTitle';
import PreContentText from '@/components/PreContentText';
import TeamInformation from '@/components/TeamInformation';
import TextWithBox from '@/components/TextWithBox';

const boxData = [
{
Expand Down Expand Up @@ -35,6 +36,7 @@ export default function Services() {
<div className="min-w-full">
<TeamInformation />
</div>
<BoxLogotypes />
<TextWithBox />
</>
);
Expand Down
13 changes: 13 additions & 0 deletions assets/image/logo-aws-atual.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 0 additions & 9 deletions assets/image/logo-aws.svg

This file was deleted.

Loading