Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
# Conflicts:
#	components/content/ReadMore.vue
#	pages/modules/index.vue
  • Loading branch information
Ivan Bochkarev committed Oct 14, 2024
2 parents a0fff44 + b95197b commit 91fd165
Show file tree
Hide file tree
Showing 23 changed files with 353 additions and 231 deletions.
5 changes: 3 additions & 2 deletions components/EmptyCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ withDefaults(defineProps<{
<div class="flex flex-col items-center py-12">
<UIcon name="i-ph-magnifying-glass" class="w-16 h-16 mx-auto text-gray-500 dark:text-gray-400 mb-4" aria-hidden="true" />

<!-- eslint-disable-next-line vue/no-v-html -->
<p class="text-lg text-center max-w-sm" v-html="label" />
<p class="text-lg text-center max-w-sm">
{{ label }}
</p>

<div class="flex items-center gap-3 mt-6">
<slot />
Expand Down
2 changes: 1 addition & 1 deletion components/content/ReadMore.vue
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const computedTitle = computed<string>(() => props.title || createBreadcrumb(pro
<template>
<Callout icon="i-ph-bookmark-simple" :to="to">
<MDCSlot unwrap="p">
Узнать больше <span class="font-bold" v-html="computedTitle" />.
Узнать больше <span class="font-bold" v-text="computedTitle" />.
</MDCSlot>
</Callout>
</template>
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
---
category: agency
title: The Coding Machine
description: "Specialized in tailor-made development around Open Source technologies for more than 15 years."
description: Specialized in tailor-made development around Open Source technologies for more than 15 years.
logo:
light: "/assets/enterprise/agencies/square/light/the-coding-machine.svg"
dark: "/assets/enterprise/agencies/square/dark/the-coding-machine.svg"
logoFull: "/assets/enterprise/agencies/full/dark/the-coding-machine.svg"
light: /assets/enterprise/agencies/square/light/the-coding-machine.svg
dark: /assets/enterprise/agencies/square/dark/the-coding-machine.svg
logoFull: /assets/enterprise/agencies/full/dark/the-coding-machine.svg
link: https://thecodingmachine.com/?ref=nuxt
services:
- eCommerce
- Software & SaaS
- Mobile development
- Consulting & Code audit
resources:
- label: 'Discover our projects'
to: 'https://thecodingmachine.com/en/projects/?ref=nuxt'
target: '_blank'
- label: Discover our projects
to: https://thecodingmachine.com/en/projects/?ref=nuxt
target: _blank
emailAddress: [email protected]
phoneNumber:
github: 'thecodingmachine'
linkedin: 'the-coding-machine'
phoneNumber: null
github: thecodingmachine
linkedin: the-coding-machine
color:
- '#00ecae'
regions:
- 'Europe'
- Europe
location: Paris, France
---

Expand Down
File renamed without changes.
File renamed without changes.
32 changes: 32 additions & 0 deletions content/8.enterprise/2.agencies/9.geist.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
category: agency
title: Geist
description: Shopify Composable Commerce Expert
logo:
light: /assets/enterprise/agencies/square/light/geist.svg
dark: /assets/enterprise/agencies/square/dark/geist.svg
logoFull: /assets/enterprise/agencies/full/dark/geist.png
link: https://geistjs.com/
services:
- eCommerce
- UI/UX design
resources:
- label: Blog
to: https://geistjs.com/blog
target: _blank
emailAddress: [email protected]
phoneNumber: null
twitter: null
github: Geistjs
color:
- '#f94345'
regions:
- Europe
location: Frankfurt
---

We are a specialized agency focused on building complex, high-performance e-commerce websites using Nuxt 3 and Shopify.

Our approach prioritizes long-term success for our clients by delivering a clean, maintainable codebase that ensures full control over their project post-delivery.

This allows our clients to easily manage and scale their e-commerce platforms without reliance on external developers, empowering them to make updates and adjustments seamlessly.
2 changes: 1 addition & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import nuxt from './.nuxt/eslint.config.mjs'
export default nuxt()
.override('nuxt/vue/rules', {
rules: {
'vue/no-v-html': 'off',
'vue/no-v-html': 'error',
'vue/max-attributes-per-line': ['error', { singleline: 5, multiline: 1 }]
}
})
Expand Down
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@
"test": "pnpm lint && pnpm typecheck"
},
"dependencies": {
"@iconify-json/heroicons": "^1.2.0",
"@iconify-json/logos": "^1.2.2",
"@iconify-json/octicon": "^1.2.0",
"@iconify-json/ph": "^1.2.0",
"@iconify-json/simple-icons": "^1.2.6",
"@iconify-json/uil": "^1.2.0",
"@iconify-json/heroicons": "^1.2.1",
"@iconify-json/logos": "^1.2.3",
"@iconify-json/octicon": "^1.2.1",
"@iconify-json/ph": "^1.2.1",
"@iconify-json/simple-icons": "^1.2.7",
"@iconify-json/uil": "^1.2.1",
"@nuxt/content": "^2.13.2",
"@nuxt/fonts": "^0.9.2",
"@nuxt/fonts": "^0.10.0",
"@nuxt/image": "^1.8.1",
"@nuxt/scripts": "^0.9.4",
"@nuxt/ui-pro": "^1.4.3",
"@nuxt/ui-pro": "^1.4.4",
"@nuxthq/studio": "^2.1.1",
"@nuxtjs/html-validator": "^1.8.2",
"@nuxtjs/plausible": "^1.0.3",
Expand All @@ -34,7 +34,7 @@
"floating-vue": "^5.2.2",
"nuxt": "^3.13.2",
"nuxt-og-image": "^3.0.4",
"ofetch": "^1.4.0",
"ofetch": "^1.4.1",
"perfect-debounce": "^1.0.0",
"scule": "^1.3.0",
"sitemap": "^8.0.0",
Expand Down
1 change: 1 addition & 0 deletions pages/enterprise/support.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ onBeforeUnmount(() => {
<UContainer>
<UPageHero :title="page.title" align="center" :links="page.hero.links">
<template #description>
<!-- eslint-disable-next-line vue/no-v-html -->
<span v-html="page.description" />
</template>
</UPageHero>
Expand Down
2 changes: 1 addition & 1 deletion pages/modules/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ const { copy } = useCopyToClipboard()
</UPageCard>
</UPageGrid>

<EmptyCard v-else :label="`Модуль пока не найден <b>${q}</b>. Станьте первым, кто его создаст!`">
<EmptyCard v-else :label="`Модуль пока не найден ${q}. Станьте первым, кто его создаст!`">
<UButton
label="Contribute on GitHub"
color="black"
Expand Down
Loading

0 comments on commit 91fd165

Please sign in to comment.