Merge pull request #7459 from ever-co/develop

Release

.cspell.json

@@ -3,6 +3,7 @@
 	"language": "en",
 	"$schema": "https://raw.githubusercontent.com/streetsidesoftware/cspell/main/cspell.schema.json",
 	"words": [
+		"accesibility",
 		"activitywatch",
 		"adminer",
 		"AGPL",
@@ -44,6 +45,7 @@
 		"checkmark",
 		"chetan",
 		"Chetan",
+		"childout",
 		"Chinthagunta",
 		"circlon",
 		"Civo",
@@ -92,6 +94,7 @@
 		"doctl",
 		"dpkg",
 		"Dsonar",
+		"echart",
 		"echarts",
 		"editorplaceholder",
 		"empl",
@@ -117,11 +120,13 @@
 		"fontface",
 		"formcontrol",
 		"formcontrolname",
+		"formpicker",
 		"fortawesome",
 		"Freemont",
 		"fullcalendar",
 		"Fullname",
 		"fullscreenable",
+		"fulltext",
 		"gauzydesktop",
 		"gauzydesktoptimer",
 		"gauzydevsess",
@@ -143,6 +148,7 @@
 		"huntr",
 		"IAWS",
 		"ibase",
+		"ichart",
 		"icns",
 		"icnsutils",
 		"icrud",
@@ -228,6 +234,7 @@
 		"libstdc",
 		"linebreak",
 		"linkedin",
+		"longtext",
 		"MAINDB",
 		"MAINLOADURL",
 		"MAINOPENEXT",
@@ -285,6 +292,7 @@
 		"pageobjects",
 		"pantone",
 		"Parens",
+		"parentin",
 		"payperiod",
 		"pdfmake",
 		"pdfmaker",
@@ -318,6 +326,7 @@
 		"r_emailaddress",
 		"r_liteprofile",
 		"randomcolor",
+		"rangepicker",
 		"rediss",
 		"reference",
 		"Rememberd",
@@ -396,6 +405,7 @@
 		"trufflehog",
 		"trufflesecurity",
 		"tsbuildinfo",
+		"tsconfigs",
 		"twing",
 		"typeorm",
 		"Udemy",
@@ -427,13 +437,10 @@
 		"Yostorono",
 		"zfgk",
 		"Zrdm",
-		"accesibility",
-		"tsconfigs",
-		"rangepicker",
-		"echart",
-		"childout",
-		"parentin",
-		"formpicker"
+		"TIMESTAMPDIFF",
+		"listbox",
+		"combobox",
+		"tabid"
 	],
 	"useGitignore": true,
 	"ignorePaths": [

.env.local

@@ -10,13 +10,13 @@ APP_SIGNATURE="Gauzy"
 # The link to the application.
 APP_LINK="http://localhost:4200"
 
-# The URL for email confirmation in the application.
+# The URL for an email confirmation in the application.
 APP_EMAIL_CONFIRMATION_URL="http://localhost:4200/#/auth/confirm-email"
 
 # The URL for magic sign-in in the application.
 APP_MAGIC_SIGN_URL="http://localhost:4200/#/auth/magic-sign-in"
 
-# set true if running inside Docker container
+# set true if running inside the Docker container
 IS_DOCKER=false
 
 HOST=localhost
@@ -52,14 +52,16 @@ CLIENT_BASE_URL=http://localhost:4200
 PLATFORM_WEBSITE_URL=https://gauzy.co
 PLATFORM_WEBSITE_DOWNLOAD_URL=https://gauzy.co/downloads
 
-# DB_TYPE: sqlite | postgres | better-sqlite3
+# DB_TYPE: sqlite | postgres | better-sqlite3 | mysql
 DB_TYPE=better-sqlite3
 DB_SYNCHRONIZE=false
 
-# Below are PostgreSQL Connection Parameters
+# DB Connection Parameters
 DB_HOST=localhost
+## DB Port. The default for PostgreSQL - 5432, for MySQL - 3306
 DB_PORT=5432
 DB_NAME=gauzy
+## DB Username. The default for PostgreSQL is 'postgres', for MySQL it's 'root'
 DB_USER=postgres
 DB_PASS=root
 DB_LOGGING=all

.env.sample

@@ -10,13 +10,13 @@ APP_SIGNATURE="Gauzy"
 # The link to the application.
 APP_LINK="http://localhost:4200"
 
-# The URL for email confirmation in the application.
+# The URL for an email confirmation in the application.
 APP_EMAIL_CONFIRMATION_URL="http://localhost:4200/#/auth/confirm-email"
 
 # The URL for magic sign-in in the application.
 APP_MAGIC_SIGN_URL="http://localhost:4200/#/auth/magic-sign-in"
 
-# Set true if running inside Docker container
+# Set true if running inside the Docker container
 IS_DOCKER=false
 
 # Set true if running as a Demo
@@ -37,13 +37,15 @@ CLIENT_BASE_URL=http://localhost:4200
 PLATFORM_WEBSITE_URL=https://gauzy.co
 PLATFORM_WEBSITE_DOWNLOAD_URL=https://gauzy.co/downloads
 
-# DB_TYPE: sqlite | postgres | better-sqlite3
+# DB_TYPE: sqlite | postgres | better-sqlite3 | mysql
 DB_TYPE=better-sqlite3
 
-# PostgreSQL Connection Parameters
+# DB Connection Parameters
 # DB_HOST=localhost
+## DB Port. The default for PostgreSQL - 5432, for MySQL - 3306
 # DB_PORT=5432
 # DB_NAME=gauzy
+## DB Username. The default for PostgreSQL is 'postgres', for MySQL it's 'root'
 # DB_USER=postgres
 # DB_PASS=root
 # DB_LOGGING=all

apps/desktop/src/index.ts

@@ -78,6 +78,11 @@ try {
 process.env.GAUZY_USER_PATH = app.getPath('userData');
 log.info(`GAUZY_USER_PATH: ${process.env.GAUZY_USER_PATH}`);
 
+process.env.GAUZY_SEED_PATH = path.join(__dirname, 'api', 'assets', 'seed');
+log.info(`GAUZY_SEED_PATH: ${process.env.GAUZY_SEED_PATH}`);
+
+
+
 const sqlite3filename = `${process.env.GAUZY_USER_PATH}/gauzy.sqlite3`;
 log.info(`Sqlite DB path: ${sqlite3filename}`);
 

apps/gauzy-e2e/src/support/Base/pageobjects/AddOrganizationPageObject.ts

@@ -1,13 +1,13 @@
 export const AddOrganizationPage = {
-	organisationNameFieldCss: '[placeholder="Organization Name"]',
+	organizationNameFieldCss: '[placeholder="Organization Name"]',
 	currencyFieldCss: 'div.ng-select-container.ng-has-value',
 	dropdownOptionCss: 'ng-dropdown-panel[role="listbox"]',
-	startofweekOptionCss: 'ul.option-list',
+	startOfWeekOptionCss: 'ul.option-list',
 	bonusDropdownOptionCss: 'ul.option-list',
 	dateDropdownOptionCss: 'ul.option-list',
 	regionDropdownOptionCss: 'ul.option-list',
 	dateFormatOptionCss: 'ul.option-list',
-	numformatDropdownOptionCss: 'ul.option-list',
+	numberFormatDropdownOptionCss: 'ul.option-list',
 	officialNameFieldCss: '#officialNameInput',
 	gridButtonCss: 'div.layout-switch > button',
 	taxFieldCss: '#taxIdInput',
@@ -17,7 +17,7 @@ export const AddOrganizationPage = {
 	toastrMessageCss: 'nb-toast.ng-tns-c214-120.ng-trigger',
 	countryDropdownCss: 'div.ng-select-container.ng-has-value',
 	cityInputCss: '#cityInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	streetInputCss: '#addressInput',
 	bonusTypeDropdownCss: '[formcontrolname="bonusType"]',
 	bonusPercentageCss: '[formcontrolname="bonusPercentage"]',

apps/gauzy-e2e/src/support/Base/pageobjects/AddTasksPageObject.ts

@@ -1,9 +1,8 @@
 export const AddTaskPage = {
 	gridButtonCss: 'div.layout-switch > button',
 	addTaskButtonCss: 'button[status="success"]',
-	selectProjectDropdownCss:
-		'ga-project-selector.ng-untouched > .ng-select-taggable > .ng-select-container > .ng-value-container > .ng-input > input',
-	selectProjectDrodownOptionCss: 'div.ng-dropdown-panel-items.scroll-host',
+	selectProjectDropdownCss: 'ga-project-selector.ng-untouched > .ng-select-taggable > .ng-select-container > .ng-value-container > .ng-input > input',
+	selectProjectDropdownOptionCss: 'div.ng-dropdown-panel-items.scroll-host',
 	editTaskButtonCss: '.ng-star-inserted .appearance-filled.ng-star-inserted.nb-transition:nth-of-type(2)',
 	duplicateTaskButtonCss: '.ng-star-inserted .nb-transition:nth-of-type(3)',
 	deleteTaskButtonCss: '.appearance-filled.icon-end.ng-star-inserted',

apps/gauzy-e2e/src/support/Base/pageobjects/CandidatesPageObject.ts

@@ -31,7 +31,7 @@ export const CandidatesPage = {
 	selectDropdownOptionCss: '.option-list nb-option',
 	cityInputCss: '#cityInput',
 	addressOneInputCss: 'addressInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	saveActionButtonCss: 'ga-edit-candidate-main div.actions > button[status="success"]',
 	ratesButtonCss: '.route-tab:nth-child(5) > .tab-text',
 	payPeriodDropdownCss: '#payPeriodsSelect',

apps/gauzy-e2e/src/support/Base/pageobjects/ClientsPageObject.ts

@@ -8,10 +8,10 @@ export const ClientsPage = {
 	emailInputCss: '#email',
 	lastStepBtnCss: 'div.step-content > form > div > button[status="success"]',
 	phoneInputCss: '[formcontrolname="primaryPhone"]',
-	budgetInpuCss: 'input[formcontrolname="budget"]',
+	budgetInputCss: 'input[formcontrolname="budget"]',
 	countryDropdownCss: 'ga-country > div.form-group > nb-select',
-	cityInpuCss: '[formcontrolname="city"]',
-	postcodeinputCss: '[formcontrolname="postcode"]',
+	cityInputCss: '[formcontrolname="city"]',
+	postCodeInputCss: '[formcontrolname="postcode"]',
 	streetInputCss: '[formcontrolname="address"]',
 	projectsDropdownCss: '[formcontrolname="projects"]',
 	projectsDropdownOptionCss: 'div.ng-option',
@@ -35,7 +35,7 @@ export const ClientsPage = {
 	clientsTableData: 'td.ng-star-inserted',
 	clientsTableRow: 'tr[class="angular2-smart-row ng-star-inserted"]',
 	viewButtonCss: 'div.mb-3 > button[status="info"]',
-	clientNameViewCss: 'div.profile-usertitle-name',
-	clientTypeViewCss: 'div.profile-usertitle-type',
+	clientNameViewCss: 'div.profile-user-title-name',
+	clientTypeViewCss: 'div.profile-user-title-type',
 	backBtn: 'ngx-back-navigation > div > button[status="primary"]'
 };

apps/gauzy-e2e/src/support/Base/pageobjects/ContactsLeadsPageObject.ts

@@ -9,9 +9,9 @@ export const ContactsLeadsPage = {
 	phoneInputCss: '[formcontrolname="primaryPhone"]',
 	lastStepBtnCss: 'div.step-content > form > div > button[status="success"]',
 	countryDropdownCss: 'ga-country div.form-group nb-select',
-	cityInpuCss: '[formcontrolname="city"]',
-	budgetInpuCss: 'input[formcontrolname="budget"]',
-	postcodeinputCss: '[formcontrolname="postcode"]',
+	cityInputCss: '[formcontrolname="city"]',
+	budgetInputCss: 'input[formcontrolname="budget"]',
+	postCodeInputCss: '[formcontrolname="postcode"]',
 	streetInputCss: '[formcontrolname="address"]',
 	projectsDropdownCss: '[formcontrolname="projects"]',
 	projectsDropdownOptionCss: 'div.ng-option',

apps/gauzy-e2e/src/support/Base/pageobjects/CustomersPageObject.ts

@@ -6,12 +6,12 @@ export const CustomersPage = {
 	deleteButtonCss: 'div.mb-3 > button[status="danger"]',
 	nameInputCss: '#name',
 	emailInputCss: '#email',
-	budgetInpuCss: 'input[formcontrolname="budget"]',
+	budgetInputCss: 'input[formcontrolname="budget"]',
 	lastStepBtnCss: 'div.step-content > form > div > button[status="success"]',
 	phoneInputCss: '[formcontrolname="primaryPhone"]',
 	countryDropdownCss: 'ga-country div.form-group nb-select',
-	cityInpuCss: '[formcontrolname="city"]',
-	postcodeinputCss: '[formcontrolname="postcode"]',
+	cityInputCss: '[formcontrolname="city"]',
+	postCodeInputCss: '[formcontrolname="postcode"]',
 	streetInputCss: '[formcontrolname="address"]',
 	projectsDropdownCss: '[formcontrolname="projects"]',
 	projectsDropdownOptionCss: 'div.ng-option',

apps/gauzy-e2e/src/support/Base/pageobjects/EditEmployeePageObject.ts

@@ -16,7 +16,7 @@ export const EditEmployeePage = {
 	acceptDateInputCss: '#acceptDateInput',
 	countryDropdownCss: 'ga-country > div.form-group > nb-select.d-block',
 	cityInputCss: '#cityInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	addressInputCss: '#addressInput',
 	payPeriodDropdownCss: '#payPeriodsSelect',
 	weeklyLimitInputCss: '#reWeeklyLimitInput',

apps/gauzy-e2e/src/support/Base/pageobjects/GoalsKPIPageObject.ts

@@ -13,7 +13,7 @@ export const GoalsKPIPage = {
 	deleteButtonCss: 'nb-tab[tabid="kpi"] > div.mb-3 > button[status="danger"]',
 	confirmDeleteButtonCss: 'nb-card-footer > button[status="success"]',
 	verifyKPICss: 'div.ng-star-inserted',
-	verifyEmpytTableCss: 'tr.ng-star-inserted > td',
+	verifyEmptyTableCss: 'tr.ng-star-inserted > td',
 	toastrMessageCss: 'nb-toast.ng-trigger',
 	searchNameInputCss: 'input-filter > input[placeholder="Name"]'
 };

apps/gauzy-e2e/src/support/Base/pageobjects/GoalsTimeFramePageObject.ts

@@ -1,4 +1,4 @@
-export const GoalstimeFramePage = {
+export const GoalsTimeFramePage = {
 	gridButtonCss: 'div.layout-switch > button',
 	tabButtonCss: 'ul.tabset > li.tab',
 	titleInputCss: '#time-frame-title',
@@ -11,6 +11,6 @@ export const GoalstimeFramePage = {
 	deleteButtonCss: 'nb-tab[tabid="timeframe"] > div.mb-3 > button[status="danger"]',
 	confirmDeleteButtonCss: 'nb-card-footer > button[status="success"]',
 	verifyTimeFrameCss: 'div.ng-star-inserted',
-	verifyEmpytTableCss: 'tr.ng-star-inserted > td',
+	verifyEmptyTableCss: 'tr.ng-star-inserted > td',
 	toastrMessageCss: 'nb-toast.ng-trigger'
 };

apps/gauzy-e2e/src/support/Base/pageobjects/ManageInterviewsPageObject.ts

@@ -35,5 +35,5 @@ export const ManageInterviewsPage = {
 	archiveInterviewOkButtonCss: 'nb-card-footer > button[status="danger"]',
 	archiveBadgeCss: 'ga-interview-actions div.badges > div.badge',
 	deleteButtonCss: 'ga-delete-interview button[status="danger"]',
-	fututeCheckBoxCss: 'nb-checkbox[status="warning"] > span.custom-checkbox'
+	customCheckBoxCss: 'nb-checkbox[status="warning"] > span.custom-checkbox'
 };

apps/gauzy-e2e/src/support/Base/pageobjects/ManageOrganizationPageObject.ts

@@ -9,14 +9,14 @@ export const ManageOrganizationPage = {
 	selectTableRowCss: 'table > tbody > tr.angular2-smart-row',
 	saveButtonCss: 'div.actions > button[status="success"]',
 	toastrMessageCss: 'nb-toast.ng-trigger',
-	organisationNameFieldCss: '#nameInput',
+	organizationNameFieldCss: '#nameInput',
 	currencyFieldCss: '#currencySelect',
 	officialNameFieldCss: '#officialNameInput',
 	taxFieldCss: '#taxIdInput',
 	verifyOrganizationCss: 'div.d-block',
 	countryDropdownCss: 'ga-country div.form-group nb-select',
 	cityInputCss: '#cityInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	streetInputCss: '#addressInput',
 	bonusTypeDropdownCss: '[formcontrolname="bonusType"]',
 	bonusPercentageCss: '[formcontrolname="bonusPercentage"]',

apps/gauzy-e2e/src/support/Base/pageobjects/OnboardingPageObject.ts

@@ -1,5 +1,5 @@
 export const OnboardingPage = {
-	organisationNameFieldCss: '#nameInput',
+	organizationNameFieldCss: '#nameInput',
 	currencyFieldCss: '#currencySelect',
 	currencyOptionCss: '.option-list nb-option',
 	officialNameFieldCss: '#officialNameInput',

apps/gauzy-e2e/src/support/Base/pageobjects/OrganizationInventoryPageObject.ts

@@ -38,7 +38,7 @@ export const OrganizationInventoryPage = {
 	merchantNextBtnCss: 'div.row > div[class="form-group col-4"] > button[status="primary"]',
 	countrySelectCss: 'div.col-4 > ga-country > div.form-group > nb-select > button.select-button',
 	cityInputCss: 'div.form-group > input[id="cityInput"]',
-	postcodeInputCss: 'div.form-group > input[id="postcodeInput"]',
+	postCodeInputCss: 'div.form-group > input[id="postcodeInput"]',
 	addressInputCss: 'div.form-group > input[id="addressInput"]',
 	saveMerchantBtnCss: 'div.row > div[class="form-group col-4"] > button[status="success"]',
 	editMerchantBtnCss: 'div.mb-3 > button[status="info"]',

apps/gauzy-e2e/src/support/Base/pageobjects/OrganizationPublicPagePageObject.ts

@@ -42,7 +42,7 @@ export const OrganizationPublicPage = {
 	clientFocusCss: 'div.org-head div.org-client-focus > h5.org-title > span.client-focus',
 	skillsCss: 'div.org-skills > .org-value > li.org_list_data',
 
-	organisationNameFieldCss: '[placeholder="Organization Name"]',
+	organizationNameFieldCss: '[placeholder="Organization Name"]',
 	currencyFieldCss: '#currencySelect',
 	dropdownOptionCss: '.option-list nb-option',
 	officialNameFieldCss: '#officialNameInput',
@@ -53,7 +53,7 @@ export const OrganizationPublicPage = {
 	verifyOrganizationCss: 'div.d-block',
 	countryDropdownCss: 'ga-country div.form-group nb-select',
 	cityInputCss: '#cityInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	streetInputCss: '#addressInput',
 	bonusTypeDropdownCss: '[formcontrolname="bonusType"]',
 	bonusPercentageCss: '[formcontrolname="bonusPercentage"]',

apps/gauzy-e2e/src/support/Base/pageobjects/PipelinesPageObject.ts

@@ -2,7 +2,7 @@ export const PipelinesPage = {
 	gridButtonCss: 'div.layout-switch > button',
 	addPipelineButtonCss: 'div.mb-3 > button[status="success"]',
 	pipelineNameInputCss: '[formcontrolname="name"]',
-	descriptioninputCss: '[formcontrolname="description"]',
+	descriptionInputCss: '[formcontrolname="description"]',
 	createPipelineButtonCss: 'nb-card-footer > button[status="primary"]',
 	selectTableRowCss: 'table > tbody > tr.angular2-smart-row',
 	editPipelineButtonCss: 'div.mb-3 > button[status="info"]',

apps/gauzy-e2e/src/support/Base/pageobjects/RegisterPageObject.ts

@@ -6,7 +6,7 @@ export const RegisterPage = {
 	confirmPassFieldCss: '#input-re-password',
 	termAndConditionCheckboxCss: 'span.custom-checkbox',
 	registerButtonCss: 'ngx-register > form > button',
-	organisationNameFieldCss: '[placeholder="Organization Name"]',
+	organizationNameFieldCss: '[placeholder="Organization Name"]',
 	currencyFieldCss: '[class="select-button placeholder"]',
 	dropdownOptionCss: '.option-list nb-option',
 	officialNameFieldCss: '#officialNameInput',
@@ -16,7 +16,7 @@ export const RegisterPage = {
 	toastrMessageCss: 'nb-toast.ng-trigger',
 	countryDropdownCss: 'ga-country div.form-group nb-select',
 	cityInputCss: '#cityInput',
-	postcodeInputCss: '#postcodeInput',
+	postCodeInputCss: '#postcodeInput',
 	streetInputCss: '#addressInput',
 	bonusTypeDropdownCss: '[formcontrolname="bonusType"]',
 	bonusPercentageCss: '[formcontrolname="bonusPercentage"]',