Skip to content

Open-Source API Development Ecosystem • https://hoppscotch.io • Offline, On-Prem & Cloud • Web, Desktop & CLI • Open-Source Alternative to Postman, Insomnia

feat: init boring avatars (#3615)

Liyas Thomas259cd48dbb86
diff --git a/packages/hoppscotch-common/src/components/app/Header.vue b/packages/hoppscotch-common/src/components/app/Header.vue
index 4148d0c50..e68c2e8f4 100644
--- a/packages/hoppscotch-common/src/components/app/Header.vue
+++ b/packages/hoppscotch-common/src/components/app/Header.vue
@@ -134,34 +134,15 @@
:on-shown="() => tippyActions.focus()"
>
<HoppSmartPicture
- v-if="currentUser.photoURL"
v-tippy="{
theme: 'tooltip',
}"
- :url="currentUser.photoURL"
- :alt="
- currentUser.displayName ||
- t('profile.default_hopp_displayname')
- "
- :title="
- currentUser.displayName ||
- currentUser.email ||
- t('profile.default_hopp_displayname')
- "
- indicator
- :indicator-styles="
- network.isOnline ? 'bg-green-500' : 'bg-red-500'
- "
- />
- <HoppSmartPicture
- v-else
- v-tippy="{ theme: 'tooltip' }"
+ :name="currentUser.uid"
:title="
currentUser.displayName ||
currentUser.email ||
t('profile.default_hopp_displayname')
"
- :initial="currentUser.displayName || currentUser.email"
indicator
:indicator-styles="
network.isOnline ? 'bg-green-500' : 'bg-red-500'
diff --git a/packages/hoppscotch-common/src/components/teams/MemberStack.vue b/packages/hoppscotch-common/src/components/teams/MemberStack.vue
index 6dad4bfcc..76eddaabe 100644
--- a/packages/hoppscotch-common/src/components/teams/MemberStack.vue
+++ b/packages/hoppscotch-common/src/components/teams/MemberStack.vue
@@ -6,19 +6,9 @@
class="inline-flex"
>
<HoppSmartPicture
- v-if="member.user.photoURL"
v-tippy="{ theme: 'tooltip' }"
- :url="member.user.photoURL"
- :title="getUserName(member)"
- :alt="getUserName(member)"
- class="ring-2 ring-primary"
- @click="handleClick()"
- />
- <HoppSmartPicture
- v-else
- v-tippy="{ theme: 'tooltip' }"
- :title="getUserName(member)"
- :initial="getUserName(member)"
+ :name="member.user.uid"
+ :title="getUserName(member as TeamMember)"
class="ring-2 ring-primary"
@click="handleClick()"
/>
@@ -59,7 +49,7 @@ const emit = defineEmits<{
const getUserName = (member: TeamMember): string =>
member.user.displayName ||
member.user.email ||
- t("profile.default_hopp_displayName")
+ t("profile.default_hopp_displayname")
const maxMembersSoftLimit = 4
const maxMembersHardLimit = 6
@@ -77,7 +67,7 @@ const remainingSlicedMembers = computed(
props.teamMembers
.slice(maxMembersSoftLimit)
.slice(0, maxMembersHardLimit)
- .map((member) => getUserName(member))
+ .map((member) => getUserName(member as TeamMember))
.join(`,<br>`) +
(props.teamMembers.length - (maxMembersSoftLimit + maxMembersHardLimit) > 0
? `,<br>${t("team.more_members", {
diff --git a/packages/hoppscotch-common/src/pages/profile.vue b/packages/hoppscotch-common/src/pages/profile.vue
index 5f07c91ec..74de222f0 100644
--- a/packages/hoppscotch-common/src/pages/profile.vue
+++ b/packages/hoppscotch-common/src/pages/profile.vue
@@ -21,27 +21,15 @@
</HoppSmartPlaceholder>
<div v-else class="space-y-8">
<div
- class="-mb-11 h-24 rounded bg-primaryLight md:h-32"
+ class="-mb-12 h-24 rounded bg-primaryLight md:h-32"
style="background-image: url(/images/cover.svg)"
></div>
<div class="flex flex-col justify-between space-y-8 px-4 md:flex-row">
<div class="flex items-end">
<HoppSmartPicture
- v-if="currentUser.photoURL"
- :url="currentUser.photoURL"
- :alt="
- currentUser.displayName || t('profile.default_displayname')
- "
- class="ring-4 ring-primary"
- size="16"
- rounded="lg"
- />
- <HoppSmartPicture
- v-else
- :initial="currentUser.displayName || currentUser.email"
- rounded="lg"
- size="16"
- class="ring-4 ring-primary"
+ :name="currentUser.uid"
+ class="ring-8 ring-primary"
+ :size="64"
/>
<div class="ml-4">
<label class="heading">
diff --git a/packages/hoppscotch-sh-admin/src/components/app/Header.vue b/packages/hoppscotch-sh-admin/src/components/app/Header.vue
index 940c54ec2..577a0f160 100644
--- a/packages/hoppscotch-sh-admin/src/components/app/Header.vue
+++ b/packages/hoppscotch-sh-admin/src/components/app/Header.vue
@@ -33,28 +33,16 @@
:on-shown="() => tippyActions!.focus()"
>
<HoppSmartPicture
- v-if="currentUser.photoURL"
v-tippy="{
theme: 'tooltip',
}"
- :url="currentUser.photoURL"
- :alt="currentUser.displayName ?? `${t('app.no_name')}`"
+ :name="currentUser.uid"
:title="
currentUser.displayName ??
currentUser.email ??
`${t('app.no_name')}`
"
/>
- <HoppSmartPicture
- v-else
- v-tippy="{ theme: 'tooltip' }"
- :title="
- currentUser.displayName ??
- currentUser.email ??
- `${t('app.no_name')}`
- "
- :initial="currentUser.displayName ?? currentUser.email"
- />
<template #content="{ hide }">
<div
ref="tippyActions"
diff --git a/packages/hoppscotch-ui/package.json b/packages/hoppscotch-ui/package.json
index f9b1aedcc..a0cbdc46a 100644
--- a/packages/hoppscotch-ui/package.json
+++ b/packages/hoppscotch-ui/package.json
@@ -17,6 +17,7 @@
"vue": "^3.2.25"
},
"dependencies": {
+ "@boringer-avatars/vue3": "^0.2.1",
"@fontsource-variable/inter": "^5.0.5",
"@fontsource-variable/material-symbols-rounded": "^5.0.5",
"@fontsource-variable/roboto-mono": "^5.0.6",
@@ -96,4 +97,4 @@
"./helpers/treeAdapter.ts": "./src/helpers/treeAdapter.ts"
},
"types": "./dist/index.d.ts"
-}
\ No newline at end of file
+}
diff --git a/packages/hoppscotch-ui/src/components/smart/Picture.vue b/packages/hoppscotch-ui/src/components/smart/Picture.vue
index 26f0b14bb..36fcb0fa0 100644
--- a/packages/hoppscotch-ui/src/components/smart/Picture.vue
+++ b/packages/hoppscotch-ui/src/components/smart/Picture.vue
@@ -1,72 +1,38 @@
<template>
<div
tabindex="0"
- class="relative flex items-center justify-center cursor-pointer focus:outline-none focus-visible:ring focus-visible:ring-primaryDark"
- :class="[`rounded-${rounded}`, `w-${size} h-${size}`]"
+ class="relative rounded-full flex items-center justify-center cursor-pointer focus:outline-none focus-visible:ring focus-visible:ring-primaryDark"
>
- <img
- v-if="url"
- class="absolute object-cover object-center transition bg-primaryDark"
- :class="[`rounded-${rounded}`, `w-${size} h-${size}`]"
- :src="url"
- :alt="alt"
- loading="lazy"
- referrerpolicy="no-referrer"
+ <Avatar
+ :size="size"
+ :name="name"
+ :square="false"
+ :colors="['#FFAD08', '#EDD75A', '#73B06F', '#0C8F8F', '#405059']"
+ variant="beam"
/>
- <div
- v-else
- class="absolute flex items-center justify-center object-cover object-center transition bg-primaryDark text-accentContrast"
- :class="[`rounded-${rounded}`, `w-${size} h-${size}`]"
- :style="`background-color: ${initial ? toHex(initial) : '#480000'}`"
- >
- <template v-if="initial && initial.charAt(0).toUpperCase()">
- {{ initial.charAt(0).toUpperCase() }}
- </template>
- <icon-lucide-user v-else />
- </div>
<span
v-if="indicator"
- class="border-primary border-2 h-2.5 -top-0.5 -right-0.5 w-2.5 absolute"
- :class="[`rounded-${rounded}`, indicatorStyles]"
+ class="border-primary rounded-full border-2 h-2.5 -top-0.5 -right-0.5 w-2.5 absolute"
+ :class="indicatorStyles"
></span>
- <!-- w-5 h-5 rounded-lg -->
</div>
</template>
<script setup lang="ts">
+import { Avatar } from "@boringer-avatars/vue3";
+
withDefaults(
defineProps<{
- url: string
- alt: string
+ name: string
indicator: boolean
indicatorStyles: string
- rounded: string
- size: string
- initial: string | undefined | null
+ size: number
}>(),
{
- url: "",
- alt: "Profile picture",
+ name: "",
indicator: false,
indicatorStyles: "bg-green-500",
- rounded: "full",
- size: "5",
- initial: "",
+ size: 24,
}
)
-
-const toHex = (initial: string) => {
- let hash = 0
- if (initial.length === 0) return hash
- for (let i = 0; i < initial.length; i++) {
- hash = initial.charCodeAt(i) + ((hash << 5) - hash)
- hash = hash & hash
- }
- let color = "#"
- for (let i = 0; i < 3; i++) {
- const value = (hash >> (i * 8)) & 255
- color += `00${value.toString(16)}`.slice(-2)
- }
- return color
-}
</script>
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f161e81d5..bcd99b3cd 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1414,6 +1414,9 @@ importers:
packages/hoppscotch-ui:
dependencies:
+ '@boringer-avatars/vue3':
+ specifier: ^0.2.1
+ version: 0.2.1([email protected])
'@fontsource-variable/inter':
specifier: ^5.0.5
version: 5.0.5
@@ -4447,6 +4450,14 @@ packages:
resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
dev: true
+ /@boringer-avatars/[email protected]([email protected]):
+ resolution: {integrity: sha512-KzAfh31SDXToTvFL0tBNG5Ur+VzfD1PP4jmY5/GS+eIuObGTIAiUu9eiht0LjuAGI+0xCgnaEgsTrOx8H3vLOQ==}
+ peerDependencies:
+ vue: ^3.0.0
+ dependencies:
+ vue: 3.2.45
+ dev: false
+
/@codemirror/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@lezer/[email protected]):
resolution: {integrity: sha512-3dCL7b0j2GdtZzWN5j7HDpRAJ26ip07R4NGYz7QYthIYMiX8I4E4TNrYcdTayPJGeVQtd/xe7lWU4XL7THFb/w==}
peerDependencies:
@@ -11990,7 +12001,7 @@ packages:
vite: ^3.0.0
vue: ^3.2.25
dependencies:
- vite: 3.2.4(@types/[email protected])([email protected])
vue: 3.2.45
dev: true
@@ -26181,7 +26192,7 @@ packages:
dependencies:
fast-glob: 3.2.12
unplugin: 1.4.0
- vite: 3.2.4(@types/[email protected])([email protected])
dev: true
@@ -27177,7 +27188,7 @@ packages:
json5: 2.2.3
local-pkg: 0.4.3
picocolors: 1.0.0
- vite: 3.2.4(@types/[email protected])([email protected])
yaml: 2.3.1
transitivePeerDependencies:
- supports-color