From 88e488bdc73c11c526c054dea5ea8449104eb256 Mon Sep 17 00:00:00 2001 From: dhrubesh-makeen Date: Sat, 24 Apr 2021 01:51:45 +0530 Subject: [PATCH] revamps api layer --- frontend/src/api/apiV1.ts | 3 ++ frontend/src/api/graphQuery.js | 8 ----- frontend/src/api/index.ts | 9 +++++ frontend/src/api/metricsAPI.js | 6 ---- frontend/src/api/submitForm.js | 15 -------- frontend/src/api/tracesAPI.js | 12 ------- frontend/src/components/Signup.tsx | 21 ++++-------- .../src/components/traces/TraceFilter.tsx | 34 ++++++++++--------- frontend/src/store/actions/metrics.ts | 19 ++++++----- frontend/src/store/actions/traces.ts | 13 +++---- frontend/src/store/actions/usage.ts | 7 ++-- 11 files changed, 58 insertions(+), 89 deletions(-) create mode 100644 frontend/src/api/apiV1.ts delete mode 100644 frontend/src/api/graphQuery.js create mode 100644 frontend/src/api/index.ts delete mode 100644 frontend/src/api/metricsAPI.js delete mode 100644 frontend/src/api/submitForm.js delete mode 100644 frontend/src/api/tracesAPI.js diff --git a/frontend/src/api/apiV1.ts b/frontend/src/api/apiV1.ts new file mode 100644 index 0000000000..2cd9b83295 --- /dev/null +++ b/frontend/src/api/apiV1.ts @@ -0,0 +1,3 @@ +const apiV1 = "/api/v1/"; + +export default apiV1; diff --git a/frontend/src/api/graphQuery.js b/frontend/src/api/graphQuery.js deleted file mode 100644 index e679ca505d..0000000000 --- a/frontend/src/api/graphQuery.js +++ /dev/null @@ -1,8 +0,0 @@ -import axios from "axios"; -import { ENVIRONMENT } from "Src/constants/env"; -import { Token } from "../utils/token"; - -// No auth for the API -export default axios.create({ - baseURL: `${ENVIRONMENT.baseURL}/api/prom/api/v1`, -}); diff --git a/frontend/src/api/index.ts b/frontend/src/api/index.ts new file mode 100644 index 0000000000..c580024bcb --- /dev/null +++ b/frontend/src/api/index.ts @@ -0,0 +1,9 @@ +import axios, { AxiosRequestConfig } from "axios"; +import { ENVIRONMENT } from "Src/constants/env"; +import apiV1 from "./apiV1"; + +export default axios.create({ + baseURL: `${ENVIRONMENT.baseURL}`, +}); + +export { apiV1 }; diff --git a/frontend/src/api/metricsAPI.js b/frontend/src/api/metricsAPI.js deleted file mode 100644 index f82bf8f357..0000000000 --- a/frontend/src/api/metricsAPI.js +++ /dev/null @@ -1,6 +0,0 @@ -import axios from "axios"; -import { ENVIRONMENT } from "Src/constants/env"; - -export default axios.create({ - baseURL: `${ENVIRONMENT.baseURL}/api/v1/`, -}); diff --git a/frontend/src/api/submitForm.js b/frontend/src/api/submitForm.js deleted file mode 100644 index 216569dad5..0000000000 --- a/frontend/src/api/submitForm.js +++ /dev/null @@ -1,15 +0,0 @@ -import axios from "axios"; -import { ENVIRONMENT } from "Src/constants/env"; -import { Token } from "../utils/token"; - -export default axios.create({ - // baseURL: 'https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/', - // baseURL: 'http://104.211.113.204:8080/api/v1/', - // baseURL: "/api/v1/", - baseURL: `${ENVIRONMENT.baseURL}/api/v1/`, -}); - -//https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/sendMessage?chat_id=351813222&text=Hello%20there - -// Chat ID can be obtained from here -//https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/getUpdates diff --git a/frontend/src/api/tracesAPI.js b/frontend/src/api/tracesAPI.js deleted file mode 100644 index 9c11771e6b..0000000000 --- a/frontend/src/api/tracesAPI.js +++ /dev/null @@ -1,12 +0,0 @@ -import axios from "axios"; -import { ENVIRONMENT } from "Src/constants/env"; -import { Token } from "../utils/token"; -//import { format } from 'path'; - -export default axios.create({ - // baseURL: 'http://104.211.113.204:8080/api/v1/' //comment this line and remove this comment before pushing - // baseURL: process.env.QUERY_SERVICE_URL, - // console.log('in traces API', process.env.QUERY_SERVICE_URL) - // baseURL: "/api/v1/", - baseURL: `${ENVIRONMENT.baseURL}/api/v1/`, -}); diff --git a/frontend/src/components/Signup.tsx b/frontend/src/components/Signup.tsx index c8e7d6593e..6e90ceb6fe 100644 --- a/frontend/src/components/Signup.tsx +++ b/frontend/src/components/Signup.tsx @@ -1,6 +1,7 @@ -import React, { useState, useRef, Suspense } from "react"; -import { Row, Space, Button, Input, Checkbox } from "antd"; -import submitForm from "../api/submitForm"; +import React, { useState } from "react"; +import { Row, Space, Button, Input } from "antd"; +import api, { apiV1 } from "../api"; + import { withRouter } from "react-router"; import { RouteComponentProps } from "react-router-dom"; @@ -15,14 +16,10 @@ const Signup = (props: SignUpProps) => { password: { value: "", valid: true }, emailOptIn: { value: true }, }); - const passwordInput = useRef(null); - // const { createAccount } = useActions(signupLogic) - // const { accountLoading } = useValues(signupLogic) - // const { plan } = fromParams() const updateForm = (name: any, target: any, valueAttr = "value") => { /* Validate password (if applicable) */ - if (name === "firstName") { + if (name === "firstName") { setFormState({ ...formState, firstName: { ...formState.firstName, value: target[valueAttr] }, @@ -49,9 +46,7 @@ const Signup = (props: SignUpProps) => { let texttolog = JSON.stringify(payload); - - - submitForm.post("user?email=" + texttolog).then((res) => { + api.post(apiV1 + "/user?email=" + texttolog).then((res) => { console.log(res); console.log(res.data); }); @@ -118,8 +113,6 @@ const Signup = (props: SignUpProps) => { /> - -
{ />
-
+