From 63145574e3b91f3ce316d52e0888a8fde22e219e Mon Sep 17 00:00:00 2001 From: shirajuki <shirajuki00@gmail.com> Date: Wed, 10 Feb 2021 14:53:30 +0100 Subject: [PATCH] Issue: set up get/set route for posts (#2) --- server/src/controllers/example.ts | 21 --------------------- server/src/controllers/postController.ts | 24 ++++++++++++++++++++++++ server/src/index.ts | 2 +- server/src/routes/routes.ts | 19 ++++++++----------- server/src/services/db_query.ts | 12 ++++++++++++ server/src/services/example.ts | 15 --------------- 6 files changed, 45 insertions(+), 48 deletions(-) delete mode 100644 server/src/controllers/example.ts create mode 100644 server/src/controllers/postController.ts create mode 100644 server/src/services/db_query.ts delete mode 100644 server/src/services/example.ts diff --git a/server/src/controllers/example.ts b/server/src/controllers/example.ts deleted file mode 100644 index 07470ee..0000000 --- a/server/src/controllers/example.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { Response, Request } from "express"; -import example from '../services/example'; - -export const example1 = async (_: Request, res: Response): Promise<void> => { - try { - //res.status(200).json({"hello":"example1","database": "a"}); - res.json(await example.getTest()); - } catch (error) { - res.status(400).send("Bad Request"); - // res.status(500).send("Internal Server Error"); - } -}; - -export const example2 = async (_: Request, res: Response): Promise<void> => { - try { - res.status(200).json({"hello":"example2"}); - } catch (error) { - res.status(400).send("Bad Request"); - // res.status(500).send("Internal Server Error"); - } -}; diff --git a/server/src/controllers/postController.ts b/server/src/controllers/postController.ts new file mode 100644 index 0000000..93622fd --- /dev/null +++ b/server/src/controllers/postController.ts @@ -0,0 +1,24 @@ +import { Response, Request } from "express"; +import query from '../services/db_query'; +import express from 'express'; +const router = express.Router(); + +router.route('/sendPost').get(async (request: Request, response: Response) => { + try { + response.status(200).send("a"); + // response.status(200).json(await query("SELECT * FROM test;")); + } catch (error) { + response.status(400).send("Bad Request"); + } +}); + +router.route('/editPost').get(async (request: Request, response: Response) => { + try { + response.status(200).send("a"); + //response.status(200).json(await example.getTest()); + } catch (error) { + response.status(400).send("Bad Request"); + } +}); + +export default router; diff --git a/server/src/index.ts b/server/src/index.ts index af9e008..209a2b7 100644 --- a/server/src/index.ts +++ b/server/src/index.ts @@ -16,7 +16,7 @@ app.use(bodyParser.json()); // Configuring json response app.set("json spaces", 2); -app.use("/", routes); +app.use("/api", routes); /* // create the connection to database diff --git a/server/src/routes/routes.ts b/server/src/routes/routes.ts index fcdddaa..9146195 100644 --- a/server/src/routes/routes.ts +++ b/server/src/routes/routes.ts @@ -1,18 +1,15 @@ -import { example1, example2 } from '../controllers/example'; +//import { example1, example2 } from '../controllers/example'; +import postController from '../controllers/postController' import express from 'express'; const router = express.Router(); -router.get("/", (_, res) => { - res.send("Hello world!"); -}); -router.get('/test', (req, res) => { - console.log(req,res); - res.send("test!"); -}); - // routes go brrrrr! -router.get("/example1", example1); -router.get("/example1/example2", example2); +//router.get("/example1", example1); +//router.get("/example1/example2", example2); + +// Endpoints +router.use("/post", postController); + export default router; diff --git a/server/src/services/db_query.ts b/server/src/services/db_query.ts new file mode 100644 index 0000000..009370f --- /dev/null +++ b/server/src/services/db_query.ts @@ -0,0 +1,12 @@ +import db from '../services/db'; + +export default async function query(query: string){ + const data = await db.query(query,""); + const meta = {page: 1}; + + return { + data, + meta + } +} + diff --git a/server/src/services/example.ts b/server/src/services/example.ts deleted file mode 100644 index 322c1e7..0000000 --- a/server/src/services/example.ts +++ /dev/null @@ -1,15 +0,0 @@ -import db from '../services/db'; - -async function getTest(){ - const data = await db.query('SELECT * FROM test',""); - const meta = {page: 1}; - - return { - data, - meta - } -} - -export default { - getTest -} -- GitLab