fix branch conflicts

vuejs · Sep 18, 2024 · d97af2c · d97af2c
2 parents 51dbcb7 + c1455ac
commit d97af2c
Show file tree

Hide file tree

Showing 17 changed files with 456 additions and 382 deletions.
diff --git a/.vitepress/config.ts b/.vitepress/config.ts
@@ -127,10 +127,11 @@ const nav: ThemeConfig['nav'] = [
   },
   {
     text: 'Experts',
+    badge: { text: 'NEW' },
     activeMatch: `^/(partners|developers)/`,
     items: [
       { text: 'Partners', link: '/partners/' },
-      { text: 'Developers', link: '/developers/' }
+      { text: 'Developers', link: '/developers/', badge: { text: 'NEW' } }
     ]
   }
 ]

diff --git a/src/developers/developers.json b/src/developers/developers.json
diff --git a/src/developers/partnerConfig.js b/src/developers/partnerConfig.js
@@ -10,7 +10,6 @@ const hireUrl = 'https://proxify.io/hire-vuejs'
 const vueArticleUrl = 'https://proxify.io/hire-vue-developers'
 const imageStorageUrl = 'https://res.cloudinary.com/proxify-io/image/upload'
 
-
 const partnerConfig = {
   // Partner information
   partnerName: partner?.name,

diff --git a/src/public/images/developers/1020-profile.svg b/src/public/images/developers/1020-profile.svg
diff --git a/src/public/images/developers/1346-profile.svg b/src/public/images/developers/1346-profile.svg
diff --git a/...public/images/developers/5486-profile.svg → ...public/images/developers/2030-profile.svg b/...public/images/developers/5486-profile.svg → ...public/images/developers/2030-profile.svg
diff --git a/src/public/images/developers/2030-score.svg b/src/public/images/developers/2030-score.svg
diff --git a/src/public/images/developers/2535-profile.svg b/src/public/images/developers/2535-profile.svg
diff --git a/src/public/images/developers/3021-profile.svg b/src/public/images/developers/3021-profile.svg
diff --git a/src/public/images/developers/3709-profile.svg b/src/public/images/developers/3709-profile.svg
diff --git a/...public/images/developers/4747-profile.svg → ...public/images/developers/4290-profile.svg b/...public/images/developers/4747-profile.svg → ...public/images/developers/4290-profile.svg
diff --git a/src/public/images/developers/4290-score.svg b/src/public/images/developers/4290-score.svg
diff --git a/src/public/images/developers/4747-score.svg b/src/public/images/developers/4747-score.svg
diff --git a/src/public/images/developers/5022-profile.svg b/src/public/images/developers/5022-profile.svg
diff --git a/src/public/images/developers/5328-profile.svg b/src/public/images/developers/5328-profile.svg
diff --git a/src/public/images/developers/5486-score.svg b/src/public/images/developers/5486-score.svg
diff --git a/src/public/images/developers/5697-profile.svg b/src/public/images/developers/5697-profile.svg