twitch panel logic

web/components/twitch-panel.tsx

@@ -3,90 +3,75 @@ import React, { useState } from 'react'
 import toast from 'react-hot-toast'
 
 import { copyToClipboard } from 'web/lib/util/copy'
-import { initLinkTwitchAccount } from 'web/lib/twitch/link-twitch-account'
+import { linkTwitchAccount } from 'web/lib/twitch/link-twitch-account'
 import { LinkIcon } from '@heroicons/react/solid'
-import { User, PrivateUser } from 'common/user'
+import { track } from 'web/lib/service/analytics'
+import { Button } from './button'
+import { LoadingIndicator } from './loading-indicator'
+import { Row } from './layout/row'
+import { usePrivateUser, useUser } from 'web/hooks/use-user'
 
-export function TwitchPanel(props: {
+export function TwitchPanel() {
-  auth: { user: User; privateUser: PrivateUser }
+  const user = useUser()
-}) {
+  const privateUser = usePrivateUser()
-  const { user, privateUser } = props.auth
 
-  const [twitchToken, setTwitchToken] = useState('')
+  const twitchName = privateUser?.twitchInfo?.twitchName
-  const [twitchLoading, setTwitchLoading] = useState(false)
+  const twitchToken = privateUser?.twitchInfo?.controlToken
-  const [twitchLinkError, setTwitchLinkError] = useState('')
-  const [controlToken, setControlToken] = useState<string | undefined>(
-    undefined
-  )
-
-  const linkTwitchAccount = async () => {
-    if (!privateUser.apiKey) return // TODO: handle missing API key
-    try {
-      setTwitchLoading(true)
-      const [twitchAuthURL, linkSuccessPromise] = await initLinkTwitchAccount(
-        privateUser.id,
-        privateUser.apiKey
-      )
-      window.open(twitchAuthURL)
-      const data = await linkSuccessPromise
-      setTwitchToken(data.twitchName)
-      setControlToken(data.controlToken)
-    } catch (e) {
-      console.error(e)
-      toast.error('Failed to link Twitch account: ' + (e as Object).toString())
-    } finally {
-      setTwitchLoading(false)
-    }
-  }
 
   const linkIcon = <LinkIcon className="mr-2 h-6 w-6" aria-hidden="true" />
+
   const copyOverlayLink = async () => {
-    copyToClipboard(`http://localhost:1000/overlay?t=${controlToken}`)
+    copyToClipboard(`http://localhost:1000/overlay?t=${twitchToken}`)
     toast.success('Overlay link copied!', {
       icon: linkIcon,
     })
   }
+
   const copyDockLink = async () => {
-    copyToClipboard(`http://localhost:1000/dock?t=${controlToken}`)
+    copyToClipboard(`http://localhost:1000/dock?t=${twitchToken}`)
     toast.success('Dock link copied!', {
       icon: linkIcon,
     })
   }
 
+  const [twitchLoading, setTwitchLoading] = useState(false)
+
+  const createLink = async () => {
+    if (!user || !privateUser) return
+    setTwitchLoading(true)
+
+    const promise = linkTwitchAccount(user, privateUser)
+    track('link twitch from profile')
+    await promise
+
+    setTwitchLoading(false)
+  }
+
   return (
     <>
       <div>
         <label className="label">Twitch</label>
-        <div className="relative flex w-full justify-items-stretch">
+
-          <input
+        {!twitchName ? (
-            type="text"
+          <Row>
-            placeholder="Click link to connect your Twitch account"
+            <Button
-            className="input input-bordered w-full"
+              color="indigo"
-            value={twitchToken}
+              onClick={createLink}
-            readOnly
+              disabled={twitchLoading}
-            style={{
-              borderTopRightRadius: '0',
-              borderBottomRightRadius: '0',
-            }}
-          />
-          <button
-            className={clsx(
-              'btn btn-secondary btn-square p-2',
-              twitchLoading ? 'loading' : ''
-            )}
-            onClick={linkTwitchAccount}
-            style={{
-              borderTopLeftRadius: '0',
-              borderBottomLeftRadius: '0',
-            }}
             >
-            {!twitchLoading && <LinkIcon />}
+              Link your Twitch account
-          </button>
+            </Button>
-        </div>
+            {twitchLoading && <LoadingIndicator className="ml-4" />}
+          </Row>
+        ) : (
+          <Row>
+            <span className="mr-4 text-gray-500">Linked Twitch account</span>{' '}
+            {twitchName}
+          </Row>
+        )}
       </div>
 
-      <span className="text-sm text-red-400">Not editable for now</span>
+      {twitchToken && (
-
         <div>
           <div className="flex w-full">
             <div
@@ -96,27 +81,16 @@ export function TwitchPanel(props: {
               )}
               data-tip="You must link your Twitch account first"
             >
-            <button
+              <Button color="blue" size="lg" onClick={copyOverlayLink}>
-              className={clsx(
-                'btn grow',
-                twitchToken ? 'btn-primary' : 'btn-disabled'
-              )}
-              onClick={copyOverlayLink}
-            >
                 Copy overlay link
-            </button>
+              </Button>
-            <button
+              <Button color="indigo" size="lg" onClick={copyDockLink}>
-              className={clsx(
-                'btn grow',
-                twitchToken ? 'btn-primary' : 'btn-disabled'
-              )}
-              onClick={copyDockLink}
-            >
                 Copy dock link
-            </button>
+              </Button>
             </div>
           </div>
         </div>
+      )}
     </>
   )
 }

web/pages/profile.tsx

@@ -238,7 +238,7 @@ export default function ProfilePage(props: {
             </div>
           </div>
 
-          <TwitchPanel auth={props.auth} />
+          <TwitchPanel />
         </Col>
       </Col>
     </Page>