From 6e7a1198315b8cf0f61ca9839137da2f37e92e29 Mon Sep 17 00:00:00 2001 From: Jorik Schellekens Date: Tue, 1 Sep 2020 10:37:15 +0200 Subject: [PATCH] Add inviting client tile --- src/components/InvitingClientTile.stories.tsx | 23 ++++++++ src/components/InvitingClientTile.tsx | 58 +++++++++++++++++++ src/pages/LinkRouter.tsx | 19 +++++- 3 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 src/components/InvitingClientTile.stories.tsx create mode 100644 src/components/InvitingClientTile.tsx diff --git a/src/components/InvitingClientTile.stories.tsx b/src/components/InvitingClientTile.stories.tsx new file mode 100644 index 0000000..6cac6ee --- /dev/null +++ b/src/components/InvitingClientTile.stories.tsx @@ -0,0 +1,23 @@ +/* +Copyright 2020 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; + +import ClientTile from './InvitingClientTile'; + +export default { title: 'ClientTile' }; + +export const Element = ; diff --git a/src/components/InvitingClientTile.tsx b/src/components/InvitingClientTile.tsx new file mode 100644 index 0000000..2d22a6c --- /dev/null +++ b/src/components/InvitingClientTile.tsx @@ -0,0 +1,58 @@ +/* +Copyright 2020 The Matrix.org Foundation C.I.C. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +import React from 'react'; +import Tile from './Tile'; + +import { clientMap } from '../clients'; +import './MatrixTile.scss'; + +interface IProps { + clientName: string; +} + +const InvitingClientTile: React.FC = ({ clientName }: IProps) => { + const client = clientMap[clientName]; + + if (!client) { + return ( + + {/* TODO: add gh link */} +

+ The client that created this link "{clientName}" is not a + recognised client. If this is a mistake and you'd like a + nice advertisement for it here please{' '} + + open a pr + + . +

+
+ ); + } + + return ( + + {client.name} +

+ Invite created with {client.name} +

+
{client.description}
+
+ ); +}; + +export default InvitingClientTile; diff --git a/src/pages/LinkRouter.tsx b/src/pages/LinkRouter.tsx index fe4a2a1..a455c7d 100644 --- a/src/pages/LinkRouter.tsx +++ b/src/pages/LinkRouter.tsx @@ -18,6 +18,7 @@ import React from 'react'; import Tile from '../components/Tile'; import LinkPreview from '../components/LinkPreview'; +import InvitingClientTile from '../components/InvitingClientTile'; import { parseHash } from '../parser/parser'; import { LinkKind } from '../parser/types'; @@ -28,9 +29,9 @@ interface IProps { const LinkRouter: React.FC = ({ link }: IProps) => { // our room id's will be stored in the hash const parsedLink = parseHash(link); - console.log({ link }); let feedback: JSX.Element; + let client: JSX.Element = <>; switch (parsedLink.kind) { case LinkKind.ParseFailed: feedback = ( @@ -41,7 +42,21 @@ const LinkRouter: React.FC = ({ link }: IProps) => { ); break; default: - feedback = ; + if (parsedLink.arguments.client) { + client = ( + + ); + } + + feedback = ( + <> + +
+ {client} + + ); } return feedback;