From 2499f244a2ef9b695db6170a41fa0635f7735724 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Wed, 8 Nov 2023 15:42:25 +0530 Subject: [PATCH 1/8] Update main.rs --- web_server/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_server/src/main.rs b/web_server/src/main.rs index fadf9f7a0..6af3925a9 100644 --- a/web_server/src/main.rs +++ b/web_server/src/main.rs @@ -94,7 +94,7 @@ async fn main() { // run our app with hyper // `axum::Server` is a re-export of `hyper::Server` - let addr = SocketAddr::from(([127, 0, 0, 1], 3000)); + let addr = SocketAddr::from(([0, 0, 0, 0], 3000)); // http://127.0.0.1:3000 println!("listening on {}", addr); tracing::debug!("listening on {}", addr); From 6af541cb5004d8d4b4c9c2d343c23e9d436e2d37 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 12:07:53 +0530 Subject: [PATCH 2/8] Update main.rs --- web_server/src/main.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/web_server/src/main.rs b/web_server/src/main.rs index 6af3925a9..a986d93d5 100644 --- a/web_server/src/main.rs +++ b/web_server/src/main.rs @@ -94,8 +94,16 @@ async fn main() { // run our app with hyper // `axum::Server` is a re-export of `hyper::Server` +<<<<<<< master + let addr = if cfg!(debug_assertions) { + SocketAddr::from(([127, 0, 0, 1], 3000)) + } + else { + SocketAddr::from(([0, 0, 0, 0], 3000)) + }; +======= let addr = SocketAddr::from(([0, 0, 0, 0], 3000)); - // http://127.0.0.1:3000 +>>>>>>> master println!("listening on {}", addr); tracing::debug!("listening on {}", addr); axum::Server::bind(&addr) From cc3c55ad5c9b3947097ffe6653ff8c42f220c7f2 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 12:12:04 +0530 Subject: [PATCH 3/8] Update main.rs --- web_server/src/main.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/web_server/src/main.rs b/web_server/src/main.rs index a986d93d5..23701e128 100644 --- a/web_server/src/main.rs +++ b/web_server/src/main.rs @@ -94,16 +94,13 @@ async fn main() { // run our app with hyper // `axum::Server` is a re-export of `hyper::Server` -<<<<<<< master let addr = if cfg!(debug_assertions) { SocketAddr::from(([127, 0, 0, 1], 3000)) } else { SocketAddr::from(([0, 0, 0, 0], 3000)) }; -======= - let addr = SocketAddr::from(([0, 0, 0, 0], 3000)); ->>>>>>> master + // http://127.0.0.1:3000 println!("listening on {}", addr); tracing::debug!("listening on {}", addr); axum::Server::bind(&addr) From 2b0f345e0d4651ee527359cf7cedb99013220d2c Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:04:21 +0530 Subject: [PATCH 4/8] Update App.jsx --- frontend/src/App.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index 4f65ae4e6..0a97d9007 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import Task from './components/task' +import Task from './components/Task.jsx' import Project from './containers/Project' import Menu from './containers/Menu' From bbc2131d3e51514f46103ed0a1e202e448706950 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:07:28 +0530 Subject: [PATCH 5/8] Update Project.jsx --- frontend/src/containers/Project.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/containers/Project.jsx b/frontend/src/containers/Project.jsx index 653bc3edd..9f3868a8a 100644 --- a/frontend/src/containers/Project.jsx +++ b/frontend/src/containers/Project.jsx @@ -1,6 +1,6 @@ import React from 'react' import ProjectMenu from './ProjectMenu'; -import TaskContainer from './taskContainer'; +import TaskContainer from './TaskContainer'; const Project = (props) => { const { title } = props; @@ -36,4 +36,4 @@ const Project = (props) => { ) } -export default Project \ No newline at end of file +export default Project From 4838ad1722b84e3258af966b39e304229feba56b Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:08:54 +0530 Subject: [PATCH 6/8] Update Project.jsx --- frontend/src/containers/Project.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/containers/Project.jsx b/frontend/src/containers/Project.jsx index 9f3868a8a..9eeab64ef 100644 --- a/frontend/src/containers/Project.jsx +++ b/frontend/src/containers/Project.jsx @@ -1,6 +1,6 @@ import React from 'react' import ProjectMenu from './ProjectMenu'; -import TaskContainer from './TaskContainer'; +import TaskContainer from './TaskContainer.jsx'; const Project = (props) => { const { title } = props; From 3b05857ef8dbab28c7b9f89db1cdd1be4bd4cf61 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:09:14 +0530 Subject: [PATCH 7/8] Update Project.jsx --- frontend/src/containers/Project.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/containers/Project.jsx b/frontend/src/containers/Project.jsx index 9eeab64ef..ebab6b429 100644 --- a/frontend/src/containers/Project.jsx +++ b/frontend/src/containers/Project.jsx @@ -1,5 +1,5 @@ import React from 'react' -import ProjectMenu from './ProjectMenu'; +import ProjectMenu from './ProjectMenu.jsx'; import TaskContainer from './TaskContainer.jsx'; const Project = (props) => { From 788a5cecba0b98370788bc1d40f96bc491cb5905 Mon Sep 17 00:00:00 2001 From: Vasanthi B N S <127195382+VB-123@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:12:38 +0530 Subject: [PATCH 8/8] Update TaskContainer.jsx --- frontend/src/containers/TaskContainer.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/containers/TaskContainer.jsx b/frontend/src/containers/TaskContainer.jsx index 0c32d4585..f48247889 100644 --- a/frontend/src/containers/TaskContainer.jsx +++ b/frontend/src/containers/TaskContainer.jsx @@ -1,5 +1,5 @@ import React from 'react' -import Task from '../components/task' +import Task from '../components/Task.jsx' const TaskContainer = ({ section }) => { return ( @@ -25,4 +25,4 @@ const TaskContainer = ({ section }) => { ) } -export default TaskContainer \ No newline at end of file +export default TaskContainer