Skip to content

Commit

Permalink
Merge pull request #2788 from ever-co/main
Browse files Browse the repository at this point in the history
Main
  • Loading branch information
evereq authored Jul 23, 2024
2 parents 8bdde2a + 287b1cc commit a87c663
Show file tree
Hide file tree
Showing 113 changed files with 3,713 additions and 1,230 deletions.
57 changes: 29 additions & 28 deletions .cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
"Accordian",
"adipiscing",
"aliqua",
"tblr",
"conver",
"amet",
"Andross",
"animatable",
Expand All @@ -23,6 +21,7 @@
"arrowleft",
"asel",
"Authentificate",
"authjs",
"barcodes",
"billrate",
"binutils",
Expand All @@ -48,6 +47,7 @@
"choos",
"ciphertext",
"classpath",
"Clik",
"cloc",
"clockcircleo",
"cloudinary",
Expand All @@ -62,13 +62,21 @@
"combx",
"commitlint",
"comparision",
"comparization",
"compodoc",
"consectetur",
"containerd",
"contaniner",
"conver",
"creatoe",
"dailyplan",
"Darkmode",
"datas",
"dataToDisplay",
"dearmor",
"deepscan",
"Defaul",
"Desabled",
"Descrption",
"deserunt",
"dimesions",
Expand All @@ -79,6 +87,7 @@
"domutils",
"DONT",
"dotenv",
"dpkg",
"Dropown",
"dropwdown",
"dummyimage",
Expand All @@ -90,6 +99,7 @@
"embla",
"Enderbury",
"endregion",
"Entra",
"Entypo",
"envalid",
"errr",
Expand All @@ -115,6 +125,7 @@
"gauzystage",
"gcloud",
"Gitter",
"GlobalSkeleton",
"gradlew",
"graphicsmagick",
"greenkeeper",
Expand Down Expand Up @@ -170,9 +181,11 @@
"kanban",
"Kanbanboard",
"kanbandata",
"keyrings",
"Kiritimati",
"Kolkata",
"Kosrae",
"Koyeb",
"labore",
"Lask",
"lastest",
Expand All @@ -191,6 +204,7 @@
"mathieudutour",
"Mazen",
"Metral",
"MICROSOFTENTRAID",
"miliseconds",
"millisencods",
"mobx",
Expand All @@ -200,7 +214,11 @@
"nextjs",
"nimg",
"nocheck",
"nodesource",
"nodistro",
"noreferrer",
"Northflank",
"Notif",
"Opena",
"opentelemetry",
"Ordereds",
Expand All @@ -220,10 +238,12 @@
"phraseapp",
"pkill",
"Plaholder",
"plan",
"plasmo",
"plasmohq",
"popperjs",
"Pourtcent",
"prebuild",
"precommit",
"Pressable",
"Pressible",
Expand All @@ -236,6 +256,7 @@
"RECAPTCHA",
"recieve",
"Reconds",
"Relationnal",
"Repobeats",
"RESERVERD",
"Rickert",
Expand All @@ -249,6 +270,7 @@
"Settingfilter",
"setuptools",
"setwin",
"setwork",
"shadcn",
"shandow",
"signin",
Expand All @@ -259,9 +281,8 @@
"skey",
"smalltext",
"snyk",
"Sonner",
"sonner",
"Notif",
"Sonner",
"stackoverflow",
"statsus",
"statut",
Expand All @@ -270,8 +291,8 @@
"stylelint",
"stylesheet",
"subsquently",
"svgs",
"svgr",
"svgs",
"Swith",
"Syle",
"Synk",
Expand All @@ -281,6 +302,7 @@
"tanstack",
"taskid",
"taskstatus",
"tblr",
"teamtask",
"tempor",
"testid",
Expand All @@ -290,6 +312,7 @@
"tinvitations",
"tnode",
"Togger",
"tomorow",
"Tongatapu",
"tota",
"TRANSFERT",
Expand Down Expand Up @@ -326,29 +349,7 @@
"Xlarge",
"xlcard",
"xlight",
"yellowbox",
"Desabled",
"keyrings",
"dearmor",
"dpkg",
"containerd",
"nodistro",
"nodesource",
"Koyeb",
"Northflank",
"prebuild",
"dataToDisplay",
"GlobalSkeleton",
"dailyplan",
"tomorow",
"comparization",
"plan",
"setwork",
"Clik",
"Relationnal",
"authjs",
"MICROSOFTENTRAID",
"Entra"
"yellowbox"
],
"useGitignore": true,
"ignorePaths": [
Expand Down
82 changes: 41 additions & 41 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
{
"importSorter.generalConfiguration.sortOnBeforeSave": false,
"importSorter.sortConfiguration.joinImportPaths": false,
"cSpell.userWords": [],
"cSpell.enabled": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"npm.packageManager": "yarn",
"prettier.trailingComma": "none",
"prettier.singleQuote": true,
"editor.formatOnSave": true,
"eslint.format.enable": true,
"editor.tabSize": 4,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "never",
"source.sortMembers": "never",
"organizeImports": "never"
},
"vsicons.presets.angular": true,
"deepscan.enable": true,
"cSpell.words": [],
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/node_modules": false,
"**/public/**/*.png": false,
"**/public/**/*.jpg": false,
"**/public/**/*.pdf": true
},
"search.exclude": {
"**/node_modules": true,
"**/.idea": true,
"**/.idea/**/*.{xml,iml}": true,
"**/.iml": true,
"**/.yarn": true,
"**/yarn.lock": true
},
"docwriter.style": "Auto-detect"
"importSorter.generalConfiguration.sortOnBeforeSave": false,
"importSorter.sortConfiguration.joinImportPaths": false,
"cSpell.userWords": [],
"cSpell.enabled": true,
"typescript.tsdk": "node_modules/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"npm.packageManager": "yarn",
"prettier.trailingComma": "none",
"prettier.singleQuote": true,
"editor.formatOnSave": true,
"eslint.format.enable": true,
"editor.tabSize": 4,
"files.insertFinalNewline": true,
"files.trimFinalNewlines": true,
"files.trimTrailingWhitespace": true,
"editor.codeActionsOnSave": {
"source.fixAll": "explicit",
"source.organizeImports": "never",
"source.sortMembers": "never",
"organizeImports": "never"
},
"vsicons.presets.angular": true,
"deepscan.enable": true,
"cSpell.words": ["Timepicker"],
"files.exclude": {
"**/.git": true,
"**/.DS_Store": true,
"**/node_modules": false,
"**/public/**/*.png": false,
"**/public/**/*.jpg": false,
"**/public/**/*.pdf": true
},
"search.exclude": {
"**/node_modules": true,
"**/.idea": true,
"**/.idea/**/*.{xml,iml}": true,
"**/.iml": true,
"**/.yarn": true,
"**/yarn.lock": true
},
"docwriter.style": "Auto-detect"
}
2 changes: 1 addition & 1 deletion apps/extensions/components/popup/Timer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const Timer: React.FC<Props> = ({ port }) => {
? new Date(msg.payload.timer * 1000).toISOString().substr(11, 8)
: '00:00:00';
const totalWorkedTime =
msg.payload.totalWorked > 0
msg.payload!.totalWorked > 0
? new Date(msg.payload.totalWorked * 1000).toISOString().substr(11, 8)
: '00:00:00';
setTimeString(taskWorkedTime);
Expand Down
3 changes: 2 additions & 1 deletion apps/server-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
"i18next-resources-to-backend": "^1.2.1",
"react-i18next": "^14.1.0",
"@radix-ui/react-switch": "^1.1.0",
"classnames": "^2.5.1"
"classnames": "^2.5.1",
"fast-glob": "^3.3.2"
},
"devDependencies": {
"electron": "28.1.0",
Expand Down
29 changes: 25 additions & 4 deletions apps/server-web/src/locales/i18n/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
"APP_QUIT": "Откажете се",
"GENERAL": "Общ",
"SERVER_STATUS_STOPPED": "Статус: Спряна",
"SERVER_STATUS_STARTED": "Статус: започна"
"SERVER_STATUS_STARTED": "Статус: започна",
"OPEN_WEB": "Отворете уеб в браузъра",
"SERVER_WINDOW": "Прозорец на сървъра"
},
"FORM": {
"FIELDS": {
Expand All @@ -22,7 +24,15 @@
},
"BUTTON": {
"SAVE_SETTING": "Запазване на настройката",
"OK": "Добре"
"OK": "Добре",
"YES": "да",
"NO": "Не",
"DOWNLOAD_NOW": "Свали сега",
"LATER": "По късно",
"CANCEL": "Отказ",
"CLOSE": "Близо",
"START": "Започнете",
"STOP": "Спри се"
},
"LABELS": {
"CHECKING": "Проверка",
Expand All @@ -42,11 +52,22 @@
"AUTO_UPDATE_SUBTITLE": "Активирайте автоматичната проверка на актуализацията, за да стартирате заявка за проверка дали е налична нова версия и да уведомите",
"AUTO_UPDATE_TOGLE": "Автоматична актуализация",
"CHECK_UPDATE_TITLE": "Проверете и актуализирайте версията на приложението си",
"CHECK_UPDATE_SUBTITLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу."
"CHECK_UPDATE_SUBTITLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу.",
"LANGUAGES": "Езици"
}
},
"MESSAGE": {
"SUCCESS": "Успех",
"ERROR": "Грешка"
"ERROR": "Грешка",
"WARNING": "Warning",
"INFO": "Информация",
"UPDATE_AVAILABLE": "Налична е нова актуализация! Моля, щракнете върху бутона Изтегляне сега по-долу.",
"EXIT_MESSAGE": "Мрежата на сървъра все още работи, сигурни ли сте, че ще излезете от приложението?",
"UPDATE_SUCCESS": "Актуализирайте успешно",
"SERVER_RUN_DIALOG": "Сървърната мрежа работи в момента, искате ли да рестартирате сървъра?"
},
"LANGUAGES": {
"en": "Английски",
"bg": "България"
}
}
Loading

0 comments on commit a87c663

Please sign in to comment.