diff --git a/frontend/public/SigNoz-dark.svg b/frontend/public/SigNoz-dark.svg new file mode 100644 index 0000000000..41a6fb8258 --- /dev/null +++ b/frontend/public/SigNoz-dark.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/public/SigNoz-white.svg b/frontend/public/SigNoz-white.svg new file mode 100644 index 0000000000..17cc833d12 --- /dev/null +++ b/frontend/public/SigNoz-white.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/api/metricsAPI.js b/frontend/src/api/metricsAPI.js index f60d642940..e43bd89983 100644 --- a/frontend/src/api/metricsAPI.js +++ b/frontend/src/api/metricsAPI.js @@ -1,10 +1,11 @@ import axios from 'axios'; export default axios.create({ - baseURL: 'http://104.211.113.204:8080/api/v1/', + // baseURL: 'http://104.211.113.204:8080/api/v1/', // baseURL: process.env.REACT_APP_QUERY_SERVICE_URL, //baseURL: 'http://localhost:3000/api/v1/', // console.log('in metrics API', process.env.QUERY_SERVICE_URL) + baseURL: '/api/v1/', } ); \ No newline at end of file diff --git a/frontend/src/api/submitForm.js b/frontend/src/api/submitForm.js index ad8e1af19f..46a65ae6de 100644 --- a/frontend/src/api/submitForm.js +++ b/frontend/src/api/submitForm.js @@ -1,7 +1,9 @@ import axios from 'axios'; export default axios.create({ - baseURL: 'https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/', + // baseURL: 'https://api.telegram.org/bot1518273960:AAHcgVvym9a0Qkl-PKiCI84X1VZaVbkTud0/', + // baseURL: 'http://104.211.113.204:8080/api/v1/', + baseURL: '/api/v1/', } ); diff --git a/frontend/src/components/App.tsx b/frontend/src/components/App.tsx index 8695c7de59..5b00987d12 100644 --- a/frontend/src/components/App.tsx +++ b/frontend/src/components/App.tsx @@ -102,6 +102,7 @@ const App = () => { + {/* */} diff --git a/frontend/src/components/AppWrapper.tsx b/frontend/src/components/AppWrapper.tsx index 21faff3a50..1b42f3f59f 100644 --- a/frontend/src/components/AppWrapper.tsx +++ b/frontend/src/components/AppWrapper.tsx @@ -1,8 +1,8 @@ -import React,{Suspense} from 'react'; +import React,{Suspense, useState} from 'react'; import {Spin} from 'antd'; -import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'; +import { BrowserRouter as Router, Route, Switch, Redirect } from 'react-router-dom'; const Signup = React.lazy(() => import('./Signup')); @@ -12,6 +12,8 @@ const App = React.lazy(() => import('./App')); const AppWrapper = () => { + const [isUserAuthenticated, setIsUserAuthenticated] = useState(false); + return( @@ -19,8 +21,25 @@ const AppWrapper = () => { }> + + + + + + - + { + return ( + localStorage.getItem('isLoggedIn')==='yes' ? + : + + ) + }} + + /> + + diff --git a/frontend/src/components/Signup.tsx b/frontend/src/components/Signup.tsx index c0f5c46fe1..c87163f1e4 100644 --- a/frontend/src/components/Signup.tsx +++ b/frontend/src/components/Signup.tsx @@ -1,10 +1,15 @@ import React, { useState,useRef, Suspense } from 'react'; import { Row, Space, Button, Input, Checkbox } from 'antd' import submitForm from '../api/submitForm'; -import axios from 'axios'; +import { withRouter } from "react-router"; +import { RouteComponentProps } from 'react-router-dom'; -const Signup = () => { +interface SignUpProps extends RouteComponentProps { + +} + +const Signup = (props:SignUpProps) => { const [state, setState] = useState({ submitted: false }) const [formState, setFormState] = useState({ @@ -76,18 +81,29 @@ const Signup = () => { // console.log(res); // console.log(res.data); // }) + let texttolog = JSON.stringify(payload) - submitForm.get('sendMessage', { - params: { - chat_id: 351813222, - text:texttolog, - } - } + // submitForm.get('sendMessage', { + // params: { + // chat_id: 351813222, + // text:texttolog, + // } + // } + // ).then(res => { + // console.log(res); + // console.log(res.data); + // }) + + + submitForm.post('user?email='+texttolog ).then(res => { console.log(res); console.log(res.data); }) + + localStorage.setItem('isLoggedIn', 'yes'); + props.history.push('/application') }; @@ -95,7 +111,7 @@ const Signup = () => {

- {/* */} + {/* */} Create your account

Monitor your applications. Find what is causing issues.
@@ -123,7 +139,7 @@ const Signup = () => {
updateForm('email', e.target)} @@ -154,7 +170,7 @@ const Signup = () => {
updateForm('firstName', e.target)} @@ -167,7 +183,7 @@ const Signup = () => {
updateForm('companyName', e.target)} // disabled={accountLoading} @@ -193,11 +209,11 @@ const Signup = () => { disabled={state.submitted && !formState.password} // loading={accountLoading} > - Create my account + Get Started
-
+ {/*
By clicking the button above you agree to our{' '} Terms of Service @@ -207,7 +223,7 @@ const Signup = () => { Privacy Policy . -
+
*/}
@@ -216,4 +232,4 @@ const Signup = () => { ); } -export default Signup; \ No newline at end of file +export default withRouter(Signup); \ No newline at end of file diff --git a/frontend/src/components/servicemap/ServiceGraph.tsx b/frontend/src/components/servicemap/ServiceGraph.tsx index 57652ea756..335ac15f4b 100644 --- a/frontend/src/components/servicemap/ServiceGraph.tsx +++ b/frontend/src/components/servicemap/ServiceGraph.tsx @@ -48,7 +48,8 @@ const ServiceGraph = () => { return ( -
Service Graph Component
+
Updated Service Graph module coming soon..
+ { // // if you want access to vis.js network api you can set the state in a parent component using this property // }} /> + ); @@ -64,4 +66,6 @@ const ServiceGraph = () => { -export default ServiceGraph; \ No newline at end of file +export default ServiceGraph; + + diff --git a/frontend/src/components/servicemap/ServiceMap.tsx b/frontend/src/components/servicemap/ServiceMap.tsx index 622c7b76d2..2919087b39 100644 --- a/frontend/src/components/servicemap/ServiceMap.tsx +++ b/frontend/src/components/servicemap/ServiceMap.tsx @@ -5,10 +5,11 @@ const ServiceMap = () => { return ( -
- +
Service Map module coming soon... + {/* */}
+ ); } diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index fe5d923d74..354c54983f 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -24,12 +24,7 @@ ReactDOM.render( - {/* - - - - - */} + {/* */}