Update - Mise à jour de l'app pour fonctionner en local avec un envir…

…onnement docker
sheaft-app · Nov 19, 2020 · 2b41a16 · 2b41a16
1 parent a9c8e8a
commit 2b41a16
Show file tree

Hide file tree

Showing 22 changed files with 50 additions and 28 deletions.
diff --git a/src/App.svelte b/src/App.svelte
@@ -114,7 +114,7 @@
       await authInstance.login();
     }
 
-    const progress = await fetch('https://content.sheaft.com/progress/departments.json');
+    const progress = await fetch(config.content + '/progress/departments.json');
     var data = await progress.json();
       
     allDepartmentsProgress.set(data);

diff --git a/src/components/nav/Nav.svelte b/src/components/nav/Nav.svelte
@@ -41,6 +41,7 @@
   import SellingPointRoutes from "./../../routes/selling-points/routes.js";
   import DeliveryRoutes from "./../../routes/deliveries/routes.js";
   import QuickOrderRoutes from "./../../routes/quick-orders/routes.js";
+import { config } from "../../configs/config";
 
   const authInstance = GetAuthInstance();
   const routerInstance = GetRouterInstance();
@@ -323,7 +324,7 @@
           {$authUserAccount.profile.given_name ? $authUserAccount.profile.given_name : $authUserAccount.profile.name}
         </span>
         <div
-          style="background-image: url('{$authUserAccount.profile.picture ? $authUserAccount.profile.picture : "https://content.sheaft.com/pictures/users/profile.svg"}');"
+          style="background-image: url('{$authUserAccount.profile.picture ? $authUserAccount.profile.picture : config.content + "/pictures/users/profile.svg"}');"
           class="rounded-full bg-white user-photo ml-2 w-5 h-5 lg:w-8 lg:h-8" />
       </button>
     {:else}

diff --git a/src/configs/config.local.js b/src/configs/config.local.js
@@ -3,6 +3,7 @@ export const config = {
 	front: "http://localhost:4200",
 	api: "http://localhost:5002",
 	signalr: "http://localhost:5009",
+	content: "http://localhost:10000/devstoreaccount1",
 	auth: {
 		url: "http://localhost:5000",
 		settings: {

diff --git a/src/configs/config.production.js b/src/configs/config.production.js
@@ -3,6 +3,7 @@ export const config = {
 	front: "https://app.sheaft.com",
 	api: "https://api.sheaft.com",
 	signalr: "https://signalr.sheaft.com",
+	content: "https://content.sheaft.com",
 	auth: {
 		url: "https://auth.sheaft.com",
 		settings: {

diff --git a/src/configs/config.remote.js b/src/configs/config.remote.js
@@ -3,6 +3,7 @@ export const config = {
 	front: "http://localhost:4200",
 	api: "https://sheaft-api-rd.azurewebsites.net",
 	signalr: "https://sheaft-signalr-rd.azurewebsites.net",
+	content: "https://rd.content.sheaft.com",
 	auth: {
 		url: "https://sheaft-identity-rd.azurewebsites.net",
 		settings: {

diff --git a/src/configs/config.staging.js b/src/configs/config.staging.js
@@ -3,6 +3,7 @@ export const config = {
 	front: "https://dev.app.sheaft.com",
 	api: "https://sheaft-api-rd.azurewebsites.net",
 	signalr: "https://sheaft-signalr-rd.azurewebsites.net",
+	content: "https://rd.content.sheaft.com",
 	auth: {
 		url: "https://sheaft-identity-rd.azurewebsites.net",
 		settings: {

diff --git a/src/routes/account/Profile.svelte b/src/routes/account/Profile.svelte
@@ -15,6 +15,7 @@
   import EditConsumer from "./EditConsumer.svelte";
   import EditProducer from "./EditProducer.svelte";
   import EditStore from "./EditStore.svelte";
+  import { config } from "../../configs/config";
 
   const errorsHandler = new SheaftErrors();
   const authInstance = GetAuthInstance();
@@ -65,7 +66,7 @@
     $authUserAccount.profile &&
     $authUserAccount.profile.picture
       ? $authUserAccount.profile.picture
-      : "https://content.sheaft.com/pictures/users/profile.svg";
+      : config.content + "/pictures/users/profile.svg";
 </script>
 
 <svelte:head>

diff --git a/src/routes/account/UpdateImage.svelte b/src/routes/account/UpdateImage.svelte
@@ -4,10 +4,11 @@
   import ActionConfirm from "./../../components/modal/ActionConfirm.svelte";
   import GetGraphQLInstance from "./../../services/SheaftGraphQL.js";
   import SheaftErrors from "./../../services/SheaftErrors";
+import { config } from "../../configs/config";
 
   const errorsHandler = new SheaftErrors();
 
-  export let id, mutation, close, onClose, initialSrc = "https://content.sheaft.com/pictures/users/profile.svg";
+  export let id, mutation, close, onClose, initialSrc = config.content + "/pictures/users/profile.svg";
   var graphQLInstance = GetGraphQLInstance();
   let src = initialSrc;
 

diff --git a/src/routes/leaderboard/Leaderboard.svelte b/src/routes/leaderboard/Leaderboard.svelte
@@ -12,6 +12,7 @@
     USER_POINTS_PER_COUNTRY,
     USER_POSITION_IN_COUNTRY
   } from "./queries.js";
+import { config } from "../../configs/config";
 
   export let params;
 
@@ -77,7 +78,7 @@
 
   const getUserPicture = (user) => {
     if (user.picture) return user.picture;
-    return "https://content.sheaft.com/pictures/users/profile.svg";
+    return config.content + "/pictures/users/profile.svg";
   }
 
   const getUserName = (user) => {

diff --git a/src/routes/products/ImportProducts.svelte b/src/routes/products/ImportProducts.svelte
@@ -96,7 +96,7 @@
     <ul class="list-decimal">
       <li>
         Téléchargez le modèle de catalogue
-        <a href="https://content.sheaft.com/resources/excel/sheaft_catalogue_produits.xlsx"> en cliquant ici</a>.
+        <a href="{config.content + '/resources/excel/sheaft_catalogue_produits.xlsx'}"> en cliquant ici</a>.
       </li>
       <li>
         Complétez le fichier Excel téléchargé en veillant à bien respecter les colonnes.

diff --git a/src/routes/products/ProductForm.svelte b/src/routes/products/ProductForm.svelte
@@ -21,6 +21,7 @@
 	import UnitKind from "../../enums/UnitKind";
 	import ConditioningKind from "../../enums/ConditioningKind";
   import GetAuthInstance from "../../services/SheaftAuth";
+import { config } from "../../configs/config";
 
 	export let submit, product, isLoading;
 
@@ -302,7 +303,7 @@
 					classNames="ml-1"
 					isChecked={isBio}
 					onChange={() => toggleBio()}>
-					<img src="https://content.sheaft.com/pictures/tags/icons/bio.png" alt="Produit bio" class="w-8" />
+					<img src="{config.content + '/pictures/tags/icons/bio.png'}" alt="Produit bio" class="w-8" />
 				</Toggle>
 			</div>
 		</div>

diff --git a/src/routes/products/ProductRatings.svelte b/src/routes/products/ProductRatings.svelte
@@ -12,6 +12,7 @@
   import { GET_PRODUCT_RATINGS } from "./queries.js";
   import SheaftErrors from "../../services/SheaftErrors";
   import ErrorCard from "./../../components/ErrorCard.svelte";
+import { config } from "../../configs/config";
 
   export let params = {};
 
@@ -78,7 +79,7 @@
                   <img
                     class="absolute top-0 left-0 w-full h-full bg-cover
                     object-fit object-cover"
-                    src={rating.user.picture ? rating.user.picture : "https://content.sheaft.com/pictures/users/profile.svg"}
+                    src={rating.user.picture ? rating.user.picture : config.content + "/pictures/users/profile.svg"}
                     alt={rating.user.name} />
                   <div
                     class="absolute top-0 left-0 w-full h-full rounded-full

diff --git a/src/routes/register/RegisterConsumer.svelte b/src/routes/register/RegisterConsumer.svelte
@@ -16,6 +16,7 @@
   import ErrorCard from "../../components/ErrorCard.svelte";
 	import { form, bindClass } from '../../../vendors/svelte-forms/src/index';
   import ErrorContainer from "./../../components/ErrorContainer.svelte";
+import { config } from "../../configs/config";
 
   const authInstance = GetAuthInstance();
   const routerInstance = GetRouterInstance();
@@ -220,7 +221,7 @@
                   checked={acceptMangoCgv}
                   onClick={() => (acceptMangoCgv = !acceptMangoCgv)} />
                 Je reconnais avoir lu et compris
-                <a href="https://content.sheaft.com/resources/legals/Mangopay_Terms-FR.pdf" target="_blank">
+                <a href="{config.content + '/resources/legals/Mangopay_Terms-FR.pdf'}" target="_blank">
                   les conditions générales d'utilisation de MangoPay,
                 </a>
                 notre tiers de paiement, et je les accepte

diff --git a/src/routes/register/owner/FormProductionSite.svelte b/src/routes/register/owner/FormProductionSite.svelte
@@ -5,6 +5,7 @@
   import Loader from "./../../../components/Loader.svelte";
   import Icon from "svelte-awesome";
   import { faInfoCircle } from "@fortawesome/free-solid-svg-icons";
+import { config } from "../../../configs/config";
 
   export let company, stepper = 4, isStore, submit = () => {};
 
@@ -111,7 +112,7 @@
             checked={acceptMangoCgv}
             onClick={() => (acceptMangoCgv = !acceptMangoCgv)} />
           Je reconnais avoir lu et compris
-          <a href="https://content.sheaft.com/resources/legals/Mangopay_Terms-FR.pdf" target="_blank">
+          <a href="{config.content + '/resources/legals/Mangopay_Terms-FR.pdf'}" target="_blank">
             les conditions générales d'utilisation de services de paiement de MangoPay,
           </a>
           notre tiers de paiement, et je les accepte

diff --git a/src/routes/search-producers/ProducerCard.svelte b/src/routes/search-producers/ProducerCard.svelte
@@ -101,7 +101,7 @@
       <div class="bg-white rounded-lg p-0 pl-3 lg:p-4 w-full">
         <div style="width: 20px; right: 15px;" class="absolute">
           {#if producer.tags && producer.tags.find(c => c.name == 'bio') != null}
-            <img src="https://content.sheaft.com/pictures/tags/icons/bio.png" alt="Bio" class="mb-3" />
+            <img src="{config.content + '/pictures/tags/icons/bio.png'}" alt="Bio" class="mb-3" />
           {/if}
         </div>
         <div class="pr-8">

diff --git a/src/routes/search-producers/ProducerDetails.svelte b/src/routes/search-producers/ProducerDetails.svelte
@@ -21,6 +21,7 @@
   import RatingStars from "./../../components/rating/RatingStars.svelte";
   import AgreementRoutes from "../agreements/routes";
   import GetNotificationsInstance from "./../../services/SheaftNotifications.js";
+import { config } from "../../configs/config";
 
   const graphQLInstance = GetGraphQLInstance();
   const routerInstance = GetRouterInstance();
@@ -230,7 +231,7 @@
         <p class="text-xl lg:text-3xl font-semibold">{producer.name}</p>
         {#if producer.tags && producer.tags && producer.tags.length > 0 && producer.tags.find((t) => t.name === "Bio")}
           <div class="text-center ml-3">
-            <img src="https://content.sheaft.com/pictures/tags/icons/bio.png" alt="Bio" class="m-auto mb-1" style="max-width: 30px;" />
+            <img src="{config.content + '/pictures/tags/icons/bio.png'}" alt="Bio" class="m-auto mb-1" style="max-width: 30px;" />
           </div>
         {/if}
       </div>

diff --git a/src/routes/search-products/ProductCard.svelte b/src/routes/search-products/ProductCard.svelte
@@ -9,6 +9,7 @@
   import { cartItems, selectedItem } from "./../../stores/app.js";
   import { GetDistanceInfos } from "./../../helpers/distances.js";
   import { formatMoney, formatConditioningDisplay } from "./../../helpers/app";
+import { config } from "../../configs/config";
 
   const routerInstance = GetRouterInstance();
   export let product, hoveredProduct = null;
@@ -132,7 +133,7 @@
       <div class="bg-white rounded-lg p-0 pl-3 lg:p-4 w-full">
         <div style="width: 30px; right: 15px;" class="absolute">
           {#if product.tags.map(t => t.name).includes('bio')}
-            <img src="https://content.sheaft.com/pictures/tags/icons/bio.png" alt="Bio" class="mb-1" />
+            <img src="{config.content + '/pictures/tags/icons/bio.png'}" alt="Bio" class="mb-1" />
           {/if}
           {#if product.isReturnable}
             <img src="./img/returnable.svg" alt="Consigné" class="mb-1" style="transform: scale(0.7);" />

diff --git a/src/routes/search-products/ProductDetails.svelte b/src/routes/search-products/ProductDetails.svelte
@@ -25,6 +25,7 @@
   import ErrorCard from "./../../components/ErrorCard.svelte";
   import { groupBy, encodeQuerySearchUrl, formatConditioningDisplay } from "./../../helpers/app";
   import orderBy from "lodash/orderBy";
+import { config } from "../../configs/config";
   
   const errorsHandler = new SheaftErrors();
   const routerInstance = GetRouterInstance();
@@ -129,7 +130,7 @@
 
   const getUserPicture = picture => {
     if (picture) return picture;
-    return "https://content.sheaft.com/pictures/users/profile.svg";
+    return config.content + '/pictures/users/profile.svg';
   };
 
   const focus = node => {
@@ -223,7 +224,7 @@
         </div>
       {/if}
       <div
-        style="background-position: center; background-image: url({product.picture ? product.picture : 'https://content.sheaft.com/pictures/tags/images/default.jpg'}); background-size: cover;"
+        style="background-position: center; background-image: url({product.picture ? product.picture : config.content + '/pictures/tags/images/default.jpg'}); background-size: cover;"
         class:opacity-50={product.picture.includes("pictures/tags/images/")}
         class="w-full shadow-md h-40 lg:h-64" />
       <!-- <button class="flex items-center justify-center w-12 h-12 bg-white rounded-full shadow absolute cursor-pointer text-accent" style="right: 40px; bottom: -25px;">
@@ -237,7 +238,7 @@
         {#if product.tags && product.tags.length > 0 && product.tags.find(t => t.name.toLowerCase() === 'bio' && t.kind == TagKind.Label.Value)}
           <div class="text-center ml-3">
             <img
-              src="https://content.sheaft.com/pictures/tags/icons/bio.png"
+              src="{config.content + '/pictures/tags/icons/bio.png'}"
               alt="Bio"
               class="m-auto mb-1"
               style="max-width: 30px;" />

diff --git a/src/routes/search-stores/StoreCard.svelte b/src/routes/search-stores/StoreCard.svelte
@@ -4,6 +4,7 @@
   import { faMapMarkerAlt } from "@fortawesome/free-solid-svg-icons";
   import { selectedItem } from "./../../stores/app.js";
   import { GetDistanceInfos } from "./../../helpers/distances";
+import { config } from "../../configs/config";
 
   export let store, hoveredStore = null, businessLocation = null;
 
@@ -94,7 +95,7 @@
       <div class="bg-white rounded-lg p-0 pl-3 lg:p-4 w-full">
         <div style="width: 20px; right: 15px;" class="absolute">
           {#if store.tags && store.tags.find(c => c.name == 'bio') != null}
-            <img src="https://content.sheaft.com/pictures/tags/icons/bio.png" alt="Bio" class="mb-3" />
+            <img src="{config.content + '/pictures/tags/icons/bio.png'}" alt="Bio" class="mb-3" />
           {/if}
         </div>
         <div class="pr-8">

diff --git a/src/routes/search-stores/StoreDetails.svelte b/src/routes/search-stores/StoreDetails.svelte
@@ -12,6 +12,7 @@
   import { groupBy, timeSpanToFrenchHour } from "./../../helpers/app";
   import AgreementRoutes from "../agreements/routes";
   import GetNotificationsInstance from "./../../services/SheaftNotifications.js";
+import { config } from "../../configs/config.js";
 
   const graphQLInstance = GetGraphQLInstance();
   const routerInstance = GetRouterInstance();
@@ -176,7 +177,7 @@
         {#if store.tags && store.tags.length > 0 && store.tags.find(t => t.name === 'Bio')}
           <div class="text-center ml-3">
             <img
-              src="https://content.sheaft.com/pictures/tags/icons/bio.png"
+              src="{config.content + '/pictures/tags/icons/bio.png'}"
               alt="Bio"
               class="m-auto mb-1"
               style="max-width: 30px;" />

diff --git a/src/services/SheaftAuth.js b/src/services/SheaftAuth.js
@@ -65,8 +65,9 @@ class SheaftAuth {
 			var content = await result.json();
 			if (content.data.me && content.data.me.id) {
 				this.setAuthStatus(user, true, true, true, true);
-			} else if (content.errors && content.errors.length > 0) {
-				throw content.errors;
+			} else if (content.errors && content.errors.length > 0) {	
+				console.error('An error occurred while retrieving user infos', content.errors);
+				this.refreshPageAsUnauthorized(user);
 			} else {
 				this.setAuthStatus(user, true, true, false, true);
 			}
@@ -77,11 +78,15 @@ class SheaftAuth {
 				return await this.login();
 			}	
 
-			this.setAuthStatus(user, false, false, false, true);			
-			if(location.hash != '/'){
-				location.hash = "/";
-				location.reload();
-			}
+			this.refreshPageAsUnauthorized(user);
+		}
+	}
+
+	refreshPageAsUnauthorized(user){	
+		this.setAuthStatus(user, false, false, false, true);			
+		if(location.hash.indexOf('/callback') > -1){
+			location.hash = "/";
+			location.reload();
 		}
 	}
 
@@ -150,6 +155,7 @@ class SheaftAuth {
 		try {
 			return await this.userManager.signinCallback();
 		} catch (exc) {
+			await this.userManager.removeUser();
 			location.hash = "";
 			location.reload();
 		}
@@ -159,8 +165,6 @@ class SheaftAuth {
 		try {
 			return await this.userManager.signinSilentCallback();
 		} catch (exc) {
-			location.hash = "";
-			location.reload();
 		}
 	}
 

diff --git a/src/stores/auth.js b/src/stores/auth.js
@@ -1,6 +1,7 @@
 import { writable } from "svelte/store";
+import { config } from "./../configs/config";
 
-export const authUserAccount = writable({ profile: { role: "ANONYMOUS", picture:"https://content.sheaft.com/pictures/users/profile.svg" } });
+export const authUserAccount = writable({ profile: { role: "ANONYMOUS", picture: config.content + '/pictures/users/profile.svg' } });
 export const authInitialized = writable(false);
 export const authRegistered = writable(false);
 export const authAuthenticated = writable(false);