fix(api):Resolve merge conflict

keyshade-xyz · Oct 6, 2024 · 2e1568a · 2e1568a
1 parent d801915
commit 2e1568a
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 14 deletions.
diff --git a/apps/cli/src/commands/environment/list.environment.ts b/apps/cli/src/commands/environment/list.environment.ts
@@ -1,7 +1,7 @@
 import BaseCommand from '../base.command'
 import { EnvironmentController } from '@keyshade/api-client'
 import {
-  CommandOption,
+  type CommandOption,
   type CommandActionData,
   type CommandArgument
 } from 'src/types/command/command.types'

diff --git a/apps/cli/src/commands/workspace/list.workspace.ts b/apps/cli/src/commands/workspace/list.workspace.ts
@@ -1,7 +1,10 @@
 import BaseCommand from '@/commands/base.command'
 import { Logger } from '@/util/logger'
 import ControllerInstance from '@/util/controller-instance'
-import { CommandActionData, CommandOption } from '@/types/command/command.types'
+import {
+  type CommandActionData,
+  type CommandOption
+} from '@/types/command/command.types'
 import { PAGINATION_OPTION } from '@/util/pagination-options'
 
 export default class ListWorkspace extends BaseCommand {

diff --git a/apps/cli/src/commands/workspace/role/get.role.ts b/apps/cli/src/commands/workspace/role/get.role.ts
@@ -36,16 +36,16 @@ export default class GetRoleCommand extends BaseCommand {
       )
 
     if (success) {
-      Logger.info(`Workspace role fetched successfully!`)
+      Logger.info('Workspace role fetched successfully!')
       Logger.info(`Workspace role: ${data.name} (${data.slug})`)
       Logger.info(`Description: ${data.description || 'N/A'}`)
       Logger.info(`Created at ${data.createdAt}`)
       Logger.info(`Updated at ${data.updatedAt}`)
-      Logger.info(`Authorities:`)
+      Logger.info('Authorities:')
       for (const authority of data.authorities) {
         Logger.info(`- ${authority}`)
       }
-      Logger.info(`Projects:`)
+      Logger.info('Projects:')
       for (const project of data.projects) {
         Logger.info(`- ${project.project.name} (${project.project.slug})`)
       }

diff --git a/apps/cli/src/commands/workspace/role/list.role.ts b/apps/cli/src/commands/workspace/role/list.role.ts
@@ -2,7 +2,7 @@ import BaseCommand from '@/commands/base.command'
 import {
   type CommandActionData,
   type CommandArgument,
-  CommandOption
+  type CommandOption
 } from '@/types/command/command.types'
 import { Logger } from '@/util/logger'
 import ControllerInstance from '@/util/controller-instance'

diff --git a/apps/cli/src/commands/workspace/role/update.role.ts b/apps/cli/src/commands/workspace/role/update.role.ts
@@ -1,6 +1,6 @@
 import BaseCommand from '@/commands/base.command'
 import {
-  CommandOption,
+  type CommandOption,
   type CommandActionData,
   type CommandArgument
 } from '@/types/command/command.types'
@@ -76,17 +76,17 @@ export default class UpdateRoleCommand extends BaseCommand {
       )
 
     if (success) {
-      Logger.info(`Workspace role updated successfully:`)
+      Logger.info('Workspace role updated successfully:')
       Logger.info(`Workspace role: ${data.name} (${data.slug})`)
       Logger.info(`Description: ${data.description || 'N/A'}`)
       Logger.info(`Created at ${data.createdAt}`)
       Logger.info(`Updated at ${data.updatedAt}`)
       Logger.info(`Color code: ${data.colorCode}`)
-      Logger.info(`Authorities:`)
+      Logger.info('Authorities:')
       for (const authority of data.authorities) {
         Logger.info(`- ${authority}`)
       }
-      Logger.info(`Projects:`)
+      Logger.info('Projects:')
       for (const project of data.projects) {
         Logger.info(`- ${project.project.name} (${project.project.slug})`)
       }

diff --git a/apps/cli/src/util/pagination-options.ts b/apps/cli/src/util/pagination-options.ts
@@ -1,4 +1,4 @@
-import { CommandOption } from '@/types/command/command.types'
+import { type CommandOption } from '@/types/command/command.types'
 
 export const PAGINATION_OPTION: CommandOption[] = [
   {

diff --git a/apps/platform/src/app/auth/page.tsx b/apps/platform/src/app/auth/page.tsx
@@ -6,7 +6,12 @@ import { useRouter } from 'next/navigation'
 import { useAtom } from 'jotai'
 import Cookies from 'js-cookie'
 import { LoadingSVG } from '@public/svg/shared'
-import { GithubSVG, GoogleSVG, KeyshadeBigSVG ,GitlabSVG} from '@public/svg/auth'
+import {
+  GithubSVG,
+  GoogleSVG,
+  KeyshadeBigSVG,
+  GitlabSVG
+} from '@public/svg/auth'
 import { Input } from '@/components/ui/input'
 import { Button } from '@/components/ui/button'
 import { authEmailAtom } from '@/store'

diff --git a/apps/web/src/app/(main)/career/page.tsx b/apps/web/src/app/(main)/career/page.tsx
@@ -1,5 +1,5 @@
-import { ColorBGSVG } from '@public/hero'
 import Link from 'next/link'
+import { ColorBGSVG } from '@public/hero'
 import EncryptButton from '@/components/ui/encrypt-btn'
 
 function Career(): React.JSX.Element {

diff --git a/packages/api-client/src/controllers/workspace-membership.ts b/packages/api-client/src/controllers/workspace-membership.ts
@@ -139,7 +139,7 @@ export default class WorkspaceMembershipController {
     request: GetMembersRequest,
     headers?: Record<string, string>
   ): Promise<ClientResponse<GetMembersResponse>> {
-    let url = parsePaginationUrl(
+    const url = parsePaginationUrl(
       `/api/workspace-membership/${request.workspaceSlug}/members`,
       request
     )