Merge pull request #44 from Dcastro99/dannyData

Danny data
Dcastro99 · Sep 29, 2022 · 0f96a49 · 0f96a49
2 parents d6355d2 + 68f9102
commit 0f96a49
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/backend/src/server.js b/backend/src/server.js
@@ -20,7 +20,8 @@ const server = http.createServer(app);
 
 const io = new Server(server, {
   cors: {
-    origin: "http://localhost:3000",
+    // origin: "http://localhost:3000",
+    origin: "/",
     methods: ["GET", "POST"],
   },
 });

diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -2,7 +2,7 @@ import React from 'react';
 import { BrowserRouter as Router, Routes, Route } from 'react-router-dom';
 import ReactLoading from 'react-loading';
 import { withAuth0 } from '@auth0/auth0-react';
-import Welcome from '../../frontend/src/components/Welcome/index';
+import Welcome from './components/Welcome';
 import axios from 'axios';
 import ExplorePage from './pages/ExplorePage.js';
 import AboutUsPage from './pages/AboutUsPage.js';
@@ -23,7 +23,7 @@ class App extends React.Component {
       allTrails: [],
     };
   }
-
+  //fixed env
   componentDidMount() {
     this.handleGetAllTrails();
   }
@@ -69,7 +69,7 @@ class App extends React.Component {
                   <HomePage allTrails={this.state.allTrails} auth0={this.props.auth0} />
                 }
               />
-              <Route path="Trails" element={<Trails />} />
+              <Route path="/trails" element={<Trails />} />
               <Route exact path='/weather' element={< Weather />} />
               <Route exact path='/explore' element={< ExplorePage auth0={this.props.auth0} />} />
               <Route exact path='/profile' element={< ProfilePage auth0={this.props.auth0} />} />

diff --git a/frontend/src/components/Socket-io/index.js b/frontend/src/components/Socket-io/index.js
@@ -37,7 +37,7 @@ function Chat(props) {
     return chat.map(({ name, message }, index) => (
       <div key={index}>
         <h3>
-          <p id='userName'>{user.given_name}:</p> <span id='chatmessage'>{message}</span>
+          <p id='userName'>{user.name}:</p> <span id='chatmessage'>{message}</span>
         </h3>
       </div>
     ))