Skip to content

Commit 6028989

Browse files
authored
Merge pull request #1 from 0rdnave/feature/v0.1.0
Cria versão inicial da calculadora
2 parents 7fc9512 + 2d04efc commit 6028989

File tree

5 files changed

+172
-111
lines changed

5 files changed

+172
-111
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,6 @@ yarn-error.log*
3434
# typescript
3535
*.tsbuildinfo
3636
next-env.d.ts
37+
38+
# yarn
39+
yarn.lock

package.json

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
"lint": "next lint"
1010
},
1111
"dependencies": {
12+
"next": "14.1.0",
1213
"react": "^18",
13-
"react-dom": "^18",
14-
"next": "14.1.0"
14+
"react-bootstrap-icons": "^1.11.3",
15+
"react-dom": "^18"
1516
},
1617
"devDependencies": {
17-
"typescript": "^5",
1818
"@types/node": "^20",
1919
"@types/react": "^18",
2020
"@types/react-dom": "^18",
2121
"autoprefixer": "^10.0.1",
22+
"eslint": "^8",
23+
"eslint-config-next": "14.1.0",
2224
"postcss": "^8",
2325
"tailwindcss": "^3.3.0",
24-
"eslint": "^8",
25-
"eslint-config-next": "14.1.0"
26+
"typescript": "^5"
2627
}
2728
}

src/app/page.tsx

Lines changed: 2 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,9 @@
1-
import Image from "next/image";
1+
import BasicCalc from "@/components/BasicCalc";
22

33
export default function Home() {
44
return (
55
<main className="flex min-h-screen flex-col items-center justify-between p-24">
6-
<div className="z-10 max-w-5xl w-full items-center justify-between font-mono text-sm lg:flex">
7-
<p className="fixed left-0 top-0 flex w-full justify-center border-b border-gray-300 bg-gradient-to-b from-zinc-200 pb-6 pt-8 backdrop-blur-2xl dark:border-neutral-800 dark:bg-zinc-800/30 dark:from-inherit lg:static lg:w-auto lg:rounded-xl lg:border lg:bg-gray-200 lg:p-4 lg:dark:bg-zinc-800/30">
8-
Get started by editing&nbsp;
9-
<code className="font-mono font-bold">src/app/page.tsx</code>
10-
</p>
11-
<div className="fixed bottom-0 left-0 flex h-48 w-full items-end justify-center bg-gradient-to-t from-white via-white dark:from-black dark:via-black lg:static lg:h-auto lg:w-auto lg:bg-none">
12-
<a
13-
className="pointer-events-none flex place-items-center gap-2 p-8 lg:pointer-events-auto lg:p-0"
14-
href="https://vercel.com?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
15-
target="_blank"
16-
rel="noopener noreferrer"
17-
>
18-
By{" "}
19-
<Image
20-
src="/vercel.svg"
21-
alt="Vercel Logo"
22-
className="dark:invert"
23-
width={100}
24-
height={24}
25-
priority
26-
/>
27-
</a>
28-
</div>
29-
</div>
30-
31-
<div className="relative flex place-items-center before:absolute before:h-[300px] before:w-full sm:before:w-[480px] before:-translate-x-1/2 before:rounded-full before:bg-gradient-radial before:from-white before:to-transparent before:blur-2xl before:content-[''] after:absolute after:-z-20 after:h-[180px] after:w-full sm:after:w-[240px] after:translate-x-1/3 after:bg-gradient-conic after:from-sky-200 after:via-blue-200 after:blur-2xl after:content-[''] before:dark:bg-gradient-to-br before:dark:from-transparent before:dark:to-blue-700 before:dark:opacity-10 after:dark:from-sky-900 after:dark:via-[#0141ff] after:dark:opacity-40 before:lg:h-[360px] z-[-1]">
32-
<Image
33-
className="relative dark:drop-shadow-[0_0_0.3rem_#ffffff70] dark:invert"
34-
src="/next.svg"
35-
alt="Next.js Logo"
36-
width={180}
37-
height={37}
38-
priority
39-
/>
40-
</div>
41-
42-
<div className="mb-32 grid text-center lg:max-w-5xl lg:w-full lg:mb-0 lg:grid-cols-4 lg:text-left">
43-
<a
44-
href="https://nextjs.org/docs?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
45-
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
46-
target="_blank"
47-
rel="noopener noreferrer"
48-
>
49-
<h2 className={`mb-3 text-2xl font-semibold`}>
50-
Docs{" "}
51-
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
52-
-&gt;
53-
</span>
54-
</h2>
55-
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
56-
Find in-depth information about Next.js features and API.
57-
</p>
58-
</a>
59-
60-
<a
61-
href="https://nextjs.org/learn?utm_source=create-next-app&utm_medium=appdir-template-tw&utm_campaign=create-next-app"
62-
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
63-
target="_blank"
64-
rel="noopener noreferrer"
65-
>
66-
<h2 className={`mb-3 text-2xl font-semibold`}>
67-
Learn{" "}
68-
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
69-
-&gt;
70-
</span>
71-
</h2>
72-
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
73-
Learn about Next.js in an interactive course with&nbsp;quizzes!
74-
</p>
75-
</a>
76-
77-
<a
78-
href="https://vercel.com/templates?framework=next.js&utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
79-
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
80-
target="_blank"
81-
rel="noopener noreferrer"
82-
>
83-
<h2 className={`mb-3 text-2xl font-semibold`}>
84-
Templates{" "}
85-
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
86-
-&gt;
87-
</span>
88-
</h2>
89-
<p className={`m-0 max-w-[30ch] text-sm opacity-50`}>
90-
Explore starter templates for Next.js.
91-
</p>
92-
</a>
93-
94-
<a
95-
href="https://vercel.com/new?utm_source=create-next-app&utm_medium=appdir-template&utm_campaign=create-next-app"
96-
className="group rounded-lg border border-transparent px-5 py-4 transition-colors hover:border-gray-300 hover:bg-gray-100 hover:dark:border-neutral-700 hover:dark:bg-neutral-800/30"
97-
target="_blank"
98-
rel="noopener noreferrer"
99-
>
100-
<h2 className={`mb-3 text-2xl font-semibold`}>
101-
Deploy{" "}
102-
<span className="inline-block transition-transform group-hover:translate-x-1 motion-reduce:transform-none">
103-
-&gt;
104-
</span>
105-
</h2>
106-
<p className={`m-0 max-w-[30ch] text-sm opacity-50 text-balance`}>
107-
Instantly deploy your Next.js site to a shareable URL with Vercel.
108-
</p>
109-
</a>
110-
</div>
6+
<BasicCalc />
1117
</main>
1128
);
1139
}

src/components/BasicCalc/index.tsx

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
'use client'
2+
import { useEffect, useState } from 'react';
3+
import { Backspace } from 'react-bootstrap-icons';
4+
5+
import { evaluateExpressionSafely, formatInput } from "./utils";
6+
7+
export default function BasicCalc() {
8+
9+
const [inputValue, setInputValue] = useState('')
10+
const [buttonValue, setButtonValue] = useState('')
11+
const [equacao, setEquacao] = useState('')
12+
13+
14+
const renderGridItems = () => {
15+
const gridValues = ['%', '/', '*', 'backspace', '7', '8', '9', '-', '4', '5', '6', '+', '1', '2', '3', '=', 'c', '0', '.'];
16+
return gridValues.map((value, index) => {
17+
let className = "rounded-md py-1 border-1 border-purple-600/25 bg-purple-600/25 flex justify-center items-center";
18+
if (value === '=') {
19+
className += " row-span-2";
20+
return <button onClick={() => handleResult(equacao)} key={index} className={className}>
21+
=
22+
</button>
23+
}
24+
if (value === 'backspace') {
25+
return <button onClick={() => handleBackspace()} key={index} className={className}>
26+
<Backspace />
27+
</button>
28+
}
29+
return (
30+
<button onClick={e => {
31+
if (e.currentTarget.textContent === 'c') return updateValues('')
32+
33+
e.currentTarget.textContent && setButtonValue(e.currentTarget.textContent)
34+
}
35+
36+
} key={index} className={className} >
37+
{value}
38+
</button >
39+
);
40+
});
41+
};
42+
43+
const handleResult = (values: string) => {
44+
const result = evaluateExpressionSafely(values)?.toString() || ''
45+
46+
updateValues(result)
47+
}
48+
49+
/* WIP - tratar sequencia de caracteres matemáticos */
50+
// const handleSum = (value: string) => {
51+
// setButtonValue(value)
52+
// }
53+
// const handleSub = (value: string) => {
54+
// setButtonValue(value)
55+
// }
56+
// const handleMult = (value: string) => {
57+
// setButtonValue(value)
58+
// }
59+
// const handleDiv = (value: string) => {
60+
// setButtonValue(value)
61+
// }
62+
63+
/* WIP - criar função de conversão de porcentagem */
64+
// const handlePerc = (value: string) => {
65+
// setButtonValue(value)
66+
// }
67+
68+
const updateValues = (value: string) => {
69+
const newValue = value.length > 0 && value[0] === '0' ? value.slice(1, undefined) : value
70+
71+
setEquacao(newValue)
72+
setInputValue(newValue !== '' ? formatInput(newValue) : '0')
73+
}
74+
75+
const handleBackspace = () => {
76+
const temp = isNaN(parseInt(buttonValue)) ? equacao.slice(0, -1) : equacao.slice(0, -2)
77+
updateValues(temp)
78+
}
79+
80+
useEffect(() => {
81+
let newValue = equacao
82+
83+
if (buttonValue !== '') {
84+
newValue = equacao + buttonValue
85+
setButtonValue('')
86+
}
87+
88+
updateValues(newValue)
89+
}, [buttonValue])
90+
91+
return (
92+
<div className="bg-purple-400 rounded-lg px-2 pt-2 pb-4 space-y-6">
93+
<div className="flex align-middle h-16 text-xl bg-purple-400">
94+
<input readOnly={true} className=' px-2 text-red-600 rounded-t-lg rounded-b-md text-right focus-visible:outline focus-visible:outline-2 focus-visible:outline-purple-900' type="text" value={inputValue} onChange={e => setInputValue(e.currentTarget.value)} />
95+
</div>
96+
<div>
97+
<div className="text-base grid grid-cols-4 grid-rows-5 gap-4">
98+
{renderGridItems()}
99+
</div>
100+
</div>
101+
</div>
102+
)
103+
}

src/components/BasicCalc/utils.ts

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
export const evaluateExpressionSafely = (expression: string): number | undefined => {
2+
'use strict';
3+
let result: number | undefined;
4+
try {
5+
result = (function () {
6+
return eval(expression);
7+
})();
8+
} catch (error) {
9+
console.error('Erro ao avaliar a expressão:', error);
10+
}
11+
return result;
12+
};
13+
14+
export function formatInput(expression: string) {
15+
16+
// Remove espaços em branco
17+
expression = expression.replace(/\s/g, "");
18+
19+
// Adiciona parênteses em torno de expressões negativas
20+
expression = expression.replace(/(?<!\d)(-\d+)(?!\d)/g, '($1)');
21+
22+
// Adiciona '0' antes de um ponto se necessário
23+
expression = expression.replace(/(?<!\d)\.(?=\d)/g, '0.');
24+
25+
// Adiciona '0' após um caractere matemático se necessário
26+
expression = expression.replace(/(?<=[*/+-])(?=\.)/g, '0');
27+
28+
// Remove zeros à esquerda, exceto se for parte de um número decimal ou se for o único dígito
29+
expression = expression.replace(/(?<=^|[^0-9.])0+(?=\d+)/g, '');
30+
31+
// Substitui '0' seguido por um número
32+
expression = expression.replace(/(?<!\.)0+(?=\d)/g, '');
33+
34+
// Garante que não haja dois caracteres matemáticos seguidos
35+
expression = expression.replace(/[*/+-]{2,}/g, '');
36+
37+
return adicionarEspacos(expression)
38+
}
39+
40+
function adicionarEspacos(str: string) {
41+
const characters = ['/', '*', '-', '+'];
42+
let result = '';
43+
44+
for (let i = 0; i < str.length; i++) {
45+
let char = str[i];
46+
if (characters.includes(char)) {
47+
let spaceBefore = i > 0 && str[i - 1] !== ' ';
48+
let spaceAfter = i < str.length - 1 && str[i + 1] !== ' ';
49+
50+
if (spaceBefore) result += ' ';
51+
result += char;
52+
if (spaceAfter) result += ' ';
53+
} else {
54+
result += char;
55+
}
56+
}
57+
return result;
58+
}

0 commit comments

Comments
 (0)