Update accent color in NavBar component

COS301-SE-2024 · Oct 1, 2024 · e310d11 · e310d11
1 parent a758074
commit e310d11
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/frontend/occupi-mobile4/components/NavBar.tsx b/frontend/occupi-mobile4/components/NavBar.tsx
@@ -16,7 +16,7 @@ const NavBar = () => {
   const { theme } = useTheme();
   const currentTheme = theme === "system" ? colorScheme : theme;
   const styles = getStyles(currentTheme);
-  const [accentColour, setAccentColour] = useState('#FF6B35');
+  const [accentColour, setAccentColour] = useState('greenyellow');
   const { currentTab, setCurrentTab } = useNavBar();
   const [showPopup, setShowPopup] = useState(false);
   const isDarkMode = currentTheme === "dark";

diff --git a/frontend/occupi-mobile4/screens/Booking/BookRoom.tsx b/frontend/occupi-mobile4/screens/Booking/BookRoom.tsx
@@ -121,9 +121,6 @@ const BookRoom = () => {
           <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', paddingHorizontal: 16 }}>
             <Text style={{ fontWeight: 'bold', fontSize: 24, color: textColor }}>Book</Text>
           </View>
-          <View style={{ marginHorizontal: 16, marginVertical: 24, width: wp('92%'), backgroundColor: cardBackgroundColor, borderRadius: 15, borderColor: cardBackgroundColor, height: hp('5%'), justifyContent: 'center', paddingHorizontal: 10 }}>
-            <Text style={{ fontSize: wp('4%'), color: textColor }}>Quick search for an office</Text>
-          </View>
           <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', paddingHorizontal: 16 }}>
             <Text style={{ fontWeight: 'bold', fontSize: 18, color: textColor }}>Rooms</Text>
             <TouchableOpacity onPress={toggleLayout}>

diff --git a/frontend/occupi-mobile4/screens/Booking/ViewBookings.tsx b/frontend/occupi-mobile4/screens/Booking/ViewBookings.tsx
@@ -309,24 +309,15 @@ const ViewBookings = () => {
 
 
     return (
-        <View px="$4" style={{ flex: 1, backgroundColor, paddingTop: 60 }}>
+        <View px="$4" style={{ flex: 1, backgroundColor, paddingTop: 80,  }}>
             <View style={{ flexDirection: 'column', backgroundColor }}>
-                <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center' }}>
+                <View style={{ flexDirection: 'row', justifyContent: 'space-between', alignItems: 'center', marginBottom: 12 }}>
                     <Text fontWeight="$bold" fontSize={24} color={textColor}>My Bookings</Text>
                     <Tooltip
                         content="Check your current and historical bookings!"
                         placement="bottom"
                     />
                 </View>
-                <Input my="$6" w="$full" backgroundColor={cardBackgroundColor} borderRadius="$xl" borderColor={cardBackgroundColor} h={hp('5%')}>
-                    <InputField
-                        placeholder="Quick search for an office"
-                        fontSize={wp('4%')}
-                        type="text"
-                        returnKeyType="done"
-                        color={textColor}
-                    />
-                </Input>
                 <View flexDirection="row" justifyContent="space-between" alignItems="center" mb="$4">
                     <View flexDirection="row">
 

diff --git a/frontend/occupi-mobile4/screens/Dashboard/Dashboard.tsx b/frontend/occupi-mobile4/screens/Dashboard/Dashboard.tsx
@@ -456,10 +456,10 @@ const Dashboard: React.FC = () => {
               ref={pagerRef}
             >
               <View key="1" justifyContent='center'>
-                <LineGraph data={currentData} />
+                <BarGraph data={currentData} tab={activeTab} />
               </View>
               <View key="2" justifyContent='center'>
-                <BarGraph data={currentData} tab={activeTab} />
+                <LineGraph data={currentData} />
               </View>
             </PagerView>
           </View >
@@ -571,7 +571,7 @@ const Dashboard: React.FC = () => {
               justifyContent: 'center',
               alignItems: 'center'
             }}
-            onPress={() => router.push('/stats')}
+            onPress={() => router.push('/loadingcreen')}
           >
             <View flexDirection="row" alignItems="center" justifyContent='space-between'>
               <View flexDirection='row' alignItems='center'>

diff --git a/frontend/occupi-mobile4/utils/auth.ts b/frontend/occupi-mobile4/utils/auth.ts
@@ -30,7 +30,7 @@ export async function UserLogin(email: string, password: string) {
                 fetchUserDetails(email, response.data.token);
                 fetchNotificationSettings(email);
                 fetchSecuritySettings(email);
-                router.replace('/viewbookings');
+                router.replace('/home');
             }
             else {
                 setState('verify_otp_login');