Skip to content

Commit

Permalink
Merge pull request #252 from LleidaHack/fixes-varios-2
Browse files Browse the repository at this point in the history
pos fixes
  • Loading branch information
elver5041 authored Oct 22, 2024
2 parents 1c49c94 + b9d0c36 commit 6e7e14f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/components/hackeps/Team/Team.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const Team = (props) => {
const handleShowJoinTeam = () => setShowJoinTeam(true);
const handleCloseJoinTeam = () => setShowJoinTeam(false);
const [err, setErr] = useState("");

const [JoinErrorMessage, setJoinErrorMessage] = useState("");
async function handleKick(member) {
await removeHackerFromGroup(member.id, team.id);
setTeam(await getHackerGroupById(team.id));
Expand Down Expand Up @@ -64,8 +64,10 @@ const Team = (props) => {
localStorage.getItem("userID"),
);
if (a.success) {
setTeam(await getHackerGroupById(a.added_id));
setTeam(await getHackerGroupById(a.added_group_id));
setShowJoinTeam(false);
} else {
setJoinErrorMessage(a.errMssg);
}
}

Expand Down Expand Up @@ -144,6 +146,7 @@ const Team = (props) => {
Codi de l'equip (#XXXXXXXXXX):
</label>
<Field type="text" id="teamCode" name="teamCode" />
<p>{JoinErrorMessage}</p>
<ErrorMessage
name="teamCode"
component="div"
Expand Down
2 changes: 1 addition & 1 deletion src/components/hackeps/Terms/Terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const TermsComponent = () => {
obligatori mostrar l'acreditació cada vegada que s'entri a l'espai de
l'esdeveniment.
<br />
El nombre de participants serà com a màxim de 160 persones. Si se
El nombre de participants serà com a màxim de 200 persones. Si se
supera el nombre d'inscrits, l'ORGANITZACIÓ gestionarà l'assistència
en cas d'ampliar el nombre de places per rigorós ordre d'inscripció.
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/pages/hackeps/Home.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const Home = () => {
},
{
time: "11:00 h - 23 de novembre",
title: "Começa el temps de hacking",
title: "Comença el temps de hacking",
},
{
time: "15:00 h - 23 de novembre",
Expand Down

0 comments on commit 6e7e14f

Please sign in to comment.