Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions DemoServer/client/src/components/layout/Metadata.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from "react";
import { connect } from "react-redux";
import MetaTags from "react-meta-tags";
import { Helmet } from "react-helmet-async";
import { AppState } from "../../store/state";
import { DemoHtmlMetadata, selectHtmlMetadata } from "../../store/selectors/metadata";

Expand All @@ -14,16 +14,13 @@ class MetadataComponent extends React.Component<StateProps, {}> {
const { metadata } = this.props;
const { title, description, image, url } = metadata;

const descriptionTags = description && <>
<meta name="description" content={description} />
<meta property="og:description" content={description} />
<meta property="twitter:description" content={description} />
</>;

return <MetaTags>
return <Helmet>
<title>{title}</title>
{descriptionTags}

{description && <meta name="description" content={description} />}
{description && <meta property="og:description" content={description} />}
{description && <meta property="twitter:description" content={description} />}

<meta property="og:site_name" content="RavenDB Demo" />
<meta property="og:type" content="website" />
<meta property="og:title" content={title} />
Expand All @@ -37,7 +34,7 @@ class MetadataComponent extends React.Component<StateProps, {}> {
<meta property="twitter:title" content={title} />
<meta property="twitter:image" content={image} />
<meta property="twitter:url" content={url} />
</MetaTags>;
</Helmet>;
}
}

Expand Down
13 changes: 8 additions & 5 deletions DemoServer/client/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,21 @@ import * as React from "react";
import * as ReactDOM from "react-dom";

import { ConnectedRouter } from "connected-react-router";
import { HelmetProvider } from "react-helmet-async";
import App from "./App";
import { Provider } from "react-redux";
import { store, history } from "./store";

const rootElement = document.getElementById('root');

ReactDOM.render(
<Provider store={store}>
<ConnectedRouter history={history}>
<App />
</ConnectedRouter>
</Provider>,
<HelmetProvider>
<Provider store={store}>
<ConnectedRouter history={history}>
<App />
</ConnectedRouter>
</Provider>
</HelmetProvider>,
rootElement);

import 'bootstrap.native/dist/bootstrap-native-v4';
1 change: 0 additions & 1 deletion DemoServer/client/src/utils/api/ApiClient.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import Axios, * as axios from "axios";
import { DemoStorage } from "../localStorage/DemoStorage";
import { AxiosResponse } from "axios";

const userIdHeader = "DemoUser-ID";
const userIdHeaderLowerCase = userIdHeader.toLowerCase();
Expand Down
1 change: 1 addition & 0 deletions DemoServer/client/src/utils/functionUtils.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
export function noop(...args: any[]): void {
return;
}
4 changes: 0 additions & 4 deletions DemoServer/client/src/utils/localStorage/DemoStorage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ function readFromStorage<T>(key: string) {
return JSON.parse(item) as T;
}

function removeFromStorage(key: string) {
localStorage.removeItem(key);
}

class Keys {
static readonly userId = "userId";
static readonly userProgress = "userProgress";
Expand Down
17 changes: 17 additions & 0 deletions DemoServer/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import typescriptEslint from "@typescript-eslint/eslint-plugin";
import typescriptParser from "@typescript-eslint/parser";

export default [
{
files: ["client/src/**/*.ts", "client/src/**/*.tsx"],
languageOptions: {
parser: typescriptParser,
},
plugins: {
"@typescript-eslint": typescriptEslint
},
rules: {
"@typescript-eslint/no-unused-vars": "warn",
}
}
];
Loading