Merge pull request #1433 from OneCommunityGlobal/development

Frontend Release to Main [2.95]

.eslintignore

@@ -24,9 +24,9 @@ src/components/App.jsx
 src/components/AutoReload/**
 src/components/AutoUpdate/**
 src/components/Badge/**
-src/components/BMDashboard/**
 src/components/common/**
 src/components/Header/**
+src/components/BMDashboard/BMHeader/**
 src/components/Inventory/**
 src/components/Login/**
 src/components/ManageMemberships/**

.gitattributes

@@ -1 +1 @@
-# * text eol=lf
+* text eol=lf

package.json

@@ -68,7 +68,7 @@
     "redux-actions": "^2.6.5",
     "redux-persist": "^5.10.0",
     "redux-thunk": "^2.3.0",
-    "tinymce": "^5.10.7",
+    "tinymce": "^5.10.8",
     "uuid": "^9.0.1",
     "websocket-extensions": ">=0.1.4"
   },

src/actions/bmdashboard/materialsActions.js

@@ -0,0 +1,31 @@
+import axios from "axios";
+
+import { ENDPOINTS } from "utils/URL";
+import { SET_MATERIALS } from "constants/bmdashboard/materialsConstants";
+import { GET_ERRORS } from "constants/errors";
+
+export const fetchAllMaterials = () => {
+  return async dispatch => {
+    axios.get(ENDPOINTS.BM_MATERIALS_LIST)
+    .then(res => {
+      dispatch(setMaterials(res.data))
+    })
+    .catch(err => {
+      dispatch(setErrors(err))
+    })
+  } 
+}
+
+export const setMaterials = payload => {
+  return {
+    type: SET_MATERIALS,
+    payload
+  }
+}
+
+export const setErrors = payload => {
+  return { 
+    type: GET_ERRORS,
+    payload
+  }
+}

src/components/BMDashboard/BMDashboard.jsx

@@ -1,4 +1,4 @@
-import { Row, Col, Container, Form, Button } from 'reactstrap';
+import { Container } from 'reactstrap';
 import ProjectsList from './Projects/ProjectsList';
 import ProjectSelectForm from './Projects/ProjectSelectForm';
 import './BMDashboard.css';
@@ -22,7 +22,7 @@ const dummyProjects = [
   },
 ];
 
-export const BMDashboard = () => {
+export function BMDashboard() {
   return (
     <Container className="justify-content-center align-items-center mw-80 px-4">
       <header className="bm-dashboard__header">
@@ -34,6 +34,6 @@ export const BMDashboard = () => {
       </main>
     </Container>
   );
-};
+}
 
 export default BMDashboard;

src/components/BMDashboard/BMHeader/BMHeader.css

@@ -0,0 +1,64 @@
+.header-wrapper {
+  height: fit-content;
+  width: clamp(100vw, 0.1rem + 1vw, 100%);
+}
+
+.navbar {
+  z-index: 100;
+  white-space: nowrap;
+}
+
+.timer-message-section {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  gap: 1rem;
+}
+
+.nav-links {
+  align-items: center;
+}
+
+.redBackGroupHeader {
+  z-index: 10;
+  bottom: 0;
+  right: 0;
+  position: relative;
+  height: 30px;
+  text-align: center;
+  vertical-align: middle;
+  background: #ff4d4f;
+  border-radius: 40px;
+  color: #fff;
+  padding: 3px 6px;
+  max-width: 39px;
+  font-size: 1rem;
+  min-width: 29px;
+}
+
+.owner-message {
+  margin-right: 3rem;
+}
+
+@media (max-width: 1500px) {
+  .dashboard-text-link {
+    font-size: 14px;
+  }
+
+  .owner-message {
+    margin-right: 0;
+  }
+}
+
+@media (max-width: 1400px) {
+  .timer-message-section {
+    display: flex;
+    width: 0;
+    margin-right: 0;
+  }
+
+  .owner-message {
+    display: none;
+  }
+}