Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update files with upstream code #47

Merged
merged 1 commit into from
Feb 13, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"@vueuse/core": "^10.3.0",
"@vueuse/integrations": "^10.3.0",
"feather-icons": "^4.28.0",
"frappe-ui": "^0.1.71",
"frappe-ui": "^0.1.94",
"gemoji": "^8.1.0",
"lodash": "^4.17.21",
"mime": "^4.0.1",
Expand Down
4 changes: 3 additions & 1 deletion frontend/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<script setup>
import { Dialogs } from '@/utils/dialogs'
import { sessionStore as session } from '@/stores/session'
import { Toasts } from 'frappe-ui'
import { Toasts, setConfig } from 'frappe-ui'
import { computed, defineAsyncComponent } from 'vue'

const MobileLayout = defineAsyncComponent(() =>
Expand All @@ -25,4 +25,6 @@ const Layout = computed(() => {
return DesktopLayout
}
})

setConfig('timezone', window.timezone)
</script>
Binary file removed frontend/src/assets/Inter/Inter-Black.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Black.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-BlackItalic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-BlackItalic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Bold.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Bold.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-BoldItalic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-BoldItalic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ExtraBold.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ExtraBold.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ExtraLight.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ExtraLight.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Italic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Italic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Light.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Light.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-LightItalic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-LightItalic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Medium.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Medium.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-MediumItalic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-MediumItalic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Regular.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Regular.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-SemiBold.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-SemiBold.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-SemiBoldItalic.woff
Binary file not shown.
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Thin.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-Thin.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ThinItalic.woff
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-ThinItalic.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-italic.var.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter-roman.var.woff2
Binary file not shown.
Binary file removed frontend/src/assets/Inter/Inter.var.woff2
Binary file not shown.
152 changes: 0 additions & 152 deletions frontend/src/assets/Inter/inter.css

This file was deleted.

56 changes: 28 additions & 28 deletions frontend/src/components/Activities/Activities.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
>
<div
v-if="all_activities?.loading"
class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-gray-500"
class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-ink-gray-4"
>
<LoadingIndicator class="h-6 w-6" />
<span>{{ __('Loading...') }}</span>
Expand Down Expand Up @@ -54,9 +54,9 @@
:class="i != activities.length - 1 ? 'after:h-full' : 'after:h-4'"
>
<div
class="z-10 flex h-8 w-7 items-center justify-center bg-white"
class="z-10 flex h-8 w-7 items-center justify-center bg-surface-white"
>
<CommentIcon class="text-gray-800" />
<CommentIcon class="text-ink-gray-8" />
</div>
</div>
<CommentArea class="mb-4" :activity="comment" />
Expand All @@ -76,11 +76,11 @@
:class="i != activities.length - 1 ? 'after:h-full' : 'after:h-4'"
>
<div
class="z-10 flex h-8 w-7 items-center justify-center bg-white text-gray-800"
class="z-10 flex h-8 w-7 items-center justify-center bg-surface-white text-ink-gray-8"
>
<MissedCallIcon
v-if="call.status == 'No Answer'"
class="text-red-600"
class="text-ink-red-4"
/>
<DeclinedCallIcon v-else-if="call.status == 'Busy'" />
<component
Expand Down Expand Up @@ -120,10 +120,10 @@
:class="[i != activities.length - 1 ? 'before:h-full' : 'before:h-4']"
>
<div
class="z-10 flex h-7 w-7 items-center justify-center bg-white"
class="z-10 flex h-7 w-7 items-center justify-center bg-surface-white"
:class="{
'mt-2.5': ['communication'].includes(activity.activity_type),
'bg-white': ['added', 'removed', 'changed'].includes(
'bg-surface-white': ['added', 'removed', 'changed'].includes(
activity.activity_type,
),
'h-8': [
Expand All @@ -145,7 +145,7 @@
activity.activity_type,
) && activity.status == 'No Answer'
"
class="text-red-600"
class="text-ink-red-4"
/>
<DeclinedCallIcon
v-else-if="
Expand All @@ -159,8 +159,8 @@
:is="activity.icon"
:class="
['added', 'removed', 'changed'].includes(activity.activity_type)
? 'text-gray-500'
: 'text-gray-800'
? 'text-ink-gray-4'
: 'text-ink-gray-8'
"
/>
</div>
Expand All @@ -185,10 +185,10 @@
>
<div class="flex items-center justify-stretch gap-2 text-base">
<div
class="inline-flex items-center flex-wrap gap-1.5 text-gray-800 font-medium"
class="inline-flex items-center flex-wrap gap-1.5 text-ink-gray-8 font-medium"
>
<span class="font-medium">{{ activity.owner_name }}</span>
<span class="text-gray-600">{{ __(activity.data.type) }}</span>
<span class="text-ink-gray-5">{{ __(activity.data.type) }}</span>
<a
v-if="activity.data.file_url"
:href="activity.data.file_url"
Expand All @@ -205,7 +205,7 @@
</div>
<div class="ml-auto whitespace-nowrap">
<Tooltip :text="dateFormat(activity.creation, dateTooltipFormat)">
<div class="text-sm text-gray-600">
<div class="text-sm text-ink-gray-5">
{{ __(timeAgo(activity.creation)) }}
</div>
</Tooltip>
Expand All @@ -225,7 +225,7 @@
<div class="flex items-center justify-stretch gap-2 text-base">
<div
v-if="activity.other_versions"
class="inline-flex flex-wrap gap-1.5 text-gray-800 font-medium"
class="inline-flex flex-wrap gap-1.5 text-ink-gray-8 font-medium"
>
<span>{{ activity.show_others ? __('Hide') : __('Show') }}</span>
<span> +{{ activity.other_versions.length + 1 }} </span>
Expand All @@ -243,22 +243,22 @@
</div>
<div
v-else
class="inline-flex items-center flex-wrap gap-1 text-gray-600"
class="inline-flex items-center flex-wrap gap-1 text-ink-gray-5"
>
<span class="font-medium text-gray-800">
<span class="font-medium text-ink-gray-8">
{{ activity.owner_name }}
</span>
<span v-if="activity.type">{{ __(activity.type) }}</span>
<span
v-if="activity.data.field_label"
class="max-w-xs truncate font-medium text-gray-800"
class="max-w-xs truncate font-medium text-ink-gray-8"
>
{{ __(activity.data.field_label) }}
</span>
<span v-if="activity.value">{{ __(activity.value) }}</span>
<span
v-if="activity.data.old_value"
class="max-w-xs font-medium text-gray-800"
class="max-w-xs font-medium text-ink-gray-8"
>
<div
class="flex items-center gap-1"
Expand All @@ -274,7 +274,7 @@
<span v-if="activity.to">{{ __('to') }}</span>
<span
v-if="activity.data.value"
class="max-w-xs font-medium text-gray-800"
class="max-w-xs font-medium text-ink-gray-8"
>
<div
class="flex items-center gap-1"
Expand All @@ -291,7 +291,7 @@

<div class="ml-auto whitespace-nowrap">
<Tooltip :text="dateFormat(activity.creation, dateTooltipFormat)">
<div class="text-sm text-gray-600">
<div class="text-sm text-ink-gray-5">
{{ __(timeAgo(activity.creation)) }}
</div>
</Tooltip>
Expand All @@ -305,23 +305,23 @@
v-for="activity in [activity, ...activity.other_versions]"
class="flex items-start justify-stretch gap-2 py-1.5 text-base"
>
<div class="inline-flex flex-wrap gap-1 text-gray-600">
<div class="inline-flex flex-wrap gap-1 text-ink-gray-5">
<span
v-if="activity.data.field_label"
class="max-w-xs truncate text-gray-600"
class="max-w-xs truncate text-ink-gray-5"
>
{{ __(activity.data.field_label) }}
</span>
<FeatherIcon
name="arrow-right"
class="mx-1 h-4 w-4 text-gray-600"
class="mx-1 h-4 w-4 text-ink-gray-5"
/>
<span v-if="activity.type">
{{ startCase(__(activity.type)) }}
</span>
<span
v-if="activity.data.old_value"
class="max-w-xs font-medium text-gray-800"
class="max-w-xs font-medium text-ink-gray-8"
>
<div
class="flex items-center gap-1"
Expand All @@ -337,7 +337,7 @@
<span v-if="activity.to">{{ __('to') }}</span>
<span
v-if="activity.data.value"
class="max-w-xs font-medium text-gray-800"
class="max-w-xs font-medium text-ink-gray-8"
>
<div
class="flex items-center gap-1"
Expand All @@ -356,7 +356,7 @@
<Tooltip
:text="dateFormat(activity.creation, dateTooltipFormat)"
>
<div class="text-sm text-gray-600">
<div class="text-sm text-ink-gray-5">
{{ __(timeAgo(activity.creation)) }}
</div>
</Tooltip>
Expand All @@ -368,7 +368,7 @@
</div>
<div
v-else
class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-gray-500"
class="flex flex-1 flex-col items-center justify-center gap-3 text-xl font-medium text-ink-gray-4"
>
<component :is="emptyTextIcon" class="h-10 w-10" />
<span>{{ __(emptyText) }}</span>
Expand Down Expand Up @@ -758,7 +758,7 @@ const emptyTextIcon = computed(() => {
} else if (title.value == 'WhatsApp') {
icon = WhatsAppIcon
}
return h(icon, { class: 'text-gray-500' })
return h(icon, { class: 'text-ink-gray-4' })
})

function timelineIcon(activity_type, is_lead) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/Activities/ActivityHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div
class="mx-4 my-3 flex items-center justify-between text-lg font-medium sm:mx-10 sm:mb-4 sm:mt-8"
>
<div class="flex h-8 items-center text-xl font-semibold text-gray-800">
<div class="flex h-8 items-center text-xl font-semibold text-ink-gray-8">
{{ __(title) }}
</div>
<Button
Expand Down
Loading