Merge pull request #2191 from ever-co/develop

Release
ever-co · Feb 9, 2024 · b32ce5e · b32ce5e
2 parents 8e295f6 + 617e5b0
commit b32ce5e
Show file tree

Hide file tree

Showing 16 changed files with 287 additions and 65 deletions.
diff --git a/apps/web/app/[locale]/layout.tsx b/apps/web/app/[locale]/layout.tsx
@@ -30,13 +30,7 @@ interface Props {
 	};
 }
 
-import { Plus_Jakarta_Sans, Poppins } from 'next/font/google';
-
-const jakarta = Plus_Jakarta_Sans({
-	subsets: ['latin'],
-	variable: '--font-jakarta',
-	display: 'swap'
-});
+import { Poppins } from 'next/font/google';
 
 const poppins = Poppins({
 	subsets: ['latin'],
@@ -66,7 +60,7 @@ const LocaleLayout = ({ children, params: { locale }, pageProps }: Props) => {
 	// eslint-disable-next-line @typescript-eslint/no-var-requires
 	const messages = require(`../../messages/${locale}.json`);
 	return (
-		<html lang={locale} className={`${poppins.variable} ${jakarta.variable}`}>
+		<html lang={locale} className={poppins.variable}>
 			{/* <head>
 				<link rel="preconnect" href="https://fonts.googleapis.com" />
 				<link rel="preconnect" href="https://fonts.gstatic.com" crossOrigin="" />

diff --git a/apps/web/components/pages/main/no-team.tsx b/apps/web/components/pages/main/no-team.tsx
@@ -1,8 +1,10 @@
-import { useAuthenticateUser, useModal } from '@app/hooks';
+'use client';
+
+import { useAuthenticateUser, useModal, useOrganizationTeams } from '@app/hooks';
 import { clsxm } from '@app/utils';
 import { Avatar, Button, Text, Tooltip } from 'lib/components';
 import { CreateTeamModal } from 'lib/features';
-import { PropsWithChildren } from 'react';
+import React, { PropsWithChildren } from 'react';
 import noTeamImg from '../../../public/assets/svg/no-team.svg';
 import { useTranslations } from 'next-intl';
 
@@ -11,6 +13,12 @@ const NoTeam = ({ className, ...rest }: Props) => {
 	const t = useTranslations();
 	const { isOpen, closeModal, openModal } = useModal();
 	const { user } = useAuthenticateUser();
+	const { teams } = useOrganizationTeams();
+
+	React.useEffect(() => {
+		closeModal();
+		if (teams.length < 1 && user?.isEmailVerified == true) openModal();
+	}, [closeModal, openModal, teams.length, user?.isEmailVerified]);
 
 	return (
 		<div className={clsxm('flex justify-center items-center flex-col xs:mt-32 mt-8 mx-auto', className)} {...rest}>
@@ -24,11 +32,11 @@ const NoTeam = ({ className, ...rest }: Props) => {
 				</p>
 			</div>
 
-			<Tooltip placement="auto" label={t('common.NO_TEAM_TOOLTIP')} enabled={!user?.isEmailVerified}>
+			<Tooltip placement="auto" label={t('common.NO_TEAM_TOOLTIP')} enabled={user?.isEmailVerified == false}>
 				<Button
 					className="mt-10 text-base font-medium capitalize"
 					onClick={openModal}
-					disabled={!user?.isEmailVerified}
+					disabled={user?.isEmailVerified == false}
 				>
 					{t('common.CREATE_TEAM')}
 				</Button>

diff --git a/apps/web/messages/ar.json b/apps/web/messages/ar.json
@@ -36,11 +36,11 @@
 		"CONTINUE": "متابعة",
 		"EDIT_TASK": "تعديل المهمة",
 		"ASSIGN_TASK": "تعيين مهمة",
-
 		"ASSIGN_TASK_TO": "تعيين المهمة إلى",
 		"REMOVE_ACCOUNT": "إزالة الحساب",
 		"REMOVE_EVERYWHERE": "إزالة من كل مكان",
 		"DELETE_ACCOUNT": "حذف هذا الحساب",
+		"DELETE_ALL_DATA": "حذف جميع البيانات",
 		"UNASSIGN_TASK": "إلغاء تعيين المهمة",
 		"MAKE_A_MANAGER": "جعل مدير",
 		"UNMAKE_A_MANAGER": "إلغاء جعل مدير",
@@ -54,6 +54,7 @@
 		"STATUSES": "الحالات",
 		"RESEND_INVITATION": "إعادة إرسال الدعوة",
 		"TODAY": "اليوم",
+		"DONT_HAVE_ACCOUNT": "ليس لديك حساب؟",
 		"TOTAL": "المجموع",
 		"ESTIMATED": "التقديري",
 		"ESTIMATE": "تقدير",
@@ -122,6 +123,7 @@
 		"MY_TEAM": "فريقي",
 		"FULL_NAME": "الاسم الكامل",
 		"USER_AVATAR": "صورة المستخدم",
+		"REGISTER": "سجل الآن!",
 		"CONTACT": "جهة الاتصال",
 		"THEME": "الموضوع",
 		"TIME_ZONE": "المنطقة الزمنية",
@@ -172,7 +174,8 @@
 		"GITHUB_LOADING_TEXT": "نحن الآن في عملية تثبيت التكامل الخاص بك على GitHub، توكّل.",
 		"GITHUB_INTEGRATION_AUTO_SYNC_TASK_TEXT": "قم بمزامنة المهام تلقائيًا في تطبيقك لتحديثات سلسة وفعّالة.",
 		"GITHUB_INTEGRATION_LABEL_SYNC_TASK_TEXT": "تزامن المهام بشكل انتقائي عن طريق ربطها بتصنيف معين.",
-		"GITHUB_AUTO_SYNC_LABEL": "اختر تسمية التزامن التلقائي"
+		"GITHUB_AUTO_SYNC_LABEL": "اختر تسمية التزامن التلقائي",
+		"GITHUB_INTEGRATION_SUBTITLE_TEXT": "قم بتفعيل تكامل GitHub لمزامنة المشروع والمستودع"
 	},
 	"alerts": {
 		"ALERT_DELETE_ACCOUNT": "سيتم إزالة الحساب من جميع الفرق، باستثناء حيث أنت المدير فقط",
@@ -289,7 +292,6 @@
 			"TIMEZONE_SEARCH_PLACEHOLDER": "المنطقة الزمنية الخاصة بك",
 			"ABOUT_TO_CHANGE_EMAIL": "أنت على وشك تغيير البريد الإلكتروني",
 			"ABOUT_TO_DELETE_ACCOUNT": "أنت على وشك حذف حسابك؟",
-			"ABOUT_TO_REMOVE_ACCOUNT": "أنت على وشك إزالة حسابك؟",
 			"ABOUT_TO_REMOVE_FROM_ALL_TEAMS": "You're about to be removed from all teams, unless you're the only manager ?",
 			"ABOUT_TO_DELETE_ALL_ACCOUNT_DATA": "You are about to Delete your account and all your data ?"
 		},
@@ -451,14 +453,31 @@
 	},
 
 	"timer": {
+		"ACTIVE" : "نشط",
+		"APPS" : "تطبيقات",
+		"ARCHIVED" : "مؤرشف",
 		"START_TIMER": "يرجى تحديد أو إنشاء مهمة جديدة لبدء تتبع الوقت",
 		"TEAM_SWITCH": {
 			"STOPPED_TIMER_TOAST_TITLE": "توقف المؤقت",
 			"STOPPED_TIMER_TOAST_DESCRIPTION": "توقف المؤقت بسبب التبديل بين الفرق"
 		},
+		"THERE_IS_NO_APPS_VISITED": "لا توجد تطبيقات تم زيارتها.",
+		"TIME_ACTIVITY": "النشاط",
+		"TIME_SPENT_IN_HOURS": "الوقت المستغرق (ساعات)",
+		"TIMES": "مرات",
+		"TOTAL_HOURS": "إجمالي الساعات",
+		"VISITED_DATES": "تواريخ الزيارة",
 		"ESTIMATION": {
 			"ESTIMATE_LABEL": "التقدير"
 		},
+		"INACTIVE": "غير نشط",
+		"KEYBOARD": "لوحة المفاتيح",
+		"MOUSE": "الفأرة",
+		"NO_SCREENSHOOT": "لا توجد لقطات شاشة",
+		"NOT_ARCHIVED": "غير مؤرشف",
+		"OTHER_DETAILS": "تفاصيل أخرى",
+		"PERCENT_OF_MINUTES": " % من 10 دقائق",
+		"PERCENT_USED": "النسبة المئوية المستخدمة",
 		"DAY_LIST": [{ "title": "7 أيام" }, { "title": "14 يوم" }]
 	},
 

diff --git a/apps/web/messages/bg.json b/apps/web/messages/bg.json
@@ -40,6 +40,7 @@
 		"REMOVE_ACCOUNT": "Премахване на профил",
 		"REMOVE_EVERYWHERE": "Премахване навсякъде",
 		"DELETE_ACCOUNT": "Изтриване на този профил",
+		"DELETE_ALL_DATA": "Изтриване на всички данни",
 		"UNASSIGN_TASK": "Отмяна на възлагането на задача",
 		"MAKE_A_MANAGER": "Направи мениджър",
 		"UNMAKE_A_MANAGER": "Премахни мениджъра",
@@ -140,6 +141,8 @@
 		"NEW_MEMBER": "Стани член",
 		"BACK": "Назад",
 		"JOIN_REQUEST": "Искане за присъединяване",
+		"DONT_HAVE_ACCOUNT": "Нямате профил?",
+		"REGISTER": "Регистрация",
 		"PERMISSION": "Разрешение",
 		"SEARCH": "Търсене",
 		"ADD_PARENT": "Добави родител",
@@ -168,6 +171,7 @@
 		"FILTER_UNSUBSCRIBE": "Отпиши се",
 
 		"KEYBOARD_SHORTCUTS": "Клавишни комбинации",
+		"GITHUB_INTEGRATION_SUBTITLE_TEXT" : "Активирайте интеграцията с GitHub за синхронизация на проекта и хранилището",
 		"GITHUB_LOADING_TEXT": "В момента инсталираме вашия GitHub интеграция, изчакайте...",
 		"GITHUB_INTEGRATION_AUTO_SYNC_TASK_TEXT": "Автоматично синхронизирайте задачите в приложението си за безпроблемни и ефективни актуализации.",
 		"GITHUB_INTEGRATION_LABEL_SYNC_TASK_TEXT": "Синхронизирайте задачите избирателно, като ги свържете с конкретен етикет.",
@@ -289,7 +293,6 @@
 			"TIMEZONE_SEARCH_PLACEHOLDER": "Вашата часова зона",
 			"ABOUT_TO_CHANGE_EMAIL": "Ще промените имейл",
 			"ABOUT_TO_DELETE_ACCOUNT": "Ще изтриете профила си?",
-			"ABOUT_TO_REMOVE_ACCOUNT": "Ще премахнете профила си?",
 			"ABOUT_TO_REMOVE_FROM_ALL_TEAMS": "You're about to be removed from all teams, unless you're the only manager ?",
 			"ABOUT_TO_DELETE_ALL_ACCOUNT_DATA": "You are about to Delete your account and all your data ?"
 		},
@@ -455,15 +458,32 @@
 	},
 
 	"timer": {
+		"ACTIVE" : "Активен",
+		"APPS" : "Приложения",
+		"ARCHIVED" : "Архивиран",
 		"START_TIMER": "Моля, изберете или създайте нова задача, за да започнете да проследявате времето",
 		"TEAM_SWITCH": {
 			"STOPPED_TIMER_TOAST_TITLE": "Таймерът спря",
 
 			"STOPPED_TIMER_TOAST_DESCRIPTION": "Таймерът спря поради смяна на отбора"
 		},
+		"THERE_IS_NO_APPS_VISITED": "Няма посетени приложения.",
+		"TIME_ACTIVITY": "Дейност",
+		"TIME_SPENT_IN_HOURS": "Време, прекарано (часове)",
+		"TIMES": "Пъти",
+		"TOTAL_HOURS": "Общо часове",
+		"VISITED_DATES": "Посетени дати",
 		"ESTIMATION": {
 			"ESTIMATE_LABEL": "Оценка"
 		},
+		"INACTIVE" : "Неактивен",
+		"KEYBOARD" : "клавиатура",
+		"MOUSE" : "мишка",
+		"NO_SCREENSHOOT" : "Без снимки на екрана",
+		"NOT_ARCHIVED" : "Неархивиран",
+		"OTHER_DETAILS" : "Други детайли",
+		"PERCENT_OF_MINUTES" : " % от 10 минути",
+		"PERCENT_USED" : "Използван процент",
 		"DAY_LIST": [{ "title": "7 дни" }, { "title": "14 дни" }]
 	},
 

diff --git a/apps/web/messages/de.json b/apps/web/messages/de.json
@@ -40,6 +40,7 @@
 		"REMOVE_ACCOUNT": "Konto entfernen",
 		"REMOVE_EVERYWHERE": "Überall entfernen",
 		"DELETE_ACCOUNT": "Dieses Konto löschen",
+		"DELETE_ALL_DATA": "Delete All Data",
 		"UNASSIGN_TASK": "Aufgabe entziehen",
 		"MAKE_A_MANAGER": "Manager erstellen",
 		"UNMAKE_A_MANAGER": "Manager entfernen",
@@ -140,6 +141,8 @@
 		"EXISTING_MEMBER": "Bereits Mitglied",
 		"NEW_MEMBER": "Mitglied werden",
 		"BACK": "Zurück",
+		"DONT_HAVE_ACCOUNT": "Don't have an account?",
+		"REGISTER": "Register Now!",
 		"JOIN_REQUEST": "Beitrittsanfrage",
 		"PERMISSION": "Berechtigung",
 		"SEARCH": "Suchen",
@@ -171,11 +174,13 @@
 		"KEYBOARD_SHORTCUTS": "Tastenkombinationen",
 
 		"GITHUB_LOADING_TEXT": "Wir installieren jetzt Ihre GitHub-Integration, warten Sie...",
+		"GITHUB_INTEGRATION_SUBTITLE_TEXT": "Activate GitHub Integration for project & repository sync",
 		"GITHUB_INTEGRATION_AUTO_SYNC_TASK_TEXT": "Synchronisieren Sie Aufgaben in Ihrer Anwendung automatisch für nahtlose und effiziente Aktualisierungen.",
 		"GITHUB_INTEGRATION_LABEL_SYNC_TASK_TEXT": "Synchronisieren Sie Aufgaben selektiv, indem Sie sie mit einem bestimmten Label verknüpfen.",
 		"GITHUB_AUTO_SYNC_LABEL": "Auto-Sync-Label auswählen"
 	},
 	"alerts": {
+
 		"ALERT_DELETE_ACCOUNT": "Das Konto wird von allen Teams entfernt, außer wo Sie nur Manager sind",
 		"ALERT_ACCOUNT_PERMANENT_DELETE": "Ihr Konto wird dauerhaft gelöscht und von allen Teams entfernt",
 		"ALERT_REMOVE_TEAM": "Das Team wird vollständig aus dem System entfernt und die Teammitglieder verlieren den Zugriff",
@@ -288,7 +293,6 @@
 			"TIMEZONE_SEARCH_PLACEHOLDER": "Ihre Zeitzone",
 			"ABOUT_TO_CHANGE_EMAIL": "Sie sind im Begriff, die E-Mail zu ändern",
 			"ABOUT_TO_DELETE_ACCOUNT": "Sie sind im Begriff, Ihr Konto zu löschen?",
-			"ABOUT_TO_REMOVE_ACCOUNT": "Sie sind im Begriff, Ihr Konto zu entfernen?",
 			"ABOUT_TO_REMOVE_FROM_ALL_TEAMS": "You're about to be removed from all teams, unless you're the only manager ?",
 			"ABOUT_TO_DELETE_ALL_ACCOUNT_DATA": "You are about to Delete your account and all your data ?"
 		},
@@ -447,6 +451,9 @@
 		}
 	},
 	"timer": {
+		"ACTIVE": "Aktiv",
+		"APPS": "Apps",
+		"ARCHIVED": "Archiviert",
 		"START_TIMER": "Bitte wählen oder erstellen Sie eine neue Aufgabe, um die Zeit zu tracken",
 		"TEAM_SWITCH": {
 			"STOPPED_TIMER_TOAST_TITLE": "Timer gestoppt",
@@ -455,6 +462,20 @@
 		"ESTIMATION": {
 			"ESTIMATE_LABEL": "Schätzen"
 		},
+		"INACTIVE": "Inaktiv",
+		"KEYBOARD": "Tastatur",
+		"MOUSE": "Maus",
+		"NO_SCREENSHOOT": "Keine Screenshots",
+		"NOT_ARCHIVED": "Nicht archiviert",
+		"OTHER_DETAILS": "Andere Details",
+		"PERCENT_OF_MINUTES": " % von 10 Minuten",
+		"PERCENT_USED": "Prozent verwendet",
+		"THERE_IS_NO_APPS_VISITED" : "Es gibt keine besuchten Apps.",
+		"TIME_ACTIVITY" : "Aktivität",
+		"TIME_SPENT_IN_HOURS" : "Verbrachte Zeit (Stunden)",
+		"TIMES" : "Mal",
+		"TOTAL_HOURS" : "Gesamtstunden",
+		"VISITED_DATES" : "Besuchte Daten",
 		"DAY_LIST": [{ "title": "7 Tage" }, { "title": "14 Tage" }]
 	},
 

diff --git a/apps/web/messages/en.json b/apps/web/messages/en.json
@@ -197,14 +197,12 @@
 			"CONFIRM_ACCEPT_INVITATION": "Are you sure you want to accept the invitation?",
 			"CONFIRM_REJECT_INVITATION": "Are you sure you want to reject the invitation?"
 		},
-
 		"profile": {
 			"BREADCRUMB": "[\"Member Tasks\"]"
 		},
 		"kanban": {
 			"KANBAN_BOARD": "Kanban Board"
 		},
-
 		"taskDetails": {
 			"BREADCRUMB": "[\"Task Details\"]",
 			"DESCRIPTION": "Descriptions",

diff --git a/apps/web/messages/es.json b/apps/web/messages/es.json
@@ -27,6 +27,7 @@
 		"ONLY_ME": "Sólo yo",
 		"YES": "Sí",
 		"BASIC": "Básico",
+		"REGISTER": "Registrarse",
 		"DELETE": "Eliminar",
 		"MEET": "Reunirse",
 		"BOARD": "Tablero",
@@ -41,6 +42,7 @@
 		"REMOVE_EVERYWHERE": "Eliminar en todas partes",
 		"DELETE_ACCOUNT": "Eliminar esta cuenta",
 		"UNASSIGN_TASK": "Desasignar tarea",
+		"DELETE_ALL_DATA": "Eliminar todos los datos",
 		"MAKE_A_MANAGER": "Hacer administrador",
 		"UNMAKE_A_MANAGER": "Quitar como administrador",
 		"TRANSFERT_OWNERSHIP": "Transferir propiedad",
@@ -52,6 +54,7 @@
 		"QUIT": "Abandonar",
 		"STATUSES": "Estados",
 		"RESEND_INVITATION": "Reenviar invitación",
+		"DONT_HAVE_ACCOUNT": "¿No tienes una cuenta?",
 		"TODAY": "Hoy",
 		"TOTAL": "Total",
 		"ESTIMATED": "Estimado",
@@ -169,7 +172,9 @@
 		"GITHUB_LOADING_TEXT": "Estamos instalando su integración de GitHub, espere...",
 		"GITHUB_INTEGRATION_AUTO_SYNC_TASK_TEXT": "Sincronice automáticamente tareas en su aplicación para actualizaciones fluidas y eficientes.",
 		"GITHUB_INTEGRATION_LABEL_SYNC_TASK_TEXT": "Sincronice tareas de manera selectiva asociándolas con una etiqueta específica.",
-		"GITHUB_AUTO_SYNC_LABEL": "Seleccionar etiqueta de sincronización automática"
+		"GITHUB_AUTO_SYNC_LABEL": "Seleccionar etiqueta de sincronización automática",
+		"GITHUB_INTEGRATION_SUBTITLE_TEXT": "Activa la integración de GitHub para la sincronización de proyectos y repositorios"
+
 	},
 	"alerts": {
 		"ALERT_DELETE_ACCOUNT": "La cuenta será eliminada de todos los equipos, excepto donde eres sólo el administrador",
@@ -277,7 +282,6 @@
 			"SUBSCRIPTION": "Suscripción",
 			"ABOUT_TO_CHANGE_EMAIL": "Estás a punto de cambiar el Email",
 			"ABOUT_TO_DELETE_ACCOUNT": "Estás a punto de Eliminar tu cuenta ?",
-			"ABOUT_TO_REMOVE_ACCOUNT": "Estás a punto de Eliminar tu cuenta ?",
 			"TIMEZONE_SEARCH_PLACEHOLDER": "Your Timezone",
 			"ABOUT_TO_REMOVE_FROM_ALL_TEAMS": "You're about to be removed from all teams, unless you're the only manager ?",
 			"ABOUT_TO_DELETE_ALL_ACCOUNT_DATA": "You are about to Delete your account and all your data ?"
@@ -307,6 +311,7 @@
 			"CREATE_NEW_PRIORITIES": "Crear nuevas prioridades",
 			"CREATE_NEW_PRIORITY": "Crear nueva prioridad",
 			"CREATE_NEW_SIZE": "Crear nuevo tamaño",
+			"CREATE_NEW_SIZES": "Crear nuevos tamaños",
 			"CREATE_NEW_LABELS": "Crear nuevas etiquetas",
 			"CREATE_NEW_LABEL": "Crear nueva etiqueta",
 			"CREATE_NEW_ISSUE_TYPES": "Crear nuevos tipos de problemas",
@@ -426,6 +431,9 @@
 		}
 	},
 	"timer": {
+		"ACTIVE": "Activo",
+		"APPS": "Aplicaciones",
+		"ARCHIVED": "Archivado",
 		"START_TIMER": "Por favor, selecciona o crea una nueva tarea para comenzar a rastrear el tiempo",
 		"TEAM_SWITCH": {
 			"STOPPED_TIMER_TOAST_TITLE": "Temporizador detenido",
@@ -434,14 +442,28 @@
 		"ESTIMATION": {
 			"ESTIMATE_LABEL": "Estimar"
 		},
+		"INACTIVE" : "Inactivo",
+		"KEYBOARD" : "Teclado",
+		"MOUSE" : "Ratón",
+		"NO_SCREENSHOOT" : "Sin capturas de pantalla",
+		"NOT_ARCHIVED" : "No archivado",
+		"OTHER_DETAILS" : "Otros detalles",
+		"PERCENT_OF_MINUTES" : " % de 10 minutos",
+		"PERCENT_USED" : "Porcentaje utilizado",
 		"DAY_LIST": [
 			{
 				"title": "7 días"
 			},
 			{
 				"title": "14 días"
 			}
-		]
+		],
+		"THERE_IS_NO_APPS_VISITED": "No hay aplicaciones visitadas.",
+		"TIME_ACTIVITY": "Actividad",
+		"TIME_SPENT_IN_HOURS": "Tiempo gastado (Horas)",
+		"TIMES": "Veces",
+		"TOTAL_HOURS": "Horas totales",
+		"VISITED_DATES": "Fechas visitadas"
 	},
 	"task": {
 		"TITLE": "Tarea",