Skip to content

Commit

Permalink
Merge pull request #264 from Arquisoft/uo271447-arreglandoAddress
Browse files Browse the repository at this point in the history
Uo271447 arreglando address
  • Loading branch information
UO277876 authored May 2, 2022
2 parents fbf5b8c + 0d6a206 commit 5e4c32f
Show file tree
Hide file tree
Showing 7 changed files with 195 additions and 111 deletions.
146 changes: 73 additions & 73 deletions webapp/package-lock.json

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

13 changes: 9 additions & 4 deletions webapp/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@inrupt/vocab-solid-common": "^0.7.5",
"@material-ui/core": "^4.12.3",
"@mui/icons-material": "^5.2.5",
"@mui/material": "^5.5.3",
"@mui/material": "^5.6.4",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/react": "^12.1.2",
"@testing-library/user-event": "^13.5.0",
Expand Down Expand Up @@ -44,9 +44,14 @@
},
"jest": {
"collectCoverageFrom": [
"src/components/Cart/**","src/components/Details/**",
"src/components/Fragments/**","src/components/Home/**", "src/components/Login/**",
"src/components/Requets/**", "src/components/Developers/**" ,"src/App.tsx"
"src/components/Cart/**",
"src/components/Details/**",
"src/components/Fragments/**",
"src/components/Home/**",
"src/components/Login/**",
"src/components/Requets/**",
"src/components/Developers/**",
"src/App.tsx"
]
},
"eslintConfig": {
Expand Down
2 changes: 2 additions & 0 deletions webapp/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import GastosEnvio from './components/POD/GastosEnvio';
import Nav from './components/Fragments/Nav';
import Us from './components/Developers/Us';
import ListRequests from './components/Requests/ListRequests';
import ErrorPod from './components/Login/ErrorPod';


let productos:Array<Product>= new Array<Product>();
Expand All @@ -36,6 +37,7 @@ function App(): JSX.Element {
<Route path="/GastosEnvio" element={<GastosEnvio/>}/>
<Route path="/ProfileViewer" element={<ProfileViewer/>}/>
<Route path="/ListRequests" element={<ListRequests/>}/>
<Route path="/ErrorPod" element={<ErrorPod/>}/>
<Route path="/Us" element={<Us/>}/>
</Routes>
<Footer/>
Expand Down
Loading

0 comments on commit 5e4c32f

Please sign in to comment.