Merge branch 'feature/web/dashboard' of https://github.com/COS301-SE-…

…2024/occupi into feature/web/dashboard
COS301-SE-2024 · Jul 2, 2024 · 3ff4087 · 3ff4087
2 parents cd7ac44 + a507bf4
commit 3ff4087
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/frontend/occupi-web/bun.lockb b/frontend/occupi-web/bun.lockb
diff --git a/frontend/occupi-web/src/assets/icons/Loading.tsx b/frontend/occupi-web/src/assets/icons/Loading.tsx
@@ -3,14 +3,14 @@ const Loading = () => {
         <svg width="38" height="38" viewBox="0 0 38 38" xmlns="http://www.w3.org/2000/svg">
             <defs>
                 <linearGradient x1="8.042%" y1="0%" x2="65.682%" y2="23.865%" id="a">
-                    <stop stop-color="var(--tertiary)" stop-opacity="0" offset="0%"/>
-                    <stop stop-color="var(--tertiary)" stop-opacity=".631" offset="63.146%"/>
-                    <stop stop-color="var(--tertiary)" offset="100%"/>
+                    <stop stopColor="var(--tertiary)" stopOpacity="0" offset="0%"/>
+                    <stop stopColor="var(--tertiary)" stopOpacity=".631" offset="63.146%"/>
+                    <stop stopColor="var(--tertiary)" offset="100%"/>
                 </linearGradient>
             </defs>
-            <g fill="none" fill-rule="evenodd">
+            <g fill="none" fillRule="evenodd">
                 <g transform="translate(1 1)">
-                    <path d="M36 18c0-9.94-8.06-18-18-18" id="Oval-2" stroke="url(#a)" stroke-width="3">
+                    <path d="M36 18c0-9.94-8.06-18-18-18" id="Oval-2" stroke="url(#a)" strokeWidth="3">
                         <animateTransform
                             attributeName="transform"
                             type="rotate"

diff --git a/frontend/occupi-web/src/components/index.ts b/frontend/occupi-web/src/components/index.ts
@@ -2,17 +2,17 @@ import DrawerComponent from "./drawerComponent/DrawerComponent";
 import GradientButton from "./gradientButtonComponent/gradientButton";
 import { Checkbox } from "./ui/checkbox";
 import InputBox from "./InputBox/InputBox";
-import OtpComponent from "./otpComponent/OtpComponent";
-import SideNavBarButton from "./sideNavBarButton/SideNavBarButton";
+import OtpComponent from "./OtpComponent/OtpComponent";
+import SideNavBarButton from "./SideNavBarButton/SideNavBarButton";
 import TopNav from './topNav/TopNav';
 import GraphContainer from "./graphContainer/GraphContainer";
 import TabComponent from "./tabComponent/TabComponent";
 import Appearance from "./appearance/Appearance";
 import MenuItem from './drawerComponent/menuItem/MenuItem';
 import Bookings from "./bookings/Bookings";
 import OverView from "./overView/OverView";
-import OverviewComponent from "./overviewComponent/OverviewComponent";
-import ProfileComponent from "./profileComponent/ProfileComponent";
+import OverviewComponent from "./OverviewComponent/OverviewComponent";
+import ProfileComponent from "./ProfileComponent/ProfileComponent";
 import SearchBarComponent from "./searchBarComponent/SearchBar";
 import SideNav from "./sideNavComponent/SideNav";
 import Line_Chart from "./linechart/Line_Chart";