Merge pull request #224 from kalczur/CSV-827

CSV-827 Fix packages

Author: ppekrol

DemoServer/client/src/components/layout/Metadata.tsx

@@ -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";
 
@@ -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} />
@@ -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>;
     }
 }
 

DemoServer/client/src/index.tsx

@@ -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';

DemoServer/client/src/utils/api/ApiClient.ts

@@ -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();

DemoServer/client/src/utils/functionUtils.ts

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 export function noop(...args: any[]): void {
     return;
 }

DemoServer/client/src/utils/localStorage/DemoStorage.ts

@@ -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";

DemoServer/eslint.config.js

@@ -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",
+    }
+  }
+];