Merge pull request #15 from lora322/master

Merge pull request #14 from lora322/ai-dev

frontend/src/components/FooterBar.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode } from 'react';
+ciimport React, { ReactNode } from 'react';
 import LanguageSwitcher from './LanguageSwitcher';
 import { containerMaxW } from '../config';
 import Logo from './Logo';
@@ -16,8 +16,8 @@ export default function FooterBar({ children }: Props) {
         <div className='text-center md:text-left mb-6 md:mb-0'>
           <b>
             &copy;{year},{` `}
-            <a href='https://flatlogic.com/' rel='noreferrer' target='_blank'>
+            <a href='https://veracityres.com/' rel='noreferrer' target='_blank'>
-              Flatlogic
+              Veracity Real Estate Solutions
             </a>
             .
           </b>
@@ -27,7 +27,7 @@ export default function FooterBar({ children }: Props) {
 
         <div className='flex item-center md:py-2 gap-4'>
           <LanguageSwitcher />
-          <a href='https://flatlogic.com/' rel='noreferrer' target='_blank'>
+          <a href='https://veracityres.com.com/' rel='noreferrer' target='_blank'>
             <Logo className='w-auto h-8 md:h-6 mx-auto' />
           </a>
         </div>

frontend/src/components/Logo/index.tsx

@@ -7,9 +7,9 @@ type Props = {
 export default function Logo({ className = '' }: Props) {
   return (
     <img
-      src={'https://flatlogic.com/logo.svg'}
+      src={'https://veracityres.com/wp-content/uploads/2024/08/VRES_logo_blk-red-tr.png'}
       className={className}
-      alt={'Flatlogic logo'}
+      alt={'VRES logo'}
     ></img>
   );
 }

frontend/src/pages/login.tsx

@@ -361,7 +361,7 @@ export default function Login() {
       </SectionFullScreen>
       <div className='bg-black text-white flex flex-col text-center justify-center md:flex-row'>
         <p className='py-6 text-sm'>
-          © 2024 <span>{title}</span>.{' '}
+          © 2025 <span>{title}</span>.{' '}
           {t('pages.login.footer.copyright', {
             defaultValue: '© All rights reserved',
           })}

frontend/src/pages/orders/orders-new.tsx

@@ -50,6 +50,22 @@ const OrdersNew = () => {
   const router = useRouter();
   const dispatch = useAppDispatch();
 
+   // State for property options
+  const [propertyOptions, setPropertyOptions] = useState([]);
+
+  // Fetch property options from your backend API
+  useEffect(() => {
+    fetch('https://vres.flatlogic.app/api/properties') // <-- uses deployed api
+      .then(res => res.json())
+      .then(data => {
+        const options = data.map(property => ({
+          value: property.id,
+          label: property.name,
+        }));
+        setPropertyOptions(options);
+      });
+  }, []);
+  
   const handleSubmit = async (data) => {
     await dispatch(create(data));
     await router.push('/orders/orders-list');
@@ -88,9 +104,9 @@ const OrdersNew = () => {
                   name='property'
                   id='property'
                   component={SelectField}
-                  options={[]}
+                  options={propertyOptions}
                   itemRef={'properties'}
-                ></Field>
+                />
               </FormField>
 
               <FormField label='RequestedDate'>

frontend/tailwind.config.js

@@ -51,7 +51,7 @@ module.exports = {
           text: '#45B26B',
         },
         pavitra: {
-          blue: '#0162FD',
+          blue: '#244E5E',
           green: '#00B448',
           orange: '#FFAA00',
           red: '#F20041',
@@ -67,8 +67,8 @@ module.exports = {
         pastelEmeraldTheme: {
           text: '#515564',
           iconsColor: '#030A0D',
-          mainBG: '#DFECF2',
+          mainBG: '#FFFFFF',
-          buttonColor: '#030A0D',
+          buttonColor: '#244E5E',
           outsideCardColor: '#D0E1E9',
           cardColor: '#DFECF2',
           webSiteComponentBg: '#030A0D',