diff --git a/public/fonts/DMMono-Italic.ttf b/public/fonts/DMMono-Italic.ttf new file mode 100644 index 0000000..5869450 Binary files /dev/null and b/public/fonts/DMMono-Italic.ttf differ diff --git a/public/fonts/DMMono-Italic.woff b/public/fonts/DMMono-Italic.woff new file mode 100644 index 0000000..6ef33c0 Binary files /dev/null and b/public/fonts/DMMono-Italic.woff differ diff --git a/public/fonts/DMMono-Italic.woff2 b/public/fonts/DMMono-Italic.woff2 new file mode 100644 index 0000000..54fdc20 Binary files /dev/null and b/public/fonts/DMMono-Italic.woff2 differ diff --git a/public/fonts/DMMono-Light.ttf b/public/fonts/DMMono-Light.ttf new file mode 100644 index 0000000..b655a6e Binary files /dev/null and b/public/fonts/DMMono-Light.ttf differ diff --git a/public/fonts/DMMono-Light.woff b/public/fonts/DMMono-Light.woff new file mode 100644 index 0000000..fbbf788 Binary files /dev/null and b/public/fonts/DMMono-Light.woff differ diff --git a/public/fonts/DMMono-Light.woff2 b/public/fonts/DMMono-Light.woff2 new file mode 100644 index 0000000..b350b1b Binary files /dev/null and b/public/fonts/DMMono-Light.woff2 differ diff --git a/public/fonts/DMMono-LightItalic.ttf b/public/fonts/DMMono-LightItalic.ttf new file mode 100644 index 0000000..164a019 Binary files /dev/null and b/public/fonts/DMMono-LightItalic.ttf differ diff --git a/public/fonts/DMMono-LightItalic.woff b/public/fonts/DMMono-LightItalic.woff new file mode 100644 index 0000000..a272ee4 Binary files /dev/null and b/public/fonts/DMMono-LightItalic.woff differ diff --git a/public/fonts/DMMono-LightItalic.woff2 b/public/fonts/DMMono-LightItalic.woff2 new file mode 100644 index 0000000..5ea75ec Binary files /dev/null and b/public/fonts/DMMono-LightItalic.woff2 differ diff --git a/public/fonts/DMMono-Medium.ttf b/public/fonts/DMMono-Medium.ttf new file mode 100644 index 0000000..8a9988e Binary files /dev/null and b/public/fonts/DMMono-Medium.ttf differ diff --git a/public/fonts/DMMono-Medium.woff b/public/fonts/DMMono-Medium.woff new file mode 100644 index 0000000..bd9646a Binary files /dev/null and b/public/fonts/DMMono-Medium.woff differ diff --git a/public/fonts/DMMono-Medium.woff2 b/public/fonts/DMMono-Medium.woff2 new file mode 100644 index 0000000..aa607de Binary files /dev/null and b/public/fonts/DMMono-Medium.woff2 differ diff --git a/public/fonts/DMMono-MediumItalic.ttf b/public/fonts/DMMono-MediumItalic.ttf new file mode 100644 index 0000000..24103cd Binary files /dev/null and b/public/fonts/DMMono-MediumItalic.ttf differ diff --git a/public/fonts/DMMono-MediumItalic.woff b/public/fonts/DMMono-MediumItalic.woff new file mode 100644 index 0000000..c8f9e35 Binary files /dev/null and b/public/fonts/DMMono-MediumItalic.woff differ diff --git a/public/fonts/DMMono-MediumItalic.woff2 b/public/fonts/DMMono-MediumItalic.woff2 new file mode 100644 index 0000000..daa5a6c Binary files /dev/null and b/public/fonts/DMMono-MediumItalic.woff2 differ diff --git a/public/fonts/DMMono-Regular.ttf b/public/fonts/DMMono-Regular.ttf new file mode 100644 index 0000000..4bb53cf Binary files /dev/null and b/public/fonts/DMMono-Regular.ttf differ diff --git a/public/fonts/DMMono-Regular.woff b/public/fonts/DMMono-Regular.woff new file mode 100644 index 0000000..2cf66d2 Binary files /dev/null and b/public/fonts/DMMono-Regular.woff differ diff --git a/public/fonts/DMMono-Regular.woff2 b/public/fonts/DMMono-Regular.woff2 new file mode 100644 index 0000000..c36abf6 Binary files /dev/null and b/public/fonts/DMMono-Regular.woff2 differ diff --git a/public/fonts/DMSans-Bold.ttf b/public/fonts/DMSans-Bold.ttf new file mode 100644 index 0000000..e70172a Binary files /dev/null and b/public/fonts/DMSans-Bold.ttf differ diff --git a/public/fonts/DMSans-Bold.woff b/public/fonts/DMSans-Bold.woff new file mode 100644 index 0000000..e52c156 Binary files /dev/null and b/public/fonts/DMSans-Bold.woff differ diff --git a/public/fonts/DMSans-Bold.woff2 b/public/fonts/DMSans-Bold.woff2 new file mode 100644 index 0000000..96f9f3b Binary files /dev/null and b/public/fonts/DMSans-Bold.woff2 differ diff --git a/public/fonts/DMSans-BoldItalic.ttf b/public/fonts/DMSans-BoldItalic.ttf new file mode 100644 index 0000000..8b972ca Binary files /dev/null and b/public/fonts/DMSans-BoldItalic.ttf differ diff --git a/public/fonts/DMSans-BoldItalic.woff b/public/fonts/DMSans-BoldItalic.woff new file mode 100644 index 0000000..56c070b Binary files /dev/null and b/public/fonts/DMSans-BoldItalic.woff differ diff --git a/public/fonts/DMSans-BoldItalic.woff2 b/public/fonts/DMSans-BoldItalic.woff2 new file mode 100644 index 0000000..b59de74 Binary files /dev/null and b/public/fonts/DMSans-BoldItalic.woff2 differ diff --git a/public/fonts/DMSans-Italic.ttf b/public/fonts/DMSans-Italic.ttf new file mode 100644 index 0000000..b965526 Binary files /dev/null and b/public/fonts/DMSans-Italic.ttf differ diff --git a/public/fonts/DMSans-Italic.woff b/public/fonts/DMSans-Italic.woff new file mode 100644 index 0000000..ab190a5 Binary files /dev/null and b/public/fonts/DMSans-Italic.woff differ diff --git a/public/fonts/DMSans-Italic.woff2 b/public/fonts/DMSans-Italic.woff2 new file mode 100644 index 0000000..71c7353 Binary files /dev/null and b/public/fonts/DMSans-Italic.woff2 differ diff --git a/public/fonts/DMSans-Medium.ttf b/public/fonts/DMSans-Medium.ttf new file mode 100644 index 0000000..71b2277 Binary files /dev/null and b/public/fonts/DMSans-Medium.ttf differ diff --git a/public/fonts/DMSans-Medium.woff b/public/fonts/DMSans-Medium.woff new file mode 100644 index 0000000..43ca4a6 Binary files /dev/null and b/public/fonts/DMSans-Medium.woff differ diff --git a/public/fonts/DMSans-Medium.woff2 b/public/fonts/DMSans-Medium.woff2 new file mode 100644 index 0000000..e29cf89 Binary files /dev/null and b/public/fonts/DMSans-Medium.woff2 differ diff --git a/public/fonts/DMSans-MediumItalic.ttf b/public/fonts/DMSans-MediumItalic.ttf new file mode 100644 index 0000000..d3293d6 Binary files /dev/null and b/public/fonts/DMSans-MediumItalic.ttf differ diff --git a/public/fonts/DMSans-MediumItalic.woff b/public/fonts/DMSans-MediumItalic.woff new file mode 100644 index 0000000..a5267dc Binary files /dev/null and b/public/fonts/DMSans-MediumItalic.woff differ diff --git a/public/fonts/DMSans-MediumItalic.woff2 b/public/fonts/DMSans-MediumItalic.woff2 new file mode 100644 index 0000000..31c650b Binary files /dev/null and b/public/fonts/DMSans-MediumItalic.woff2 differ diff --git a/public/fonts/DMSans-Regular.ttf b/public/fonts/DMSans-Regular.ttf new file mode 100644 index 0000000..cad73f0 Binary files /dev/null and b/public/fonts/DMSans-Regular.ttf differ diff --git a/public/fonts/DMSans-Regular.woff b/public/fonts/DMSans-Regular.woff new file mode 100644 index 0000000..225f3e4 Binary files /dev/null and b/public/fonts/DMSans-Regular.woff differ diff --git a/public/fonts/DMSans-Regular.woff2 b/public/fonts/DMSans-Regular.woff2 new file mode 100644 index 0000000..b6eeb11 Binary files /dev/null and b/public/fonts/DMSans-Regular.woff2 differ diff --git a/public/fonts/fonts.css b/public/fonts/fonts.css new file mode 100644 index 0000000..ded7918 --- /dev/null +++ b/public/fonts/fonts.css @@ -0,0 +1,119 @@ +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-Regular.woff2') format('woff2'), + url('./DMSans-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-Bold.woff2') format('woff2'), + url('./DMSans-Bold.woff') format('woff'); + font-weight: 700; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-Italic.woff2') format('woff2'), + url('./DMSans-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-Medium.woff2') format('woff2'), + url('./DMSans-Medium.woff') format('woff'); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-MediumItalic.woff2') format('woff2'), + url('./DMSans-MediumItalic.woff') format('woff'); + font-weight: 500; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'DM Sans'; + src: + url('./DMSans-BoldItalic.woff2') format('woff2'), + url('./DMSans-BoldItalic.woff') format('woff'); + font-weight: 700; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-Regular.woff2') format('woff2'), + url('./DMMono-Regular.woff') format('woff'); + font-weight: 400; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-Medium.woff2') format('woff2'), + url('./DMMono-Medium.woff') format('woff'); + font-weight: 500; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-MediumItalic.woff2') format('woff2'), + url('./DMMono-MediumItalic.woff') format('woff'); + font-weight: 500; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-Light.woff2') format('woff2'), + url('./DMMono-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-LightItalic.woff2') format('woff2'), + url('./DMMono-LightItalic.woff') format('woff'); + font-weight: 300; + font-style: italic; + font-display: swap; +} + +@font-face { + font-family: 'DM Mono'; + src: + url('./DMMono-Italic.woff2') format('woff2'), + url('./DMMono-Italic.woff') format('woff'); + font-weight: 400; + font-style: italic; + font-display: swap; +} diff --git a/public/index.html b/public/index.html index 362c43f..b4da97c 100644 --- a/public/index.html +++ b/public/index.html @@ -24,6 +24,7 @@ work correctly both with client-side routing and a non-root public URL. Learn how to configure a non-root public URL by running `npm run build`. --> + Farm Control diff --git a/src/App.css b/src/App.css index 2c18b4d..709352a 100644 --- a/src/App.css +++ b/src/App.css @@ -1,3 +1,35 @@ +.ant-typography, +.ant-descriptions-item-label, +.ant-descriptions-item-content, +.ant-menu-title-content, +.ant-tag, +.ant-checkbox-label, +.ant-btn, +.ant-breadcrumb-link, +.ant-dropdown-menu-title-content, +.ant-notification-notice-message, +.ant-notification-notice-description, +.ant-message-custom-content, +.ant-modal-title, +.ant-modal-body, +.ant-table-column-title, +.ant-table-cell, +.ant-alert-message, +.ant-drawer-title, +.ant-tooltip-inner, +.ant-form-item-control-input-content, +.ant-form-item-control-input, +.ant-input, +.ant-input-number .ant-input-number-input, +.ant-segmented-item-label, +.ant-badge-status-text { + font-family: 'DM Sans'; +} + +.ant-typography code { + font-family: 'DM Mono'; +} + :root { --unit-100vh: 100vh; } @@ -82,3 +114,53 @@ code { .ant-popover-inner:has(.spotlight-tooltip) { padding: 0 !important; } + +/* --- Start of src/index.css --- */ +body { + margin: 0; +} + +.ant-modal-mask { + backdrop-filter: blur(3px); +} + +.ant-spin-blur { + filter: blur(3px); +} +/* --- End of src/index.css --- */ + +/* --- Start of src/components/Dashboard/Layout.css --- */ +.no-padding-collapse .ant-collapse-header { + padding: 0 !important; +} + +.no-padding-collapse .ant-collapse-content-box { + padding: 0 !important; +} + +.no-h-padding-collapse .ant-collapse-header { + padding-top: 0 !important; + padding-left: 0 !important; + padding-right: 0 !important; + padding-bottom: 4px !important; +} + +.no-h-padding-collapse .ant-collapse-content-box { + padding-left: 0 !important; + padding-right: 0 !important; + padding-bottom: 0 !important; +} + +.no-padding-collapse .ant-collapse-item, +.no-v-padding-collapse .ant-collapse-item { + border: none !important; +} +/* --- End of src/components/Dashboard/Layout.css --- */ + +/* --- Start of src/components/Dashboard/common/DashboardSidebar.css --- */ +.ant-layout-sider { + width: 250px; /* Adjust the width as per your preference */ + min-width: 250px; /* Ensure a minimum width to avoid collapsing */ + max-width: 400px; /* Optionally set a maximum width */ +} +/* --- End of src/components/Dashboard/common/DashboardSidebar.css --- */ diff --git a/src/components/Dashboard/Layout.css b/src/components/Dashboard/Layout.css deleted file mode 100644 index 1930dd4..0000000 --- a/src/components/Dashboard/Layout.css +++ /dev/null @@ -1,25 +0,0 @@ -.no-padding-collapse .ant-collapse-header { - padding: 0 !important; -} - -.no-padding-collapse .ant-collapse-content-box { - padding: 0 !important; -} - -.no-h-padding-collapse .ant-collapse-header { - padding-top: 0 !important; - padding-left: 0 !important; - padding-right: 0 !important; - padding-bottom: 4px !important; -} - -.no-h-padding-collapse .ant-collapse-content-box { - padding-left: 0 !important; - padding-right: 0 !important; - padding-bottom: 0 !important; -} - -.no-padding-collapse .ant-collapse-item, -.no-v-padding-collapse .ant-collapse-item { - border: none !important; -} diff --git a/src/components/Dashboard/Layout.jsx b/src/components/Dashboard/Layout.jsx index 9bc05ae..9fd8e5a 100644 --- a/src/components/Dashboard/Layout.jsx +++ b/src/components/Dashboard/Layout.jsx @@ -8,7 +8,6 @@ import InventorySidebar from './Inventory/InventorySidebar' import ManagementSidebar from './Management/ManagementSidebar' import DashboardNavigation from './common/DashboardNavigation' import DashboardBreadcrumb from './common/DashboardBreadcrumb' -import './Layout.css' import DeveloperSidebar from './Developer/DeveloperSidebar' const { Content } = Layout diff --git a/src/components/Dashboard/common/DashboardSidebar.css b/src/components/Dashboard/common/DashboardSidebar.css deleted file mode 100644 index 80301bf..0000000 --- a/src/components/Dashboard/common/DashboardSidebar.css +++ /dev/null @@ -1,5 +0,0 @@ -.ant-layout-sider { - width: 250px; /* Adjust the width as per your preference */ - min-width: 250px; /* Ensure a minimum width to avoid collapsing */ - max-width: 400px; /* Optionally set a maximum width */ - } \ No newline at end of file diff --git a/src/components/Dashboard/context/AuthContext.js b/src/components/Dashboard/context/AuthContext.js index 5260357..b9bf589 100644 --- a/src/components/Dashboard/context/AuthContext.js +++ b/src/components/Dashboard/context/AuthContext.js @@ -142,7 +142,7 @@ const AuthProvider = ({ children }) => { refreshToken() }} > - Extend Session + Reload Session ) }) diff --git a/src/index.css b/src/index.css deleted file mode 100644 index 258392c..0000000 --- a/src/index.css +++ /dev/null @@ -1,11 +0,0 @@ -body { - margin: 0; -} - -.ant-modal-mask { - backdrop-filter: blur(3px); -} - -.ant-spin-blur { - filter: blur(3px); -} diff --git a/src/index.js b/src/index.js index f49c8e5..6125e3d 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,6 @@ import reportWebVitals from './reportWebVitals' import React from 'react' import ReactDOM from 'react-dom/client' import FarmControlApp from './App' -import './index.css' const root = ReactDOM.createRoot(document.getElementById('root')) root.render(