- {`${widgetsRole?.role?.label || 'Users'}'s widgets`} -
- )} + const getItemIcon = (type: string) => { + switch (type) { + case 'project_created': return icon.mdiFolderPlusOutline; + case 'trial_created': return icon.mdiFlaskPlusOutline; + case 'submission_created': return icon.mdiClipboardCheckOutline; + case 'user_created': return icon.mdiAccountPlusOutline; + case 'attachment_added': return icon.mdiPaperclip; + default: return icon.mdiBellOutline; + } + } -
- {(isFetchingQuery || loading) && (
- {getPageTitle('Home')}
+
+
+
+ {''}
+
- { rolesWidgets &&
- rolesWidgets.map((widget) => (
-
+ {/* Summary Cards */}
+
-
- )}
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- {!!rolesWidgets.length &&
+
+
+
+ Projects
+{projects}
+
+
+
+
+ Trials
+{trials}
+
+
+
+
+ Submissions
+{form_submissions}
+
+
+
+
+ Team Members
+{users}
+} - -
-
-
- {hasPermission(currentUser, 'READ_USERS') &&
-
-
-
-
-
- Users
-
-
- {users}
-
-
- {page}
+ return {page}
}
export default Dashboard
diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx
index 6c2cbca..54a4078 100644
--- a/frontend/src/pages/index.tsx
+++ b/frontend/src/pages/index.tsx
@@ -1,166 +1,187 @@
-
-import React, { useEffect, useState } from 'react';
+import React from 'react';
import type { ReactElement } from 'react';
import Head from 'next/head';
import Link from 'next/link';
import BaseButton from '../components/BaseButton';
-import CardBox from '../components/CardBox';
-import SectionFullScreen from '../components/SectionFullScreen';
import LayoutGuest from '../layouts/Guest';
-import BaseDivider from '../components/BaseDivider';
-import BaseButtons from '../components/BaseButtons';
import { getPageTitle } from '../config';
-import { useAppSelector } from '../stores/hooks';
-import CardBoxComponentTitle from "../components/CardBoxComponentTitle";
-import { getPexelsImage, getPexelsVideo } from '../helpers/pexels';
-
-
-export default function Starter() {
- const [illustrationImage, setIllustrationImage] = useState({
- src: undefined,
- photographer: undefined,
- photographer_url: undefined,
- })
- const [illustrationVideo, setIllustrationVideo] = useState({video_files: []})
- const [contentType, setContentType] = useState('image');
- const [contentPosition, setContentPosition] = useState('left');
- const textColor = useAppSelector((state) => state.style.linkColor);
+import BaseIcon from '../components/BaseIcon';
+import * as icon from '@mdi/js';
+export default function LandingPage() {
const title = 'Trial Tracker'
- // Fetch Pexels image/video
- useEffect(() => {
- async function fetchData() {
- const image = await getPexelsImage();
- const video = await getPexelsVideo();
- setIllustrationImage(image);
- setIllustrationVideo(video);
- }
- fetchData();
- }, []);
+ return (
+
+
- }
-
- {hasPermission(currentUser, 'READ_ROLES') &&
-
+
+
+ )}
+
+
- Loading feed...
} + + {!activityLoading && activity_feed_items?.length === 0 && ( +No recent activity found.
+
+ {activity_feed_items?.map((item: any) => (
+
+
+ ))}
+
+
+
+
+
+
+
+
+
+ {item.actor_user?.firstName} {item.actor_user?.lastName}
+
+
+ {item.title}
+
+
+
+
+ + {item.summary} +
+ + {item.thumbnail && item.thumbnail[0] && ( +
+ {/* eslint-disable-next-line @next/next/no-img-element */}
+ 
+
+ )}
+
+
+
+
+
+ {item.link_path && (
+
+ View Details →
+
+ )}
+
-
-
-
- )
+
+
+ )
}
Dashboard.getLayout = function getLayout(page: ReactElement) {
- return
-
- }
-
- {hasPermission(currentUser, 'READ_PERMISSIONS') &&
-
-
-
- Roles
-
-
- {roles}
-
-
-
+
+
+
+
+
+
+
+
+
+ Active Projects
+ {projects}
+
+
+ Ongoing Trials
+ {trials}
+
+
+ New Submissions
+ +{form_submissions}
+
+ + Trial Tracker is running in multi-tenant mode. + Farm-level data isolation is active for your account. +
+
-
- }
-
- {hasPermission(currentUser, 'READ_ORGANIZATIONS') &&
-
-
-
-
-
- Permissions
-
-
- {permissions}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_TENANTS') &&
-
-
-
-
-
- Organizations
-
-
- {organizations}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_LOCATIONS') &&
-
-
-
-
-
- Tenants
-
-
- {tenants}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_PROJECTS') &&
-
-
-
-
-
- Locations
-
-
- {locations}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_TRIAL_TYPES') &&
-
-
-
-
-
- Projects
-
-
- {projects}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_TRIALS') &&
-
-
-
-
-
- Trial types
-
-
- {trial_types}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_FORM_TEMPLATES') &&
-
-
-
-
-
- Trials
-
-
- {trials}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_FORM_FIELDS') &&
-
-
-
-
-
- Form templates
-
-
- {form_templates}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_FORM_FIELD_CHOICES') &&
-
-
-
-
-
- Form fields
-
-
- {form_fields}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_FORM_SUBMISSIONS') &&
-
-
-
-
-
- Form field choices
-
-
- {form_field_choices}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_SUBMISSION_VALUES') &&
-
-
-
-
-
- Form submissions
-
-
- {form_submissions}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_ACTIVITY_FEED_ITEMS') &&
-
-
-
-
-
- Submission values
-
-
- {submission_values}
-
-
-
-
-
- }
-
- {hasPermission(currentUser, 'READ_REPORTS') &&
-
-
-
-
-
- Activity feed items
-
-
- {activity_feed_items}
-
-
-
-
-
- }
-
-
-
-
-
-
-
- Reports
-
-
- {reports}
-
-
-
-
+
+ {getPageTitle('Trial Tracker - Research Simplified')}
+
- const imageBlock = (image) => (
- {page} ;
-};
-
+LandingPage.getLayout = function getLayout(page: ReactElement) {
+ return {page} ;
+};
\ No newline at end of file
diff --git a/frontend/src/pages/login.tsx b/frontend/src/pages/login.tsx
index b7b5ac0..91270a2 100644
--- a/frontend/src/pages/login.tsx
+++ b/frontend/src/pages/login.tsx
@@ -1,5 +1,3 @@
-
-
import React, { useEffect, useState } from 'react';
import type { ReactElement } from 'react';
import Head from 'next/head';
@@ -62,10 +60,14 @@ export default function Login() {
dispatch(findMe());
}
}, [token, dispatch]);
- // Redirect to dashboard if user is logged in
+ // Redirect based on role if user is logged in
useEffect(() => {
if (currentUser?.id) {
- router.push('/dashboard');
+ if (currentUser.app_role?.globalAccess) {
+ router.push('/tenants/tenants-list');
+ } else {
+ router.push('/dashboard');
+ }
}
}, [currentUser?.id, router]);
// Show error message if there is one
@@ -280,4 +282,4 @@ export default function Login() {
Login.getLayout = function getLayout(page: ReactElement) {
return {page} ;
-};
+};
\ No newline at end of file
diff --git a/frontend/src/pages/search.tsx b/frontend/src/pages/search.tsx
index 00f5168..65ea1b7 100644
--- a/frontend/src/pages/search.tsx
+++ b/frontend/src/pages/search.tsx
@@ -1,10 +1,7 @@
-import React, { ReactElement, useEffect, useState } from 'react';
+import { ReactElement, useEffect, useState } from 'react';
import Head from 'next/head';
import 'react-datepicker/dist/react-datepicker.css';
-import { useAppDispatch } from '../stores/hooks';
-
-import { useAppSelector } from '../stores/hooks';
-
+import { useAppDispatch, useAppSelector } from '../stores/hooks';
import { useRouter } from 'next/router';
import LayoutAuthenticated from '../layouts/Authenticated';
import SectionTitleLineWithButton from '../components/SectionTitleLineWithButton';
@@ -93,4 +90,4 @@ SearchView.getLayout = function getLayout(page: ReactElement) {
);
};
-export default SearchView;
+export default SearchView;
\ No newline at end of file
diff --git a/frontend/src/pages/settings/company-preferences.tsx b/frontend/src/pages/settings/company-preferences.tsx
new file mode 100644
index 0000000..b8eaea5
--- /dev/null
+++ b/frontend/src/pages/settings/company-preferences.tsx
@@ -0,0 +1,181 @@
+import { mdiChartTimelineVariant, mdiCogOutline } from '@mdi/js'
+import Head from 'next/head'
+import React, { ReactElement, useEffect, useState } from 'react'
+import { useRouter } from 'next/router'
+import { Field, Form, Formik } from 'formik'
+
+import CardBox from '../../components/CardBox'
+import LayoutAuthenticated from '../../layouts/Authenticated'
+import SectionMain from '../../components/SectionMain'
+import SectionTitleLineWithButton from '../../components/SectionTitleLineWithButton'
+import { getPageTitle } from '../../config'
+import FormField from '../../components/FormField'
+import BaseDivider from '../../components/BaseDivider'
+import BaseButton from '../../components/BaseButton'
+
+import { update, fetch } from '../../stores/organizations/organizationsSlice'
+import { useAppDispatch, useAppSelector } from '../../stores/hooks'
+import { findMe } from '../../stores/authSlice'
+import axios from 'axios'
+
+const CompanyPreferencesPage = () => {
+ const router = useRouter()
+ const dispatch = useAppDispatch()
+ const { currentUser } = useAppSelector((state) => state.auth)
+ const { organizations } = useAppSelector((state) => state.organizations)
+
+ const [initialValues, setInitialValues] = useState({
+ name: '',
+ address: '',
+ city: '',
+ state: '',
+ country: '',
+ zip: '',
+ navOrientation: 'side',
+ })
+
+ const [activeOrganizationId, setActiveOrganizationId] = useState(null)
+
+ // Determine the organization ID to use
+ useEffect(() => {
+ if (currentUser?.organizations?.id || currentUser?.organizationsId) {
+ setActiveOrganizationId(currentUser?.organizations?.id || currentUser?.organizationsId);
+ } else {
+ // If user has no organization linked, try to fetch the first available one if they are an admin
+ const fetchAnyOrganization = async () => {
+ try {
+ const response = await axios.get('/organizations?limit=1')
+ if (response.data.rows && response.data.rows.length > 0) {
+ setActiveOrganizationId(response.data.rows[0].id)
+ }
+ } catch (err) {
+ console.error('Failed to fetch organization for admin:', err)
+ }
+ }
+ fetchAnyOrganization()
+ }
+ }, [currentUser])
+
+ useEffect(() => {
+ if (activeOrganizationId) {
+ dispatch(fetch({ id: activeOrganizationId }))
+ }
+ }, [activeOrganizationId, dispatch])
+
+ useEffect(() => {
+ // If organizations is an array (from list fetch) or object (from single fetch)
+ const orgData = Array.isArray(organizations) ? organizations[0] : organizations;
+
+ if (orgData && typeof orgData === 'object') {
+ setInitialValues({
+ name: orgData.name || '',
+ address: orgData.address || '',
+ city: orgData.city || '',
+ state: orgData.state || '',
+ country: orgData.country || '',
+ zip: orgData.zip || '',
+ navOrientation: orgData.navOrientation || 'side',
+ })
+ }
+ }, [organizations])
+
+ const handleSubmit = async (values: any) => {
+ if (activeOrganizationId) {
+ try {
+ const resultAction = await dispatch(update({ id: activeOrganizationId, data: values }))
+ if (update.fulfilled.match(resultAction)) {
+ // Update current user to reflect changes in orientation immediately
+ await dispatch(findMe())
+ // Reload to ensure everything is in sync
+ router.reload();
+ } else if (update.rejected.match(resultAction)) {
+ console.error('Update rejected:', resultAction.payload);
+ alert('Error updating company preferences: ' + (resultAction.payload as any)?.message || 'Unknown error');
+ }
+ } catch (err) {
+ console.error('Unexpected error:', err);
+ }
+ } else {
+ alert('No organization found to update. Please link your user to an organization.');
+ }
+ }
+
+ return (
+ <>
+
+ {getPageTitle('Company Preferences')}
+
+
+
+ {''}
+
+
+
+ {({ isSubmitting }) => (
+
+ )}
+
+
+
+
+ )
+}
+
+CompanyPreferencesPage.getLayout = function getLayout(page: ReactElement) {
+ return (
+
+ {page}
+
+ )
+}
+
+export default CompanyPreferencesPage
\ No newline at end of file
-
+ {/* Navigation */}
+
+
+ {/* Hero Section */}
+
+
+
+
+ {/* Features Section */}
+
+
+
+ {/* CTA Section */}
+
+
+
+ {/* Footer */}
+
);
-
- const videoBlock = (video) => {
- if (video?.video_files?.length > 0) {
- return (
-
+
+
+
+
+
+
+
+ Advanced Multi-tenant Solution
+
+ + Research Tracked Effortlessly. +
++ The ultimate tool for research trials. Manage projects, monitor trials, and capture field data in real-time with our beautiful, intuitive interface. +
+
+
+ Launch App
+
+
+
+
+ {/* Decorative elements */}
+
+
+
+
+
+
+
+
+
+ Powerful Capabilities
+Designed for modern field research.
+
+ {[
+ {
+ title: 'Activity Feed',
+ description: 'Stay updated with a social-media style feed of everything happening across your trials.',
+ icon: icon.mdiTimelineTextOutline,
+ color: 'bg-blue-50 text-blue-600'
+ },
+ {
+ title: 'Dynamic Forms',
+ description: 'Configure custom fields and forms for different trial types like plant vs chemical.',
+ icon: icon.mdiClipboardTextOutline,
+ color: 'bg-emerald-50 text-emerald-600'
+ },
+ {
+ title: 'Track-IT',
+ description: 'Analyze all completed forms and data in a powerful, filtered table view.',
+ icon: icon.mdiDatabaseOutline,
+ color: 'bg-teal-50 text-teal-600'
+ },
+ {
+ title: '3-Tier Locations',
+ description: 'Organize your data by Farm, Block, and Row for precise spatial tracking.',
+ icon: icon.mdiMapMarkerOutline,
+ color: 'bg-orange-50 text-orange-600'
+ },
+ {
+ title: 'Project Management',
+ description: 'Categorize trials into projects with custom start/end dates and status tracking.',
+ icon: icon.mdiFolderOutline,
+ color: 'bg-purple-50 text-purple-600'
+ },
+ {
+ title: 'Multi-tenant',
+ description: 'Seamlessly toggle between different farms as a Global Admin with full data isolation.',
+ icon: icon.mdiDomain,
+ color: 'bg-indigo-50 text-indigo-600'
+ }
+ ].map((feature, i) => (
+
+
+
+ ))}
+
+
+ {feature.title}
+{feature.description}
+
+
+
+
+
+
+
+ Ready to transform your trial tracking?
++ Join hundreds of researchers who trust Trial Tracker for their daily field operations. +
+
+
+ Get Started Now
+
-
-
-
)
- }
- };
-
- return (
-
-
- {getPageTitle('Starter Page')}
-
-
-
-
-
- );
}
-Starter.getLayout = function getLayout(page: ReactElement) {
- return
- {contentType === 'image' && contentPosition !== 'background'
- ? imageBlock(illustrationImage)
- : null}
- {contentType === 'video' && contentPosition !== 'background'
- ? videoBlock(illustrationVideo)
- : null}
-
-
-
-
-
-
-
-
-
-
- This is a React.js/Node.js app generated by the Flatlogic Web App Generator
-For guides and documentation please check - your local README.md and the Flatlogic documentation
-
-
-
- © 2026 {title}. All rights reserved
- - Privacy Policy - -