Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/gh-pages' into gh-pages
Browse files Browse the repository at this point in the history
  • Loading branch information
Artem-K-Koltunov committed Feb 23, 2024
2 parents 5316472 + 76eef41 commit 30f3c2b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions samples/chat/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
--search-height: 36px;
--toolbar-height: 49px;
--sidebar-width: 374px;
--cash-tester-color: orange;
}

* {
Expand Down
3 changes: 2 additions & 1 deletion samples/chat/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
<title>QuickBlox chat code sample</title>
<link rel="shortcut icon" href="https://quickblox.com/favicon.ico">

Expand Down Expand Up @@ -131,7 +132,7 @@ <h2>Info</h2>

<div class="dashboard">
<div class="dashboard_center copyright-2020-pow ">
<samp style="padding-right: 6px;">Copyright © 2020 Powered by QuickBlox. All rights reserved.</samp>
<samp style="padding-right: 6px;">Copyright © 2020 Powered by QuickBlox. All rights reserved. Sample version 1.0.0.</samp>

</div>

Expand Down
1 change: 1 addition & 0 deletions samples/chat/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ App.prototype.init = function (config) {
// Step 1. QB SDK initialization.
QB = _.clone(qbConnectService.qb);
QB.init(config.credentials.appId, config.credentials.authKey, config.credentials.authSecret, config.appConfig);
console.log('QB version: ', QB.version, ' build number: ', QB.buildNumber, ' sample version: 1.0.0');
};

App.prototype.renderDashboard = function (activeTabName) {
Expand Down
6 changes: 3 additions & 3 deletions samples/react-chat-ui-kit-demo-app/src/index.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { BrowserRouter } from 'react-router-dom';
import {HashRouter} from 'react-router-dom';
import './index.scss';
import App from './App';
import reportWebVitals from './reportWebVitals';
Expand All @@ -10,9 +10,9 @@ const root = ReactDOM.createRoot(
);
root.render(
<React.StrictMode>
<BrowserRouter>
<HashRouter>
<App />
</BrowserRouter>
</HashRouter>
</React.StrictMode>
);

Expand Down

0 comments on commit 30f3c2b

Please sign in to comment.