From 001f7414db0849f8bba0797e7fdff281b9c310a7 Mon Sep 17 00:00:00 2001 From: dhrubesh-makeen Date: Sat, 24 Apr 2021 01:21:24 +0530 Subject: [PATCH 1/4] moves store to a separate folder --- .../src/components/CustomDateTimeModal.tsx | 2 +- frontend/src/components/DateTimeSelector.tsx | 6 +++--- .../instrumentationPage.tsx | 2 +- .../src/components/metrics/ErrorRateChart.tsx | 2 +- .../metrics/GenericVisualization.tsx | 2 +- .../components/metrics/LatencyLineChart.tsx | 2 +- .../components/metrics/RequestRateChart.tsx | 2 +- .../src/components/metrics/ServiceMetrics.tsx | 4 ++-- .../src/components/metrics/ServicesTable.tsx | 4 ++-- .../components/metrics/TopEndpointsTable.tsx | 2 +- .../src/components/settings/settingsPage.tsx | 2 +- .../components/traces/FilterStateDisplay.tsx | 4 ++-- .../traces/TraceCustomVisualizations.tsx | 4 ++-- frontend/src/components/traces/TraceFilter.tsx | 4 ++-- frontend/src/components/traces/TraceGraph.tsx | 4 ++-- .../src/components/traces/TraceGraphColumn.tsx | 4 ++-- frontend/src/components/traces/TraceList.tsx | 4 ++-- .../src/components/usage/UsageExplorer.tsx | 4 ++-- frontend/src/index.tsx | 18 ++---------------- frontend/src/{ => store}/actions/global.ts | 0 frontend/src/{ => store}/actions/index.ts | 0 frontend/src/{ => store}/actions/metrics.ts | 6 +++--- .../src/{ => store}/actions/traceFilters.ts | 0 frontend/src/{ => store}/actions/traces.ts | 4 ++-- frontend/src/{ => store}/actions/types.ts | 0 frontend/src/{ => store}/actions/usage.ts | 4 ++-- frontend/src/store/index.ts | 9 +++++++++ frontend/src/{ => store}/reducers/global.ts | 0 frontend/src/{ => store}/reducers/index.ts | 4 +++- frontend/src/{ => store}/reducers/metrics.ts | 0 .../src/{ => store}/reducers/traceFilters.ts | 0 frontend/src/{ => store}/reducers/traces.ts | 0 frontend/src/{ => store}/reducers/usage.ts | 0 frontend/src/themes/index.ts | 6 ++++++ frontend/src/utils/spanToTree.ts | 2 +- 35 files changed, 57 insertions(+), 54 deletions(-) rename frontend/src/{ => store}/actions/global.ts (100%) rename frontend/src/{ => store}/actions/index.ts (100%) rename frontend/src/{ => store}/actions/metrics.ts (95%) rename frontend/src/{ => store}/actions/traceFilters.ts (100%) rename frontend/src/{ => store}/actions/traces.ts (97%) rename frontend/src/{ => store}/actions/types.ts (100%) rename frontend/src/{ => store}/actions/usage.ts (89%) create mode 100644 frontend/src/store/index.ts rename frontend/src/{ => store}/reducers/global.ts (100%) rename frontend/src/{ => store}/reducers/index.ts (94%) rename frontend/src/{ => store}/reducers/metrics.ts (100%) rename frontend/src/{ => store}/reducers/traceFilters.ts (100%) rename frontend/src/{ => store}/reducers/traces.ts (100%) rename frontend/src/{ => store}/reducers/usage.ts (100%) create mode 100644 frontend/src/themes/index.ts diff --git a/frontend/src/components/CustomDateTimeModal.tsx b/frontend/src/components/CustomDateTimeModal.tsx index c71d96a299..1fa6010dd6 100644 --- a/frontend/src/components/CustomDateTimeModal.tsx +++ b/frontend/src/components/CustomDateTimeModal.tsx @@ -1,6 +1,6 @@ import React, { useState } from "react"; import { Modal, DatePicker } from "antd"; -import { DateTimeRangeType } from "../actions"; +import { DateTimeRangeType } from "../store/actions"; import { Moment } from "moment"; import moment from "moment"; diff --git a/frontend/src/components/DateTimeSelector.tsx b/frontend/src/components/DateTimeSelector.tsx index b5deac900b..f53fcf54bb 100644 --- a/frontend/src/components/DateTimeSelector.tsx +++ b/frontend/src/components/DateTimeSelector.tsx @@ -6,11 +6,11 @@ import { RouteComponentProps, useLocation } from "react-router-dom"; import { connect } from "react-redux"; import CustomDateTimeModal from "./CustomDateTimeModal"; -import { GlobalTime, updateTimeInterval } from "../actions"; -import { StoreState } from "../reducers"; +import { GlobalTime, updateTimeInterval } from "../store/actions"; +import { StoreState } from "../store/reducers"; import FormItem from "antd/lib/form/FormItem"; -import { DateTimeRangeType } from "../actions"; +import { DateTimeRangeType } from "../store/actions"; import { METRICS_PAGE_QUERY_PARAM } from "Src/constants/query"; import { LOCAL_STORAGE } from "Src/constants/localStorage"; import moment from "moment"; diff --git a/frontend/src/components/add-instrumentation/instrumentationPage.tsx b/frontend/src/components/add-instrumentation/instrumentationPage.tsx index 84d3c5952d..2fdb896db3 100644 --- a/frontend/src/components/add-instrumentation/instrumentationPage.tsx +++ b/frontend/src/components/add-instrumentation/instrumentationPage.tsx @@ -7,7 +7,7 @@ import { EyeTwoTone, EyeInvisibleOutlined, } from "@ant-design/icons"; -import { StoreState } from "../../reducers"; +import { StoreState } from "../../store/reducers"; import { Alert } from "antd"; diff --git a/frontend/src/components/metrics/ErrorRateChart.tsx b/frontend/src/components/metrics/ErrorRateChart.tsx index 4feedacc86..72d5670efb 100644 --- a/frontend/src/components/metrics/ErrorRateChart.tsx +++ b/frontend/src/components/metrics/ErrorRateChart.tsx @@ -5,7 +5,7 @@ import { withRouter } from "react-router"; import { RouteComponentProps } from "react-router-dom"; import styled from "styled-components"; -import { metricItem } from "../../actions/metrics"; +import { metricItem } from "../../store/actions/metrics"; const ChartPopUpUnique = styled.div<{ ycoordinate: number; diff --git a/frontend/src/components/metrics/GenericVisualization.tsx b/frontend/src/components/metrics/GenericVisualization.tsx index 28a83b46d1..a68d08bcf2 100644 --- a/frontend/src/components/metrics/GenericVisualization.tsx +++ b/frontend/src/components/metrics/GenericVisualization.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Bar, Line as ChartJSLine } from "react-chartjs-2"; import styled from "styled-components"; -import { customMetricsItem } from "../../actions/metrics"; +import { customMetricsItem } from "../../store/actions/metrics"; const GenVisualizationWrapper = styled.div` height: 160px; diff --git a/frontend/src/components/metrics/LatencyLineChart.tsx b/frontend/src/components/metrics/LatencyLineChart.tsx index 7456487cee..18fd095df7 100644 --- a/frontend/src/components/metrics/LatencyLineChart.tsx +++ b/frontend/src/components/metrics/LatencyLineChart.tsx @@ -5,7 +5,7 @@ import { withRouter } from "react-router"; import { RouteComponentProps } from "react-router-dom"; import styled from "styled-components"; -import { metricItem } from "../../actions/metrics"; +import { metricItem } from "../../store/actions/metrics"; const ChartPopUpUnique = styled.div<{ ycoordinate: number; diff --git a/frontend/src/components/metrics/RequestRateChart.tsx b/frontend/src/components/metrics/RequestRateChart.tsx index 6f2bb079f5..c2d78ee6c5 100644 --- a/frontend/src/components/metrics/RequestRateChart.tsx +++ b/frontend/src/components/metrics/RequestRateChart.tsx @@ -5,7 +5,7 @@ import { withRouter } from "react-router"; import { RouteComponentProps } from "react-router-dom"; import styled from "styled-components"; -import { metricItem } from "../../actions/metrics"; +import { metricItem } from "../../store/actions/metrics"; const ChartPopUpUnique = styled.div<{ ycoordinate: number; diff --git a/frontend/src/components/metrics/ServiceMetrics.tsx b/frontend/src/components/metrics/ServiceMetrics.tsx index c35e81213d..cf0209dd45 100644 --- a/frontend/src/components/metrics/ServiceMetrics.tsx +++ b/frontend/src/components/metrics/ServiceMetrics.tsx @@ -11,8 +11,8 @@ import { topEndpointListItem, GlobalTime, updateTimeInterval, -} from "../../actions"; -import { StoreState } from "../../reducers"; +} from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import LatencyLineChart from "./LatencyLineChart"; import RequestRateChart from "./RequestRateChart"; import ErrorRateChart from "./ErrorRateChart"; diff --git a/frontend/src/components/metrics/ServicesTable.tsx b/frontend/src/components/metrics/ServicesTable.tsx index e8faffd8d6..8422995169 100644 --- a/frontend/src/components/metrics/ServicesTable.tsx +++ b/frontend/src/components/metrics/ServicesTable.tsx @@ -5,8 +5,8 @@ import { Button, Space, Spin, Table } from "antd"; import styled from "styled-components"; import { connect } from "react-redux"; -import { getServicesList, GlobalTime, servicesListItem } from "../../actions"; -import { StoreState } from "../../reducers"; +import { getServicesList, GlobalTime, servicesListItem } from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import { CustomModal } from "../common/Modal"; interface ServicesTableProps { diff --git a/frontend/src/components/metrics/TopEndpointsTable.tsx b/frontend/src/components/metrics/TopEndpointsTable.tsx index 4ea60bcd4a..c8e205772b 100644 --- a/frontend/src/components/metrics/TopEndpointsTable.tsx +++ b/frontend/src/components/metrics/TopEndpointsTable.tsx @@ -2,7 +2,7 @@ import React from "react"; import { NavLink } from "react-router-dom"; import { Table } from "antd"; import styled from "styled-components"; -import { topEndpointListItem } from "../../actions/metrics"; +import { topEndpointListItem } from "../../store/actions/metrics"; const Wrapper = styled.div` padding-top: 10px; diff --git a/frontend/src/components/settings/settingsPage.tsx b/frontend/src/components/settings/settingsPage.tsx index 9e98b41c88..a514e6051c 100644 --- a/frontend/src/components/settings/settingsPage.tsx +++ b/frontend/src/components/settings/settingsPage.tsx @@ -7,7 +7,7 @@ import { EyeTwoTone, EyeInvisibleOutlined, } from "@ant-design/icons"; -import { StoreState } from "../../reducers"; +import { StoreState } from "../../store/reducers"; import { Alert } from "antd"; interface SettingsPageProps {} diff --git a/frontend/src/components/traces/FilterStateDisplay.tsx b/frontend/src/components/traces/FilterStateDisplay.tsx index 4de5b30348..ff8da5abc1 100644 --- a/frontend/src/components/traces/FilterStateDisplay.tsx +++ b/frontend/src/components/traces/FilterStateDisplay.tsx @@ -2,8 +2,8 @@ import React from "react"; import { Card, Tag } from "antd"; import { connect } from "react-redux"; -import { StoreState } from "../../reducers"; -import { TagItem, TraceFilters, updateTraceFilters } from "../../actions"; +import { StoreState } from "../../store/reducers"; +import { TagItem, TraceFilters, updateTraceFilters } from "../../store/actions"; interface FilterStateDisplayProps { traceFilters: TraceFilters; diff --git a/frontend/src/components/traces/TraceCustomVisualizations.tsx b/frontend/src/components/traces/TraceCustomVisualizations.tsx index ca5ee7c7ce..4f642a8fb3 100644 --- a/frontend/src/components/traces/TraceCustomVisualizations.tsx +++ b/frontend/src/components/traces/TraceCustomVisualizations.tsx @@ -3,13 +3,13 @@ import GenericVisualizations from "../metrics/GenericVisualization"; import { Select, Card, Space, Form } from "antd"; import { connect } from "react-redux"; -import { StoreState } from "../../reducers"; +import { StoreState } from "../../store/reducers"; import { customMetricsItem, getFilteredTraceMetrics, GlobalTime, TraceFilters, -} from "../../actions"; +} from "../../store/actions"; const { Option } = Select; diff --git a/frontend/src/components/traces/TraceFilter.tsx b/frontend/src/components/traces/TraceFilter.tsx index 154a90bf8d..84f12fb993 100644 --- a/frontend/src/components/traces/TraceFilter.tsx +++ b/frontend/src/components/traces/TraceFilter.tsx @@ -9,8 +9,8 @@ import { fetchTraces, TraceFilters, GlobalTime, -} from "../../actions"; -import { StoreState } from "../../reducers"; +} from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import LatencyModalForm from "./LatencyModalForm"; import { FilterStateDisplay } from "./FilterStateDisplay"; diff --git a/frontend/src/components/traces/TraceGraph.tsx b/frontend/src/components/traces/TraceGraph.tsx index d633b8a51f..a1a65c09eb 100644 --- a/frontend/src/components/traces/TraceGraph.tsx +++ b/frontend/src/components/traces/TraceGraph.tsx @@ -11,8 +11,8 @@ import * as d3Tip from "d3-tip"; import "./TraceGraph.css"; import { spanToTreeUtil } from "../../utils/spanToTree"; -import { fetchTraceItem, spansWSameTraceIDResponse } from "../../actions"; -import { StoreState } from "../../reducers"; +import { fetchTraceItem, spansWSameTraceIDResponse } from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import { TraceGraphColumn } from "./TraceGraphColumn"; import SelectedSpanDetails from "./SelectedSpanDetails"; diff --git a/frontend/src/components/traces/TraceGraphColumn.tsx b/frontend/src/components/traces/TraceGraphColumn.tsx index ac60cd68d8..48e36d0156 100644 --- a/frontend/src/components/traces/TraceGraphColumn.tsx +++ b/frontend/src/components/traces/TraceGraphColumn.tsx @@ -2,8 +2,8 @@ import React from "react"; import { connect } from "react-redux"; import { Table } from "antd"; -import { traceResponseNew, pushDStree } from "../../actions"; -import { StoreState } from "../../reducers"; +import { traceResponseNew, pushDStree } from "../../store/actions"; +import { StoreState } from "../../store/reducers"; interface TraceGraphColumnProps { traces: traceResponseNew; diff --git a/frontend/src/components/traces/TraceList.tsx b/frontend/src/components/traces/TraceList.tsx index 2742daec3f..7f0164835c 100644 --- a/frontend/src/components/traces/TraceList.tsx +++ b/frontend/src/components/traces/TraceList.tsx @@ -3,8 +3,8 @@ import { connect } from "react-redux"; import { NavLink } from "react-router-dom"; import { Space, Table } from "antd"; -import { traceResponseNew, fetchTraces, pushDStree } from "../../actions"; -import { StoreState } from "../../reducers"; +import { traceResponseNew, fetchTraces, pushDStree } from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import { isOnboardingSkipped } from "../../utils/app"; interface TraceListProps { diff --git a/frontend/src/components/usage/UsageExplorer.tsx b/frontend/src/components/usage/UsageExplorer.tsx index b1171c9f13..3152e12693 100644 --- a/frontend/src/components/usage/UsageExplorer.tsx +++ b/frontend/src/components/usage/UsageExplorer.tsx @@ -9,8 +9,8 @@ import { GlobalTime, servicesListItem, usageDataItem, -} from "../../actions"; -import { StoreState } from "../../reducers"; +} from "../../store/actions"; +import { StoreState } from "../../store/reducers"; import moment from "moment"; import { isOnboardingSkipped } from "../../utils/app"; const { Option } = Select; diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index 629469570f..7e5997f08d 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -1,26 +1,12 @@ import React from "react"; import ReactDOM from "react-dom"; import { Provider } from "react-redux"; -import { createStore, applyMiddleware, compose } from "redux"; import { ThemeSwitcherProvider } from "react-css-theme-switcher"; -import thunk from "redux-thunk"; -// import { NavLink, BrowserRouter as Router, Route, Switch } from 'react-router-dom'; -import { Auth0Provider } from "@auth0/auth0-react"; - +import store from "Src/store"; import AppWrapper from "Src/components/AppWrapper"; import "Src/assets/index.css"; -import { reducers } from "Src/reducers"; import { BrowserRouter as Router } from "react-router-dom"; -import { AUTH0_CLIENT_ID, AUTH0_DOMAIN } from "./constants/env"; -// import Signup from './components/Signup'; -// @ts-ignore -const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; -const store = createStore(reducers, composeEnhancers(applyMiddleware(thunk))); - -const themes = { - dark: `/dark-theme.css`, - light: `/light-theme.css`, -}; +import themes from "Src/themes"; ReactDOM.render( diff --git a/frontend/src/actions/global.ts b/frontend/src/store/actions/global.ts similarity index 100% rename from frontend/src/actions/global.ts rename to frontend/src/store/actions/global.ts diff --git a/frontend/src/actions/index.ts b/frontend/src/store/actions/index.ts similarity index 100% rename from frontend/src/actions/index.ts rename to frontend/src/store/actions/index.ts diff --git a/frontend/src/actions/metrics.ts b/frontend/src/store/actions/metrics.ts similarity index 95% rename from frontend/src/actions/metrics.ts rename to frontend/src/store/actions/metrics.ts index 33177772e0..c1592a512a 100644 --- a/frontend/src/actions/metrics.ts +++ b/frontend/src/store/actions/metrics.ts @@ -1,9 +1,9 @@ import { Dispatch } from "redux"; -import metricsAPI from "../api/metricsAPI"; +import metricsAPI from "../../api/metricsAPI"; import { GlobalTime } from "./global"; import { ActionTypes } from "./types"; -import { Token } from "../utils/token"; -import { toUTCEpoch } from "../utils/timeUtils"; +import { Token } from "../../utils/token"; +import { toUTCEpoch } from "../../utils/timeUtils"; export interface servicesListItem { serviceName: string; diff --git a/frontend/src/actions/traceFilters.ts b/frontend/src/store/actions/traceFilters.ts similarity index 100% rename from frontend/src/actions/traceFilters.ts rename to frontend/src/store/actions/traceFilters.ts diff --git a/frontend/src/actions/traces.ts b/frontend/src/store/actions/traces.ts similarity index 97% rename from frontend/src/actions/traces.ts rename to frontend/src/store/actions/traces.ts index 58c58c06bd..b694312212 100644 --- a/frontend/src/actions/traces.ts +++ b/frontend/src/store/actions/traces.ts @@ -1,8 +1,8 @@ import { ActionTypes } from "./types"; -import tracesAPI from "../api/tracesAPI"; +import tracesAPI from "../../api/tracesAPI"; import { Dispatch } from "redux"; import { GlobalTime } from "./global"; -import { toUTCEpoch } from "../utils/timeUtils"; +import { toUTCEpoch } from "../../utils/timeUtils"; // PNOTE // define trace interface - what it should return diff --git a/frontend/src/actions/types.ts b/frontend/src/store/actions/types.ts similarity index 100% rename from frontend/src/actions/types.ts rename to frontend/src/store/actions/types.ts diff --git a/frontend/src/actions/usage.ts b/frontend/src/store/actions/usage.ts similarity index 89% rename from frontend/src/actions/usage.ts rename to frontend/src/store/actions/usage.ts index 356aa2c327..b212bc9533 100644 --- a/frontend/src/actions/usage.ts +++ b/frontend/src/store/actions/usage.ts @@ -1,8 +1,8 @@ import { Dispatch } from "redux"; -import metricsAPI from "../api/metricsAPI"; +import metricsAPI from "../../api/metricsAPI"; import { ActionTypes } from "./types"; import { GlobalTime } from "./global"; -import { toUTCEpoch } from "../utils/timeUtils"; +import { toUTCEpoch } from "../../utils/timeUtils"; export interface usageDataItem { timestamp: number; diff --git a/frontend/src/store/index.ts b/frontend/src/store/index.ts new file mode 100644 index 0000000000..3846a01077 --- /dev/null +++ b/frontend/src/store/index.ts @@ -0,0 +1,9 @@ +import { createStore, applyMiddleware, compose } from "redux"; +import reducers from "./reducers"; +import thunk from "redux-thunk"; + +const composeEnhancers = + (window && (window as any).__REDUX_DEVTOOLS_EXTENSION_COMPOSE__) || compose; +const store = createStore(reducers, composeEnhancers(applyMiddleware(thunk))); + +export default store; diff --git a/frontend/src/reducers/global.ts b/frontend/src/store/reducers/global.ts similarity index 100% rename from frontend/src/reducers/global.ts rename to frontend/src/store/reducers/global.ts diff --git a/frontend/src/reducers/index.ts b/frontend/src/store/reducers/index.ts similarity index 94% rename from frontend/src/reducers/index.ts rename to frontend/src/store/reducers/index.ts index 6d0a3a0814..565b8c1d7f 100644 --- a/frontend/src/reducers/index.ts +++ b/frontend/src/store/reducers/index.ts @@ -34,7 +34,7 @@ export interface StoreState { filteredTraceMetrics: customMetricsItem[]; } -export const reducers = combineReducers({ +const reducers = combineReducers({ traceFilters: traceFiltersReducer, inputTag: inputsReducer, traces: tracesReducer, @@ -46,3 +46,5 @@ export const reducers = combineReducers({ globalTime: updateGlobalTimeReducer, filteredTraceMetrics: filteredTraceMetricsReducer, }); + +export default reducers; diff --git a/frontend/src/reducers/metrics.ts b/frontend/src/store/reducers/metrics.ts similarity index 100% rename from frontend/src/reducers/metrics.ts rename to frontend/src/store/reducers/metrics.ts diff --git a/frontend/src/reducers/traceFilters.ts b/frontend/src/store/reducers/traceFilters.ts similarity index 100% rename from frontend/src/reducers/traceFilters.ts rename to frontend/src/store/reducers/traceFilters.ts diff --git a/frontend/src/reducers/traces.ts b/frontend/src/store/reducers/traces.ts similarity index 100% rename from frontend/src/reducers/traces.ts rename to frontend/src/store/reducers/traces.ts diff --git a/frontend/src/reducers/usage.ts b/frontend/src/store/reducers/usage.ts similarity index 100% rename from frontend/src/reducers/usage.ts rename to frontend/src/store/reducers/usage.ts diff --git a/frontend/src/themes/index.ts b/frontend/src/themes/index.ts new file mode 100644 index 0000000000..9923705da9 --- /dev/null +++ b/frontend/src/themes/index.ts @@ -0,0 +1,6 @@ +const themes = { + dark: `/dark-theme.css`, + light: `/light-theme.css`, +}; + +export default themes; \ No newline at end of file diff --git a/frontend/src/utils/spanToTree.ts b/frontend/src/utils/spanToTree.ts index 9f281ff516..2287964610 100644 --- a/frontend/src/utils/spanToTree.ts +++ b/frontend/src/utils/spanToTree.ts @@ -1,4 +1,4 @@ -import { pushDStree, span, RefItem } from "../actions"; +import { pushDStree, span, RefItem } from "../store/actions"; // PNOTE - should the data be taken from redux or only through props? - Directly as arguments export const spanToTreeUtil = (spanlist: span[]): pushDStree => { From 88e488bdc73c11c526c054dea5ea8449104eb256 Mon Sep 17 00:00:00 2001 From: dhrubesh-makeen Date: Sat, 24 Apr 2021 01:51:45 +0530 Subject: [PATCH 2/4] 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) => { /> - -
{ />
-
+