diff --git a/app/components/BoxLogotypes.tsx b/app/components/BoxLogotypes.tsx new file mode 100644 index 0000000..b45ae5b --- /dev/null +++ b/app/components/BoxLogotypes.tsx @@ -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) => ( + + )); + + return ( +
+
+ {renderCol(1)} +
+
+ {renderCol(2)} +
+
+ {renderCol(3)} +
+
+ ); +} diff --git a/app/components/MultiTechnology.tsx b/app/components/MultiTechnology.tsx index 5c76222..e471e20 100644 --- a/app/components/MultiTechnology.tsx +++ b/app/components/MultiTechnology.tsx @@ -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() { @@ -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, @@ -42,6 +43,7 @@ export default function MultiTechnology() { { logo: logoLaravel, logoName: 'logo-laravel', + logoClass: 'max-w-none', width: 150, height: 150, size: true, @@ -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, @@ -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, }, @@ -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, @@ -130,19 +143,14 @@ export default function MultiTechnology() {

Trabalho

-

+

MĂșltiplas Tecnologias

{renderRow(1)}
{renderRow(2)}
-
- {renderRow(3)} -
-

Ci/Cd

-
-
+
{renderRow(3)}
); diff --git a/app/servicos/page.tsx b/app/servicos/page.tsx index d9f2a1a..8787d14 100644 --- a/app/servicos/page.tsx +++ b/app/servicos/page.tsx @@ -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 = [ { @@ -35,6 +36,7 @@ export default function Services() {
+ ); diff --git a/assets/image/logo-aws-atual.svg b/assets/image/logo-aws-atual.svg new file mode 100644 index 0000000..dac5475 --- /dev/null +++ b/assets/image/logo-aws-atual.svg @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/assets/image/logo-aws.svg b/assets/image/logo-aws.svg deleted file mode 100644 index 811264a..0000000 --- a/assets/image/logo-aws.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/assets/image/logo-ci-cd.svg b/assets/image/logo-ci-cd.svg new file mode 100644 index 0000000..a999551 --- /dev/null +++ b/assets/image/logo-ci-cd.svg @@ -0,0 +1,308 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/image/logo-cypress-atual.svg b/assets/image/logo-cypress-atual.svg new file mode 100644 index 0000000..77d9bcb --- /dev/null +++ b/assets/image/logo-cypress-atual.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/image/logo-cypress.svg b/assets/image/logo-cypress.svg deleted file mode 100644 index b57a2f7..0000000 --- a/assets/image/logo-cypress.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/assets/image/logo-nest-atual.svg b/assets/image/logo-nest-atual.svg new file mode 100644 index 0000000..3fb44ac --- /dev/null +++ b/assets/image/logo-nest-atual.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/image/logo-nest.svg b/assets/image/logo-nest.svg deleted file mode 100644 index f9453b5..0000000 --- a/assets/image/logo-nest.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - -