Merge pull request #33 from Evozone/main

Fix link colors
Evozone · Feb 12, 2023 · 14dd323 · 14dd323
2 parents 8e29532 + f78cbe7
commit 14dd323
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/client/src/components/TextBody.js b/client/src/components/TextBody.js
@@ -179,14 +179,28 @@ export default function TextBody({ message, endRef }) {
                                         <Link
                                             key={index}
                                             href={src}
-                                            target='_blank'
-                                            rel='noopener noreferrer'
+                                            target={
+                                                item.includes(
+                                                    'comfortspace.netlify.app'
+                                                )
+                                                    ? '_self'
+                                                    : '_blank'
+                                            }
+                                            rel={
+                                                item.includes(
+                                                    'comfortspace.netlify.app'
+                                                )
+                                                    ? ''
+                                                    : 'noopener noreferrer'
+                                            }
                                             sx={{
-                                                color: 'white',
+                                                ...(currentUser.uid ===
+                                                message.senderId
+                                                    ? {
+                                                          color: '#00f6ff',
+                                                      }
+                                                    : { color: '#1769e3' }),
                                                 textDecoration: 'underline',
-                                                '&:hover': {
-                                                    color: 'lightblue',
-                                                },
                                             }}
                                         >
                                             {item}

diff --git a/client/src/index.js b/client/src/index.js
@@ -1,15 +1,16 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
 import { Provider } from 'react-redux';
-// import { legacy_createStore as createStore } from 'redux';
-import { legacy_createStore as createStore, compose } from 'redux';
+import { legacy_createStore as createStore } from 'redux';
+// import { legacy_createStore as createStore, compose } from 'redux';
 import { BrowserRouter } from 'react-router-dom';
 
 import App from './App';
 import reducers from './reducers/reducers';
 
-const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
-const store = createStore(reducers, composeEnhancers());
+// const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
+// const store = createStore(reducers, composeEnhancers());
+const store = createStore(reducers);
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(