42 add typescript #104

ivanbkovacevic · 2023-04-13T18:41:09Z

Added TS to the project.

Maybe tsconfig.json some other settings to be put.

Modelselect.tsx causing some little problems

itmilos · 2023-04-13T19:57:07Z

@ivanbkovacevicIt may require some time for me to go through this thoroughly. In the future for similar tasks, we should consider breaking it down into smaller parts.

ivanbkovacevic · 2023-04-13T20:02:46Z

@ivanbkovacevicIt may require some time for me to go through this thoroughly. In the future for similar tasks, we should consider breaking it down into smaller parts.

@itmilos yes yes.... Offcourse

vercel · 2023-04-14T08:07:16Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
uplatnica	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 14, 2023 5:52pm
uplatnica-x	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Apr 14, 2023 5:52pm

ivanbkovacevic · 2023-04-14T08:22:24Z

@itmilos I extracted types to constant but now Im getting conflicts in some files that was not there yesterday.
App constantly changes .ts import to .js imports

Help needed

itmilos · 2023-04-14T17:13:26Z

src/components/Input.tsx

+   width: number;
+   label: string;
+   value: string | number; 
+   whenChanged: (e:any) => void;


whenChanged: (e: React.ChangeEvent<HTMLInputElement>) => void; }

itmilos · 2023-04-14T17:14:28Z

src/components/Input.tsx

@@ -1,16 +1,33 @@
+import React from 'react';
+import { deviceBrakepoints } from '../config/device-brakepoints'
 import Label from './Label.jsx'


remove .jsx

itmilos · 2023-04-14T17:15:56Z

src/components/InputGroup.tsx

@@ -1,14 +1,22 @@
-import ErrorMessage from './ErrorMessage.jsx'


remove .jsx

itmilos · 2023-04-14T17:16:41Z

src/components/InputGroup.tsx

@@ -1,14 +1,22 @@
-import ErrorMessage from './ErrorMessage.jsx'
+import React from 'react'
+import ErrorMessage from './ErrorMessage.js'


itmilos · 2023-04-14T17:16:49Z

src/components/InputGroup.tsx

 import S from 'styled-components'
 import { useState } from 'react'
+import { InputsProps } from './SplittedInput.js';


@itmilos I do not know why is that happening. The app is constantly injecting .jsx imports

itmilos · 2023-04-14T17:31:00Z

src/components/SavedTemplates.tsx

-  const handleUseTemplate = (template) => {
+  const pullTemplates = localStorage.getItem('templates');
+  const templates = pullTemplates !== null ? JSON.parse(pullTemplates) : [];
+ console.log(templates);


@itmilos I have made the recommended changes.
Please test the branch before merging into master. It is a big change and also configuration changes

itmilos

are we using in Payslip:1067
const accountNumber = params.get('account-number')
const amount = params.get('amount')

itmilos · 2023-04-14T17:53:06Z

src/components/Textarea.tsx

+    helpText: string;
+    label: string;
+    value: string | number; 
+    whenChanged: (e:any) => void;


whenChanged: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;

itmilos · 2023-04-14T18:02:20Z

src/pages/Payslip.tsx

@@ -959,38 +990,39 @@ function Payslip() {
    const [state, dispatch] = useReducer(reducer, initialState, init)


const [state, dispatch] = useReducer<React.Reducer<ReducerState, ReducerAction>>(reducer, initialState, init)

itmilos · 2023-04-14T18:03:42Z

src/pages/Payslip.tsx


-    const appendZeros = value => {
+    const appendZeros = (value: any) => {


const appendZeros = (value: string)

not sure please double check

itmilos · 2023-04-14T18:04:37Z

src/pages/Payslip.tsx

        let newValue = value
        while (newValue.length < 13) newValue = '0' + newValue
        dispatch({ type: ACTIONS.ACCOUNT_NUMBER_CHANGE, payload: newValue })
    }
-    const onFixBankNumberChange = event => {
+    const onFixBankNumberChange = (event: { target: { value: string } }) => {


const onFixBankNumberChange = (event: React.ChangeEvent) => {
if (/^[1-9]{0,1}[0-9]{0,2}$/.test(event.target.value))
dispatch({ type: ACTIONS.BANK_NUMBER_CHANGE, payload: event.target.value })
}
const onAccountNumberChange = (event: React.ChangeEvent) => {
if (/^[0-9]{0,13}$/.test(event.target.value)) {
dispatch({ type: ACTIONS.ACCOUNT_NUMBER_CHANGE, payload: event.target.value })
}
}
const onControlNumberChange = (event: React.ChangeEvent) => {
if (/^[1-9]{0,1}[0-9]{0,1}$/.test(event.target.value))
dispatch({ type: ACTIONS.CONTROL_NUMBER_CHANGE, payload: event.target.value })
}

itmilos · 2023-04-14T18:05:33Z

src/pages/Payslip.tsx

-    const onSetModelCodeChange = event => dispatch({ type: ACTIONS.MODEL_CODE, payload: event })
-    const onPaymentNumberChange = event => dispatch({ type: ACTIONS.PAYMENT_NUMBER, payload: event.target.value })
+    const onSetModelCodeChange = (event: { value: string; label: string }) => dispatch({ type: ACTIONS.MODEL_CODE, payload: event })
+    const onPaymentNumberChange = (event: { target: { value: any } }) => dispatch({ type: ACTIONS.PAYMENT_NUMBER, payload: event.target.value })


const onPaymentNumberChange = (event: React.ChangeEvent)

itmilos · 2023-04-14T18:06:24Z

src/pages/Payslip.tsx

    const resetValues = () => dispatch({ type: ACTIONS.RESET_VALUES })

-    const storeTemplate = (templateName) => {
-        const templates = JSON.parse(localStorage.getItem('templates')) ?? [];
+    const storeTemplate = (templateName: any) => {


const storeTemplate = (templateName: string)

# Conflicts: # package-lock.json # package.json # src/components/BankCard.tsx # src/pages/Payslip.tsx

ivanbkovacevic added 9 commits April 13, 2023 16:41

41-add-typescript

27f0fe3

Select types fix

2c56b72

refactor BankCard

a575a23

fixing type script

2d2cded

fixing ts

66093b4

fix ts

d73a084

fix ts

be5124a

react-select types fix

a57fa3c

Update Modelselect.tsx

f176d13

ivanbkovacevic requested review from itmilos and MrGeminus April 13, 2023 18:41

ivanbkovacevic self-assigned this Apr 13, 2023

github-actions bot added the codeball:needs-careful-review Codeball label Apr 13, 2023

itmilos linked an issue Apr 13, 2023 that may be closed by this pull request

Add TypeScirpt #42

Closed

extracted types in constatns/types

46dfa9e

vercel bot deployed to Preview – uplatnica April 14, 2023 08:07 View deployment

vercel bot deployed to Preview – uplatnica-x April 14, 2023 08:07 View deployment

itmilos reviewed Apr 14, 2023

View reviewed changes

src/components/InputGroup.tsx

@@ -1,14 +1,22 @@

import ErrorMessage from './ErrorMessage.jsx'

Copy link

Member

itmilos Apr 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove .jsx

itmilos reviewed Apr 14, 2023

View reviewed changes

ivanbkovacevic added the bug Something isn't working label Apr 14, 2023

Merge branch 'master' into 42-add-typescript

2518158

itmilos reviewed Apr 14, 2023

View reviewed changes

Update package-lock.json

3d9086d

ivanbkovacevic added 3 commits April 14, 2023 19:41

backgroun color in modals

b27eac6

fix extensions

b181f3b

extensions

92992d9

vercel bot deployed to Preview – uplatnica-x April 14, 2023 17:51 View deployment

vercel bot deployed to Preview – uplatnica April 14, 2023 17:51 View deployment

type

88a6776

vercel bot deployed to Preview – uplatnica-x April 14, 2023 17:52 View deployment

vercel bot deployed to Preview – uplatnica April 14, 2023 17:52 View deployment

ivanbkovacevic removed the bug Something isn't working label Apr 14, 2023

itmilos requested changes Apr 14, 2023

View reviewed changes

itmilos closed this Mar 18, 2024

itmilos deleted the 42-add-typescript branch March 18, 2024 11:11

itmilos restored the 42-add-typescript branch March 18, 2024 11:20

itmilos reopened this Mar 18, 2024

itmilos added 2 commits March 18, 2024 21:32

Merge remote-tracking branch 'origin/master' into 42-add-typescript

c16364d

# Conflicts: # package-lock.json # package.json # src/components/BankCard.tsx # src/pages/Payslip.tsx

Fix payslip

eff476e

itmilos merged commit 961aab0 into master Mar 18, 2024
1 check failed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

42 add typescript #104

42 add typescript #104

ivanbkovacevic commented Apr 13, 2023

itmilos commented Apr 13, 2023

ivanbkovacevic commented Apr 13, 2023

vercel bot commented Apr 14, 2023 •

edited

Loading

ivanbkovacevic commented Apr 14, 2023

itmilos Apr 14, 2023 •

edited

Loading

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

ivanbkovacevic Apr 14, 2023

itmilos Apr 14, 2023

ivanbkovacevic Apr 14, 2023

itmilos left a comment

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

itmilos Apr 14, 2023

		@@ -1,14 +1,22 @@
		import ErrorMessage from './ErrorMessage.jsx'

		@@ -959,38 +990,39 @@ function Payslip() {
		const [state, dispatch] = useReducer(reducer, initialState, init)


		const appendZeros = value => {
		const appendZeros = (value: any) => {

42 add typescript #104

42 add typescript #104

Conversation

ivanbkovacevic commented Apr 13, 2023

itmilos commented Apr 13, 2023

ivanbkovacevic commented Apr 13, 2023

vercel bot commented Apr 14, 2023 • edited Loading

ivanbkovacevic commented Apr 14, 2023

itmilos Apr 14, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

itmilos left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vercel bot commented Apr 14, 2023 •

edited

Loading

itmilos Apr 14, 2023 •

edited

Loading