Compare commits
1 Commits
81ce9eb546
...
fr/backend
Author | SHA1 | Date | |
---|---|---|---|
899520fd3c |
@@ -15,18 +15,9 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
node-version: "20.14.0"
|
node-version: "20.14.0"
|
||||||
|
|
||||||
- name: npm install
|
- name: npm install, build and test
|
||||||
working-directory: api/
|
|
||||||
run: |
|
run: |
|
||||||
npm install
|
npm install
|
||||||
|
|
||||||
- name: npm run build
|
|
||||||
working-directory: api/
|
|
||||||
run: |
|
|
||||||
npm run build --if-present
|
npm run build --if-present
|
||||||
|
|
||||||
- name: npm run test
|
|
||||||
working-directory: api/
|
|
||||||
run: |
|
|
||||||
npm run test
|
npm run test
|
||||||
|
|
@@ -90,7 +90,7 @@ export function AuthProvider({ children }) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (resUser.status != 200) {
|
if (resUser.status != 200) {
|
||||||
throw Error("Username or password is incorrect!");
|
throw Error("user does not have user data");
|
||||||
}
|
}
|
||||||
|
|
||||||
const userData = await resUser.json();
|
const userData = await resUser.json();
|
||||||
@@ -104,7 +104,7 @@ export function AuthProvider({ children }) {
|
|||||||
await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
|
await storageUtil.setItem(TOKEN_KEY, loginData.data.jwt);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error("Failed to log in", err);
|
console.error("Failed to log in", err);
|
||||||
return { error: true, msg: err };
|
return { error: true, msg: err.res };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -20,12 +20,8 @@ function LoginPage() {
|
|||||||
}
|
}
|
||||||
}, [authState.authenticated]);
|
}, [authState.authenticated]);
|
||||||
|
|
||||||
async function login() {
|
function login() {
|
||||||
const res = await onLogin(email, pass);
|
onLogin(email, pass);
|
||||||
if (res !== undefined && res.error === true) {
|
|
||||||
alert(res.msg);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
Reference in New Issue
Block a user