Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/webapp/new signup #65

Merged
merged 22 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
26649ca
feat: Creating the Signup.css
sergiorodriguezgarcia Feb 27, 2024
baef072
feat: Adding the Signup.test.js class
sergiorodriguezgarcia Feb 27, 2024
8b39b97
feat: Deleting the css and updating the Signup.jsx
sergiorodriguezgarcia Feb 27, 2024
1a032b8
feat: Changing the UI of the Signup
sergiorodriguezgarcia Feb 27, 2024
58b339f
feat: Adding confirm password to the Signup and aesthetic changes
sergiorodriguezgarcia Feb 27, 2024
49bbb4e
feat: Adding control to the show hide password
sergiorodriguezgarcia Feb 28, 2024
702f8c5
feat: Adding the translation conventions to the Signup view
sergiorodriguezgarcia Feb 28, 2024
b126bdf
feat: Adding test cases to the Signup.test.js
sergiorodriguezgarcia Mar 1, 2024
32d0845
feat: Fixing errors in the Signup.test.js
sergiorodriguezgarcia Mar 1, 2024
cc7e899
Merge branch 'develop' into feat/webapp/new-signup
sergiorodriguezgarcia Mar 1, 2024
6ecdac0
fix: Making the Signup.test work correctly
sergiorodriguezgarcia Mar 2, 2024
c278c38
fx: Changes in the Signup.jsx to make the test pass
sergiorodriguezgarcia Mar 4, 2024
994de83
Merge branch 'develop' into feat/webapp/new-signup
sergiorodriguezgarcia Mar 4, 2024
c419e3b
Update Signup.jsx
sergiorodriguezgarcia Mar 4, 2024
1416212
fix: Updating to pass the test
sergiorodriguezgarcia Mar 4, 2024
2a7ad39
Merge branch 'feat/webapp/new-signup' of https://github.com/Arquisoft…
sergiorodriguezgarcia Mar 4, 2024
8e72663
fix: Changing the signup.jsx to pass the tests
sergiorodriguezgarcia Mar 4, 2024
35de8f7
fix: Changing the signup.test error submitting the info
sergiorodriguezgarcia Mar 4, 2024
353a454
fix: Updating the signup.tests
sergiorodriguezgarcia Mar 4, 2024
b9b0c65
fix: Merge Login.jsx
sergiorodriguezgarcia Mar 4, 2024
f8eecc9
feat: Adding buttons to follow conventions of other views
sergiorodriguezgarcia Mar 4, 2024
17beee4
fix: Changing the Signup.test to pass with the new conventions
sergiorodriguezgarcia Mar 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 50 additions & 56 deletions webapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.2",
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^14.1.2",
"@testing-library/user-event": "^14.5.2",
"axios": "^1.6.5",
"dotenv": "^16.4.1",
"framer-motion": "^11.0.3",
"framer-motion": "^11.0.6",
"i18next": "^23.8.2",
"i18next-browser-languagedetector": "^7.2.0",
"i18next-http-backend": "^2.4.3",
Expand Down
11 changes: 9 additions & 2 deletions webapp/public/locales/en/translation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"nav":{
"common": {
"home": "Home",
"api_docs": "API Documentation",
"statistics": {
Expand All @@ -9,6 +9,13 @@
},
"play": "Play",
"login": "Log in",
"register": "Register"
"register": "Register",
"submit": "Submit"
},
"session": {
"username": "Username",
"password": "Password",
"email": "Email",
"confirm_password": "Confirm password"
}
}
10 changes: 8 additions & 2 deletions webapp/public/locales/es/translation.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"nav":{
"common":{
"home": "Inicio",
"api_docs": "Documentación de la API",
"statistics": {
Expand All @@ -10,5 +10,11 @@
"play": "Jugar",
"login": "Iniciar sesión",
"register": "Registrarse"
},
"session": {
"username": "Nombre de usuario",
"password": "Contraseña",
"email": "Correo electrónico",
"confirm_password": "Confirmar contraseña"
}
}
}
6 changes: 3 additions & 3 deletions webapp/src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ export function TopBar() {
{ pages.map(page => parsePage(page)) }
</GridItem>
<GridItem as={Flex} justifyContent={"right"} key={"right-navbar"}>
<Button as={Link} mr={"1vw"}>{t("nav.login")}</Button>
<Button as={Link} mr={"1vw"}>{t("nav.register")}</Button>
<Button as={Link} href="/login" mr={"1vw"}>{t("nav.login")}</Button>
<Button as={Link} href="/register" mr={"1vw"}>{t("nav.register")}</Button>
</GridItem>
</Grid>
}
export default function Layout() {
return <>
<TopBar />
<Container bgColor="#DCF2F1" minW={"100%"} minH={"100%"}>
<Container minW={"100%"} minH={"100%"}>
<Outlet />
</Container>
</>
Expand Down
9 changes: 5 additions & 4 deletions webapp/src/components/Router.jsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import React from "react";
import Root from "../pages/Root";
import Layout from "./Layout";
import { Route, createBrowserRouter, createRoutesFromElements } from "react-router-dom";
import Signup from "../pages/Signup";
import { Route,createRoutesFromElements } from "react-router-dom";

export default createRoutesFromElements(
<Route path="/" element={<Layout />} >
<Route path="/">
<Route index element={<Root />} />
<Route path="/signup" element={<Signup />} />
</Route>
)
)
Loading
Loading