feat(navbar): implement new notification and invitation components

- Added NotificationDrawer and InvitationItem components to enhance the notification system.
- Refactored existing notification handling to improve user experience and maintainability.
- Introduced new styles and structure for notifications using Tailwind CSS for better visual consistency.
- Updated Navbar to include new components and improve overall layout.
- Created a centralized navRoutes file for better route management within the navbar.

.claude/settings.local.json

@@ -0,0 +1,15 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(find:*)",
+      "Bash(npm run build:*)",
+      "Bash(npm run type-check:*)",
+      "Bash(npm run:*)",
+      "Bash(move:*)",
+      "Bash(mv:*)",
+      "Bash(grep:*)",
+      "Bash(rm:*)"
+    ],
+    "deny": []
+  }
+}

.cursor/rules/antd-components.mdc

@@ -0,0 +1,237 @@
+---
+alwaysApply: true
+---
+# Ant Design Import Rules for Worklenz
+
+## 🚨 CRITICAL: Always Use Centralized Imports
+
+**NEVER import Ant Design components directly from 'antd' or '@ant-design/icons'**
+
+### ✅ Correct Import Pattern
+```typescript
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@antd-imports';
+// or
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@/shared/antd-imports';
+```
+
+### ❌ Forbidden Import Patterns
+```typescript
+// NEVER do this:
+import { Button, Input, Select } from 'antd';
+import { EditOutlined, PlusOutlined } from '@ant-design/icons';
+```
+
+## Why This Rule Exists
+
+### Benefits of Centralized Imports:
+- **Better Tree-Shaking**: Optimized bundle size through centralized management
+- **Consistent React Context**: Proper context sharing across components
+- **Type Safety**: Centralized TypeScript definitions
+- **Maintainability**: Single source of truth for all Ant Design imports
+- **Performance**: Reduced bundle size and improved loading times
+
+## What's Available in `@antd-imports`
+
+### Core Components
+- **Layout**: Layout, Row, Col, Flex, Divider, Space
+- **Navigation**: Menu, Tabs, Breadcrumb, Pagination
+- **Data Entry**: Input, Select, DatePicker, TimePicker, Form, Checkbox, InputNumber
+- **Data Display**: Table, List, Card, Tag, Avatar, Badge, Progress, Statistic
+- **Feedback**: Modal, Drawer, Alert, Message, Notification, Spin, Skeleton, Result
+- **Other**: Button, Typography, Tooltip, Popconfirm, Dropdown, ConfigProvider
+
+### Icons
+Common icons including: EditOutlined, DeleteOutlined, PlusOutlined, MoreOutlined, CheckOutlined, CloseOutlined, CalendarOutlined, UserOutlined, TeamOutlined, and many more.
+
+### Utilities
+- **appMessage**: Centralized message utility
+- **appNotification**: Centralized notification utility
+- **antdConfig**: Default Ant Design configuration
+- **taskManagementAntdConfig**: Task-specific configuration
+
+## Implementation Guidelines
+
+### When Creating New Components:
+1. **Always** import from `@/shared/antd-imports`
+2. Use `appMessage` and `appNotification` for user feedback
+3. Apply `antdConfig` for consistent styling
+4. Use `taskManagementAntdConfig` for task-related components
+
+### When Refactoring Existing Code:
+1. Replace direct 'antd' imports with `@/shared/antd-imports`
+2. Replace direct '@ant-design/icons' imports with `@/shared/antd-imports`
+3. Update any custom message/notification calls to use the utilities
+
+### File Location
+The centralized import file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+
+## Examples
+
+### Component Creation
+```typescript
+import React from 'react';
+import { Button, Input, Modal, EditOutlined, appMessage } from '@antd-imports';
+
+const MyComponent = () => {
+  const handleClick = () => {
+    appMessage.success('Operation completed!');
+  };
+
+  return (
+    <Button icon={<EditOutlined />} onClick={handleClick}>
+      Edit Item
+    </Button>
+  );
+};
+```
+
+### Form Implementation
+```typescript
+import { Form, Input, Select, Button, DatePicker } from '@antd-imports';
+
+const MyForm = () => {
+  return (
+    <Form layout="vertical">
+      <Form.Item label="Name" name="name">
+        <Input />
+      </Form.Item>
+      <Form.Item label="Type" name="type">
+        <Select options={options} />
+      </Form.Item>
+      <Form.Item label="Date" name="date">
+        <DatePicker />
+      </Form.Item>
+    </Form>
+  );
+};
+```
+
+## Enforcement
+
+This rule is **MANDATORY** and applies to:
+- All new component development
+- All code refactoring
+- All bug fixes
+- All feature implementations
+
+**Violations will result in code review rejection.**
+
+### File Path:
+The centralized file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+# Ant Design Import Rules for Worklenz
+
+## 🚨 CRITICAL: Always Use Centralized Imports
+
+**NEVER import Ant Design components directly from 'antd' or '@ant-design/icons'**
+
+### ✅ Correct Import Pattern
+```typescript
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@antd-imports';
+// or
+import { Button, Input, Select, EditOutlined, PlusOutlined } from '@/shared/antd-imports';
+```
+
+### ❌ Forbidden Import Patterns
+```typescript
+// NEVER do this:
+import { Button, Input, Select } from 'antd';
+import { EditOutlined, PlusOutlined } from '@ant-design/icons';
+```
+
+## Why This Rule Exists
+
+### Benefits of Centralized Imports:
+- **Better Tree-Shaking**: Optimized bundle size through centralized management
+- **Consistent React Context**: Proper context sharing across components
+- **Type Safety**: Centralized TypeScript definitions
+- **Maintainability**: Single source of truth for all Ant Design imports
+- **Performance**: Reduced bundle size and improved loading times
+
+## What's Available in `@antd-imports`
+
+### Core Components
+- **Layout**: Layout, Row, Col, Flex, Divider, Space
+- **Navigation**: Menu, Tabs, Breadcrumb, Pagination
+- **Data Entry**: Input, Select, DatePicker, TimePicker, Form, Checkbox, InputNumber
+- **Data Display**: Table, List, Card, Tag, Avatar, Badge, Progress, Statistic
+- **Feedback**: Modal, Drawer, Alert, Message, Notification, Spin, Skeleton, Result
+- **Other**: Button, Typography, Tooltip, Popconfirm, Dropdown, ConfigProvider
+
+### Icons
+Common icons including: EditOutlined, DeleteOutlined, PlusOutlined, MoreOutlined, CheckOutlined, CloseOutlined, CalendarOutlined, UserOutlined, TeamOutlined, and many more.
+
+### Utilities
+- **appMessage**: Centralized message utility
+- **appNotification**: Centralized notification utility
+- **antdConfig**: Default Ant Design configuration
+- **taskManagementAntdConfig**: Task-specific configuration
+
+## Implementation Guidelines
+
+### When Creating New Components:
+1. **Always** import from `@antd-imports` or `@/shared/antd-imports`
+2. Use `appMessage` and `appNotification` for user feedback
+3. Apply `antdConfig` for consistent styling
+4. Use `taskManagementAntdConfig` for task-related components
+
+### When Refactoring Existing Code:
+1. Replace direct 'antd' imports with `@antd-imports`
+2. Replace direct '@ant-design/icons' imports with `@antd-imports`
+3. Update any custom message/notification calls to use the utilities
+
+### File Location
+The centralized import file is located at: `worklenz-frontend/src/shared/antd-imports.ts`
+
+## Examples
+
+### Component Creation
+```typescript
+import React from 'react';
+import { Button, Input, Modal, EditOutlined, appMessage } from '@antd-imports';
+
+const MyComponent = () => {
+  const handleClick = () => {
+    appMessage.success('Operation completed!');
+  };
+
+  return (
+    <Button icon={<EditOutlined />} onClick={handleClick}>
+      Edit Item
+    </Button>
+  );
+};
+```
+
+### Form Implementation
+```typescript
+import { Form, Input, Select, Button, DatePicker } from '@antd-imports';
+
+const MyForm = () => {
+  return (
+    <Form layout="vertical">
+      <Form.Item label="Name" name="name">
+        <Input />
+      </Form.Item>
+      <Form.Item label="Type" name="type">
+        <Select options={options} />
+      </Form.Item>
+      <Form.Item label="Date" name="date">
+        <DatePicker />
+      </Form.Item>
+    </Form>
+  );
+};
+```
+
+## Enforcement
+
+This rule is **MANDATORY** and applies to:
+- All new component development
+- All code refactoring
+- All bug fixes
+- All feature implementations
+
+**Violations will result in code review rejection.**
+
+### File Path:
+The centralized file is located at: `worklenz-frontend/src/shared/antd-imports.ts`

.gitignore

@@ -36,8 +36,6 @@ lerna-debug.log*
 .vscode/*
 !.vscode/extensions.json
 .idea/
-.cursor/
-.claude/
 .DS_Store
 *.suo
 *.ntvs*

test_sort_fix.sql

@@ -0,0 +1,41 @@
+-- Test script to verify the sort order constraint fix
+
+-- Test the helper function
+SELECT get_sort_column_name('status');    -- Should return 'status_sort_order'
+SELECT get_sort_column_name('priority');  -- Should return 'priority_sort_order'
+SELECT get_sort_column_name('phase');     -- Should return 'phase_sort_order'
+SELECT get_sort_column_name('members');   -- Should return 'member_sort_order'
+SELECT get_sort_column_name('unknown');   -- Should return 'status_sort_order' (default)
+
+-- Test bulk update function (example - would need real project_id and task_ids)
+/*
+SELECT update_task_sort_orders_bulk(
+    '[
+        {"task_id": "example-uuid", "sort_order": 1, "status_id": "status-uuid"},
+        {"task_id": "example-uuid-2", "sort_order": 2, "status_id": "status-uuid"}
+    ]'::json,
+    'status'
+);
+*/
+
+-- Verify that sort_order constraint still exists and works
+SELECT 
+    tc.constraint_name,
+    tc.table_name,
+    kcu.column_name
+FROM information_schema.table_constraints tc
+JOIN information_schema.key_column_usage kcu 
+    ON tc.constraint_name = kcu.constraint_name
+WHERE tc.constraint_name = 'tasks_sort_order_unique';
+
+-- Check that new sort order columns don't have unique constraints (which is correct)
+SELECT 
+    tc.constraint_name,
+    tc.table_name,
+    kcu.column_name
+FROM information_schema.table_constraints tc
+JOIN information_schema.key_column_usage kcu 
+    ON tc.constraint_name = kcu.constraint_name
+WHERE kcu.table_name = 'tasks'
+  AND kcu.column_name IN ('status_sort_order', 'priority_sort_order', 'phase_sort_order', 'member_sort_order')
+  AND tc.constraint_type = 'UNIQUE';

test_sort_orders.sql

@@ -0,0 +1,30 @@
+-- Test script to validate the separate sort order implementation
+
+-- Check if new columns exist
+SELECT column_name, data_type, is_nullable, column_default
+FROM information_schema.columns 
+WHERE table_name = 'tasks' 
+  AND column_name IN ('status_sort_order', 'priority_sort_order', 'phase_sort_order', 'member_sort_order')
+ORDER BY column_name;
+
+-- Check if helper function exists
+SELECT routine_name, routine_type
+FROM information_schema.routines 
+WHERE routine_name IN ('get_sort_column_name', 'update_task_sort_orders_bulk', 'handle_task_list_sort_order_change');
+
+-- Sample test data to verify different sort orders work
+-- (This would be run after the migrations)
+/*
+-- Test: Tasks should have different orders for different groupings
+SELECT 
+  id, 
+  name, 
+  sort_order, 
+  status_sort_order, 
+  priority_sort_order, 
+  phase_sort_order, 
+  member_sort_order
+FROM tasks 
+WHERE project_id = '<test-project-id>'
+ORDER BY status_sort_order;
+*/

worklenz-backend/database/sql/1_tables.sql

@@ -2297,60 +2297,3 @@ ALTER TABLE organization_working_days
 ALTER TABLE organization_working_days
     ADD CONSTRAINT org_organization_id_fk
         FOREIGN KEY (organization_id) REFERENCES organizations;
-
--- Survey tables for account setup questionnaire
-CREATE TABLE IF NOT EXISTS surveys (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    name VARCHAR(255) NOT NULL,
-    description TEXT,
-    survey_type VARCHAR(50) DEFAULT 'account_setup' NOT NULL,
-    is_active BOOLEAN DEFAULT TRUE NOT NULL,
-    created_at TIMESTAMP DEFAULT now() NOT NULL,
-    updated_at TIMESTAMP DEFAULT now() NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS survey_questions (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    survey_id UUID REFERENCES surveys(id) ON DELETE CASCADE NOT NULL,
-    question_key VARCHAR(100) NOT NULL,
-    question_type VARCHAR(50) NOT NULL,
-    is_required BOOLEAN DEFAULT FALSE NOT NULL,
-    sort_order INTEGER DEFAULT 0 NOT NULL,
-    options JSONB,
-    created_at TIMESTAMP DEFAULT now() NOT NULL,
-    updated_at TIMESTAMP DEFAULT now() NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS survey_responses (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    survey_id UUID REFERENCES surveys(id) ON DELETE CASCADE NOT NULL,
-    user_id UUID REFERENCES users(id) ON DELETE CASCADE NOT NULL,
-    is_completed BOOLEAN DEFAULT FALSE NOT NULL,
-    started_at TIMESTAMP DEFAULT now() NOT NULL,
-    completed_at TIMESTAMP,
-    created_at TIMESTAMP DEFAULT now() NOT NULL,
-    updated_at TIMESTAMP DEFAULT now() NOT NULL
-);
-
-CREATE TABLE IF NOT EXISTS survey_answers (
-    id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
-    response_id UUID REFERENCES survey_responses(id) ON DELETE CASCADE NOT NULL,
-    question_id UUID REFERENCES survey_questions(id) ON DELETE CASCADE NOT NULL,
-    answer_text TEXT,
-    answer_json JSONB,
-    created_at TIMESTAMP DEFAULT now() NOT NULL,
-    updated_at TIMESTAMP DEFAULT now() NOT NULL
-);
-
--- Survey table indexes
-CREATE INDEX IF NOT EXISTS idx_surveys_type_active ON surveys(survey_type, is_active);
-CREATE INDEX IF NOT EXISTS idx_survey_questions_survey_order ON survey_questions(survey_id, sort_order);
-CREATE INDEX IF NOT EXISTS idx_survey_responses_user_survey ON survey_responses(user_id, survey_id);
-CREATE INDEX IF NOT EXISTS idx_survey_responses_completed ON survey_responses(survey_id, is_completed);
-CREATE INDEX IF NOT EXISTS idx_survey_answers_response ON survey_answers(response_id);
-
--- Survey table constraints
-ALTER TABLE survey_questions ADD CONSTRAINT survey_questions_sort_order_check CHECK (sort_order >= 0);
-ALTER TABLE survey_questions ADD CONSTRAINT survey_questions_type_check CHECK (question_type IN ('single_choice', 'multiple_choice', 'text'));
-ALTER TABLE survey_responses ADD CONSTRAINT unique_user_survey_response UNIQUE (user_id, survey_id);
-ALTER TABLE survey_answers ADD CONSTRAINT unique_response_question_answer UNIQUE (response_id, question_id);

worklenz-backend/database/sql/2_dml.sql

@@ -142,25 +142,3 @@ DROP FUNCTION sys_insert_license_types();
 INSERT INTO timezones (name, abbrev, utc_offset)
 SELECT name, abbrev, utc_offset
 FROM pg_timezone_names;
-
--- Insert default account setup survey
-INSERT INTO surveys (name, description, survey_type, is_active) VALUES 
-('Account Setup Survey', 'Initial questionnaire during account setup to understand user needs', 'account_setup', true)
-ON CONFLICT DO NOTHING;
-
--- Insert survey questions for account setup survey
-DO $$
-DECLARE
-    survey_uuid UUID;
-BEGIN
-    SELECT id INTO survey_uuid FROM surveys WHERE survey_type = 'account_setup' AND name = 'Account Setup Survey' LIMIT 1;
-    
-    -- Insert survey questions
-    INSERT INTO survey_questions (survey_id, question_key, question_type, is_required, sort_order, options) VALUES
-    (survey_uuid, 'organization_type', 'single_choice', true, 1, '["freelancer", "startup", "small_medium_business", "agency", "enterprise", "other"]'),
-    (survey_uuid, 'user_role', 'single_choice', true, 2, '["founder_ceo", "project_manager", "software_developer", "designer", "operations", "other"]'),
-    (survey_uuid, 'main_use_cases', 'multiple_choice', true, 3, '["task_management", "team_collaboration", "resource_planning", "client_communication", "time_tracking", "other"]'),
-    (survey_uuid, 'previous_tools', 'text', false, 4, null),
-    (survey_uuid, 'how_heard_about', 'single_choice', false, 5, '["google_search", "twitter", "linkedin", "friend_colleague", "blog_article", "other"]')
-    ON CONFLICT DO NOTHING;
-END $$;

worklenz-backend/package-lock.json

@@ -33,6 +33,7 @@
         "express-rate-limit": "^6.8.0",
         "express-session": "^1.17.3",
         "express-validator": "^6.15.0",
+        "grunt-cli": "^1.5.0",
         "helmet": "^6.2.0",
         "hpp": "^0.2.3",
         "http-errors": "^2.0.0",
@@ -45,7 +46,6 @@
         "morgan": "^1.10.0",
         "nanoid": "^3.3.6",
         "passport": "^0.7.0",
-        "passport-custom": "^1.1.1",
         "passport-google-oauth2": "^0.2.0",
         "passport-google-oauth20": "^2.0.0",
         "passport-local": "^1.0.0",
@@ -73,7 +73,6 @@
         "@types/compression": "^1.7.2",
         "@types/connect-flash": "^0.0.37",
         "@types/cookie-parser": "^1.4.3",
-        "@types/cookie-signature": "^1.1.2",
         "@types/cron": "^2.0.1",
         "@types/crypto-js": "^4.2.2",
         "@types/csurf": "^1.11.2",
@@ -127,7 +126,7 @@
         "typescript": "^4.9.5"
       },
       "engines": {
-        "node": ">=20.0.0",
+        "node": ">=16.13.0",
         "npm": ">=8.11.0",
         "yarn": "WARNING: Please use npm package manager instead of yarn"
       }
@@ -5446,16 +5445,6 @@
         "@types/express": "*"
       }
     },
-    "node_modules/@types/cookie-signature": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/cookie-signature/-/cookie-signature-1.1.2.tgz",
-      "integrity": "sha512-2OhrZV2LVnUAXklUFwuYUTokalh/dUb8rqt70OW6ByMSxYpauPZ+kfNLknX3aJyjY5iu8i3cUyoLZP9Fn37tTg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/cors": {
       "version": "2.8.19",
       "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.19.tgz",
@@ -6466,12 +6455,30 @@
       "dev": true,
       "license": "Python-2.0"
     },
+    "node_modules/array-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
+      "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-flatten": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
       "license": "MIT"
     },
+    "node_modules/array-slice": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
+      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array-union": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
@@ -6944,7 +6951,6 @@
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
       "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "fill-range": "^7.1.1"
@@ -8050,6 +8056,15 @@
         "npm": "1.2.8000 || >= 1.4.16"
       }
     },
+    "node_modules/detect-file": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+      "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/detect-libc": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz",
@@ -8909,6 +8924,18 @@
         "node": ">=6"
       }
     },
+    "node_modules/expand-tilde": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+      "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==",
+      "license": "MIT",
+      "dependencies": {
+        "homedir-polyfill": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/expect": {
       "version": "28.1.3",
       "resolved": "https://registry.npmjs.org/expect/-/expect-28.1.3.tgz",
@@ -9061,6 +9088,12 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "license": "MIT"
+    },
     "node_modules/fast-csv": {
       "version": "4.3.6",
       "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz",
@@ -9189,7 +9222,6 @@
       "version": "7.1.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
       "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -9255,6 +9287,46 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/findup-sync": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+      "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "detect-file": "^1.0.0",
+        "is-glob": "^4.0.0",
+        "micromatch": "^4.0.2",
+        "resolve-dir": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fined": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
+      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "is-plain-object": "^2.0.3",
+        "object.defaults": "^1.1.0",
+        "object.pick": "^1.2.0",
+        "parse-filepath": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/flagged-respawn": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
+      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/flat-cache": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
@@ -9355,6 +9427,27 @@
         }
       }
     },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/for-own": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
+      "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==",
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/foreground-child": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -9752,6 +9845,48 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/global-modules": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+      "license": "MIT",
+      "dependencies": {
+        "global-prefix": "^1.0.1",
+        "is-windows": "^1.0.1",
+        "resolve-dir": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+      "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==",
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.2",
+        "homedir-polyfill": "^1.0.1",
+        "ini": "^1.3.4",
+        "is-windows": "^1.0.1",
+        "which": "^1.2.14"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/global-prefix/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
     "node_modules/globals": {
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
@@ -9808,6 +9943,34 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/grunt-cli": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.5.0.tgz",
+      "integrity": "sha512-rILKAFoU0dzlf22SUfDtq2R1fosChXXlJM5j7wI6uoW8gwmXDXzbUvirlKZSYCdXl3LXFbR+8xyS+WFo+b6vlA==",
+      "license": "MIT",
+      "dependencies": {
+        "grunt-known-options": "~2.0.0",
+        "interpret": "~1.1.0",
+        "liftup": "~3.0.1",
+        "nopt": "~5.0.0",
+        "v8flags": "^4.0.1"
+      },
+      "bin": {
+        "grunt": "bin/grunt"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/grunt-known-options": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+      "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -9879,6 +10042,18 @@
       "dev": true,
       "license": "https://www.highcharts.com/license"
     },
+    "node_modules/homedir-polyfill": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+      "license": "MIT",
+      "dependencies": {
+        "parse-passwd": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/hpp": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/hpp/-/hpp-0.2.3.tgz",
@@ -10088,6 +10263,12 @@
       "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
       "license": "ISC"
     },
+    "node_modules/interpret": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+      "integrity": "sha512-CLM8SNMDu7C5psFCn6Wg/tgpj/bKAg7hc2gWqcuR9OD5Ft9PhBpIu8PLicPeis+xDd6YX2ncI8MCA64I9tftIA==",
+      "license": "MIT"
+    },
     "node_modules/ipaddr.js": {
       "version": "1.9.1",
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
@@ -10097,6 +10278,19 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-arrayish": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
@@ -10158,7 +10352,6 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
       "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
@@ -10187,7 +10380,6 @@
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
       "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
@@ -10200,7 +10392,6 @@
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
@@ -10216,6 +10407,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-promise": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz",
@@ -10240,6 +10443,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "license": "MIT",
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-stream": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
@@ -10252,6 +10467,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "license": "MIT",
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -10262,9 +10498,17 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
       "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true,
       "license": "ISC"
     },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.2",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
@@ -11282,6 +11526,15 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -11373,6 +11626,25 @@
         "immediate": "~3.0.5"
       }
     },
+    "node_modules/liftup": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
+      "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
+      "license": "MIT",
+      "dependencies": {
+        "extend": "^3.0.2",
+        "findup-sync": "^4.0.0",
+        "fined": "^1.2.0",
+        "flagged-respawn": "^1.0.1",
+        "is-plain-object": "^2.0.4",
+        "object.map": "^1.0.1",
+        "rechoir": "^0.7.0",
+        "resolve": "^1.19.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
@@ -11611,6 +11883,18 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/make-iterator": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
+      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^6.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/makeerror": {
       "version": "1.0.12",
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
@@ -11621,6 +11905,15 @@
         "tmpl": "1.0.5"
       }
     },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/math-intrinsics": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -11678,7 +11971,6 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
@@ -12126,6 +12418,46 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object.defaults": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
+      "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==",
+      "license": "MIT",
+      "dependencies": {
+        "array-each": "^1.0.1",
+        "array-slice": "^1.0.0",
+        "for-own": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
+      "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==",
+      "license": "MIT",
+      "dependencies": {
+        "for-own": "^1.0.0",
+        "make-iterator": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/on-finished": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
@@ -12288,6 +12620,20 @@
         "node": ">=6"
       }
     },
+    "node_modules/parse-filepath": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
+      "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==",
+      "license": "MIT",
+      "dependencies": {
+        "is-absolute": "^1.0.0",
+        "map-cache": "^0.2.0",
+        "path-root": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/parse-json": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
@@ -12307,6 +12653,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/parse-passwd": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+      "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/parse-srcset": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz",
@@ -12340,18 +12695,6 @@
         "url": "https://github.com/sponsors/jaredhanson"
       }
     },
-    "node_modules/passport-custom": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/passport-custom/-/passport-custom-1.1.1.tgz",
-      "integrity": "sha512-/2m7jUGxmCYvoqenLB9UrmkCgPt64h8ZtV+UtuQklZ/Tn1NpKBeOorCYkB/8lMRoiZ5hUrCoMmDtxCS/d38mlg==",
-      "license": "MIT",
-      "dependencies": {
-        "passport-strategy": "1.x.x"
-      },
-      "engines": {
-        "node": ">= 0.10.0"
-      }
-    },
     "node_modules/passport-google-oauth2": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/passport-google-oauth2/-/passport-google-oauth2-0.2.0.tgz",
@@ -12457,6 +12800,27 @@
       "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
       "license": "MIT"
     },
+    "node_modules/path-root": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
+      "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==",
+      "license": "MIT",
+      "dependencies": {
+        "path-root-regex": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-root-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
+      "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/path-scurry": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
@@ -12604,7 +12968,6 @@
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=8.6"
@@ -13200,6 +13563,18 @@
         "node": ">=8.10.0"
       }
     },
+    "node_modules/rechoir": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+      "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
+      "license": "MIT",
+      "dependencies": {
+        "resolve": "^1.9.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/redis": {
       "version": "4.7.1",
       "resolved": "https://registry.npmjs.org/redis/-/redis-4.7.1.tgz",
@@ -13351,6 +13726,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/resolve-dir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+      "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==",
+      "license": "MIT",
+      "dependencies": {
+        "expand-tilde": "^2.0.0",
+        "global-modules": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/resolve-from": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -14586,7 +14974,6 @@
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
       "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
@@ -15107,6 +15494,15 @@
       "integrity": "sha512-IevTus0SbGwQzYh3+fRsAMTVVPOoIVufzacXcHPmdlle1jUpq7BRL+mw3dgeLanvGZdwwbWhRV6XrcFNdBmjWA==",
       "license": "MIT"
     },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
@@ -15336,6 +15732,15 @@
         "node": ">=10.12.0"
       }
     },
+    "node_modules/v8flags": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-4.0.1.tgz",
+      "integrity": "sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
     "node_modules/validator": {
       "version": "13.15.15",
       "resolved": "https://registry.npmjs.org/validator/-/validator-13.15.15.tgz",

worklenz-backend/package.json

@@ -80,7 +80,6 @@
     "morgan": "^1.10.0",
     "nanoid": "^3.3.6",
     "passport": "^0.7.0",
-    "passport-custom": "^1.1.1",
     "passport-google-oauth2": "^0.2.0",
     "passport-google-oauth20": "^2.0.0",
     "passport-local": "^1.0.0",
@@ -108,7 +107,6 @@
     "@types/compression": "^1.7.2",
     "@types/connect-flash": "^0.0.37",
     "@types/cookie-parser": "^1.4.3",
-    "@types/cookie-signature": "^1.1.2",
     "@types/cron": "^2.0.1",
     "@types/crypto-js": "^4.2.2",
     "@types/csurf": "^1.11.2",

worklenz-backend/src/controllers/auth-controller.ts

@@ -1,6 +1,4 @@
 import bcrypt from "bcrypt";
-import passport from "passport";
-import {NextFunction} from "express";
 
 import {sendResetEmail, sendResetSuccessEmail} from "../shared/email-templates";
 
@@ -183,162 +181,4 @@ export default class AuthController extends WorklenzControllerBase {
       res.status(500).send(new ServerResponse(false, null, DEFAULT_ERROR_MESSAGE));
     }
   }
-
-  public static googleMobileAuthPassport(req: IWorkLenzRequest, res: IWorkLenzResponse, next: NextFunction) {
-    
-    const mobileOptions = {
-      session: true,
-      failureFlash: true,
-      failWithError: false
-    };
-
-    passport.authenticate("google-mobile", mobileOptions, (err: any, user: any, info: any) => {
-      if (err) {
-        return res.status(500).send({
-          done: false,
-          message: "Authentication failed",
-          body: null
-        });
-      }
-      
-      if (!user) {
-        return res.status(400).send({
-          done: false,
-          message: info?.message || "Authentication failed",
-          body: null
-        });
-      }
-      // Log the user in (create session)
-      req.login(user, (loginErr) => {
-        if (loginErr) {
-          return res.status(500).send({
-            done: false,
-            message: "Session creation failed",
-            body: null
-          });
-        }
-        
-        // Add build version
-        user.build_v = FileConstants.getRelease();
-        
-        // Ensure session is saved and cookie is set
-        req.session.save((saveErr) => {
-          if (saveErr) {
-            return res.status(500).send({
-              done: false,
-              message: "Session save failed",
-              body: null
-            });
-          }
-          
-          // Get session cookie details
-          const sessionName = process.env.SESSION_NAME || 'connect.sid';
-          
-          // Return response with session info for mobile app to handle
-          res.setHeader('X-Session-ID', req.sessionID);
-          res.setHeader('X-Session-Name', sessionName);
-          
-          return res.status(200).send({
-            done: true,
-            message: "Login successful",
-            user,
-            authenticated: true,
-            sessionId: req.sessionID,
-            sessionName: sessionName,
-            newSessionId: req.sessionID
-          });
-        });
-      }); // Close login callback
-    })(req, res, next);
-  }
-
-  @HandleExceptions({logWithError: "body"})
-  public static async googleMobileAuth(req: IWorkLenzRequest, res: IWorkLenzResponse) {
-    const {idToken} = req.body;
-    
-    if (!idToken) {
-      return res.status(400).send(new ServerResponse(false, null, "ID token is required"));
-    }
-
-    try {
-      const response = await axios.get(`https://oauth2.googleapis.com/tokeninfo?id_token=${idToken}`);
-      const profile = response.data;
-
-      // Validate token audience (client ID) - accept web, Android, and iOS client IDs
-      const allowedClientIds = [
-        process.env.GOOGLE_CLIENT_ID, // Web client ID
-        process.env.GOOGLE_ANDROID_CLIENT_ID, // Android client ID
-        process.env.GOOGLE_IOS_CLIENT_ID, // iOS client ID
-      ].filter(Boolean); // Remove undefined values
-      
-      console.log("Token audience (aud):", profile.aud);
-      console.log("Allowed client IDs:", allowedClientIds);
-      console.log("Environment variables check:");
-      console.log("- GOOGLE_CLIENT_ID:", process.env.GOOGLE_CLIENT_ID ? "Set" : "Not set");
-      console.log("- GOOGLE_ANDROID_CLIENT_ID:", process.env.GOOGLE_ANDROID_CLIENT_ID ? "Set" : "Not set");
-      console.log("- GOOGLE_IOS_CLIENT_ID:", process.env.GOOGLE_IOS_CLIENT_ID ? "Set" : "Not set");
-      
-      if (!allowedClientIds.includes(profile.aud)) {
-        return res.status(400).send(new ServerResponse(false, null, "Invalid token audience"));
-      }
-
-      // Validate token issuer
-      if (!["https://accounts.google.com", "accounts.google.com"].includes(profile.iss)) {
-        return res.status(400).send(new ServerResponse(false, null, "Invalid token issuer"));
-      }
-
-      // Check token expiry
-      if (Date.now() >= profile.exp * 1000) {
-        return res.status(400).send(new ServerResponse(false, null, "Token expired"));
-      }
-
-      if (!profile.email_verified) {
-        return res.status(400).send(new ServerResponse(false, null, "Email not verified"));
-      }
-
-      // Check for existing local account
-      const localAccountResult = await db.query("SELECT 1 FROM users WHERE email = $1 AND password IS NOT NULL AND is_deleted IS FALSE;", [profile.email]);
-      if (localAccountResult.rowCount) {
-        return res.status(400).send(new ServerResponse(false, null, `No Google account exists for email ${profile.email}.`));
-      }
-
-      // Check if user exists
-      const userResult = await db.query(
-        "SELECT id, google_id, name, email, active_team FROM users WHERE google_id = $1 OR email = $2;",
-        [profile.sub, profile.email]
-      );
-
-      let user: any;
-      if (userResult.rowCount) {
-        // Existing user - login
-        user = userResult.rows[0];
-      } else {
-        // New user - register
-        const googleUserData = {
-          id: profile.sub,
-          displayName: profile.name,
-          email: profile.email,
-          picture: profile.picture
-        };
-
-        const registerResult = await db.query("SELECT register_google_user($1) AS user;", [JSON.stringify(googleUserData)]);
-        user = registerResult.rows[0].user;
-      }
-
-      // Create session
-      req.login(user, (err) => {
-        if (err) {
-          log_error(err);
-          return res.status(500).send(new ServerResponse(false, null, "Authentication failed"));
-        }
-        
-        user.build_v = FileConstants.getRelease();
-        return res.status(200).send(new AuthResponse("Login Successful!", true, user, null, "User successfully logged in"));
-      });
-
-    } catch (error) {
-      log_error(error);
-      return res.status(400).send(new ServerResponse(false, null, "Invalid ID token"));
-    }
-  }
 }

worklenz-backend/src/controllers/labels-controller.ts

@@ -5,7 +5,7 @@ import db from "../config/db";
 import {ServerResponse} from "../models/server-response";
 import WorklenzControllerBase from "./worklenz-controller-base";
 import HandleExceptions from "../decorators/handle-exceptions";
-import {TASK_PRIORITY_COLOR_ALPHA, WorklenzColorCodes, WorklenzColorShades} from "../shared/constants";
+import {TASK_PRIORITY_COLOR_ALPHA, WorklenzColorCodes} from "../shared/constants";
 
 export default class LabelsController extends WorklenzControllerBase {
   @HandleExceptions()
@@ -73,44 +73,13 @@ export default class LabelsController extends WorklenzControllerBase {
                WHERE id = $1
                  AND team_id = $2;`;
 
-    if (!Object.values(WorklenzColorShades).flat().includes(req.body.color))
+    if (!WorklenzColorCodes.includes(req.body.color))
       return res.status(400).send(new ServerResponse(false, null));
 
     const result = await db.query(q, [req.params.id, req.user?.team_id, req.body.color]);
     return res.status(200).send(new ServerResponse(true, result.rows));
   }
 
-  @HandleExceptions()
-  public static async updateLabel(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
-    const updates = [];
-    const values = [req.params.id, req.user?.team_id];
-    let paramIndex = 3;
-
-    if (req.body.name) {
-      updates.push(`name = $${paramIndex++}`);
-      values.push(req.body.name);
-    }
-
-    if (req.body.color) {
-      if (!Object.values(WorklenzColorShades).flat().includes(req.body.color))
-        return res.status(400).send(new ServerResponse(false, null));
-      updates.push(`color_code = $${paramIndex++}`);
-      values.push(req.body.color);
-    }
-
-    if (updates.length === 0) {
-      return res.status(400).send(new ServerResponse(false, "No valid fields to update"));
-    }
-
-    const q = `UPDATE team_labels
-               SET ${updates.join(', ')}
-               WHERE id = $1
-                 AND team_id = $2;`;
-
-    const result = await db.query(q, values);
-    return res.status(200).send(new ServerResponse(true, result.rows));
-  }
-
   @HandleExceptions()
   public static async deleteById(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
     const q = `DELETE

worklenz-backend/src/controllers/project-members-controller.ts

@@ -9,7 +9,7 @@ import {getColor} from "../shared/utils";
 import TeamMembersController from "./team-members-controller";
 import {checkTeamSubscriptionStatus} from "../shared/paddle-utils";
 import {updateUsers} from "../shared/paddle-requests";
-import {statusExclude, TRIAL_MEMBER_LIMIT} from "../shared/constants";
+import {statusExclude} from "../shared/constants";
 import {NotificationsService} from "../services/notifications/notifications.service";
 
 export default class ProjectMembersController extends WorklenzControllerBase {
@@ -118,17 +118,6 @@ export default class ProjectMembersController extends WorklenzControllerBase {
       return res.status(200).send(new ServerResponse(false, null, "Maximum number of life time users reached."));
     }
 
-    /**
-   * Checks trial user team member limit
-   */
-    if (subscriptionData.subscription_status === "trialing") {
-      const currentTrialMembers = parseInt(subscriptionData.current_count) || 0;
-      
-      if (currentTrialMembers + 1 > TRIAL_MEMBER_LIMIT) {
-        return res.status(200).send(new ServerResponse(false, null, `Trial users cannot exceed ${TRIAL_MEMBER_LIMIT} team members. Please upgrade to add more members.`));
-      }
-    }
-
     // if (subscriptionData.status === "trialing") break;
     if (!userExists && !subscriptionData.is_credit && !subscriptionData.is_custom && subscriptionData.subscription_status !== "trialing") {
       // if (subscriptionData.subscription_status === "active") {

worklenz-backend/src/controllers/reporting/reporting-controller-base-with-timezone.ts

@@ -17,7 +17,7 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
                JOIN timezones tz ON u.timezone_id = tz.id 
                WHERE u.id = $1`;
     const result = await db.query(q, [userId]);
-    return result.rows[0]?.timezone || "UTC";
+    return result.rows[0]?.timezone || 'UTC';
   }
 
   /**
@@ -30,43 +30,20 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
   protected static getDateRangeClauseWithTimezone(key: string, dateRange: string[], userTimezone: string) {
     // For custom date ranges
     if (dateRange.length === 2) {
-      try {
+      // Convert dates to user's timezone start/end of day
-        // Handle different date formats that might come from frontend
+      const start = moment.tz(dateRange[0], userTimezone).startOf('day');
-        let startDate, endDate;
+      const end = moment.tz(dateRange[1], userTimezone).endOf('day');
       
-        // Try to parse the date - it might be a full JS Date string or ISO string
+      // Convert to UTC for database comparison
-        if (dateRange[0].includes("GMT") || dateRange[0].includes("(")) {
+      const startUtc = start.utc().format("YYYY-MM-DD HH:mm:ss");
-          // Parse JavaScript Date toString() format
+      const endUtc = end.utc().format("YYYY-MM-DD HH:mm:ss");
-          startDate = moment(new Date(dateRange[0]));
-          endDate = moment(new Date(dateRange[1]));
-        } else {
-          // Parse ISO format or other formats
-          startDate = moment(dateRange[0]);
-          endDate = moment(dateRange[1]);
-        }
       
-        // Convert to user's timezone and get start/end of day
+      if (start.isSame(end, 'day')) {
-        const start = startDate.tz(userTimezone).startOf("day");
+        // Single day selection
-        const end = endDate.tz(userTimezone).endOf("day");
+        return `AND task_work_log.created_at >= '${startUtc}'::TIMESTAMP AND task_work_log.created_at <= '${endUtc}'::TIMESTAMP`;
-        
-        // Convert to UTC for database comparison
-        const startUtc = start.utc().format("YYYY-MM-DD HH:mm:ss");
-        const endUtc = end.utc().format("YYYY-MM-DD HH:mm:ss");
-        
-        if (start.isSame(end, "day")) {
-          // Single day selection
-          return `AND twl.created_at >= '${startUtc}'::TIMESTAMP AND twl.created_at <= '${endUtc}'::TIMESTAMP`;
-        }
-        
-        return `AND twl.created_at >= '${startUtc}'::TIMESTAMP AND twl.created_at <= '${endUtc}'::TIMESTAMP`;
-      } catch (error) {
-        console.error("Error parsing date range:", error, { dateRange, userTimezone });
-        // Fallback to current date if parsing fails
-        const now = moment.tz(userTimezone);
-        const startUtc = now.clone().startOf("day").utc().format("YYYY-MM-DD HH:mm:ss");
-        const endUtc = now.clone().endOf("day").utc().format("YYYY-MM-DD HH:mm:ss");
-        return `AND twl.created_at >= '${startUtc}'::TIMESTAMP AND twl.created_at <= '${endUtc}'::TIMESTAMP`;
       }
+      
+      return `AND task_work_log.created_at >= '${startUtc}'::TIMESTAMP AND task_work_log.created_at <= '${endUtc}'::TIMESTAMP`;
     }
 
     // For predefined ranges, calculate based on user's timezone
@@ -75,20 +52,20 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
 
     switch (key) {
       case DATE_RANGES.YESTERDAY:
-        startDate = now.clone().subtract(1, "day").startOf("day");
+        startDate = now.clone().subtract(1, 'day').startOf('day');
-        endDate = now.clone().subtract(1, "day").endOf("day");
+        endDate = now.clone().subtract(1, 'day').endOf('day');
         break;
       case DATE_RANGES.LAST_WEEK:
-        startDate = now.clone().subtract(1, "week").startOf("week");
+        startDate = now.clone().subtract(1, 'week').startOf('week');
-        endDate = now.clone().subtract(1, "week").endOf("week");
+        endDate = now.clone().subtract(1, 'week').endOf('week');
         break;
       case DATE_RANGES.LAST_MONTH:
-        startDate = now.clone().subtract(1, "month").startOf("month");
+        startDate = now.clone().subtract(1, 'month').startOf('month');
-        endDate = now.clone().subtract(1, "month").endOf("month");
+        endDate = now.clone().subtract(1, 'month').endOf('month');
         break;
       case DATE_RANGES.LAST_QUARTER:
-        startDate = now.clone().subtract(3, "months").startOf("day");
+        startDate = now.clone().subtract(3, 'months').startOf('day');
-        endDate = now.clone().endOf("day");
+        endDate = now.clone().endOf('day');
         break;
       default:
         return "";
@@ -97,7 +74,7 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
     if (startDate && endDate) {
       const startUtc = startDate.utc().format("YYYY-MM-DD HH:mm:ss");
       const endUtc = endDate.utc().format("YYYY-MM-DD HH:mm:ss");
-      return `AND twl.created_at >= '${startUtc}'::TIMESTAMP AND twl.created_at <= '${endUtc}'::TIMESTAMP`;
+      return `AND task_work_log.created_at >= '${startUtc}'::TIMESTAMP AND task_work_log.created_at <= '${endUtc}'::TIMESTAMP`;
     }
 
     return "";
@@ -110,7 +87,7 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
    * @param format - Moment format string
    * @returns Formatted date string
    */
-  protected static formatDateInTimezone(date: string | Date, userTimezone: string, format = "YYYY-MM-DD HH:mm:ss") {
+  protected static formatDateInTimezone(date: string | Date, userTimezone: string, format: string = "YYYY-MM-DD HH:mm:ss") {
     return moment.tz(date, userTimezone).format(format);
   }
 
@@ -127,12 +104,12 @@ export default abstract class ReportingControllerBaseWithTimezone extends Workle
     let workingDays = 0;
     
     const current = start.clone();
-    while (current.isSameOrBefore(end, "day")) {
+    while (current.isSameOrBefore(end, 'day')) {
       // Monday = 1, Friday = 5
       if (current.isoWeekday() >= 1 && current.isoWeekday() <= 5) {
         workingDays++;
       }
-      current.add(1, "day");
+      current.add(1, 'day');
     }
     
     return workingDays;

worklenz-backend/src/controllers/survey-controller.ts

@@ -164,38 +164,4 @@ export default class SurveyController extends WorklenzControllerBase {
 
     return res.status(200).send(new ServerResponse(true, response));
   }
-
-  @HandleExceptions()
-  public static async checkAccountSetupSurveyStatus(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
-    const userId = req.user?.id;
-
-    if (!userId) {
-      return res.status(200).send(new ServerResponse(false, null, "User not authenticated"));
-    }
-
-    const q = `
-      SELECT EXISTS(
-        SELECT 1 
-        FROM survey_responses sr
-        INNER JOIN surveys s ON sr.survey_id = s.id
-        WHERE sr.user_id = $1 
-        AND s.survey_type = 'account_setup'
-        AND sr.is_completed = true
-      ) as is_completed,
-      (
-        SELECT sr.completed_at
-        FROM survey_responses sr
-        INNER JOIN surveys s ON sr.survey_id = s.id
-        WHERE sr.user_id = $1 
-        AND s.survey_type = 'account_setup'
-        AND sr.is_completed = true
-        LIMIT 1
-      ) as completed_at;
-    `;
-
-    const result = await db.query(q, [userId]);
-    const status = result.rows[0] || { is_completed: false, completed_at: null };
-
-    return res.status(200).send(new ServerResponse(true, status));
-  }
 }

worklenz-backend/src/controllers/task-comments-controller.ts

@@ -217,43 +217,7 @@ export default class TaskCommentsController extends WorklenzControllerBase {
       }
     }
 
-    // Get user avatar URL from database
+    return res.status(200).send(new ServerResponse(true, data.comment));
-    const avatarQuery = `SELECT avatar_url FROM users WHERE id = $1`;
-    const avatarResult = await db.query(avatarQuery, [req.user?.id]);
-    const avatarUrl = avatarResult.rows[0]?.avatar_url || "";
-
-    // Get comment details including created_at
-    const commentQuery = `SELECT created_at FROM task_comments WHERE id = $1`;
-    const commentResult = await db.query(commentQuery, [response.id]);
-    const commentData = commentResult.rows[0];
-
-    // Get attachments if any
-    const attachmentsQuery = `SELECT id, name, type, size FROM task_comment_attachments WHERE comment_id = $1`;
-    const attachmentsResult = await db.query(attachmentsQuery, [response.id]);
-    const commentAttachments = attachmentsResult.rows.map(att => ({
-      id: att.id,
-      name: att.name,
-      type: att.type,
-      size: att.size
-    }));
-
-
-    const commentdata = {
-      attachments: commentAttachments,
-      avatar_url: avatarUrl,
-      content: req.body.content,
-      created_at: commentData?.created_at || new Date().toISOString(),
-      edit: false,
-      id: response.id,
-      member_name: req.user?.name || "",
-      mentions: mentions || [],
-      rawContent: req.body.content,
-      reactions: { likes: {} },
-      team_member_id: req.user?.team_member_id || "",
-      user_id: req.user?.id || ""
-    };
-
-    return res.status(200).send(new ServerResponse(true, commentdata));
   }
 
   @HandleExceptions()

worklenz-backend/src/controllers/team-members-controller.ts

@@ -13,7 +13,7 @@ import { SocketEvents } from "../socket.io/events";
 import WorklenzControllerBase from "./worklenz-controller-base";
 import HandleExceptions from "../decorators/handle-exceptions";
 import { formatDuration, getColor } from "../shared/utils";
-import { statusExclude, TEAM_MEMBER_TREE_MAP_COLOR_ALPHA, TRIAL_MEMBER_LIMIT } from "../shared/constants";
+import { statusExclude, TEAM_MEMBER_TREE_MAP_COLOR_ALPHA } from "../shared/constants";
 import { checkTeamSubscriptionStatus } from "../shared/paddle-utils";
 import { updateUsers } from "../shared/paddle-requests";
 import { NotificationsService } from "../services/notifications/notifications.service";
@@ -141,17 +141,6 @@ export default class TeamMembersController extends WorklenzControllerBase {
       return res.status(200).send(new ServerResponse(false, null, "Cannot exceed the maximum number of life time users."));
     }
 
-    /**
-   * Checks trial user team member limit
-   */
-    if (subscriptionData.subscription_status === "trialing") {
-      const currentTrialMembers = parseInt(subscriptionData.current_count) || 0;
-      
-      if (currentTrialMembers + incrementBy > TRIAL_MEMBER_LIMIT) {
-        return res.status(200).send(new ServerResponse(false, null, `Trial users cannot exceed ${TRIAL_MEMBER_LIMIT} team members. Please upgrade to add more members.`));
-      }
-    }
-
     /**
    * Checks subscription details and updates the user count if applicable.
    * Sends a response if there is an issue with the subscription.
@@ -1092,18 +1081,6 @@ export default class TeamMembersController extends WorklenzControllerBase {
       return res.status(200).send(new ServerResponse(false, "Please check your subscription status."));
     }
 
-    /**
-   * Checks trial user team member limit
-   */
-    if (subscriptionData.subscription_status === "trialing") {
-      const currentTrialMembers = parseInt(subscriptionData.current_count) || 0;
-      const emailsToAdd = req.body.emails?.length || 1;
-      
-      if (currentTrialMembers + emailsToAdd > TRIAL_MEMBER_LIMIT) {
-        return res.status(200).send(new ServerResponse(false, null, `Trial users cannot exceed ${TRIAL_MEMBER_LIMIT} team members. Please upgrade to add more members.`));
-      }
-    }
-
     // if (subscriptionData.status === "trialing") break;
     if (!subscriptionData.is_credit && !subscriptionData.is_custom) {
       if (subscriptionData.subscription_status === "active") {

worklenz-backend/src/controllers/user-activity-logs-controller.ts

@@ -1,117 +0,0 @@
-import moment from "moment";
-import { IWorkLenzRequest } from "../interfaces/worklenz-request";
-import { IWorkLenzResponse } from "../interfaces/worklenz-response";
-
-import db from "../config/db";
-
-import { ServerResponse } from "../models/server-response";
-import WorklenzControllerBase from "./worklenz-controller-base";
-import HandleExceptions from "../decorators/handle-exceptions";
-import { formatDuration, formatLogText, getColor } from "../shared/utils";
-
-interface IUserRecentTask {
-    task_id: string;
-    task_name: string;
-    project_id: string;
-    project_name: string;
-    last_activity_at: string;
-    activity_count: number;
-    project_color?: string;
-    task_status?: string;
-    status_color?: string;
-}
-
-interface IUserTimeLoggedTask {
-    task_id: string;
-    task_name: string;
-    project_id: string;
-    project_name: string;
-    total_time_logged: number;
-    total_time_logged_string: string;
-    last_logged_at: string;
-    logged_by_timer: boolean;
-    project_color?: string;
-    task_status?: string;
-    status_color?: string;
-    log_entries_count?: number;
-    estimated_time?: number;
-}
-
-export default class UserActivityLogsController extends WorklenzControllerBase {
-    @HandleExceptions()
-    public static async getRecentTasks(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
-        if (!req.user) {
-            return res.status(401).send(new ServerResponse(false, null, "Unauthorized"));
-        }
-
-        const { id: userId, team_id: teamId } = req.user;
-        const { offset = 0, limit = 10 } = req.query;
-
-        // Optimized query with better performance and team filtering
-        const q = `
-        SELECT DISTINCT tal.task_id, t.name AS task_name, tal.project_id, p.name AS project_name,
-               MAX(tal.created_at) AS last_activity_at,
-               COUNT(DISTINCT tal.id) AS activity_count,
-               p.color_code AS project_color,
-               (SELECT name FROM task_statuses WHERE id = t.status_id) AS task_status,
-               (SELECT color_code 
-                FROM sys_task_status_categories 
-                WHERE id = (SELECT category_id FROM task_statuses WHERE id = t.status_id)) AS status_color
-        FROM task_activity_logs tal
-        INNER JOIN tasks t ON tal.task_id = t.id AND t.archived = FALSE
-        INNER JOIN projects p ON tal.project_id = p.id AND p.team_id = $1
-        WHERE tal.user_id = $2
-          AND tal.created_at >= NOW() - INTERVAL '30 days'
-        GROUP BY tal.task_id, t.name, tal.project_id, p.name, p.color_code, t.status_id
-        ORDER BY MAX(tal.created_at) DESC
-        LIMIT $3 OFFSET $4;
-        `;
-
-        const result = await db.query(q, [teamId, userId, limit, offset]);
-        const tasks: IUserRecentTask[] = result.rows;
-
-        return res.status(200).send(new ServerResponse(true, tasks));
-    }
-
-    @HandleExceptions()
-    public static async getTimeLoggedTasks(req: IWorkLenzRequest, res: IWorkLenzResponse): Promise<IWorkLenzResponse> {
-        if (!req.user) {
-            return res.status(401).send(new ServerResponse(false, null, "Unauthorized"));
-        }
-
-        const { id: userId, team_id: teamId } = req.user;
-        const { offset = 0, limit = 10 } = req.query;
-
-        // Optimized query with better performance, team filtering, and useful additional data
-        const q = `
-        SELECT twl.task_id, t.name AS task_name, t.project_id, p.name AS project_name,
-               SUM(twl.time_spent) AS total_time_logged,
-               MAX(twl.created_at) AS last_logged_at,
-               MAX(twl.logged_by_timer::int)::boolean AS logged_by_timer,
-               p.color_code AS project_color,
-               (SELECT name FROM task_statuses WHERE id = t.status_id) AS task_status,
-               (SELECT color_code 
-                FROM sys_task_status_categories 
-                WHERE id = (SELECT category_id FROM task_statuses WHERE id = t.status_id)) AS status_color,
-               COUNT(DISTINCT twl.id) AS log_entries_count,
-               (t.total_minutes * 60) AS estimated_time
-        FROM task_work_log twl
-        INNER JOIN tasks t ON twl.task_id = t.id AND t.archived = FALSE
-        INNER JOIN projects p ON t.project_id = p.id AND p.team_id = $1
-        WHERE twl.user_id = $2
-          AND twl.created_at >= NOW() - INTERVAL '90 days'
-        GROUP BY twl.task_id, t.name, t.project_id, p.name, p.color_code, t.status_id, t.total_minutes
-        HAVING SUM(twl.time_spent) > 0
-        ORDER BY MAX(twl.created_at) DESC
-        LIMIT $3 OFFSET $4;
-        `;
-
-        const result = await db.query(q, [teamId, userId, limit, offset]);
-        const tasks: IUserTimeLoggedTask[] = result.rows.map(task => ({
-            ...task,
-            total_time_logged_string: formatDuration(moment.duration(task.total_time_logged, "seconds")),
-        }));
-
-        return res.status(200).send(new ServerResponse(true, tasks));
-    }
-}

worklenz-backend/src/middlewares/session-middleware.ts

@@ -1,13 +1,11 @@
 import session from "express-session";
 import db from "../config/db";
 import { isProduction } from "../shared/utils";
-import * as cookieSignature from "cookie-signature";
-import { randomBytes } from "crypto";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const pgSession = require("connect-pg-simple")(session);
 
-const sessionConfig = {
+export default session({
   name: process.env.SESSION_NAME,
   secret: process.env.SESSION_SECRET || "development-secret-key",
   proxy: false,
@@ -20,56 +18,10 @@ const sessionConfig = {
   }),
   cookie: {
     path: "/",
-    httpOnly: true,
+    // secure: isProduction(),
-    // For mobile app support in production, use "none", for local development use "lax"
+    // httpOnly: isProduction(),
-    sameSite: "lax" as const,
+    // sameSite: "none",
-    // Secure only in production (HTTPS required for sameSite: "none")
+    // domain: isProduction() ? ".worklenz.com" : undefined,
-    secure: false,
-    domain: undefined,
     maxAge: 30 * 24 * 60 * 60 * 1000 // 30 days
-  },
-  // Custom session ID handling for mobile apps
-  genid: () => {
-    return randomBytes(24).toString("base64url");
   }
-};
+});
-
-const sessionMiddleware = session(sessionConfig);
-
-// Enhanced session middleware that supports both cookies and headers for mobile apps
-export default (req: any, res: any, next: any) => {
-  // Check if mobile app is sending session ID via header (fallback for cookie issues)
-  const headerSessionId = req.headers["x-session-id"];
-  const headerSessionName = req.headers["x-session-name"];
-  
-  // Only process headers if they exist AND there's no existing valid session cookie
-  if (headerSessionId && headerSessionName) {
-    const secret = process.env.SESSION_SECRET || "development-secret-key";
-    
-    try {
-      // Create a signed cookie using the session secret
-      const signedSessionId = `s:${cookieSignature.sign(headerSessionId, secret)}`;
-      const encodedSignedId = encodeURIComponent(signedSessionId);
-      const sessionCookie = `${headerSessionName}=${encodedSignedId}`;
-      
-      if (req.headers.cookie) {
-        // Replace existing session cookie while keeping other cookies
-        req.headers.cookie = req.headers.cookie
-          .split(";")
-          .filter((cookie: string) => !cookie.trim().startsWith(headerSessionName))
-          .concat(sessionCookie)
-          .join(";");
-      } else {
-        // Set the session cookie from header
-        req.headers.cookie = sessionCookie;
-      }
-    } catch (error) {
-      // Fallback to the old method
-      const sessionCookie = `${headerSessionName}=s%3A${headerSessionId}`;
-      req.headers.cookie = sessionCookie;
-    }
-  }
-  
-  // Always call the original session middleware (handles both cookie and header-converted cases)
-  sessionMiddleware(req, res, next);
-};

worklenz-backend/src/middlewares/validators/password-validator.ts

@@ -8,7 +8,7 @@ import {PASSWORD_POLICY} from "../../shared/constants";
 function isStrongPassword(password: string) {
   if (!isProduction()) return true;
   const strength = PasswordStrengthChecker.validate(password);
-  return strength.value >= 2 && strength.length <= 32;
+  return strength.value >= 2 && strength.length < 32;
 }
 
 export default function (req: Request, res: Response, next: NextFunction) {

worklenz-backend/src/middlewares/validators/survey-submission-validator.ts

@@ -27,7 +27,10 @@ export default function surveySubmissionValidator(req: IWorkLenzRequest, res: IW
       return res.status(200).send(new ServerResponse(false, null, `Answer ${i + 1}: Question ID is required and must be a string`));
     }
 
-    // answer_text and answer_json are both optional - users can submit empty answers
+    // At least one of answer_text or answer_json should be provided
+    if (!answer.answer_text && !answer.answer_json) {
+      return res.status(200).send(new ServerResponse(false, null, `Answer ${i + 1}: Either answer_text or answer_json is required`));
+    }
 
     // Validate answer_text if provided
     if (answer.answer_text && typeof answer.answer_text !== 'string') {

worklenz-backend/src/passport/index.ts

@@ -4,7 +4,6 @@ import {deserialize} from "./deserialize";
 import {serialize} from "./serialize";
 
 import GoogleLogin from "./passport-strategies/passport-google";
-import GoogleMobileLogin from "./passport-strategies/passport-google-mobile";
 import LocalLogin from "./passport-strategies/passport-local-login";
 import LocalSignup from "./passport-strategies/passport-local-signup";
 
@@ -16,7 +15,6 @@ export default (passport: PassportStatic) => {
   passport.use("local-login", LocalLogin);
   passport.use("local-signup", LocalSignup);
   passport.use(GoogleLogin);
-  passport.use("google-mobile", GoogleMobileLogin);
   passport.serializeUser(serialize);
   passport.deserializeUser(deserialize);
 };

worklenz-backend/src/passport/passport-strategies/passport-google-mobile.ts

@@ -1,110 +0,0 @@
-import { Strategy as CustomStrategy } from "passport-custom";
-import axios from "axios";
-import { Request } from "express";
-import db from "../../config/db";
-import { log_error } from "../../shared/utils";
-import { ERROR_KEY } from "./passport-constants";
-
-interface GoogleTokenProfile {
-  sub: string;
-  email: string;
-  name: string;
-  picture: string;
-  email_verified: boolean;
-  aud: string;
-  iss: string;
-  exp: number;
-}
-
-async function handleMobileGoogleAuth(req: Request, done: any) {
-  try {
-    const { idToken } = req.body;
-
-    if (!idToken) {
-      return done(null, false, { message: "ID token is required" });
-    }
-
-    // Verify Google ID token
-    const response = await axios.get(
-      `https://oauth2.googleapis.com/tokeninfo?id_token=${idToken}`
-    );
-    const profile: GoogleTokenProfile = response.data;
-
-    // Validate token audience (client ID)
-    const allowedClientIds = [
-      process.env.GOOGLE_CLIENT_ID,
-      process.env.GOOGLE_ANDROID_CLIENT_ID,
-      process.env.GOOGLE_IOS_CLIENT_ID,
-    ].filter(Boolean);
-
-    if (!allowedClientIds.includes(profile.aud)) {
-      return done(null, false, { message: "Invalid token audience" });
-    }
-
-    // Validate token issuer
-    if (
-      !["https://accounts.google.com", "accounts.google.com"].includes(
-        profile.iss
-      )
-    ) {
-      return done(null, false, { message: "Invalid token issuer" });
-    }
-
-    // Check token expiry
-    if (Date.now() >= profile.exp * 1000) {
-      return done(null, false, { message: "Token expired" });
-    }
-
-    if (!profile.email_verified) {
-      return done(null, false, { message: "Email not verified" });
-    }
-
-    // Check for existing local account
-    const localAccountResult = await db.query(
-      "SELECT 1 FROM users WHERE email = $1 AND password IS NOT NULL AND is_deleted IS FALSE;",
-      [profile.email]
-    );
-
-    if (localAccountResult.rowCount) {
-      const message = `No Google account exists for email ${profile.email}.`;
-      return done(null, false, { message });
-    }
-
-    // Check if user exists
-    const userResult = await db.query(
-      "SELECT id, google_id, name, email, active_team FROM users WHERE google_id = $1 OR email = $2;",
-      [profile.sub, profile.email]
-    );
-
-    if (userResult.rowCount) {
-      // Existing user - login
-      const user = userResult.rows[0];
-      return done(null, user, { message: "User successfully logged in" });
-    }
-    // New user - register
-    const googleUserData = {
-      id: profile.sub,
-      displayName: profile.name,
-      email: profile.email,
-      picture: profile.picture,
-    };
-
-    const registerResult = await db.query(
-      "SELECT register_google_user($1) AS user;",
-      [JSON.stringify(googleUserData)]
-    );
-    const { user } = registerResult.rows[0];
-
-    return done(null, user, {
-      message: "User successfully registered and logged in",
-    });
-  } catch (error: any) {
-    log_error(error);
-    if (error.response?.status === 400) {
-      return done(null, false, { message: "Invalid ID token" });
-    }
-    return done(error);
-  }
-}
-
-export default new CustomStrategy(handleMobileGoogleAuth);

worklenz-backend/src/public/locales/alb/task-list-filters.json

@@ -81,12 +81,5 @@
   "delete": "Fshi",
   "enterStatusName": "Shkruani emrin e statusit",
   "selectCategory": "Zgjidh kategorinë",
-  "close": "Mbyll",
+  "close": "Mbyll"
-  "clearSort": "Pastro Renditjen",
-  "sortAscending": "Rendit në Rritje",
-  "sortDescending": "Rendit në Zbritje",
-  "sortByField": "Rendit sipas {{field}}",
-  "ascendingOrder": "Rritës",
-  "descendingOrder": "Zbritës",
-  "currentSort": "Renditja aktuale: {{field}} {{order}}"
 }

worklenz-backend/src/public/locales/de/task-list-filters.json

@@ -81,12 +81,5 @@
   "delete": "Löschen",
   "enterStatusName": "Statusnamen eingeben",
   "selectCategory": "Kategorie auswählen",
-  "close": "Schließen",
+  "close": "Schließen"
-  "clearSort": "Sortierung löschen",
-  "sortAscending": "Aufsteigend sortieren",
-  "sortDescending": "Absteigend sortieren",
-  "sortByField": "Sortieren nach {{field}}",
-  "ascendingOrder": "Aufsteigend",
-  "descendingOrder": "Absteigend",
-  "currentSort": "Aktuelle Sortierung: {{field}} {{order}}"
 }

worklenz-backend/src/public/locales/en/task-list-filters.json

@@ -81,12 +81,5 @@
   "delete": "Delete",
   "enterStatusName": "Enter status name",
   "selectCategory": "Select category",
-  "close": "Close",
+  "close": "Close"
-  "clearSort": "Clear Sort",
-  "sortAscending": "Sort Ascending",
-  "sortDescending": "Sort Descending",
-  "sortByField": "Sort by {{field}}",
-  "ascendingOrder": "Ascending",
-  "descendingOrder": "Descending",
-  "currentSort": "Current sort: {{field}} {{order}}"
 }

worklenz-backend/src/public/locales/es/task-list-filters.json

@@ -77,12 +77,5 @@
   "delete": "Eliminar",
   "enterStatusName": "Introducir nombre del estado",
   "selectCategory": "Seleccionar categoría",
-  "close": "Cerrar",
+  "close": "Cerrar"
-  "clearSort": "Limpiar Ordenamiento",
-  "sortAscending": "Ordenar Ascendente",
-  "sortDescending": "Ordenar Descendente",
-  "sortByField": "Ordenar por {{field}}",
-  "ascendingOrder": "Ascendente",
-  "descendingOrder": "Descendente",
-  "currentSort": "Ordenamiento actual: {{field}} {{order}}"
 }

worklenz-backend/src/public/locales/pt/task-list-filters.json

@@ -78,12 +78,5 @@
   "delete": "Excluir",
   "enterStatusName": "Digite o nome do status",
   "selectCategory": "Selecionar categoria",
-  "close": "Fechar",
+  "close": "Fechar"
-  "clearSort": "Limpar Ordenação",
-  "sortAscending": "Ordenar Crescente",
-  "sortDescending": "Ordenar Decrescente",
-  "sortByField": "Ordenar por {{field}}",
-  "ascendingOrder": "Crescente",
-  "descendingOrder": "Decrescente",
-  "currentSort": "Ordenação atual: {{field}} {{order}}"
 }

worklenz-backend/src/public/locales/zh/task-list-filters.json

@@ -75,12 +75,5 @@
   "delete": "删除",
   "enterStatusName": "输入状态名称",
   "selectCategory": "选择类别",
-  "close": "关闭",
+  "close": "关闭"
-  "clearSort": "清除排序",
-  "sortAscending": "升序排列",
-  "sortDescending": "降序排列",
-  "sortByField": "按{{field}}排序",
-  "ascendingOrder": "升序",
-  "descendingOrder": "降序",
-  "currentSort": "当前排序：{{field}} {{order}}"
 }

worklenz-backend/src/routes/apis/index.ts

@@ -57,9 +57,7 @@ import billingApiRouter from "./billing-api-router";
 import taskDependenciesApiRouter from "./task-dependencies-api-router";
 
 import taskRecurringApiRouter from "./task-recurring-api-router";
-
+
-import customColumnsApiRouter from "./custom-columns-api-router";
-import userActivityLogsApiRouter from "./user-activity-logs-api-router";
 import customColumnsApiRouter from "./custom-columns-api-router";
 
 const api = express.Router();
@@ -121,5 +119,4 @@ api.use("/task-recurring", taskRecurringApiRouter);
 api.use("/task-recurring", taskRecurringApiRouter);
 
 api.use("/custom-columns", customColumnsApiRouter);
-api.use("/logs", userActivityLogsApiRouter);
 

worklenz-backend/src/routes/apis/labels-api-router.ts

@@ -11,7 +11,6 @@ labelsApiRouter.get("/", safeControllerFunction(LabelsController.get));
 labelsApiRouter.get("/tasks/:id", idParamValidator, safeControllerFunction(LabelsController.getByTask));
 labelsApiRouter.get("/project/:id", idParamValidator, safeControllerFunction(LabelsController.getByProject));
 labelsApiRouter.put("/tasks/:id", idParamValidator, teamOwnerOrAdminValidator, safeControllerFunction(LabelsController.updateColor));
-labelsApiRouter.put("/team/:id", idParamValidator, teamOwnerOrAdminValidator, safeControllerFunction(LabelsController.updateLabel));
 labelsApiRouter.delete("/team/:id", idParamValidator, teamOwnerOrAdminValidator, safeControllerFunction(LabelsController.deleteById));
 
 export default labelsApiRouter;

worklenz-backend/src/routes/apis/survey-api-router.ts

@@ -8,9 +8,6 @@ const surveyApiRouter = express.Router();
 // Get account setup survey with questions
 surveyApiRouter.get("/account-setup", safeControllerFunction(SurveyController.getAccountSetupSurvey));
 
-// Check if user has completed account setup survey
-surveyApiRouter.get("/account-setup/status", safeControllerFunction(SurveyController.checkAccountSetupSurveyStatus));
-
 // Submit survey response
 surveyApiRouter.post("/responses", surveySubmissionValidator, safeControllerFunction(SurveyController.submitSurveyResponse));
 

worklenz-backend/src/routes/apis/user-activity-logs-api-router.ts

@@ -1,11 +0,0 @@
-import express from 'express';
-
-import UserActivityLogsController from '../../controllers/user-activity-logs-controller';
-import safeControllerFunction from "../../shared/safe-controller-function";
-
-const userActivityLogsApiRouter = express.Router();
-
-userActivityLogsApiRouter.get('/user-recent-tasks', safeControllerFunction(UserActivityLogsController.getRecentTasks));
-userActivityLogsApiRouter.get('/user-time-logged-tasks', safeControllerFunction(UserActivityLogsController.getTimeLoggedTasks));
-
-export default userActivityLogsApiRouter;

worklenz-backend/src/routes/auth/index.ts

@@ -8,7 +8,6 @@ import resetEmailValidator from "../../middlewares/validators/reset-email-valida
 import updatePasswordValidator from "../../middlewares/validators/update-password-validator";
 import passwordValidator from "../../middlewares/validators/password-validator";
 import safeControllerFunction from "../../shared/safe-controller-function";
-import FileConstants from "../../shared/file-constants";
 
 const authRouter = express.Router();
 
@@ -56,9 +55,6 @@ authRouter.get("/google/verify", (req, res) => {
   })(req, res);
 });
 
-// Mobile Google Sign-In using Passport strategy
-authRouter.post("/google/mobile", AuthController.googleMobileAuthPassport);
-
 // Passport logout
 authRouter.get("/logout", AuthController.logout);
 

worklenz-backend/src/shared/constants.ts

@@ -6,7 +6,7 @@ export const DEFAULT_ERROR_MESSAGE = "Unknown error has occurred.";
 export const SessionsStatus = {
   IDLE: "IDLE",
   STARTED: "STARTED",
-  ENDED: "ENDED",
+  ENDED: "ENDED"
 };
 
 export const LOG_DESCRIPTIONS = {
@@ -18,33 +18,6 @@ export const LOG_DESCRIPTIONS = {
   PROJECT_MEMBER_REMOVED: "was removed from the project by",
 };
 
-export const WorklenzColorShades = {
-  "#154c9b": ["#0D2A50", "#112E54", "#153258", "#19365C", "#1D3A60", "#213E64", "#254268", "#29466C", "#2D4A70", "#314E74"],
-  "#3b7ad4": ["#224884", "#26528A", "#2A5C90", "#2E6696", "#32709C", "#367AA2", "#3A84A8", "#3E8EAE", "#4298B4", "#46A2BA"],
-  "#70a6f3": ["#3D5D8A", "#46679E", "#5071B2", "#597BC6", "#6385DA", "#6C8FEE", "#7699F2", "#7FA3F6", "#89ADFA", "#92B7FE"],
-  "#7781ca": ["#42486F", "#4C5283", "#565C97", "#6066AB", "#6A70BF", "#747AD3", "#7E84E7", "#888EFB", "#9298FF", "#9CA2FF"],
-  "#9877ca": ["#542D70", "#6E3A8A", "#8847A4", "#A254BE", "#BC61D8", "#D66EF2", "#E07BFC", "#EA88FF", "#F495FF", "#FEA2FF"],
-  "#c178c9": ["#6A2E6F", "#843B89", "#9E48A3", "#B855BD", "#D262D7", "#EC6FF1", "#F67CFB", "#FF89FF", "#FF96FF", "#FFA3FF"],
-  "#ee87c5": ["#832C6A", "#9D3984", "#B7469E", "#D153B8", "#EB60D2", "#FF6DEC", "#FF7AF6", "#FF87FF", "#FF94FF", "#FFA1FF"],
-  "#ca7881": ["#6F2C3E", "#893958", "#A34672", "#BD538C", "#D760A6", "#F16DC0", "#FB7ADA", "#FF87F4", "#FF94FF", "#FFA1FF"],
-  "#75c9c0": ["#3F6B66", "#497E7A", "#53918E", "#5DA4A2", "#67B7B6", "#71CBCA", "#7BDEDE", "#85F2F2", "#8FFFFF", "#99FFFF"],
-  "#75c997": ["#3F6B54", "#497E6A", "#53917F", "#5DA495", "#67B7AA", "#71CBBF", "#7BDED4", "#85F2E9", "#8FFFFF", "#99FFFF"],
-  "#80ca79": ["#456F3E", "#5A804D", "#6F935C", "#84A66B", "#99B97A", "#AECC89", "#C3DF98", "#D8F2A7", "#EDFFB6", "#FFFFC5"],
-  "#aacb78": ["#5F6F3E", "#7A804D", "#94935C", "#AFA66B", "#CAB97A", "#E5CC89", "#FFDF98", "#FFF2A7", "#FFFFB6", "#FFFFC5"],
-  "#cbbc78": ["#6F5D3E", "#8A704D", "#A4835C", "#BF966B", "#DAA97A", "#F5BC89", "#FFCF98", "#FFE2A7", "#FFF5B6", "#FFFFC5"],
-  "#cb9878": ["#704D3E", "#8B604D", "#A6735C", "#C1866B", "#DC997A", "#F7AC89", "#FFBF98", "#FFD2A7", "#FFE5B6", "#FFF8C5"],
-  "#bb774c": ["#653D27", "#80502C", "#9B6331", "#B67636", "#D1893B", "#EC9C40", "#FFAF45", "#FFC24A", "#FFD54F", "#FFE854"],
-  "#905b39": ["#4D2F1A", "#623C23", "#774A2C", "#8C5735", "#A1643E", "#B67147", "#CB7E50", "#E08B59", "#F59862", "#FFA56B"],
-  "#903737": ["#4D1A1A", "#622323", "#772C2C", "#8C3535", "#A13E3E", "#B64747", "#CB5050", "#E05959", "#F56262", "#FF6B6B"],
-  "#bf4949": ["#661212", "#801B1B", "#992424", "#B32D2D", "#CC3636", "#E63F3F", "#FF4848", "#FF5151", "#FF5A5A", "#FF6363"],
-  "#f37070": ["#853A3A", "#A04D4D", "#BA6060", "#D47373", "#EF8686", "#FF9999", "#FFA3A3", "#FFACAC", "#FFB6B6", "#FFBFBF"],
-  "#ff9c3c": ["#8F5614", "#AA6F1F", "#C48829", "#DFA233", "#F9BB3D", "#FFC04E", "#FFC75F", "#FFCE70", "#FFD581", "#FFDB92"],
-  "#fbc84c": ["#8F6D14", "#AA862F", "#C4A029", "#DFB933", "#F9D23D", "#FFD74E", "#FFDC5F", "#FFE170", "#FFE681", "#FFEB92"],
-  "#cbc8a1": ["#6F6D58", "#8A886F", "#A4A286", "#BFBC9D", "#DAD6B4", "#F5F0CB", "#FFFEDE", "#FFFFF2", "#FFFFCD", "#FFFFCD"],
-  "#a9a9a9": ["#5D5D5D", "#757575", "#8D8D8D", "#A5A5A5", "#BDBDBD", "#D5D5D5", "#EDEDED", "#F5F5F5", "#FFFFFF", "#FFFFFF"],
-  "#767676": ["#404040", "#4D4D4D", "#5A5A5A", "#676767", "#747474", "#818181", "#8E8E8E", "#9B9B9B", "#A8A8A8", "#B5B5B5"]
-} as const;
-
 export const WorklenzColorCodes = [
   "#154c9b",
   "#3b7ad4",
@@ -73,33 +46,33 @@ export const WorklenzColorCodes = [
 ];
 
 export const AvatarNamesMap: { [x: string]: string } = {
-  A: "#154c9b",
+  "A": "#154c9b",
-  B: "#3b7ad4",
+  "B": "#3b7ad4",
-  C: "#70a6f3",
+  "C": "#70a6f3",
-  D: "#7781ca",
+  "D": "#7781ca",
-  E: "#9877ca",
+  "E": "#9877ca",
-  F: "#c178c9",
+  "F": "#c178c9",
-  G: "#ee87c5",
+  "G": "#ee87c5",
-  H: "#ca7881",
+  "H": "#ca7881",
-  I: "#75c9c0",
+  "I": "#75c9c0",
-  J: "#75c997",
+  "J": "#75c997",
-  K: "#80ca79",
+  "K": "#80ca79",
-  L: "#aacb78",
+  "L": "#aacb78",
-  M: "#cbbc78",
+  "M": "#cbbc78",
-  N: "#cb9878",
+  "N": "#cb9878",
-  O: "#bb774c",
+  "O": "#bb774c",
-  P: "#905b39",
+  "P": "#905b39",
-  Q: "#903737",
+  "Q": "#903737",
-  R: "#bf4949",
+  "R": "#bf4949",
-  S: "#f37070",
+  "S": "#f37070",
-  T: "#ff9c3c",
+  "T": "#ff9c3c",
-  U: "#fbc84c",
+  "U": "#fbc84c",
-  V: "#cbc8a1",
+  "V": "#cbc8a1",
-  W: "#a9a9a9",
+  "W": "#a9a9a9",
-  X: "#767676",
+  "X": "#767676",
-  Y: "#cb9878",
+  "Y": "#cb9878",
-  Z: "#903737",
+  "Z": "#903737",
-  "+": "#9e9e9e",
+  "+": "#9e9e9e"
 };
 
 export const NumbersColorMap: { [x: string]: string } = {
@@ -112,19 +85,19 @@ export const NumbersColorMap: { [x: string]: string } = {
   "6": "#ee87c5",
   "7": "#ca7881",
   "8": "#75c9c0",
-  "9": "#75c997",
+  "9": "#75c997"
 };
 
-export const PriorityColorCodes: { [x: number]: string } = {
+export const PriorityColorCodes: { [x: number]: string; } = {
   0: "#2E8B57",
   1: "#DAA520",
-  2: "#CD5C5C",
+  2: "#CD5C5C"
 };
 
-export const PriorityColorCodesDark: { [x: number]: string } = {
+export const PriorityColorCodesDark: { [x: number]: string; } = {
   0: "#3CB371",
   1: "#B8860B",
-  2: "#F08080",
+  2: "#F08080"
 };
 
 export const TASK_STATUS_TODO_COLOR = "#a9a9a9";
@@ -140,6 +113,7 @@ export const TASK_DUE_UPCOMING_COLOR = "#70a6f3";
 export const TASK_DUE_OVERDUE_COLOR = "#f37070";
 export const TASK_DUE_NO_DUE_COLOR = "#a9a9a9";
 
+
 export const DEFAULT_PAGE_SIZE = 20;
 
 // S3 Credentials
@@ -151,8 +125,7 @@ export const S3_SECRET_ACCESS_KEY = process.env.S3_SECRET_ACCESS_KEY || "";
 
 // Azure Blob Storage Credentials
 export const STORAGE_PROVIDER = process.env.STORAGE_PROVIDER || "s3";
-export const AZURE_STORAGE_ACCOUNT_NAME =
+export const AZURE_STORAGE_ACCOUNT_NAME = process.env.AZURE_STORAGE_ACCOUNT_NAME;
-  process.env.AZURE_STORAGE_ACCOUNT_NAME;
 export const AZURE_STORAGE_CONTAINER = process.env.AZURE_STORAGE_CONTAINER;
 export const AZURE_STORAGE_ACCOUNT_KEY = process.env.AZURE_STORAGE_ACCOUNT_KEY;
 export const AZURE_STORAGE_URL = process.env.AZURE_STORAGE_URL;
@@ -177,23 +150,16 @@ export const TEAM_MEMBER_TREE_MAP_COLOR_ALPHA = "40";
 
 // LICENSING SERVER URLS
 export const LOCAL_URL = "http://localhost:3001";
-export const UAT_SERVER_URL =
+export const UAT_SERVER_URL = process.env.UAT_SERVER_URL || "https://your-uat-server-url";
-  process.env.UAT_SERVER_URL || "https://your-uat-server-url";
+export const DEV_SERVER_URL = process.env.DEV_SERVER_URL || "https://your-dev-server-url";
-export const DEV_SERVER_URL =
+export const PRODUCTION_SERVER_URL = process.env.PRODUCTION_SERVER_URL || "https://your-production-server-url";
-  process.env.DEV_SERVER_URL || "https://your-dev-server-url";
-export const PRODUCTION_SERVER_URL =
-  process.env.PRODUCTION_SERVER_URL || "https://your-production-server-url";
 
 // *Sync with the client
-export const PASSWORD_POLICY =
+export const PASSWORD_POLICY = "Minimum of 8 characters, with upper and lowercase and a number and a symbol.";
-  "Minimum of 8 characters, with upper and lowercase and a number and a symbol.";
 
 // paddle status to exclude
 export const statusExclude = ["past_due", "paused", "deleted"];
 
-// Trial user team member limit
-export const TRIAL_MEMBER_LIMIT = 10;
-
 export const HTML_TAG_REGEXP = /<\/?[^>]+>/gi;
 
 export const UNMAPPED = "Unmapped";
@@ -203,5 +169,5 @@ export const DATE_RANGES = {
   LAST_WEEK: "LAST_WEEK",
   LAST_MONTH: "LAST_MONTH",
   LAST_QUARTER: "LAST_QUARTER",
-  ALL_TIME: "ALL_TIME",
+  ALL_TIME: "ALL_TIME"
 };

worklenz-frontend/.env.development

@@ -16,7 +16,3 @@ VITE_WORKLENZ_SESSION_ID=worklenz-session-id
 
 # Google Login
 VITE_ENABLE_GOOGLE_LOGIN=false
-
-# Survey Modal Configuration
-# Set to true to enable the survey modal, false to disable it
-VITE_ENABLE_SURVEY_MODAL=false

worklenz-frontend/.env.example

@@ -1,22 +0,0 @@
-VITE_API_URL=http://localhost:3000
-VITE_SOCKET_URL=ws://localhost:3000
-
-VITE_APP_TITLE=Worklenz
-VITE_APP_ENV=development
-
-# Mixpanel
-VITE_MIXPANEL_TOKEN=mixpanel-token
-
-# Recaptcha
-VITE_ENABLE_RECAPTCHA=false
-VITE_RECAPTCHA_SITE_KEY=recaptcha-site-key
-
-# Session ID
-VITE_WORKLENZ_SESSION_ID=worklenz-session-id
-
-# Google Login
-VITE_ENABLE_GOOGLE_LOGIN=false
-
-# Survey Modal Configuration
-# Set to true to enable the survey modal, false to disable it
-VITE_ENABLE_SURVEY_MODAL=false

worklenz-frontend/package.json

@@ -9,11 +9,7 @@
     "build": "vite build",
     "dev-build": "vite build",
     "serve": "vite preview",
-    "format": "prettier --write .",
+    "format": "prettier --write ."
-    "test": "vitest",
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
-    "test:ui": "vitest --ui"
   },
   "dependencies": {
     "@ant-design/colors": "^7.1.0",
@@ -81,10 +77,7 @@
     "@types/react-dom": "19.0.0",
     "@types/react-window": "^1.8.8",
     "@vitejs/plugin-react": "^4.3.4",
-    "@vitest/coverage-v8": "^3.2.4",
-    "@vitest/ui": "^3.2.4",
     "autoprefixer": "^10.4.21",
-    "jsdom": "^26.1.0",
     "postcss": "^8.5.2",
     "prettier-plugin-tailwindcss": "^0.6.13",
     "rollup": "^4.40.2",

worklenz-frontend/public/js/hubspot.js

@@ -15,7 +15,7 @@ class HubSpotManager {
    * Load HubSpot script with dark mode support
    */
   init() {
-    // if (!this.isProduction) return;
+    if (!this.isProduction) return;
 
     const loadHubSpot = () => {
       const script = document.createElement('script');
@@ -52,7 +52,6 @@ class HubSpotManager {
         existingStyle.remove();
       }
       
-      // Apply dark mode CSS if dark theme is active
       if (isDark) {
         this.injectDarkModeCSS();
       }
@@ -77,27 +76,40 @@ class HubSpotManager {
     style.id = this.styleId;
     style.textContent = `
       /* HubSpot Chat Widget Dark Mode Override */
-      /*
-        Note: We can only style the container backgrounds, not the widget UI inside the iframe.
-        HubSpot does not currently support external dark mode theming for the chat UI itself.
-      */
       #hubspot-conversations-inline-parent,
-      #hubspot-conversations-iframe-container {
+      #hubspot-conversations-iframe-container,
-        background: #141414 !important;
+      .shadow-2xl.widget-align-right.widget-align-bottom,
+      [data-test-id="chat-widget"],
+      [class*="VizExCollapsedChat"],
+      [class*="VizExExpandedChat"],
+      iframe[src*="hubspot"] {
+        filter: invert(1) hue-rotate(180deg) !important;
+        background: transparent !important;
       }
+      
       /* Target HubSpot widget container backgrounds */
       #hubspot-conversations-inline-parent div,
       #hubspot-conversations-iframe-container div,
       [data-test-id="chat-widget"] div {
         background-color: transparent !important;
       }
-      /* Ensure Worklenz app elements are not affected by HubSpot styles */
+      
-      .ant-menu,
+      /* Prevent double inversion of images, avatars, and icons */
-      .ant-menu *,
+      #hubspot-conversations-iframe-container img,
-      [class*="settings"],
+      #hubspot-conversations-iframe-container [style*="background-image"],
-      [class*="sidebar"],
+      #hubspot-conversations-iframe-container svg,
-      .worklenz-app *:not([id*="hubspot"]):not([class*="widget"]) {
+      iframe[src*="hubspot"] img,
-        filter: none !important;
+      iframe[src*="hubspot"] svg,
+      [data-test-id="chat-widget"] img,
+      [data-test-id="chat-widget"] svg {
+        filter: invert(1) hue-rotate(180deg) !important;
+      }
+      
+      /* Additional targeting for widget launcher and chat bubble */
+      div[class*="shadow-2xl"],
+      div[class*="widget-align"],
+      div[style*="position: fixed"] {
+        filter: invert(1) hue-rotate(180deg) !important;
       }
     `;
     document.head.appendChild(style);
@@ -123,10 +135,3 @@ document.addEventListener('DOMContentLoaded', () => {
   // Make available globally for potential cleanup
   window.HubSpotManager = hubspot;
 });
-
-// Add this style to ensure the chat widget uses the light color scheme
-(function() {
-  var style = document.createElement('style');
-  style.innerHTML = '#hubspot-messages-iframe-container { color-scheme: light !important; }';
-  document.head.appendChild(style);
-})();

worklenz-frontend/public/locales/alb/account-setup.json

@@ -41,7 +41,6 @@
   "step3InputLabel": "Fto me email",
   "addAnother": "Shto një tjetër",
   "skipForNow": "Kalo për tani",
-  "skipping": "Duke kaluar...",
   "formTitle": "Krijo detyrën tënde të parë.",
   "step3Title": "Fto ekipin tënd për të punuar së bashku",
   "maxMembers": " (Mund të ftoni deri në 5 anëtarë)",
@@ -81,8 +80,6 @@
   "discoveryQuestion": "Si dëgjove për ne?",
   "allSetTitle": "Çdo gjë gati!",
   "allSetDescription": "Le të krijojmë projektin tënd të parë dhe të fillojmë me Worklenz",
-  "surveyCompleteTitle": "Faleminderit!",
-  "surveyCompleteDescription": "Përgjigjet tuaja na ndihmojnë të përmirësojmë Worklenz për të gjithë",
   "aboutYouStepName": "Rreth teje",
   "yourNeedsStepName": "Nevojat e tua",
   "discoveryStepName": "Zbulimi",

worklenz-frontend/public/locales/alb/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "Regjistrimi dështoi. Ju lutemi sigurohuni që të gjitha fushat e nevojshme janë plotësuar dhe provoni përsëri.",
   "reconnecting": "Jeni shkëputur nga serveri.",
   "connection-lost": "Lidhja me serverin dështoi. Ju lutemi kontrolloni lidhjen tuaj me internet.",
-  "connection-restored": "U lidhët me serverin me sukses",
+  "connection-restored": "U lidhët me serverin me sukses"
-  "cancel": "Anulo",
-  "update-available": "Worklenz u përditesua!",
-  "update-description": "Një version i ri i Worklenz është i disponueshëm me karakteristikat dhe përmirësimet më të fundit.",
-  "update-instruction": "Për eksperiencën më të mirë, ju lutemi rifreskoni faqen për të aplikuar ndryshimet e reja.",
-  "update-whats-new": "💡 <1>Çfarë ka të re:</1> Përmirësim i performancës, rregullime të gabimeve dhe eksperiencön e përmirësuar e përdoruesit",
-  "update-now": "Përditeso tani",
-  "update-later": "Më vonë",
-  "updating": "Duke u përditesuar..."
 }

worklenz-frontend/public/locales/alb/home.json

@@ -41,22 +41,6 @@
     "list": "Listë",
     "calendar": "Kalendar",
     "tasks": "Detyrat",
-    "refresh": "Rifresko",
+    "refresh": "Rifresko"
-    "recentActivity": "Aktiviteti i Fundit",
-    "recentTasks": "Detyrat e Fundit",
-    "recentTasksSegment": "Detyrat e Fundit",
-    "timeLogged": "Koha e Regjistruar",
-    "timeLoggedSegment": "Koha e Regjistruar",
-    "noRecentTasks": "Asnjë detyrë e fundit",
-    "noTimeLoggedTasks": "Asnjë detyrë me kohë të regjistruar",
-    "activityTag": "Aktiviteti",
-    "timeLogTag": "Regjistrim Kohe",
-    "timerTag": "Kohëmatës",
-    "activitySingular": "aktivitet",
-    "activityPlural": "aktivitete",
-    "recentTaskAriaLabel": "Detyrë e fundit:",
-    "timeLoggedTaskAriaLabel": "Detyrë me kohë të regjistruar:",
-    "errorLoadingRecentTasks": "Gabim në ngarkimin e detyrave të fundit",
-    "errorLoadingTimeLoggedTasks": "Gabim në ngarkimin e detyrave me kohë të regjistruar"
   }
 }

worklenz-frontend/public/locales/alb/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "Kërko sipas emrit",
   "emptyText": "Etiketat mund të krijohen gjatë përditësimit ose krijimit të detyrave.",
   "pinTooltip": "Klikoni për ta fiksuar në menynë kryesore",
-  "colorChangeTooltip": "Klikoni për të ndryshuar ngjyrën",
+  "colorChangeTooltip": "Klikoni për të ndryshuar ngjyrën"
-  "pageTitle": "Menaxho Etiketat",
-  "deleteConfirmTitle": "Jeni i sigurt që dëshironi ta fshini këtë?",
-  "deleteButton": "Fshi",
-  "cancelButton": "Anulo"
 }

worklenz-frontend/public/locales/alb/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "Ndihmoni të përmirësojmë përvojën tuaj",
-  "skip": "Kalo për tani",
-  "previous": "Prapa",
-  "next": "Tjetra",
-  "completeSurvey": "Përfundo Anketën",
-  "submitting": "Duke dërguar përgjigjet tuaja...",
-  "submitSuccessTitle": "Faleminderit!",
-  "submitSuccessSubtitle": "Feedback-u juaj na ndihmon të përmirësojmë Worklenz për të gjithë.",
-  "submitSuccessMessage": "Faleminderit që plotësuat anketën!",
-  "submitErrorMessage": "Dështoi dërgimi i anketës. Ju lutemi provoni përsëri.",
-  "submitErrorLog": "Dështoi dërgimi i anketës",
-  "fetchErrorLog": "Dështoi marrja e anketës"
-} 

worklenz-frontend/public/locales/alb/task-list-filters.json

@@ -84,12 +84,5 @@
   "close": "Mbyll",
   "cannotMoveStatus": "Nuk mund të lëvizet statusi",
   "cannotMoveStatusMessage": "Nuk mund të lëvizet ky status sepse do të linte kategorinë '{{categoryName}}' bosh. Çdo kategori duhet të ketë të paktën një status.",
-  "ok": "OK",
+  "ok": "OK"
-  "clearSort": "Pastro Renditjen",
-  "sortAscending": "Rendit në Rritje",
-  "sortDescending": "Rendit në Zbritje",
-  "sortByField": "Rendit sipas {{field}}",
-  "ascendingOrder": "Rritës",
-  "descendingOrder": "Zbritës",
-  "currentSort": "Renditja aktuale: {{field}} {{order}}"
 }

worklenz-frontend/public/locales/alb/task-list-table.json

@@ -57,9 +57,6 @@
 
   "contextMenu": {
     "assignToMe": "Cakto mua",
-    "copyLink": "Kopjo lidhjen e detyrës",
-    "linkCopied": "Lidhja u kopjua në clipboard",
-    "linkCopyFailed": "Dështoi kopjimi i lidhjes",
     "moveTo": "Zhvendos në",
     "unarchive": "Ç'arkivizo",
     "archive": "Arkivizo",
@@ -136,11 +133,5 @@
       "dependencies": "Detyra ka varësi",
       "recurring": "Detyrë përsëritëse"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "Kronómetr Tashë Në Ecuri",
-    "conflictMessage": "Ju keni një kronómetr në ecuri për \"{{taskName}}\" në projektin \"{{projectName}}\". Dëshironi ta ndaloni atë kronómetr dhe të filloni një të ri për këtë detyrë?",
-    "stopAndStart": "Ndalo & Fillo Kronómetr të Ri"
   }
 }

worklenz-frontend/public/locales/de/account-setup.json

@@ -45,7 +45,6 @@
   "step3InputLabel": "Per E-Mail einladen",
   "addAnother": "Weitere hinzufügen",
   "skipForNow": "Jetzt überspringen",
-  "skipping": "Überspringen...",
   "formTitle": "Erstellen Sie Ihre erste Aufgabe.",
   "step3Title": "Laden Sie Ihr Team zur Zusammenarbeit ein",
   "maxMembers": " (Sie können bis zu 5 Mitglieder einladen)",
@@ -91,8 +90,6 @@
   "discoveryQuestion": "Wie haben Sie von uns erfahren?",
   "allSetTitle": "Sie sind bereit!",
   "allSetDescription": "Lassen Sie uns Ihr erstes Projekt erstellen und mit Worklenz beginnen",
-  "surveyCompleteTitle": "Vielen Dank!",
-  "surveyCompleteDescription": "Ihr Feedback hilft uns, Worklenz für alle zu verbessern",
   "aboutYouStepName": "Über Sie",
   "yourNeedsStepName": "Ihre Bedürfnisse", 
   "discoveryStepName": "Entdeckung",

worklenz-frontend/public/locales/de/auth/signup.json

@@ -7,12 +7,12 @@
   "emailLabel": "E-Mail",
   "emailPlaceholder": "Ihre E-Mail-Adresse eingeben",
   "emailRequired": "Bitte geben Sie Ihre E-Mail-Adresse ein!",
-  "passwordLabel": "Passwort",
+  "passwordLabel": "Password",
-  "passwordGuideline": "Das Passwort muss mindestens 8 Zeichen lang sein und Groß- und Kleinbuchstaben, eine Zahl und ein Sonderzeichen enthalten.",
+  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Geben Sie Ihr Passwort ein",
+  "passwordPlaceholder": "Enter your password",
   "passwordRequired": "Bitte geben Sie Ihr Passwort ein!",
   "passwordMinCharacterRequired": "Das Passwort muss mindestens 8 Zeichen lang sein!",
-  "passwordMaxCharacterRequired": "Das Passwort darf maximal 32 Zeichen lang sein!",
+  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
   "passwordPatternRequired": "Das Passwort entspricht nicht den Anforderungen!",
   "strongPasswordPlaceholder": "Ein stärkeres Passwort eingeben",
   "passwordValidationAltText": "Das Passwort muss mindestens 8 Zeichen enthalten, mit Groß- und Kleinbuchstaben, einer Zahl und einem Sonderzeichen.",

worklenz-frontend/public/locales/de/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "Registrierung fehlgeschlagen. Bitte füllen Sie alle erforderlichen Felder aus und versuchen Sie es erneut.",
   "reconnecting": "Vom Server getrennt.",
   "connection-lost": "Verbindung zum Server fehlgeschlagen. Bitte überprüfen Sie Ihre Internetverbindung.",
-  "connection-restored": "Erfolgreich mit dem Server verbunden",
+  "connection-restored": "Erfolgreich mit dem Server verbunden"
-  "cancel": "Abbrechen",
-  "update-available": "Worklenz aktualisiert!",
-  "update-description": "Eine neue Version von Worklenz ist verfügbar mit den neuesten Funktionen und Verbesserungen.",
-  "update-instruction": "Für die beste Erfahrung laden Sie bitte die Seite neu, um die neuen Änderungen zu übernehmen.",
-  "update-whats-new": "💡 <1>Was ist neu:</1> Verbesserte Leistung, Fehlerbehebungen und verbesserte Benutzererfahrung",
-  "update-now": "Jetzt aktualisieren",
-  "update-later": "Später",
-  "updating": "Wird aktualisiert..."
 }

worklenz-frontend/public/locales/de/home.json

@@ -41,22 +41,6 @@
     "list": "Liste",
     "calendar": "Kalender",
     "tasks": "Aufgaben",
-    "refresh": "Aktualisieren",
+    "refresh": "Aktualisieren"
-    "recentActivity": "Aktuelle Aktivitäten",
-    "recentTasks": "Aktuelle Aufgaben",
-    "recentTasksSegment": "Aktuelle Aufgaben",
-    "timeLogged": "Erfasste Zeit",
-    "timeLoggedSegment": "Erfasste Zeit",
-    "noRecentTasks": "Keine aktuellen Aufgaben",
-    "noTimeLoggedTasks": "Keine Aufgaben mit erfasster Zeit",
-    "activityTag": "Aktivität",
-    "timeLogTag": "Zeiterfassung",
-    "timerTag": "Timer",
-    "activitySingular": "Aktivität",
-    "activityPlural": "Aktivitäten",
-    "recentTaskAriaLabel": "Aktuelle Aufgabe:",
-    "timeLoggedTaskAriaLabel": "Aufgabe mit erfasster Zeit:",
-    "errorLoadingRecentTasks": "Fehler beim Laden aktueller Aufgaben",
-    "errorLoadingTimeLoggedTasks": "Fehler beim Laden der Zeiterfassung"
   }
 }

worklenz-frontend/public/locales/de/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "Nach Name suchen",
   "emptyText": "Labels können beim Aktualisieren oder Erstellen von Aufgaben erstellt werden.",
   "pinTooltip": "Zum Anheften an das Hauptmenü klicken",
-  "colorChangeTooltip": "Zum Ändern der Farbe klicken",
+  "colorChangeTooltip": "Zum Ändern der Farbe klicken"
-  "pageTitle": "Labels verwalten",
-  "deleteConfirmTitle": "Sind Sie sicher, dass Sie dies löschen möchten?",
-  "deleteButton": "Löschen",
-  "cancelButton": "Abbrechen"
 }

worklenz-frontend/public/locales/de/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "Helfen Sie uns, Ihre Erfahrung zu verbessern",
-  "skip": "Für jetzt überspringen",
-  "previous": "Zurück",
-  "next": "Weiter",
-  "completeSurvey": "Umfrage abschließen",
-  "submitting": "Ihre Antworten werden übermittelt...",
-  "submitSuccessTitle": "Danke!",
-  "submitSuccessSubtitle": "Ihr Feedback hilft uns, Worklenz für alle zu verbessern.",
-  "submitSuccessMessage": "Danke, dass Sie die Umfrage abgeschlossen haben!",
-  "submitErrorMessage": "Umfrage konnte nicht übermittelt werden. Bitte versuchen Sie es erneut.",
-  "submitErrorLog": "Umfrageübermittlung fehlgeschlagen",
-  "fetchErrorLog": "Umfrageabruf fehlgeschlagen"
-} 

worklenz-frontend/public/locales/de/task-list-filters.json

@@ -84,12 +84,5 @@
   "close": "Schließen",
   "cannotMoveStatus": "Status kann nicht verschoben werden",
   "cannotMoveStatusMessage": "Dieser Status kann nicht verschoben werden, da die Kategorie '{{categoryName}}' leer bleiben würde. Jede Kategorie muss mindestens einen Status haben.",
-  "ok": "OK",
+  "ok": "OK"
-  "clearSort": "Sortierung löschen",
-  "sortAscending": "Aufsteigend sortieren",
-  "sortDescending": "Absteigend sortieren",
-  "sortByField": "Sortieren nach {{field}}",
-  "ascendingOrder": "Aufsteigend",
-  "descendingOrder": "Absteigend",
-  "currentSort": "Aktuelle Sortierung: {{field}} {{order}}"
 }

worklenz-frontend/public/locales/de/task-list-table.json

@@ -57,9 +57,6 @@
 
   "contextMenu": {
     "assignToMe": "Mir zuweisen",
-    "copyLink": "Link zur Aufgabe kopieren",
-    "linkCopied": "Link in die Zwischenablage kopiert",
-    "linkCopyFailed": "Fehler beim Kopieren des Links",
     "moveTo": "Verschieben nach",
     "unarchive": "Dearchivieren",
     "archive": "Archivieren",
@@ -136,11 +133,5 @@
       "dependencies": "Aufgabe hat Abhängigkeiten",
       "recurring": "Wiederkehrende Aufgabe"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "Timer läuft bereits",
-    "conflictMessage": "Sie haben einen Timer für \"{{taskName}}\" im Projekt \"{{projectName}}\" laufen. Möchten Sie diesen Timer stoppen und einen neuen für diese Aufgabe starten?",
-    "stopAndStart": "Stoppen & Neuen Timer starten"
   }
 }

worklenz-frontend/public/locales/en/account-setup.json

@@ -44,7 +44,6 @@
   "step3InputLabel": "Invite with email",
   "addAnother": "Add another",
   "skipForNow": "Skip for now",
-  "skipping": "Skipping...",
   "formTitle": "Create your first task.",
   "step3Title": "Invite your team to work with",
   "maxMembers": " (You can invite up to 5 members)",
@@ -89,8 +88,6 @@
   "discoveryQuestion": "How did you hear about us?",
   "allSetTitle": "You're all set!",
   "allSetDescription": "Let's create your first project and get started with Worklenz",
-  "surveyCompleteTitle": "Thank you!",
-  "surveyCompleteDescription": "Your feedback helps us improve Worklenz for everyone",
   "aboutYouStepName": "About You",
   "yourNeedsStepName": "Your Needs", 
   "discoveryStepName": "Discovery",

worklenz-frontend/public/locales/en/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "Signup failed. Please ensure all required fields are filled and try again.",
   "reconnecting": "Disconnected from server.",
   "connection-lost": "Failed to connect to server. Please check your internet connection.",
-  "connection-restored": "Connected to server successfully",
+  "connection-restored": "Connected to server successfully"
-  "cancel": "Cancel",
-  "update-available": "Worklenz Updated!",
-  "update-description": "A new version of Worklenz is available with the latest features and improvements.",
-  "update-instruction": "To get the best experience, please reload the page to apply the new changes.",
-  "update-whats-new": "💡 <1>What's new:</1> Enhanced performance, bug fixes, and improved user experience",
-  "update-now": "Update Now",
-  "update-later": "Later",
-  "updating": "Updating..."
 }

worklenz-frontend/public/locales/en/home.json

@@ -41,22 +41,6 @@
     "list": "List",
     "calendar": "Calendar",
     "tasks": "Tasks",
-    "refresh": "Refresh",
+    "refresh": "Refresh"
-    "recentActivity": "Recent Activity",
-    "recentTasks": "Recent Tasks",
-    "recentTasksSegment": "Recent Tasks",
-    "timeLogged": "Time Logged",
-    "timeLoggedSegment": "Time Logged",
-    "noRecentTasks": "No recent tasks",
-    "noTimeLoggedTasks": "No time logged tasks",
-    "activityTag": "Activity",
-    "timeLogTag": "Time Log", 
-    "timerTag": "Timer",
-    "activitySingular": "activity",
-    "activityPlural": "activities",
-    "recentTaskAriaLabel": "Recent task:",
-    "timeLoggedTaskAriaLabel": "Time logged task:",
-    "errorLoadingRecentTasks": "Error loading recent tasks",
-    "errorLoadingTimeLoggedTasks": "Error loading time logged tasks"
   }
 }

worklenz-frontend/public/locales/en/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "Search by name",
   "emptyText": "Labels can be created while updating or creating tasks.",
   "pinTooltip": "Click to pin this into the main menu",
-  "colorChangeTooltip": "Click to change color",
+  "colorChangeTooltip": "Click to change color"
-  "pageTitle": "Manage Labels",
-  "deleteConfirmTitle": "Are you sure you want to delete this?",
-  "deleteButton": "Delete",
-  "cancelButton": "Cancel"
 }

worklenz-frontend/public/locales/en/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "Help Us Improve Your Experience",
-  "skip": "Skip for now",
-  "previous": "Previous",
-  "next": "Next",
-  "completeSurvey": "Complete Survey",
-  "submitting": "Submitting your responses...",
-  "submitSuccessTitle": "Thank you!",
-  "submitSuccessSubtitle": "Your feedback helps us improve Worklenz for everyone.",
-  "submitSuccessMessage": "Thank you for completing the survey!",
-  "submitErrorMessage": "Failed to submit survey. Please try again.",
-  "submitErrorLog": "Failed to submit survey",
-  "fetchErrorLog": "Failed to fetch survey"
-} 

worklenz-frontend/public/locales/en/task-list-filters.json

@@ -84,12 +84,5 @@
   "close": "Close",
   "cannotMoveStatus": "Cannot Move Status",
   "cannotMoveStatusMessage": "Cannot move this status because it would leave the '{{categoryName}}' category empty. Each category must have at least one status.",
-  "ok": "OK",
+  "ok": "OK"
-  "clearSort": "Clear Sort",
-  "sortAscending": "Sort Ascending",
-  "sortDescending": "Sort Descending",
-  "sortByField": "Sort by {{field}}",
-  "ascendingOrder": "Ascending",
-  "descendingOrder": "Descending",
-  "currentSort": "Current sort: {{field}} {{order}}"
 }

worklenz-frontend/public/locales/en/task-list-table.json

@@ -57,9 +57,6 @@
 
   "contextMenu": {
     "assignToMe": "Assign to me",
-    "copyLink": "Copy link to task",
-    "linkCopied": "Link copied to clipboard",
-    "linkCopyFailed": "Failed to copy link",
     "moveTo": "Move to",
     "unarchive": "Unarchive",
     "archive": "Archive",
@@ -136,11 +133,5 @@
       "dependencies": "Task has dependencies",
       "recurring": "Recurring task"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "Timer Already Running",
-    "conflictMessage": "You have a timer running for \"{{taskName}}\" in project \"{{projectName}}\". Would you like to stop that timer and start a new one for this task?",
-    "stopAndStart": "Stop & Start New Timer"
   }
 }

worklenz-frontend/public/locales/es/account-setup.json

@@ -45,7 +45,6 @@
   "step3InputLabel": "Invitar por correo electrónico",
   "addAnother": "Agregar otro",
   "skipForNow": "Omitir por ahora",
-  "skipping": "Omitiendo...",
   "formTitle": "Crea tu primera tarea.",
   "step3Title": "Invita a tu equipo a trabajar",
 
@@ -92,8 +91,6 @@
   "discoveryQuestion": "¿Cómo te enteraste de nosotros?",
   "allSetTitle": "¡Ya estás listo!",
   "allSetDescription": "Vamos a crear tu primer proyecto y comenzar con Worklenz",
-  "surveyCompleteTitle": "¡Gracias!",
-  "surveyCompleteDescription": "Tu retroalimentación nos ayuda a mejorar Worklenz para todos",
   "aboutYouStepName": "Sobre ti",
   "yourNeedsStepName": "Tus necesidades", 
   "discoveryStepName": "Descubrimiento",

worklenz-frontend/public/locales/es/auth/signup.json

@@ -7,12 +7,12 @@
   "emailLabel": "Correo electrónico",
   "emailPlaceholder": "Ingresa tu correo electrónico",
   "emailRequired": "¡Por favor ingresa tu correo electrónico!",
-  "passwordLabel": "Contraseña",
+  "passwordLabel": "Password",
-  "passwordGuideline": "La contraseña debe tener al menos 8 caracteres, incluir letras mayúsculas y minúsculas, un número y un carácter especial.",
+  "passwordGuideline": "Password must be at least 8 characters, include uppercase and lowercase letters, a number, and a special character.",
-  "passwordPlaceholder": "Ingresa tu contraseña",
+  "passwordPlaceholder": "Enter your password",
   "passwordRequired": "¡Por favor ingresa tu contraseña!",
   "passwordMinCharacterRequired": "¡La contraseña debe tener al menos 8 caracteres!",
-  "passwordMaxCharacterRequired": "¡La contraseña debe tener como máximo 32 caracteres!",
+  "passwordMaxCharacterRequired": "Password must be at most 32 characters!",
   "passwordPatternRequired": "¡La contraseña no cumple con los requisitos!",
   "strongPasswordPlaceholder": "Ingresa una contraseña más segura",
   "passwordValidationAltText": "La contraseña debe incluir al menos 8 caracteres con letras mayúsculas y minúsculas, un número y un símbolo.",

worklenz-frontend/public/locales/es/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "Error al registrarse. Por favor asegúrate de llenar todos los campos requeridos e intenta nuevamente.",
   "reconnecting": "Reconectando al servidor...",
   "connection-lost": "Conexión perdida. Intentando reconectarse...",
-  "connection-restored": "Conexión restaurada. Reconectando al servidor...",
+  "connection-restored": "Conexión restaurada. Reconectando al servidor..."
-  "cancel": "Cancelar",
-  "update-available": "¡Worklenz actualizado!",
-  "update-description": "Una nueva versión de Worklenz está disponible con las últimas funciones y mejoras.",
-  "update-instruction": "Para obtener la mejor experiencia, por favor recarga la página para aplicar los nuevos cambios.",
-  "update-whats-new": "💡 <1>Qué hay de nuevo:</1> Rendimiento mejorado, correcciones de errores y experiencia de usuario mejorada",
-  "update-now": "Actualizar ahora",
-  "update-later": "Más tarde",
-  "updating": "Actualizando..."
 }

worklenz-frontend/public/locales/es/home.json

@@ -40,22 +40,6 @@
     "list": "Lista",
     "calendar": "Calendario",
     "tasks": "Tareas",
-    "refresh": "Actualizar",
+    "refresh": "Actualizar"
-    "recentActivity": "Actividad Reciente",
-    "recentTasks": "Tareas Recientes",
-    "recentTasksSegment": "Tareas Recientes",
-    "timeLogged": "Tiempo Registrado",
-    "timeLoggedSegment": "Tiempo Registrado",
-    "noRecentTasks": "No hay tareas recientes",
-    "noTimeLoggedTasks": "No hay tareas con tiempo registrado",
-    "activityTag": "Actividad",
-    "timeLogTag": "Registro de Tiempo",
-    "timerTag": "Temporizador",
-    "activitySingular": "actividad",
-    "activityPlural": "actividades",
-    "recentTaskAriaLabel": "Tarea reciente:",
-    "timeLoggedTaskAriaLabel": "Tarea con tiempo registrado:",
-    "errorLoadingRecentTasks": "Error al cargar tareas recientes",
-    "errorLoadingTimeLoggedTasks": "Error al cargar tareas con tiempo registrado"
   }
 }

worklenz-frontend/public/locales/es/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "Buscar por nombre",
   "emptyText": "Las etiquetas se pueden crear al actualizar o crear tareas.",
   "pinTooltip": "Haz clic para fijar esto en el menú principal",
-  "colorChangeTooltip": "Haz clic para cambiar el color",
+  "colorChangeTooltip": "Haz clic para cambiar el color"
-  "pageTitle": "Administrar Etiquetas",
-  "deleteConfirmTitle": "¿Estás seguro de que quieres eliminar esto?",
-  "deleteButton": "Eliminar",
-  "cancelButton": "Cancelar"
 }

worklenz-frontend/public/locales/es/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "Ayúdanos a mejorar tu experiencia",
-  "skip": "Omitir por ahora",
-  "previous": "Anterior",
-  "next": "Siguiente",
-  "completeSurvey": "Completar encuesta",
-  "submitting": "Enviando tus respuestas...",
-  "submitSuccessTitle": "¡Gracias!",
-  "submitSuccessSubtitle": "Tus comentarios nos ayudan a mejorar Worklenz para todos.",
-  "submitSuccessMessage": "¡Gracias por completar la encuesta!",
-  "submitErrorMessage": "No se pudo enviar la encuesta. Por favor, inténtalo de nuevo.",
-  "submitErrorLog": "Error al enviar la encuesta",
-  "fetchErrorLog": "Error al obtener la encuesta"
-} 

worklenz-frontend/public/locales/es/task-list-filters.json

@@ -84,12 +84,5 @@
   "close": "Cerrar",
   "cannotMoveStatus": "No se puede mover el estado",
   "cannotMoveStatusMessage": "No se puede mover este estado porque dejaría vacía la categoría '{{categoryName}}'. Cada categoría debe tener al menos un estado.",
-  "ok": "OK",
+  "ok": "OK"
-  "clearSort": "Limpiar Ordenamiento",
-  "sortAscending": "Ordenar Ascendente",
-  "sortDescending": "Ordenar Descendente",
-  "sortByField": "Ordenar por {{field}}",
-  "ascendingOrder": "Ascendente",
-  "descendingOrder": "Descendente",
-  "currentSort": "Ordenamiento actual: {{field}} {{order}}"
 }

worklenz-frontend/public/locales/es/task-list-table.json

@@ -57,9 +57,6 @@
 
   "contextMenu": {
     "assignToMe": "Asignar a mí",
-    "copyLink": "Copiar enlace a la tarea",
-    "linkCopied": "Enlace copiado al portapapeles",
-    "linkCopyFailed": "Error al copiar el enlace",
     "moveTo": "Mover a",
     "unarchive": "Desarchivar",
     "archive": "Archivar",
@@ -136,11 +133,5 @@
       "dependencies": "La tarea tiene dependencias",
       "recurring": "Tarea recurrente"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "Temporizador Ya En Ejecución",
-    "conflictMessage": "Tiene un temporizador ejecutándose para \"{{taskName}}\" en el proyecto \"{{projectName}}\". ¿Le gustaría detener ese temporizador e iniciar uno nuevo para esta tarea?",
-    "stopAndStart": "Detener e Iniciar Nuevo Temporizador"
   }
 }

worklenz-frontend/public/locales/pt/account-setup.json

@@ -45,7 +45,6 @@
   "step3InputLabel": "Convidar por email",
   "addAnother": "Adicionar outro",
   "skipForNow": "Pular por enquanto",
-  "skipping": "Pulando...",
   "formTitle": "Crie sua primeira tarefa.",
   "step3Title": "Convide sua equipe para trabalhar",
 
@@ -92,8 +91,6 @@
   "discoveryQuestion": "Como você soube sobre nós?",
   "allSetTitle": "Você está pronto!",
   "allSetDescription": "Vamos criar seu primeiro projeto e começar com o Worklenz",
-  "surveyCompleteTitle": "Obrigado!",
-  "surveyCompleteDescription": "Seu feedback nos ajuda a melhorar o Worklenz para todos",
   "aboutYouStepName": "Sobre você",
   "yourNeedsStepName": "Suas necessidades", 
   "discoveryStepName": "Descoberta",

worklenz-frontend/public/locales/pt/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "Falha no cadastro. Por favor, certifique-se de que todos os campos obrigatórios estão preenchidos e tente novamente.",
   "reconnecting": "Reconectando ao servidor...",
   "connection-lost": "Conexão perdida. Tentando reconectar...",
-  "connection-restored": "Conexão restaurada. Reconectando ao servidor...",
+  "connection-restored": "Conexão restaurada. Reconectando ao servidor..."
-  "cancel": "Cancelar",
-  "update-available": "Worklenz atualizado!",
-  "update-description": "Uma nova versão do Worklenz está disponível com os recursos e melhorias mais recentes.",
-  "update-instruction": "Para obter a melhor experiência, por favor recarregue a página para aplicar as novas mudanças.",
-  "update-whats-new": "💡 <1>O que há de novo:</1> Performance aprimorada, correções de bugs e experiência do usuário melhorada",
-  "update-now": "Atualizar agora",
-  "update-later": "Mais tarde",
-  "updating": "Atualizando..."
 }

worklenz-frontend/public/locales/pt/home.json

@@ -40,22 +40,6 @@
     "list": "Lista",
     "calendar": "Calendário",
     "tasks": "Tarefas",
-    "refresh": "Atualizar",
+    "refresh": "Atualizar"
-    "recentActivity": "Atividade Recente",
-    "recentTasks": "Tarefas Recentes",
-    "recentTasksSegment": "Tarefas Recentes",
-    "timeLogged": "Tempo Registrado",
-    "timeLoggedSegment": "Tempo Registrado",
-    "noRecentTasks": "Nenhuma tarefa recente",
-    "noTimeLoggedTasks": "Nenhuma tarefa com tempo registrado",
-    "activityTag": "Atividade",
-    "timeLogTag": "Registro de Tempo",
-    "timerTag": "Cronômetro",
-    "activitySingular": "atividade",
-    "activityPlural": "atividades",
-    "recentTaskAriaLabel": "Tarefa recente:",
-    "timeLoggedTaskAriaLabel": "Tarefa com tempo registrado:",
-    "errorLoadingRecentTasks": "Erro ao carregar tarefas recentes",
-    "errorLoadingTimeLoggedTasks": "Erro ao carregar tarefas com tempo registrado"
   }
 }

worklenz-frontend/public/locales/pt/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "Pesquisar por nome",
   "emptyText": "Os rótulos podem ser criados ao atualizar ou criar tarefas.",
   "pinTooltip": "Clique para fixar isso no menu principal",
-  "colorChangeTooltip": "Clique para mudar a cor",
+  "colorChangeTooltip": "Clique para mudar a cor"
-  "pageTitle": "Gerenciar Rótulos",
-  "deleteConfirmTitle": "Tem certeza de que deseja excluir isto?",
-  "deleteButton": "Excluir",
-  "cancelButton": "Cancelar"
 }

worklenz-frontend/public/locales/pt/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "Ajude-nos a melhorar sua experiência",
-  "skip": "Pular por enquanto",
-  "previous": "Anterior",
-  "next": "Próximo",
-  "completeSurvey": "Concluir Pesquisa",
-  "submitting": "Enviando suas respostas...",
-  "submitSuccessTitle": "Obrigado!",
-  "submitSuccessSubtitle": "Seu feedback nos ajuda a melhorar o Worklenz para todos.",
-  "submitSuccessMessage": "Obrigado por completar a pesquisa!",
-  "submitErrorMessage": "Falha ao enviar a pesquisa. Por favor, tente novamente.",
-  "submitErrorLog": "Falha ao enviar a pesquisa",
-  "fetchErrorLog": "Falha ao buscar a pesquisa"
-} 

worklenz-frontend/public/locales/pt/task-list-filters.json

@@ -84,12 +84,5 @@
   "close": "Fechar",
   "cannotMoveStatus": "Não é possível mover o status",
   "cannotMoveStatusMessage": "Não é possível mover este status porque deixaria a categoria '{{categoryName}}' vazia. Cada categoria deve ter pelo menos um status.",
-  "ok": "OK",
+  "ok": "OK"
-  "clearSort": "Limpar Ordenação",
-  "sortAscending": "Ordenar Crescente",
-  "sortDescending": "Ordenar Decrescente",
-  "sortByField": "Ordenar por {{field}}",
-  "ascendingOrder": "Crescente",
-  "descendingOrder": "Decrescente",
-  "currentSort": "Ordenação atual: {{field}} {{order}}"
 }

worklenz-frontend/public/locales/pt/task-list-table.json

@@ -57,9 +57,6 @@
 
   "contextMenu": {
     "assignToMe": "Atribuir a mim",
-    "copyLink": "Copiar link da tarefa",
-    "linkCopied": "Link copiado para a área de transferência",
-    "linkCopyFailed": "Falha ao copiar o link",
     "moveTo": "Mover para",
     "unarchive": "Desarquivar",
     "archive": "Arquivar",
@@ -136,11 +133,5 @@
       "dependencies": "A tarefa tem dependências",
       "recurring": "Tarefa recorrente"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "Temporizador Já Em Execução",
-    "conflictMessage": "Você tem um temporizador executando para \"{{taskName}}\" no projeto \"{{projectName}}\". Gostaria de parar esse temporizador e iniciar um novo para esta tarefa?",
-    "stopAndStart": "Parar e Iniciar Novo Temporizador"
   }
 }

worklenz-frontend/public/locales/zh/account-setup.json

@@ -44,7 +44,6 @@
   "step3InputLabel": "通过电子邮件邀请",
   "addAnother": "添加另一个",
   "skipForNow": "暂时跳过",
-  "skipping": "跳过中...",
   "formTitle": "创建您的第一个任务。",
   "step3Title": "邀请您的团队一起工作",
   "maxMembers": "（您最多可以邀请 5 名成员）",
@@ -90,8 +89,6 @@
   "discoveryQuestion": "您是如何听说我们的？",
   "allSetTitle": "一切就绪！",
   "allSetDescription": "让我们创建您的第一个项目并开始使用 Worklenz 吧",
-  "surveyCompleteTitle": "谢谢！",
-  "surveyCompleteDescription": "您的反馈有助于我们为所有人改进 Worklenz",
   "aboutYouStepName": "关于您",
   "yourNeedsStepName": "您的需求",
   "discoveryStepName": "发现",

worklenz-frontend/public/locales/zh/common.json

@@ -5,13 +5,5 @@
   "signup-failed": "注册失败。请确保填写所有必填字段并重试。",
   "reconnecting": "与服务器断开连接。",
   "connection-lost": "无法连接到服务器。请检查您的互联网连接。",
-  "connection-restored": "成功连接到服务器",
+  "connection-restored": "成功连接到服务器"
-  "cancel": "取消",
-  "update-available": "Worklenz 已更新！",
-  "update-description": "Worklenz 的新版本已可用，具有最新的功能和改进。",
-  "update-instruction": "为了获得最佳体验，请刷新页面以应用新更改。",
-  "update-whats-new": "💡 <1>新增内容：</1>性能增强、错误修复和用户体验改善",
-  "update-now": "立即更新",
-  "update-later": "稍后",
-  "updating": "正在更新..."
 }

worklenz-frontend/public/locales/zh/home.json

@@ -41,22 +41,6 @@
     "list": "列表",
     "calendar": "日历",
     "tasks": "任务",
-    "refresh": "刷新",
+    "refresh": "刷新"
-    "recentActivity": "最近活动",
-    "recentTasks": "最近任务",
-    "recentTasksSegment": "最近任务",
-    "timeLogged": "时间记录",
-    "timeLoggedSegment": "时间记录",
-    "noRecentTasks": "没有最近任务",
-    "noTimeLoggedTasks": "没有时间记录任务",
-    "activityTag": "活动",
-    "timeLogTag": "时间记录",
-    "timerTag": "计时器",
-    "activitySingular": "活动",
-    "activityPlural": "活动",
-    "recentTaskAriaLabel": "最近任务：",
-    "timeLoggedTaskAriaLabel": "时间记录任务：",
-    "errorLoadingRecentTasks": "加载最近任务时出错",
-    "errorLoadingTimeLoggedTasks": "加载时间记录任务时出错"
   }
 }

worklenz-frontend/public/locales/zh/settings/labels.json

@@ -7,9 +7,5 @@
   "searchPlaceholder": "按名称搜索",
   "emptyText": "标签可以在更新或创建任务时创建。",
   "pinTooltip": "点击将其固定到主菜单",
-  "colorChangeTooltip": "点击更改颜色",
+  "colorChangeTooltip": "点击更改颜色"
-  "pageTitle": "管理标签",
-  "deleteConfirmTitle": "您确定要删除这个吗？",
-  "deleteButton": "删除",
-  "cancelButton": "取消"
 }

worklenz-frontend/public/locales/zh/survey.json

@@ -1,14 +0,0 @@
-{
-  "modalTitle": "帮助我们提升您的体验",
-  "skip": "暂时跳过",
-  "previous": "上一步",
-  "next": "下一步",
-  "completeSurvey": "完成调查",
-  "submitting": "正在提交您的回答...",
-  "submitSuccessTitle": "谢谢！",
-  "submitSuccessSubtitle": "您的反馈帮助我们改进 Worklenz。",
-  "submitSuccessMessage": "感谢您完成调查！",
-  "submitErrorMessage": "提交调查失败。请重试。",
-  "submitErrorLog": "提交调查失败",
-  "fetchErrorLog": "获取调查失败"
-} 

worklenz-frontend/public/locales/zh/task-list-filters.json

@@ -79,12 +79,5 @@
   "close": "关闭",
   "cannotMoveStatus": "无法移动状态",
   "cannotMoveStatusMessage": "无法移动此状态，因为这会使\"{{categoryName}}\"类别为空。每个类别必须至少有一个状态。",
-  "ok": "确定",
+  "ok": "确定"
-  "clearSort": "清除排序",
-  "sortAscending": "升序排列",
-  "sortDescending": "降序排列",
-  "sortByField": "按{{field}}排序",
-  "ascendingOrder": "升序",
-  "descendingOrder": "降序",
-  "currentSort": "当前排序：{{field}} {{order}}"
 }

worklenz-frontend/public/locales/zh/task-list-table.json

@@ -50,9 +50,6 @@
   "pendingInvitation": "待处理邀请",
   "contextMenu": {
     "assignToMe": "分配给我",
-    "copyLink": "复制任务链接",
-    "linkCopied": "链接已复制到剪贴板",
-    "linkCopyFailed": "复制链接失败",
     "moveTo": "移动到",
     "unarchive": "取消归档",
     "archive": "归档",
@@ -129,11 +126,5 @@
       "dependencies": "任务有依赖项",
       "recurring": "重复任务"
     }
-  },
-
-  "timer": {
-    "conflictTitle": "计时器已在运行",
-    "conflictMessage": "您在项目\"{{projectName}}\"中的\"{{taskName}}\"任务正在运行计时器。您是否要停止该计时器并为此任务启动新的计时器？",
-    "stopAndStart": "停止并启动新计时器"
   }
 }

worklenz-frontend/public/sw.js

@@ -325,12 +325,6 @@ self.addEventListener('message', event => {
       event.ports[0].postMessage({ version: CACHE_VERSION });
       break;
       
-    case 'CHECK_FOR_UPDATES':
-      checkForUpdates().then((hasUpdates) => {
-        event.ports[0].postMessage({ hasUpdates });
-      });
-      break;
-      
     case 'CLEAR_CACHE':
       clearAllCaches().then(() => {
         event.ports[0].postMessage({ success: true });
@@ -355,44 +349,6 @@ async function clearAllCaches() {
   console.log('Service Worker: All caches cleared');
 }
 
-async function checkForUpdates() {
-  try {
-    // Check if there's a new service worker available
-    const registration = await self.registration.update();
-    const hasNewWorker = registration.installing || registration.waiting;
-    
-    if (hasNewWorker) {
-      console.log('Service Worker: New version detected');
-      return true;
-    }
-    
-    // Also check if the main app files have been updated by trying to fetch index.html
-    // and comparing it with the cached version
-    try {
-      const cache = await caches.open(CACHE_NAMES.STATIC);
-      const cachedResponse = await cache.match('/');
-      const networkResponse = await fetch('/', { cache: 'no-cache' });
-      
-      if (cachedResponse && networkResponse.ok) {
-        const cachedContent = await cachedResponse.text();
-        const networkContent = await networkResponse.text();
-        
-        if (cachedContent !== networkContent) {
-          console.log('Service Worker: App content has changed');
-          return true;
-        }
-      }
-    } catch (error) {
-      console.log('Service Worker: Could not check for content updates', error);
-    }
-    
-    return false;
-  } catch (error) {
-    console.error('Service Worker: Error checking for updates', error);
-    return false;
-  }
-}
-
 async function handleLogout() {
   try {
     // Clear all caches

worklenz-frontend/sonar-project.properties

@@ -0,0 +1,55 @@
+# SonarQube Configuration for Worklenz Frontend
+sonar.projectKey=worklenz-frontend
+sonar.projectName=Worklenz Frontend
+sonar.projectVersion=1.0.0
+
+# Source code configuration
+sonar.sources=src
+sonar.tests=src
+sonar.test.inclusions=**/*.test.ts,**/*.test.tsx,**/*.spec.ts,**/*.spec.tsx
+
+# Language-specific configurations
+sonar.typescript.node=node
+sonar.typescript.lcov.reportPaths=coverage/lcov.info
+sonar.javascript.lcov.reportPaths=coverage/lcov.info
+
+# Exclusions
+sonar.exclusions=**/node_modules/**,\
+  **/build/**,\
+  **/dist/**,\
+  **/public/**,\
+  **/*.d.ts,\
+  src/react-app-env.d.ts,\
+  src/vite-env.d.ts,\
+  **/*.config.js,\
+  **/*.config.ts,\
+  **/*.config.mts,\
+  scripts/**
+
+# Test exclusions from coverage
+sonar.coverage.exclusions=**/*.test.ts,\
+  **/*.test.tsx,\
+  **/*.spec.ts,\
+  **/*.spec.tsx,\
+  **/*.config.*,\
+  src/index.tsx,\
+  src/reportWebVitals.ts,\
+  src/serviceWorkerRegistration.ts,\
+  src/setupTests.ts
+
+# Code quality rules
+sonar.qualitygate.wait=true
+
+# File encoding
+sonar.sourceEncoding=UTF-8
+
+# JavaScript/TypeScript specific settings
+sonar.javascript.environments=browser,node,jest
+sonar.typescript.tsconfigPath=tsconfig.json
+
+# ESLint configuration (if available)
+# sonar.eslint.reportPaths=eslint-report.json
+
+# Additional settings for React projects
+sonar.javascript.file.suffixes=.js,.jsx
+sonar.typescript.file.suffixes=.ts,.tsx

worklenz-frontend/src/App.tsx

@@ -6,7 +6,6 @@ import i18next from 'i18next';
 // Components
 import ThemeWrapper from './features/theme/ThemeWrapper';
 import ModuleErrorBoundary from './components/ModuleErrorBoundary';
-import { UpdateNotificationProvider } from './components/update-notification';
 
 // Routes
 import router from './app/routes';
@@ -203,16 +202,14 @@ const App: React.FC = memo(() => {
   return (
     <Suspense fallback={<SuspenseFallback />}>
       <ThemeWrapper>
-        <UpdateNotificationProvider>
+        <ModuleErrorBoundary>
-          <ModuleErrorBoundary>
+          <RouterProvider
-            <RouterProvider
+            router={router}
-              router={router}
+            future={{
-              future={{
+              v7_startTransition: true,
-                v7_startTransition: true,
+            }}
-              }}
+          />
-            />
+        </ModuleErrorBoundary>
-          </ModuleErrorBoundary>
-        </UpdateNotificationProvider>
       </ThemeWrapper>
     </Suspense>
   );

worklenz-frontend/src/api/home-page/user-activity.api.service.ts

@@ -1,46 +0,0 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-import { API_BASE_URL } from '@/shared/constants';
-import { getCsrfToken } from '../api-client';
-import { IUserRecentTask, IUserTimeLoggedTask } from '@/types/home/user-activity.types';
-import config from '@/config/env';
-
-const rootUrl = '/logs';
-
-export const userActivityApiService = createApi({
-    reducerPath: 'userActivityApi',
-    baseQuery: fetchBaseQuery({
-        baseUrl: `${config.apiUrl}${API_BASE_URL}`,
-        prepareHeaders: (headers) => {
-            headers.set('X-CSRF-Token', getCsrfToken() || '');
-            headers.set('Content-Type', 'application/json');
-            return headers;
-        },
-        credentials: 'include',
-    }),
-    tagTypes: ['UserRecentTasks', 'UserTimeLoggedTasks'],
-    endpoints: (builder) => ({
-        getUserRecentTasks: builder.query<IUserRecentTask[], { limit?: number; offset?: number }>({
-            query: ({ limit = 10, offset = 0 }) => ({
-                url: `${rootUrl}/user-recent-tasks`,
-                params: { limit, offset },
-                method: 'GET',
-            }),
-            providesTags: ['UserRecentTasks'],
-        }),
-        getUserTimeLoggedTasks: builder.query<IUserTimeLoggedTask[], { limit?: number; offset?: number }>({
-            query: ({ limit = 10, offset = 0 }) => ({
-                url: `${rootUrl}/user-time-logged-tasks`,
-                params: { limit, offset },
-                method: 'GET',
-            }),
-            providesTags: ['UserTimeLoggedTasks'],
-        }),
-    }),
-});
-
-export const {
-    useGetUserRecentTasksQuery,
-    useGetUserTimeLoggedTasksQuery,
-} = userActivityApiService;
-
-

worklenz-frontend/src/api/survey/survey.api.service.ts

@@ -18,10 +18,5 @@ export const surveyApiService = {
   async getUserSurveyResponse(surveyId: string): Promise<IServerResponse<ISurveyResponse>> {
     const response = await apiClient.get<IServerResponse<ISurveyResponse>>(`${API_BASE_URL}/surveys/responses/${surveyId}`);
     return response.data;
-  },
-
-  async checkAccountSetupSurveyStatus(): Promise<IServerResponse<{ is_completed: boolean; completed_at?: string }>> {
-    const response = await apiClient.get<IServerResponse<{ is_completed: boolean; completed_at?: string }>>(`${API_BASE_URL}/surveys/account-setup/status`);
-    return response.data;
   }
 };

worklenz-frontend/src/api/taskAttributes/labels/labels.api.service.ts

@@ -27,17 +27,12 @@ export const labelsApiService = {
 
   updateColor: async (labelId: string, color: string): Promise<IServerResponse<ITaskLabel>> => {
     const response = await apiClient.put<IServerResponse<ITaskLabel>>(
-      `${rootUrl}/tasks/${labelId}`,
+      `${rootUrl}/tasks/${labelId}/color`,
       { color }
     );
     return response.data;
   },
 
-  updateLabel: async (labelId: string, data: { name?: string; color?: string }): Promise<IServerResponse<ITaskLabel>> => {
-    const response = await apiClient.put<IServerResponse<ITaskLabel>>(`${rootUrl}/team/${labelId}`, data);
-    return response.data;
-  },
-
   deleteById: async (labelId: string): Promise<IServerResponse<void>> => {
     const response = await apiClient.delete<IServerResponse<void>>(`${rootUrl}/team/${labelId}`);
     return response.data;

worklenz-frontend/src/api/tasks/task-time-logs.api.service.ts

@@ -2,7 +2,6 @@ import { API_BASE_URL } from '@/shared/constants';
 import apiClient from '../api-client';
 import { IServerResponse } from '@/types/common.types';
 import { ITaskLogViewModel } from '@/types/tasks/task-log-view.types';
-import { getUserSession } from '@/utils/session-helper';
 
 const rootUrl = `${API_BASE_URL}/task-time-log`;
 
@@ -18,11 +17,7 @@ export interface IRunningTimer {
 
 export const taskTimeLogsApiService = {
   getByTask: async (id: string): Promise<IServerResponse<ITaskLogViewModel[]>> => {
-    const session = getUserSession();
+    const response = await apiClient.get(`${rootUrl}/task/${id}`);
-    const timezone = session?.timezone_name || 'UTC';
-    const response = await apiClient.get(`${rootUrl}/task/${id}`, {
-      params: { time_zone_name: timezone }
-    });
     return response.data;
   },
 

worklenz-frontend/src/app/routes/main-routes.tsx

@@ -11,7 +11,9 @@ import { SuspenseFallback } from '@/components/suspense-fallback/suspense-fallba
 const HomePage = lazy(() => import('@/pages/home/home-page'));
 const ProjectList = lazy(() => import('@/pages/projects/project-list'));
 const Schedule = lazy(() => import('@/pages/schedule/schedule'));
-
+const ProjectTemplateEditView = lazy(
+  () => import('@/pages/settings/project-templates/projectTemplateEditView/ProjectTemplateEditView')
+);
 const LicenseExpired = lazy(() => import('@/pages/license-expired/license-expired'));
 const ProjectView = lazy(() => import('@/pages/projects/projectView/project-view'));
 const Unauthorized = lazy(() => import('@/pages/unauthorized/unauthorized'));
@@ -89,6 +91,14 @@ const mainRoutes: RouteObject[] = [
           </Suspense>
         ),
       },
+      {
+        path: `settings/project-templates/edit/:templateId/:templateName`,
+        element: (
+          <Suspense fallback={<SuspenseFallback />}>
+            <ProjectTemplateEditView />
+          </Suspense>
+        ),
+      },
       {
         path: 'unauthorized',
         element: (

worklenz-frontend/src/app/store.ts

@@ -7,7 +7,6 @@ import userReducer from '@features/user/userSlice';
 
 // Home Page
 import homePageReducer from '@features/home-page/home-page.slice';
-import userActivityReducer from '@features/home-page/user-activity.slice';
 
 // Account Setup
 import accountSetupReducer from '@features/account-setup/account-setup.slice';
@@ -83,7 +82,6 @@ import groupingReducer from '@/features/task-management/grouping.slice';
 import selectionReducer from '@/features/task-management/selection.slice';
 import homePageApiService from '@/api/home-page/home-page.api.service';
 import { projectsApi } from '@/api/projects/projects.v1.api.service';
-import { userActivityApiService } from '@/api/home-page/user-activity.api.service';
 
 import projectViewReducer from '@features/project/project-view-slice';
 import taskManagementFieldsReducer from '@features/task-management/taskListFields.slice';
@@ -92,7 +90,7 @@ export const store = configureStore({
   middleware: getDefaultMiddleware =>
     getDefaultMiddleware({
       serializableCheck: false,
-    }).concat(homePageApiService.middleware, projectsApi.middleware, userActivityApiService.middleware),
+    }).concat(homePageApiService.middleware, projectsApi.middleware),
   reducer: {
     // Auth & User
     auth: authReducer,
@@ -105,9 +103,6 @@ export const store = configureStore({
     homePageReducer: homePageReducer,
     [homePageApiService.reducerPath]: homePageApiService.reducer,
     [projectsApi.reducerPath]: projectsApi.reducer,
-    userActivityReducer: userActivityReducer,
-    [userActivityApiService.reducerPath]: userActivityApiService.reducer,
-
     // Core UI
     themeReducer: themeReducer,
     localesReducer: localesReducer,

worklenz-frontend/src/components/PinRouteToNavbarButton.tsx

@@ -3,7 +3,7 @@ import { getJSONFromLocalStorage, saveJSONToLocalStorage } from '../utils/localS
 import { Button, ConfigProvider, Tooltip } from '@/shared/antd-imports';
 import { PushpinFilled, PushpinOutlined } from '@/shared/antd-imports';
 import { colors } from '../styles/colors';
-import { navRoutes, NavRoutesType } from '../features/navbar/navRoutes';
+import { navRoutes, NavRoutesType } from '../lib/navbar/navRoutes';
 
 // Props type for the component
 type PinRouteToNavbarButtonProps = {

worklenz-frontend/src/components/account-setup/survey-step.tsx

@@ -20,7 +20,6 @@ interface Props {
   styles: any;
   isDarkMode: boolean;
   token?: any;
-  isModal?: boolean; // New prop to indicate if used in modal context
 }
 
 interface SurveyPageProps {
@@ -30,7 +29,6 @@ interface SurveyPageProps {
   surveyData: IAccountSetupSurveyData;
   handleSurveyDataChange: (field: keyof IAccountSetupSurveyData, value: any) => void;
   handleUseCaseToggle?: (value: UseCase) => void;
-  isModal?: boolean;
 }
 
 // Page 1: About You
@@ -237,7 +235,7 @@ const YourNeedsPage: React.FC<SurveyPageProps> = ({ styles, token, surveyData, h
 };
 
 // Page 3: Discovery
-const DiscoveryPage: React.FC<SurveyPageProps> = ({ styles, token, surveyData, handleSurveyDataChange, isModal }) => {
+const DiscoveryPage: React.FC<SurveyPageProps> = ({ styles, token, surveyData, handleSurveyDataChange }) => {
   const { t } = useTranslation('account-setup');
   
   const howHeardAboutOptions: { value: HowHeardAbout; label: string; icon: string }[] = [
@@ -293,18 +291,14 @@ const DiscoveryPage: React.FC<SurveyPageProps> = ({ styles, token, surveyData, h
 
       <div className="mt-12 p-1.5 rounded-lg text-center" style={{ backgroundColor: token?.colorSuccessBg, borderColor: token?.colorSuccessBorder, border: '1px solid' }}>
         <div className="text-4xl mb-3">🎉</div>
-        <Title level={4} style={{ color: token?.colorText, marginBottom: 8 }}>
+        <Title level={4} style={{ color: token?.colorText, marginBottom: 8 }}>{t('allSetTitle')}</Title>
-          {isModal ? t('surveyCompleteTitle') : t('allSetTitle')}
+        <Paragraph style={{ color: token?.colorTextSecondary, marginBottom: 0 }}>{t('allSetDescription')}</Paragraph>
-        </Title>
-        <Paragraph style={{ color: token?.colorTextSecondary, marginBottom: 0 }}>
-          {isModal ? t('surveyCompleteDescription') : t('allSetDescription')}
-        </Paragraph>
       </div>
     </div>
   );
 };
 
-export const SurveyStep: React.FC<Props> = ({ onEnter, styles, isDarkMode, token, isModal = false }) => {
+export const SurveyStep: React.FC<Props> = ({ onEnter, styles, isDarkMode, token }) => {
   const { t } = useTranslation('account-setup');
   const dispatch = useDispatch();
   const { surveyData, surveySubStep } = useSelector((state: RootState) => state.accountSetupReducer);
@@ -345,9 +339,9 @@ export const SurveyStep: React.FC<Props> = ({ onEnter, styles, isDarkMode, token
   };
 
   const surveyPages = [
-    <AboutYouPage key="about-you" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} isModal={isModal} />,
+    <AboutYouPage key="about-you" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} />,
-    <YourNeedsPage key="your-needs" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} handleUseCaseToggle={handleUseCaseToggle} isModal={isModal} />,
+    <YourNeedsPage key="your-needs" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} handleUseCaseToggle={handleUseCaseToggle} />,
-    <DiscoveryPage key="discovery" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} isModal={isModal} />
+    <DiscoveryPage key="discovery" styles={styles} isDarkMode={isDarkMode} token={token} surveyData={surveyData} handleSurveyDataChange={handleSurveyDataChange} />
   ];
 
   React.useEffect(() => {

worklenz-frontend/src/components/common/invite-team-members/invite-team-members.tsx

@@ -1,4 +1,14 @@
-import { AutoComplete, Button, Drawer, Flex, Form, message, Modal, Select, Spin, Typography } from '@/shared/antd-imports';
+import {
+  AutoComplete,
+  Button,
+  Flex,
+  Form,
+  message,
+  Modal,
+  Select,
+  Spin,
+  Typography,
+} from '@/shared/antd-imports';
 import { useAppSelector } from '@/hooks/useAppSelector';
 import { useAppDispatch } from '@/hooks/useAppDispatch';
 import {
@@ -11,7 +21,6 @@ import { jobTitlesApiService } from '@/api/settings/job-titles/job-titles.api.se
 import { IJobTitle } from '@/types/job.types';
 import { teamMembersApiService } from '@/api/team-members/teamMembers.api.service';
 import { ITeamMemberCreateRequest } from '@/types/teamMembers/team-member-create-request';
-import { LinkOutlined } from '@ant-design/icons';
 
 interface FormValues {
   email: string[];

worklenz-frontend/src/components/index.ts

@@ -10,6 +10,3 @@ export { default as LabelsSelector } from './LabelsSelector';
 export { default as Progress } from './Progress';
 export { default as Tag } from './Tag';
 export { default as Tooltip } from './Tooltip';
-
-// Update Notification Components
-export * from './update-notification';

worklenz-frontend/src/components/navbar/InvitationItem.tsx

@@ -17,7 +17,7 @@ interface InvitationItemProps {
   t: TFunction;
 }
 
-const InvitationItem: React.FC<InvitationItemProps> = ({ item, isUnreadNotifications, t }) => {
+const InvitationItem = ({ item, isUnreadNotifications, t }: InvitationItemProps) => {
   const [accepting, setAccepting] = useState(false);
   const [joining, setJoining] = useState(false);
   const dispatch = useAppDispatch();

worklenz-frontend/src/components/navbar/Navbar.tsx

@@ -1,55 +1,60 @@
-import React, { useEffect, useState, useMemo } from 'react';
+import React, { useEffect, useState, useMemo, memo } from 'react';
 import { Link, useLocation } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { Col, ConfigProvider, Flex, Menu, MenuProps, Alert } from '@/shared/antd-imports';
+import { Col, ConfigProvider, Flex, Menu } from '@/shared/antd-imports';
 import { createPortal } from 'react-dom';
 
-import InviteTeamMembers from '../../components/common/invite-team-members/invite-team-members';
+import InviteTeamMembers from '../common/invite-team-members/invite-team-members';
 import InviteButton from './invite/InviteButton';
 import MobileMenuButton from './mobileMenu/MobileMenuButton';
-import NavbarLogo from './navbar-logo';
+import NavbarLogo from './NavbarLogo';
-import NotificationButton from '../../components/navbar/notifications/notifications-drawer/notification/notification-button';
+import NotificationButton from './NotificationButton';
-import ProfileButton from './user-profile/profile-button';
+import ProfileButton from './user-profile/ProfileButton';
 import SwitchTeamButton from './switchTeam/SwitchTeamButton';
 import UpgradePlanButton from './upgradePlan/UpgradePlanButton';
-import NotificationDrawer from '../../components/navbar/notifications/notifications-drawer/notification/notfication-drawer';
+import NotificationDrawer from './notifications/notifications-drawer/notfication-drawer';
 
 import { useResponsive } from '@/hooks/useResponsive';
 import { getJSONFromLocalStorage } from '@/utils/localStorageFunctions';
-import { navRoutes, NavRoutesType } from './navRoutes';
+import { navRoutes, NavRoutesType } from '@/lib/navbar/navRoutes';
 import { useAuthService } from '@/hooks/useAuth';
 import { authApiService } from '@/api/auth/auth.api.service';
 import { ISUBSCRIPTION_TYPE } from '@/shared/constants';
 import logger from '@/utils/errorLogger';
-import TimerButton from './timers/timer-button';
 import HelpButton from './help/HelpButton';
 
-const Navbar = () => {
+const Navbar = memo(() => {
   const [current, setCurrent] = useState<string>('home');
-  const currentSession = useAuthService().getCurrentSession();
+  const authService = useAuthService();
+  const currentSession = authService.getCurrentSession();
   const [daysUntilExpiry, setDaysUntilExpiry] = useState<number | null>(null);
 
   const location = useLocation();
   const { isDesktop, isMobile, isTablet } = useResponsive();
   const { t } = useTranslation('navbar');
-  const authService = useAuthService();
   const [navRoutesList, setNavRoutesList] = useState<NavRoutesType[]>(navRoutes);
   const [isOwnerOrAdmin, setIsOwnerOrAdmin] = useState<boolean>(authService.isOwnerOrAdmin());
-  const showUpgradeTypes = [ISUBSCRIPTION_TYPE.TRIAL];
+  const showUpgradeTypes = useMemo(() => [ISUBSCRIPTION_TYPE.TRIAL], []);
 
   useEffect(() => {
+    let mounted = true;
     authApiService
       .verify()
       .then(authorizeResponse => {
-        if (authorizeResponse.authenticated) {
+        if (mounted && authorizeResponse.authenticated) {
           authService.setCurrentSession(authorizeResponse.user);
           setIsOwnerOrAdmin(!!(authorizeResponse.user.is_admin || authorizeResponse.user.owner));
         }
       })
       .catch(error => {
-        logger.error('Error during authorization', error);
+        if (mounted) {
+          logger.error('Error during authorization', error);
+        }
       });
-  }, []);
+    return () => {
+      mounted = false;
+    };
+  }, [authService]);
 
   useEffect(() => {
     const storedNavRoutesList: NavRoutesType[] = getJSONFromLocalStorage('navRoutes') || navRoutes;
@@ -153,8 +158,8 @@ const Navbar = () => {
                   <Flex align="center">
                     <SwitchTeamButton />
                     <NotificationButton />
-                    <TimerButton />
+                    {/* <TimerButton /> */}
-                    {/* <HelpButton /> */}
+                    <HelpButton />
                     <ProfileButton isOwnerOrAdmin={isOwnerOrAdmin} />
                   </Flex>
                 </Flex>
@@ -183,6 +188,8 @@ const Navbar = () => {
       {createPortal(<NotificationDrawer />, document.body, 'notification-drawer')}
     </Col>
   );
-};
+});
+
+Navbar.displayName = 'Navbar';
 
 export default Navbar;

worklenz-frontend/src/components/navbar/NavbarLogo.tsx

@@ -1,14 +1,14 @@
+import { memo } from 'react';
 import { Link } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 
 import logo from '@/assets/images/worklenz-light-mode.png';
 import logoDark from '@/assets/images/worklenz-dark-mode.png';
 
-import { useAppSelector } from '@/hooks/useAppSelector';
 import { useSelector } from 'react-redux';
 import { RootState } from '@/app/store';
 
-const NavbarLogo = () => {
+const NavbarLogo = memo(() => {
   const { t } = useTranslation('navbar');
   const themeMode = useSelector((state: RootState) => state.themeReducer.mode);
 
@@ -23,6 +23,8 @@ const NavbarLogo = () => {
       </div>
     </Link>
   );
-};
+});
+
+NavbarLogo.displayName = 'NavbarLogo';
 
 export default NavbarLogo;