From 6833f04abc825563008dc59da095da62ade809f0 Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 16:20:27 +0530 Subject: [PATCH 1/6] Create main.yml added file to help deploy code from github to server --- .github/workflows/main.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..69cda60 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,32 @@ +name: demo deployement + +on: + push: + branches: [ "main" ] + paths: + - 'client/**' + - 'server/**' + +jobs: + build-and-deploy-client: + name: Build and Deploy Client + runs-on: amazonlinux-2 + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + - name: Build client + run: | + cd client + npm install --legacy-peer-deps + npm run build + + - name: Deploy client + uses: easingthemes/ssh-deploy@v2 + with: + REMOTE_HOST : ${{ secrets.SERVER_IP }} + REMOTE_USER : ${{ secrets.FE_USER }} + SSH_PRIVATE_KEY : ${{ secrets.EC2_FE_SSH_KEY }} + SOURCE : 'client/build' + TARGET : '/home/hackathon-test' From 6b4abf075e8a2018dcbf2121b2d25858b07b233f Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 16:50:35 +0530 Subject: [PATCH 2/6] Update App.js --- client/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/App.js b/client/src/App.js index 0826353..5be48ed 100644 --- a/client/src/App.js +++ b/client/src/App.js @@ -18,7 +18,7 @@ import { AssistantsList, AssistantsChatPage, ChatPage, - AssistantFileDownloadPage, + AssistantFileDownloadPage } from "./Pages"; import Layout from "./Pages/Layout"; From 1fb7d2946c316a30fa4133279aca3f3373d78dd2 Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 16:59:50 +0530 Subject: [PATCH 3/6] Update app.js --- server/app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/app.js b/server/app.js index b83dc17..60c058c 100644 --- a/server/app.js +++ b/server/app.js @@ -39,6 +39,10 @@ app.get("/", (req, res) => { var upload = multer(); + + + + app.post("/api/init", initSetup); app.use("/api/auth", router); app.use("/api/user", userRouter); From c88150c067392405a1b350ad30af8960f0c7ccc9 Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 18:35:09 +0530 Subject: [PATCH 4/6] Update app.js --- server/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 60c058c..eb4afb8 100644 --- a/server/app.js +++ b/server/app.js @@ -21,7 +21,7 @@ import assistantThreadRouter from './routers/assistantThreadRoutes.js'; import teamRouter from "./routers/teamRoutes.js"; import organizationRouter from "./routers/organizationRoutes.js"; import { errorLogger } from "./middlewares/errorMiddleware.js"; -import { initSetup } from './controllers/initController.js' +import { initSetup } from './controllers/initController.js'; const app = express(); app.use(cors({ From e5d8b55badc1d608dcff79cc7cf86e17d1c0e262 Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 18:48:19 +0530 Subject: [PATCH 5/6] Update app.js --- server/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index eb4afb8..60c058c 100644 --- a/server/app.js +++ b/server/app.js @@ -21,7 +21,7 @@ import assistantThreadRouter from './routers/assistantThreadRoutes.js'; import teamRouter from "./routers/teamRoutes.js"; import organizationRouter from "./routers/organizationRoutes.js"; import { errorLogger } from "./middlewares/errorMiddleware.js"; -import { initSetup } from './controllers/initController.js'; +import { initSetup } from './controllers/initController.js' const app = express(); app.use(cors({ From 35e2d28b32036ab05814b92ef45c70a5f5d00bee Mon Sep 17 00:00:00 2001 From: Sankalp Chari Date: Fri, 8 Mar 2024 19:01:02 +0530 Subject: [PATCH 6/6] Update app.js --- server/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/app.js b/server/app.js index 60c058c..eb4afb8 100644 --- a/server/app.js +++ b/server/app.js @@ -21,7 +21,7 @@ import assistantThreadRouter from './routers/assistantThreadRoutes.js'; import teamRouter from "./routers/teamRoutes.js"; import organizationRouter from "./routers/organizationRoutes.js"; import { errorLogger } from "./middlewares/errorMiddleware.js"; -import { initSetup } from './controllers/initController.js' +import { initSetup } from './controllers/initController.js'; const app = express(); app.use(cors({