verdnatura/worker-time-control
verdnatura
/
worker-time-control
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#6274 proxy workerTimeControl #14

Merged
jorgep merged 12 commits from 6274-loginWorkerTimeControl into test 2024-01-04 13:26:28 +00:00
Conversation 3 Commits 12 Files Changed 12 +1093 -79
jorgep commented 2023-11-23 12:31:08 +00:00
Member
Copy Link
No description provided.
jorgep added 1 commit 2023-11-23 12:31:08 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
388fc57404 refs #6274 proxy created
jorgep added 1 commit 2023-11-28 13:52:31 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
4566368d10 refs #6274 login modal, salix requests & proxy
jorgep added 1 commit 2023-11-29 08:28:25 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
76aaa3fc41 refs #6274 renewToken created
jorgep changed title from WIP: #6274 proxy workerTimeControl to #6274 proxy workerTimeControl 2023-11-29 08:29:06 +00:00
jorgep requested review from jgallego 2023-11-29 08:29:22 +00:00
jorgep requested review from sergiodt 2023-11-29 08:29:30 +00:00
jorgep requested review from juan 2023-11-29 08:29:38 +00:00
jorgep added 1 commit 2023-11-29 12:41:14 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
57df79806a refs #6274 signIn refactor
jgallego requested changes 2023-11-30 06:41:26 +00:00
js/clockIn.js Outdated
@ -93,6 +99,7 @@ function getInfo() {
}
function printTimetable(timetable) {
console.log(timetable)
jgallego commented 2023-11-30 06:28:08 +00:00
Owner
Copy Link

quitar

quitar
jorgep marked this conversation as resolved
js/index.js Outdated
@ -1,17 +1,33 @@
var pin = "";
var datoUsuario = "";
jgallego commented 2023-11-30 06:40:59 +00:00
Owner
Copy Link

revisa esta porque tiene un uso extraño, no parece que se asigne

revisa esta porque tiene un uso extraño, no parece que se asigne
jorgep marked this conversation as resolved
js/index.js Outdated
@ -1,17 +1,33 @@
var pin = "";
var datoUsuario = "";
var pass = "";
jgallego commented 2023-11-30 06:41:15 +00:00
Owner
Copy Link

porque no crear let como en salix?

porque no crear let como en salix?
jorgep commented 2023-11-30 08:08:13 +00:00
Author
Member
Copy Link

Era por seguir en la línea del proyecto. Pero lo cambio todo a let y const.

Era por seguir en la línea del proyecto. Pero lo cambio todo a let y const.
jorgep marked this conversation as resolved
js/index.js Outdated
@ -15,0 +26,4 @@
});
let token;
if (token === null) return
jgallego commented 2023-11-30 06:39:30 +00:00
Owner
Copy Link

creas y usas el token?

creas y usas el token?
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-11-30 08:27:58 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
7b9d0c5310 refs #6274 refactor
jorgep requested review from jgallego 2023-11-30 08:33:48 +00:00
jgallego approved these changes 2023-11-30 09:13:21 +00:00
sergiodt refused to review 2023-12-01 09:26:24 +00:00
jorgep added 1 commit 2023-12-05 14:59:21 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
7c5386058b refs 6274 calling renewToken
jorgep requested review from jsegarra 2023-12-05 15:02:26 +00:00
jorgep commented 2023-12-05 15:02:45 +00:00
Author
Member
Copy Link

mirar con @jsegarra el funcionamiento de renewToken

mirar con @jsegarra el funcionamiento de renewToken
jorgep added 1 commit 2023-12-07 08:14:12 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
fb85d7fe0a fix response error
jorgep added 1 commit 2023-12-07 08:43:37 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
8b68af8a9c fix renewPeriod
jsegarra requested changes 2023-12-07 08:51:37 +00:00
js/clockIn.js
@ -98,3 +112,3 @@
dated.setDate(dated.getDate() - 6);
for (var i = 0; i < 6; i++) {
for (let i = 0; i < 6; i++) {
jsegarra commented 2023-12-07 08:47:08 +00:00
Member
Copy Link

porque es let y no const?

porque es let y no const?
jorgep commented 2023-12-07 14:21:31 +00:00
Author
Member
Copy Link

Tiene que ser let para poder modificar su valor, si no, no funciona

Tiene que ser let para poder modificar su valor, si no, no funciona
👍 1
jorgep marked this conversation as resolved
js/clockIn.js Outdated
@ -228,8 +226,8 @@ function ifIsEmptyImage(value) {
}
function ifIsEmptyText(value) {
jsegarra commented 2023-12-07 08:48:53 +00:00
Member
Copy Link

Revisamos

Revisamos
jorgep marked this conversation as resolved
jsegarra requested changes 2023-12-07 12:29:56 +00:00
proxy.js
@ -0,0 +4,4 @@
const app = express();
const apiProxy = createProxyMiddleware('/api', {
target: 'http://localhost:3000',
jsegarra commented 2023-12-07 12:27:56 +00:00
Member
Copy Link

porque target no está en el .env?

porque target no está en el .env?
jorgep marked this conversation as resolved
jorgep added 1 commit 2023-12-07 14:25:35 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
c62771b6c7 refs #6274 dotenv added
jorgep requested review from jsegarra 2023-12-07 14:25:55 +00:00
jorgep added 1 commit 2023-12-07 14:47:42 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
56da86d1d5 refs #6274 refactor ifIsEmptyText
jsegarra approved these changes 2023-12-07 18:58:19 +00:00
juan requested changes 2023-12-11 08:28:12 +00:00
juan left a comment
Owner
Copy Link

Sweet alert no debería de estar como dependencia en el package.json en lugar de incluir el fichero js directamente?

Sweet alert no debería de estar como dependencia en el package.json en lugar de incluir el fichero js directamente?
jorgep added 1 commit 2023-12-11 11:18:48 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
ad7b2ab305 refs #6274 install sweetalert2
jorgep requested review from juan 2023-12-11 11:19:16 +00:00
jorgep commented 2023-12-11 11:19:32 +00:00
Author
Member
Copy Link

Sweet alert no debería de estar como dependencia en el package.json en lugar de incluir el fichero js directamente?

Listo

> Sweet alert no debería de estar como dependencia en el package.json en lugar de incluir el fichero js directamente? Listo
jorgep commented 2023-12-11 11:47:25 +00:00
Author
Member
Copy Link

PRIMERO SUBIR EL BACKEND EN SALIX

PRIMERO SUBIR EL BACKEND EN SALIX
juan approved these changes 2023-12-11 13:47:07 +00:00
jorgep added 1 commit 2024-01-03 08:59:40 +00:00
gitea/worker-time-control/pipeline/head This commit looks good Details
5a3c1dac1b refs #6274 fix error msg
jorgep requested review from jgallego 2024-01-03 10:48:39 +00:00
jorgep requested review from juan 2024-01-03 10:48:42 +00:00
jorgep requested review from jsegarra 2024-01-03 10:48:44 +00:00
jgallego approved these changes 2024-01-03 11:24:09 +00:00
jsegarra approved these changes 2024-01-03 11:48:57 +00:00
jgallego removed review request for juan 2024-01-04 12:55:58 +00:00
jorgep merged commit 8fb70a4c85 into test 2024-01-04 13:26:28 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
juan
jgallego
jsegarra
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
4 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: verdnatura/worker-time-control#14
No description provided.
Delete Branch "6274-loginWorkerTimeControl"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?