chore: merge main

2024-05-16 11:23:26 +05:00 · 2024-05-16 11:23:26 +05:00 · ad9c88a4f5
commit ad9c88a4f5
parent 1867ba6a14
17 changed files with 110 additions and 98 deletions
--- a/.env.example
+++ b/.env.example
@ -1 +1 @@
-VITE_MOST_POPULAR_RELAYS=wss://relay.damus.io wss://eden.nostr.land wss://nos.lol wss://relay.snort.social wss://relay.current.fyi wss://brb.io wss://nostr.orangepill.dev wss://nostr-pub.wellorder.net wss://nostr.bitcoiner.social wss://nostr.wine wss://nostr.oxtr.dev wss://relay.nostr.bg wss://nostr.mom wss://nostr.fmt.wiz.biz wss://relay.nostr.band wss://nostr-pub.semisol.dev wss://nostr.milou.lol wss://puravida.nostr.land wss://nostr.onsats.org wss://relay.nostr.info wss://offchain.pub wss://relay.orangepill.dev wss://no.str.cr wss://atlas.nostr.land wss://nostr.zebedee.cloud wss://nostr-relay.wlvs.space wss://relay.nostrati.com wss://relay.nostr.com.au wss://nostr.inosta.cc wss://nostr.rocks
+VITE_MOST_POPULAR_RELAYS=wss://relay.damus.io wss://eden.nostr.land wss://nos.lol wss://relay.snort.social wss://relay.current.fyi wss://brb.io wss://nostr.orangepill.dev wss://nostr-pub.wellorder.net wss://nostr.wine wss://nostr.oxtr.dev wss://relay.nostr.bg wss://nostr.mom wss://nostr.fmt.wiz.biz wss://relay.nostr.band wss://nostr-pub.semisol.dev wss://nostr.milou.lol wss://puravida.nostr.land wss://nostr.onsats.org wss://relay.nostr.info wss://offchain.pub wss://relay.orangepill.dev wss://no.str.cr wss://atlas.nostr.land wss://nostr.zebedee.cloud wss://nostr-relay.wlvs.space wss://relay.nostrati.com wss://relay.nostr.com.au wss://nostr.inosta.cc wss://nostr.rocks
--- a/.prettierrc
+++ b/.prettierrc
@ -0,0 +1,7 @@
+{
+  "trailingComma": "none",
+  "tabWidth": 2,
+  "semi": false,
+  "singleQuote": true,
+  "endOfLine": "auto"
+}
--- a/package.json
+++ b/package.json
@ -9,6 +9,8 @@
    "build": "tsc && vite build",
    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
    "lint:fix": "eslint . --fix --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "formatter:check": "npx prettier --check \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
+    "formatter:fix": "npx prettier --write \"src/**/*.{ts,tsx,js,jsx,html,css,sass,less,yml,md,graphql}\"",
    "preview": "vite preview"
  },
  "dependencies": {
--- a/src/App.tsx
+++ b/src/App.tsx
@ -67,7 +67,7 @@ const App = () => {
        })}

        <Route
-          path='*'
+          path="*"
          element={
            <Navigate
              to={
--- a/src/components/AppBar/AppBar.tsx
+++ b/src/components/AppBar/AppBar.tsx
@ -87,10 +87,10 @@ export const AppBar = () => {
  const isAuthenticated = authState?.loggedIn === true

  return (
-    <AppBarMui position='fixed' className={styles.AppBar}>
+    <AppBarMui position="fixed" className={styles.AppBar}>
      <Toolbar className={styles.toolbar}>
        <Box className={styles.logoWrapper}>
-          <img src='/logo.png' alt='Logo' onClick={() => navigate('/')} />
+          <img src="/logo.png" alt="Logo" onClick={() => navigate('/')} />
        </Box>

        <Box className={styles.rightSideBox}>
@ -99,7 +99,7 @@ export const AppBar = () => {
              onClick={() => {
                navigate(appPublicRoutes.login)
              }}
-              variant='contained'
+              variant="contained"
            >
              Sign in
            </Button>
@ -113,7 +113,7 @@ export const AppBar = () => {
                handleClick={handleOpenUserMenu}
              />
              <Menu
-                id='menu-appbar'
+                id="menu-appbar"
                anchorEl={anchorElUser}
                anchorOrigin={{
                  vertical: 'bottom',
@ -133,7 +133,7 @@ export const AppBar = () => {
                    display: { md: 'none' }
                  }}
                >
-                  <Typography variant='h6'>{username}</Typography>
+                  <Typography variant="h6">{username}</Typography>
                </MenuItem>
                <MenuItem
                  onClick={handleProfile}
@ -145,7 +145,7 @@ export const AppBar = () => {
                </MenuItem>
                <Link
                  to={appPublicRoutes.help}
-                  target='_blank'
+                  target="_blank"
                  style={{ color: 'inherit', textDecoration: 'inherit' }}
                >
                  <MenuItem
--- a/src/components/username.tsx
+++ b/src/components/username.tsx
@ -13,16 +13,16 @@ const Username = ({ username, avatarContent, handleClick }: Props) => {

  return (
    <IconButton
-      aria-label='account of current user'
-      aria-controls='menu-appbar'
-      aria-haspopup='true'
+      aria-label="account of current user"
+      aria-controls="menu-appbar"
+      aria-haspopup="true"
      onClick={handleClick}
-      color='inherit'
+      color="inherit"
    >
      <img
        src={avatarContent}
-        alt='user-avatar'
-        className='profile-image'
+        alt="user-avatar"
+        className="profile-image"
        style={{
          borderWidth: '3px',
          borderStyle: hexKey ? 'solid' : 'none',
@ -30,7 +30,7 @@ const Username = ({ username, avatarContent, handleClick }: Props) => {
        }}
      />
      <Typography
-        variant='h6'
+        variant="h6"
        sx={{
          color: '#3e3e3e',
          padding: '0 8px',
--- a/src/controllers/MetadataController.ts
+++ b/src/controllers/MetadataController.ts
@ -152,9 +152,8 @@ export class MetadataController {
        created_at: timestamp
      }

-      signedMetadataEvent = await this.nostrController.signEvent(
-        newMetadataEvent
-      )
+      signedMetadataEvent =
+        await this.nostrController.signEvent(newMetadataEvent)
    }

    await this.nostrController
@ -222,9 +221,8 @@ export class MetadataController {
      }

      // sign job request event
-      const jobSignedEvent = await this.nostrController.signEvent(
-        jobEventTemplate
-      )
+      const jobSignedEvent =
+        await this.nostrController.signEvent(jobEventTemplate)

      const relays = [
        'wss://relay.damus.io',
--- a/src/controllers/NostrController.ts
+++ b/src/controllers/NostrController.ts
@ -219,12 +219,10 @@ export class NostrController extends EventEmitter {

      results.forEach((res, index) => {
        if (res.status === 'rejected') {
-          failedPublishes.push(
-            {
-              relay: relays[index],
-              error: res.reason.message
-            }
-          )
+          failedPublishes.push({
+            relay: relays[index],
+            error: res.reason.message
+          })
        }
      })

--- a/src/layouts/Main.tsx
+++ b/src/layouts/Main.tsx
@ -59,13 +59,13 @@ export const MainLayout = () => {
    setIsLoading(false)
  }, [dispatch])

-  if (isLoading) return <LoadingSpinner desc='Loading App' />
+  if (isLoading) return <LoadingSpinner desc="Loading App" />

  return (
    <>
      <AppBar />

-      <Box className='main'>
+      <Box className="main">
        <Container
          sx={{
            position: 'relative',
--- a/src/pages/create/index.tsx
+++ b/src/pages/create/index.tsx
@ -360,10 +360,10 @@ export const CreatePage = () => {
  if (authUrl) {
    return (
      <iframe
-        title='Nsecbunker auth'
+        title="Nsecbunker auth"
        src={authUrl}
-        width='100%'
-        height='500px'
+        width="100%"
+        height="500px"
      />
    )
  }
@ -372,13 +372,13 @@ export const CreatePage = () => {
    <>
      {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
      <Box className={styles.container}>
-        <Typography component='label' variant='h6'>
+        <Typography component="label" variant="h6">
          Select files
        </Typography>

        <MuiFileInput
          multiple
-          placeholder='Choose Files'
+          placeholder="Choose Files"
          value={selectedFiles}
          onChange={(value) => handleSelectFiles(value)}
        />
@ -386,7 +386,7 @@ export const CreatePage = () => {
        <ul>
          {selectedFiles.map((file, index) => (
            <li key={index}>
-              <Typography component='label'>{file.name}</Typography>
+              <Typography component="label">{file.name}</Typography>
              <IconButton onClick={() => handleRemoveFile(file)}>
                <Clear style={{ color: 'red' }} />{' '}
              </IconButton>
@ -396,24 +396,24 @@ export const CreatePage = () => {

        {displayUserInput && (
          <>
-            <Typography component='label' variant='h6'>
+            <Typography component="label" variant="h6">
              Select signers and viewers
            </Typography>
            <Box className={styles.inputBlock}>
              <TextField
-                label='nip05 / npub'
+                label="nip05 / npub"
                value={userInput}
                onChange={(e) => setUserInput(e.target.value)}
                helperText={error}
                error={!!error}
              />
              <FormControl fullWidth>
-                <InputLabel id='select-role-label'>Role</InputLabel>
+                <InputLabel id="select-role-label">Role</InputLabel>
                <Select
-                  labelId='select-role-label'
-                  id='demo-simple-select'
+                  labelId="select-role-label"
+                  id="demo-simple-select"
                  value={userRole}
-                  label='Role'
+                  label="Role"
                  onChange={(e) => setUserRole(e.target.value as UserRole)}
                >
                  <MenuItem value={UserRole.signer}>{UserRole.signer}</MenuItem>
@ -425,7 +425,7 @@ export const CreatePage = () => {
                <Button
                  disabled={!userInput}
                  onClick={handleAddUser}
-                  variant='contained'
+                  variant="contained"
                >
                  Add
                </Button>
@ -437,7 +437,7 @@ export const CreatePage = () => {
              handleRemoveUser={handleRemoveUser}
            />
            <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
-              <Button onClick={handleCreate} variant='contained'>
+              <Button onClick={handleCreate} variant="contained">
                Create
              </Button>
            </Box>
@ -515,8 +515,8 @@ const DisplayUser = ({
                    <img
                      onError={imageLoadError}
                      src={userMeta?.picture || roboUrl}
-                      alt='Profile Image'
-                      className='profile-image'
+                      alt="Profile Image"
+                      className="profile-image"
                      style={{
                        borderWidth: '3px',
                        borderStyle: 'solid',
@ -524,7 +524,7 @@ const DisplayUser = ({
                      }}
                    />
                    <Link to={getProfileRoute(user.pubkey)}>
-                      <Typography component='label' className={styles.name}>
+                      <Typography component="label" className={styles.name}>
                        {userMeta?.display_name ||
                          userMeta?.name ||
                          shorten(npub)}
@ -549,7 +549,7 @@ const DisplayUser = ({
                  </Select>
                </TableCell>
                <TableCell>
-                  <Tooltip title='Remove User' arrow>
+                  <Tooltip title="Remove User" arrow>
                    <IconButton onClick={() => handleRemoveUser(user.pubkey)}>
                      <Clear style={{ color: 'red' }} />
                    </IconButton>
--- a/src/pages/home/index.tsx
+++ b/src/pages/home/index.tsx
@ -10,7 +10,7 @@ export const HomePage = () => {
    <Box className={styles.container}>
      <Button
        onClick={() => navigate(appPrivateRoutes.create)}
-        variant='contained'
+        variant="contained"
      >
        Create
      </Button>
@ -22,7 +22,7 @@ export const HomePage = () => {
      </Button>
      <Button
        onClick={() => navigate(appPrivateRoutes.verify)}
-        variant='contained'
+        variant="contained"
      >
        Verify
      </Button>
--- a/src/pages/landing/LandingPage.tsx
+++ b/src/pages/landing/LandingPage.tsx
@ -57,9 +57,9 @@ export const LandingPage = () => {
                  ? theme.palette.getContrastText(bodyBackgroundColor)
                  : ''
              }}
-              variant='h4'
+              variant="h4"
            >
-              What is Nostr?
+              What is SIGit?
            </Typography>
            <Typography
              sx={{
@ -67,26 +67,28 @@ export const LandingPage = () => {
                  ? theme.palette.getContrastText(bodyBackgroundColor)
                  : ''
              }}
-              variant='body1'
+              variant="body1"
            >
-              Nostr is a decentralised messaging protocol where YOU own your
-              identity. To get started, you must have an existing{' '}
+              SIGit is an open-source and self-hostable solution for secure
+              document signing and verification. Code is MIT licenced and
+              available at{' '}
              <a
-                className='bold-link'
-                target='_blank'
-                href='https://nostr.com/'
+                className="bold-link"
+                target="_blank"
+                href="https://git.sigit.io/sig/it"
              >
-                Nostr account
+                https://git.sigit.io/sig/it
              </a>
              .
              <br />
              <br />
-              No email required - all notifications are made using the nQuiz
-              relay.
+              SIGit lets you Create, Sign and Verify signature packs from any
+              device with a browser.
              <br />
              <br />
-              If you no longer wish to hear from us, simply remove
-              relay.nquiz.io from your list of relays.
+              Unlike other solutions, SIGit is totally private - files are
+              encrypted locally, and valid packs can only be exported by named
+              recipients.
            </Typography>
          </Box>
        </Box>
@ -95,7 +97,7 @@ export const LandingPage = () => {
          <div className={styles.loginBottomBar}>
            <Button
              className={styles.loginBtn}
-              variant='contained'
+              variant="contained"
              onClick={onSignInClick}
            >
              GET STARTED
--- a/src/pages/login/index.tsx
+++ b/src/pages/login/index.tsx
@ -53,9 +53,8 @@ export const Login = () => {
        dispatch(updateLoginMethod(LoginMethods.extension))

        setLoadingSpinnerDesc('Authenticating and finding metadata')
-        const redirectPath = await authController.authenticateAndFindMetadata(
-          pubkey
-        )
+        const redirectPath =
+          await authController.authenticateAndFindMetadata(pubkey)

        navigate(redirectPath)
      })
@ -290,10 +289,10 @@ export const Login = () => {
  if (authUrl) {
    return (
      <iframe
-        title='Nsecbunker auth'
+        title="Nsecbunker auth"
        src={authUrl}
-        width='100%'
-        height='500px'
+        width="100%"
+        height="500px"
      />
    )
  }
@ -302,21 +301,21 @@ export const Login = () => {
    <>
      {isLoading && <LoadingSpinner desc={loadingSpinnerDesc} />}
      <div className={styles.loginPage}>
-        <Typography variant='h4'>Welcome to Sigit</Typography>
+        <Typography variant="h4">Welcome to Sigit</Typography>
        <TextField
-          label='nip05 / npub / nsec / bunker connx string'
+          label="nip05 login / nip46 bunker string / nsec"
          value={inputValue}
          onChange={(e) => setInputValue(e.target.value)}
          sx={{ width: '100%', mt: 2 }}
        />
        {isNostrExtensionAvailable && (
-          <Button onClick={loginWithExtension} variant='text'>
+          <Button onClick={loginWithExtension} variant="text">
            Login with extension
          </Button>
        )}

        <Box sx={{ mt: 1, display: 'flex', justifyContent: 'center' }}>
-          <Button disabled={!inputValue} onClick={login} variant='contained'>
+          <Button disabled={!inputValue} onClick={login} variant="contained">
            Login
          </Button>
        </Box>
--- a/src/pages/profile/index.tsx
+++ b/src/pages/profile/index.tsx
@ -127,7 +127,7 @@ export const ProfilePage = () => {
        label={label}
        id={label.split(' ').join('-')}
        value={profileMetadata![key] || ''}
-        size='small'
+        size="small"
        multiline={multiline}
        rows={rows}
        className={styles.textField}
@ -166,7 +166,7 @@ export const ProfilePage = () => {
        label={label}
        id={label.split(' ').join('-')}
        defaultValue={value}
-        size='small'
+        size="small"
        className={styles.textField}
        disabled
        type={isPassword ? 'password' : 'text'}
@ -230,18 +230,23 @@ export const ProfilePage = () => {
  }

  /**
-   * 
+   *
   * @returns robohash generate button, loading spinner or no button
   */
  const robohashButton = () => {
-    if (profileMetadata?.picture?.includes('robohash')) return null 
+    if (profileMetadata?.picture?.includes('robohash')) return null

-    return <Tooltip title="Generate a robohash avatar">
-      {avatarLoading ? <CircularProgress style={{padding: 8}} size={22}/>
-      : <IconButton onClick={generateRobotAvatar}>
-        <SmartToy/>
-      </IconButton>}
-    </Tooltip>
+    return (
+      <Tooltip title="Generate a robohash avatar">
+        {avatarLoading ? (
+          <CircularProgress style={{ padding: 8 }} size={22} />
+        ) : (
+          <IconButton onClick={generateRobotAvatar}>
+            <SmartToy />
+          </IconButton>
+        )}
+      </Tooltip>
+    )
  }

  return (
@ -284,7 +289,7 @@ export const ProfilePage = () => {
                  }}
                  className={styles.img}
                  src={profileMetadata.picture || placeholderAvatar}
-                  alt='Profile Image'
+                  alt="Profile Image"
                />

                {nostrJoiningBlock && (
@ -296,7 +301,7 @@ export const ProfilePage = () => {
                    }}
                    component={Link}
                    to={`https://njump.me/${nostrJoiningBlock.encodedEventPointer}`}
-                    target='_blank'
+                    target="_blank"
                  >
                    On nostr since {nostrJoiningBlock.block.toLocaleString()}
                  </Typography>
@ -333,7 +338,7 @@ export const ProfilePage = () => {
        {isUsersOwnProfile && (
          <LoadingButton
            loading={savingProfileMetadata}
-            variant='contained'
+            variant="contained"
            onClick={handleSaveMetadata}
          >
            SAVE
--- a/src/types/errors/DecryptionError.ts
+++ b/src/types/errors/DecryptionError.ts
@ -1,20 +1,21 @@
 export class DecryptionError extends Error {
  public message: string = ''

-  constructor(
-    public inputError: any
-  ) {
+  constructor(public inputError: any) {
    super()

    if (inputError.message.toLowerCase().includes('expected')) {
      this.message = `The decryption key length or format is invalid.`
-    } else if (inputError.message.includes('The JWK "alg" member was inconsistent')) {
+    } else if (
+      inputError.message.includes('The JWK "alg" member was inconsistent')
+    ) {
      this.message = `The decryption key is invalid.`
    } else {
-      this.message = inputError.message || 'An error occurred while decrypting file.'
+      this.message =
+        inputError.message || 'An error occurred while decrypting file.'
    }

    this.name = 'DecryptionError'
    Object.setPrototypeOf(this, DecryptionError.prototype)
  }
-}
+}
--- a/src/utils/crypto.ts
+++ b/src/utils/crypto.ts
@ -66,14 +66,14 @@ export const decryptArrayBuffer = async (
 ) => {
  try {
    const { cryptoKey, iv } = await importKey(key)
-  
+
    // Decrypt the data
    const decryptedData = await window.crypto.subtle.decrypt(
      { name: ENCRYPTION_ALGO_NAME, iv },
      cryptoKey,
      encryptedData
    )
-  
+
    return decryptedData
  } catch (err) {
    throw new DecryptionError(err)
--- a/src/utils/misc.ts
+++ b/src/utils/misc.ts
@ -18,8 +18,8 @@ export const uploadToFileStorage = async (
  const unixNow = Math.floor(Date.now() / 1000)

  // Create a File object with the Blob data
-  const file = new File([blob], `zipped-${unixNow}.zip`, {
-    type: 'application/zip'
+  const file = new File([blob], `compressed-${unixNow}.sigit`, {
+    type: 'application/sigit'
  })

  // Define event metadata for authorization
@ -39,13 +39,13 @@ export const uploadToFileStorage = async (
  const authEvent = await nostrController.signEvent(event)

  // URL of the file storage service
-  const FILE_STORAGE_URL = 'https://blossom.sigit.io'
+  const FILE_STORAGE_URL = 'https://blossom.sigit.io' // REFACTOR: should be an env

  // Upload the file to the file storage service using Axios
  const response = await axios.put(`${FILE_STORAGE_URL}/upload`, file, {
    headers: {
      Authorization: 'Nostr ' + btoa(JSON.stringify(authEvent)), // Set authorization header
-      'Content-Type': 'application/zip' // Set content type header
+      'Content-Type': 'application/sigit' // Set content type header
    }
  })