Merge branch 'dev' of github.com:citizen-dror/safety-data-client into dev

Author: citizen-dror

src/components/organisms/RiskHotspotModel.tsx

@@ -37,13 +37,14 @@ const RiskHotspotModel = observer(() => {
 	if (hasPermission) {
 		return (
 			<div>
-				<ModelTabs/>
+				<ModelTabs />
 			</div>
 		);
 	}
 
 	return (
 		<div className='d-flex flex-column align-items-center justify-content-center' style={{ minHeight: '400px', gap: '20px' }}>
+			<span style={{ fontSize: '1.5rem', fontWeight: 'bold', color: 'var(--bs-body-color)' }}>{t('ForAuthorizedUsersOnly')}</span>
 			<Button
 				variant='success'
 				className='rounded-3 px-5 py-3 shadow-sm'
@@ -53,12 +54,12 @@ const RiskHotspotModel = observer(() => {
 					color: 'black',
 					fontWeight: '500',
 					fontSize: '1.2rem',
-					width: '320px',
+					width: '350px',
 					borderRadius: '15px',
 				}}
 				onClick={() => userStore.login()}
 			>
-				{t('LoginOrSwitchUser')}
+				{userStore.isAuthenticated ? t('SwitchUser') : t('Login')}
 			</Button>
 			<Button
 				variant='dark'
@@ -67,7 +68,7 @@ const RiskHotspotModel = observer(() => {
 					backgroundColor: '#4E6A5C',
 					border: 'none',
 					fontSize: '1.2rem',
-					width: '320px',
+					width: '350px',
 					borderRadius: '15px',
 				}}
 				href='mailto:gal@natoon.co.il'

src/lng/en/translation.json

@@ -6,8 +6,8 @@
 	"HeatMap": "Heat Map",
 	"DensityTable": "Density Table",
 	"DensityMap": "Density Map",
-	"ClusterTable" : "Cluster Table",
-	"ClusterMap" : "Cluster Map",
+	"ClusterTable": "Cluster Table",
+	"ClusterMap": "Cluster Map",
 	"Markers": "Markers",
 	"Clusters": "Clusters",
 	"Cities": "Cities",
@@ -265,15 +265,16 @@
 	"Welcome": "Welcome",
 	"User": "User",
 	"Logout": "Logout",
+	"Login": "Login",
 	"Login_to_access_more_features": "Login to access more features",
 	"#Map": "=========Map==========",
 	"MarkersColorType": "Color By",
 	"MarkersIconType": "Icon By",
 	"MapMarkersType": "Map Type",
 	"ToChooseSeverityModerate": "To choose severity moderate, please choose a city",
-	"LoginOrSwitchUser": "Login / Switch User",
+	"SwitchUser": "Switch User",
 	"ContactForMoreDetails": "For more details contact us",
 	"outside_range": "Outside Range",
 	"data_range": "Data Range",
-	"groups_limit": "Groups_limit"
+	"ForAuthorizedUsersOnly": "To gain access, please log in or contact us:"
 }

src/lng/he/translation.json

@@ -6,8 +6,8 @@
 	"HeatMap": "מפת חום",
 	"DensityTable": "טבלת צפיפות",
 	"DensityMap": "מפת צפיפות",
-	"ClusterTable" : "טבלת מקבצים",
-	"ClusterMap" : "מפת מקבצים",
+	"ClusterTable": "טבלת מקבצים",
+	"ClusterMap": "מפת מקבצים",
 	"Markers": "מרקרים",
 	"Clusters": "קלסטרס",
 	"Cities": "יישובים",
@@ -184,7 +184,7 @@
 	"urban-road": "דרך עירונית",
 	"non-urban-junction": "צומת בינעירוני",
 	"non-urban-road": "דרך בינעירונית",
-	"Junction" : "צומת",
+	"Junction": "צומת",
 	"SpeedLimit": "מגבלת מהירות",
 	"speed50": "עד 50",
 	"speed60": "60",
@@ -272,9 +272,10 @@
 	"MarkersIconType": "סמנים לפי",
 	"MapMarkersType": "סוג מפה",
 	"ToChooseSeverityModerate": "לבחירת חומרה ברמה קלה, יש לבחור יישוב",
-	"LoginOrSwitchUser": "להתחברות / החלף משתמש",
+	"SwitchUser": "החלף משתמש",
 	"ContactForMoreDetails": "לפרטים נוספים צרו קשר",
 	"outside_range": "מחוץ לטווח",
 	"data_range": "טווח נתונים",
+	"ForAuthorizedUsersOnly": "לקבלת גישה יש להתחבר או ליצור קשר:",
 	"groups_limit": "גבול קבוצות"
 }