Merge branch 'master' of https://github.com/Arquisoft/lomap_es3c

Arquisoft · May 1, 2023 · 1b93ee1 · 1b93ee1
2 parents a5dfdec + 7ac4ade
commit 1b93ee1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/webapp/Dockerfile b/webapp/Dockerfile
@@ -12,5 +12,4 @@ ENV REACT_APP_API_URI=$API_URI
 RUN npm run build
 
 #Execute npm run prod to run the server
-#CMD [ "npm", "run", "prod" ]
-CMD ["npm", "start"]
+CMD [ "npm", "run", "prod" ]
diff --git a/webapp/src/components/indexView/RegisterProvider.tsx b/webapp/src/components/indexView/RegisterProvider.tsx
@@ -10,10 +10,12 @@ interface Props {
 export const RegisterProvider = ({ handleFocus, handleBlur }: Props) => {
     const [provider, setProvider] = useState('');
 
+    let redirect = window.location.origin.concat("/home"); 
+
     const identification = async function () {
         await login({
             oidcIssuer: provider,
-            redirectUrl: "http://localhost:3000/home",//Url a la que nos llevara una vez logeado
+            redirectUrl: redirect,//Url a la que nos llevara una vez logeado
             clientName: "LoMap_es3c"
         });
     }

diff --git a/webapp/src/solid/podsFriends.js b/webapp/src/solid/podsFriends.js
@@ -84,8 +84,8 @@ export async function getFriendsMapsFromPod(friendUrl, session) {
 
   try {
     let res = await getMapsFriendFromPod(session, friendUrl);
-
-    return res;
+    let aux = res.map(map=>{return decodeURIComponent(map)});
+    return aux;
 
   } catch (e) {
     console.error(e);