BIT-10257

bitquery · Oct 21, 2024 · 155ffb8 · 155ffb8
1 parent 832c062
commit 155ffb8
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/src/components/ControlPanel.js b/src/components/ControlPanel.js
@@ -264,7 +264,7 @@ const ControlPanel = observer(function ControlPanel() {
                     </li>}
                     {user?.id && <li className="nav-item d-lg-none">
                         <a className="nav-link bitquery-links"
-                           href={`${user?.graphql_admin_url}/auth/logout`}>Logout</a>
+                           href={`${user?.graphql_admin_url}/auth/logout?redirect_to=${window.location.href}`}>Logout</a>
                     </li>}
                 </ul>
                 <ProfileComponent/>

diff --git a/src/components/ProfileComponent.js b/src/components/ProfileComponent.js
@@ -26,10 +26,10 @@ const [toastLink, setToastLink] = useState(window.location.href)
                         <a className='bitquery-ico'
                            href={`https://account.bitquery.io/auth/login?redirect_to=${toastLink}`}> log
                             in </a> or
-                        <a className='bitquery-ico' href="https://account.bitquery.io/auth/signup"> register </a>
+                        <a className='bitquery-ico' href={`https://account.bitquery.io/auth/signup?redirect_to=${toastLink}`}> register </a>
                         Logging in will allow you to access all the features and keep track of your activities.
                     </div>
-                ), {autoClose: 2000});
+                ), {autoClose: 3000});
                 setToastShown(true)
             }
         }, 2000);
@@ -70,7 +70,7 @@ const [toastLink, setToastLink] = useState(window.location.href)
                 <NavDropdown.Item className="bitquery-links" href={`${user?.graphql_admin_url}/user/api_key`}>API
                     key</NavDropdown.Item>
                 <NavDropdown.Item className="bitquery-links"
-                                  href={`${user?.graphql_admin_url}/auth/logout`}>Logout</NavDropdown.Item>
+                                  href={`${user?.graphql_admin_url}/auth/logout?redirect_to=${window.location.href}`}>Logout</NavDropdown.Item>
             </NavDropdown>
         </div>
     );

diff --git a/src/components/bitqueditor/components/WidgetView.js b/src/components/bitqueditor/components/WidgetView.js
@@ -27,6 +27,7 @@ const WidgetView = observer(function WidgetView({ children, widget, dataSource,
 						if (explicitHeight) {
 							widget = widget.replace(explicitHeight[0], '')
 						}
+						console.log('widget',widget)
 						const ChartWidget = eval(`(${widget})`)
 						const chartWidgetInstance = new ChartWidget(refChart.current, dataSource.historyDataSource, dataSource.subscriptionDataSource)
 						await chartWidgetInstance.init()

diff --git a/src/server/endPoints.js b/src/server/endPoints.js
@@ -877,6 +877,7 @@ module.exports = function (app, db, redisClient) {
     })
     app.get('/api/getwidgetconfig/:id', async (req, res) => {
         const widgetConfig = await redisClient.get(req.params.id)
+        console.log('widgetConfig',widgetConfig)
         if (widgetConfig !== null) {
             console.log('there is some widgetconfig')
             res.status(200).send(JSON.parse(widgetConfig))

diff --git a/src/store/queriesStore.js b/src/store/queriesStore.js
@@ -43,7 +43,7 @@ class User {
                         //         <a className='bitquery-ico'
                         //            href={`https://account.bitquery.io/auth/login?redirect_to=${window.location.href}`}> log
                         //             in </a> or
-                        //         <a className='bitquery-ico' href="https://account.bitquery.io/auth/signup"> register </a>
+                        //         <a className='bitquery-ico' href={`https://account.bitquery.io/auth/signup?redirect_to=${window.location.href}`}> register </a>
                         //         Logging in will allow you to access all the features and keep track of your activities.
                         //     </div>
                         // ), {autoClose: 2000})