Merge remote-tracking branch 'source-doc/main'

# Conflicts:
#	src/partners/components/PartnerHero.vue

.vitepress/theme/components/PageHero.vue

@@ -3,9 +3,9 @@
     <h1 class="page-hero__title">
       <slot name="title" />
     </h1>
-    <p class="page-hero__lead">
+    <div class="page-hero__lead">
       <slot name="lead" />
-    </p>
+    </div>
   </div>
 </template>
 

src/about/team/members-core.json

@@ -169,34 +169,6 @@
     },
     "sponsor": true
   },
-  {
-    "name": "Rahul Kadyan",
-    "title": "Software Engineer",
-    "company": "Grammarly",
-    "companyLink": "https://grammarly.com/",
-    "projects": [
-      {
-        "label": "vuejs/core",
-        "url": "https://github.com/vuejs/core"
-      },
-      { "label": "VueDX", "url": "https://github.com/vuedx" },
-      {
-        "label": "rollup-plugin-vue",
-        "url": "https://github.com/vuejs/rollup-plugin-vue"
-      }
-    ],
-    "location": "Bangalore, India",
-    "languages": ["Hindi", "English"],
-    "socials": {
-      "github": "znck",
-      "twitter": "znck0"
-    },
-    "website": {
-      "label": "https://znck.me",
-      "url": "https://znck.me"
-    },
-    "sponsor": true
-  },
   {
     "name": "Linusborg",
     "title": "Hive-Mind Community Wrangler (Probably a Bot)",
@@ -429,22 +401,6 @@
     },
     "sponsor": true
   },
-  {
-    "name": "HcySunYang",
-    "title": "Developer",
-    "projects": [
-      {
-        "label": "vuejs/core",
-        "url": "https://github.com/vuejs/core"
-      }
-    ],
-    "location": "Beijing, China",
-    "languages": ["Chinese", "English"],
-    "socials": {
-      "github": "HcySunYang",
-      "twitter": "HcySunYang"
-    }
-  },
   {
     "name": "Johnson Chu",
     "title": "Developer",

src/about/team/members-emeriti.json

@@ -258,5 +258,49 @@
       "twitter": "DamianDulisz"
     },
     "sponsor": true
+  },
+  {
+    "name": "HcySunYang",
+    "title": "Developer",
+    "projects": [
+      {
+        "label": "vuejs/core",
+        "url": "https://github.com/vuejs/core"
+      }
+    ],
+    "location": "Beijing, China",
+    "languages": ["Chinese", "English"],
+    "socials": {
+      "github": "HcySunYang",
+      "twitter": "HcySunYang"
+    }
+  },
+  {
+    "name": "Rahul Kadyan",
+    "title": "Software Engineer",
+    "company": "Grammarly",
+    "companyLink": "https://grammarly.com/",
+    "projects": [
+      {
+        "label": "vuejs/core",
+        "url": "https://github.com/vuejs/core"
+      },
+      { "label": "VueDX", "url": "https://github.com/vuedx" },
+      {
+        "label": "rollup-plugin-vue",
+        "url": "https://github.com/vuejs/rollup-plugin-vue"
+      }
+    ],
+    "location": "Bangalore, India",
+    "languages": ["Hindi", "English"],
+    "socials": {
+      "github": "znck",
+      "twitter": "znck0"
+    },
+    "website": {
+      "label": "https://znck.me",
+      "url": "https://znck.me"
+    },
+    "sponsor": true
   }
 ]

src/developers/components/DeveloperHero.vue

@@ -8,17 +8,58 @@ import { generateUTMUrl } from './utils'
 defineProps<{ title?: string }>()
 
 const route = useRoute()
-const applyLink = computed(() => generateUTMUrl(partnerConfig.pageHeroBanner.applyButton.url, route.path))
+const hireUsLink = computed(() => generateUTMUrl(partnerConfig.hireUsButtonUrl, route.path))
 </script>
 
 <template>
-  <PageHero>
+  <PageHero class="page-hero">
     <template #title>{{ title || partnerConfig.pageHeroBanner.title }}</template>
     <template #lead>
-      {{ partnerConfig.pageHeroBanner.description }}
-      <br />
-      <a v-if="applyLink" class="link" :href="applyLink"
-         target="_blank">{{ partnerConfig.pageHeroBanner.applyButton.label }}</a>.
+      <p class="description">
+        {{ partnerConfig.pageHeroBanner.description1 }}
+        <br />
+        {{ partnerConfig.pageHeroBanner.description2 }}
+        <br />
+      </p>
+
+      <a
+        v-if="hireUsLink"
+        :href="hireUsLink"
+        target="_blank"
+        class="accent-button"
+      >
+        {{ partnerConfig.pageHeroBanner.hireButton.label }}
+      </a>
+
+      <p class="description">{{ partnerConfig.pageHeroBanner.footer }}</p>
     </template>
   </PageHero>
 </template>
+
+<style scoped>
+.accent-button {
+  margin: 40px auto 16px;
+}
+
+br {
+  display: none;
+}
+
+/* Media Queries */
+@media (min-width: 768px) {
+  .accent-button {
+    margin-top: 48px;
+  }
+}
+
+@media (min-width: 1024px) {
+  .page-hero {
+    max-width: 846px;
+    padding: 64px 0;
+  }
+
+  br {
+    display: block;
+  }
+}
+</style>

src/developers/partnerConfig.js

@@ -25,12 +25,14 @@ const partnerConfig = {
 
   // Hero Section
   pageHeroBanner: {
-    title: 'Vue Developers',
-    description: 'Vue Developers are certified individual freelancers. Payments, compliance and vetting are administrated by our partner Proxify. Interested to join the list?',
-    applyButton: {
-      url: applyUrl,
-      label: 'Apply here'
-    }
+    title: 'Find top Vue.js developers for your team',
+    description1: 'Access certified Vue.js developers available for your next project.',
+    description2: 'Proxify handles the vetting process to ensure top-tier quality and reliability.',
+    hireButton: {
+      url: hireUrl,
+      label: 'Find Vue.js developers now'
+    },
+    footer: "Get matched with a top Vue.js developer in less than 48 hours",
   },
 
   // Hero Section

src/partners/components/PartnerHero.vue

@@ -8,12 +8,13 @@ defineProps<{ title?: string }>()
   <PageHero>
     <template #title>{{ title || 'Партнеры Vue' }}</template>
     <template #lead>
+      <p>
       Партнеры Vue — это агентства, одобренные командой Vue,
       которые предоставляют первоклассные консультационные и услуги разработки на базе Vue.
       Если ваша компания заинтересована в том, чтобы быть указанной как партнер, пожалуйста,
       <a class="link" href="https://airtable.com/shrCQhat57SApJI2l" target="_blank"
-        >зарегистрируйтесь здесь</a
-      >.
+        >зарегистрируйтесь здесь</a>.
+      </p>
     </template>
   </PageHero>
 </template>

src/public/funding.json

@@ -0,0 +1,120 @@
+{
+  "version": "v1.0.0",
+
+  "entity": {
+    "type": "organisation",
+    "role": "owner",
+    "name": "Vue Technology LLC",
+    "email": "[email protected]",
+    "phone": "",
+    "description": "Vue Technology LLC is the legal entity representing Vue's business operations and fund distribution to team members",
+    "webpageUrl": {
+      "url": "https://vuejs.org",
+      "wellKnown": ""
+    }
+  },
+
+  "projects": [
+    {
+      "guid": "vuejs",
+      "name": "Vue.js",
+      "description": "Vue.js is one of the most widely adopted frontend frameworks, with over 5.5 million weekly downloads and 2 million weekly active users. It is also the technology powering Zerodha's frontend.",
+      "webpageUrl": {
+        "url": "https://vuejs.org",
+        "wellKnown": ""
+      },
+      "repositoryUrl": {
+        "url": "https://github.com/vuejs/core",
+        "wellKnown": "https://github.com/vuejs/core/blob/main/.well-known/funding-manifest-urls"
+      },
+      "licenses": ["spdx:MIT"],
+      "tags": ["frontend", "javascript", "web-development", "ui"]
+    }
+  ],
+
+  "funding": {
+    "channels": [
+      {
+        "guid": "github-sponsors",
+        "type": "other",
+        "address": "https://github.com/sponsors/yyx990803",
+        "description": "GitHub supports payment via credit card or invoice-based billing."
+      },
+      {
+        "guid": "open-collective",
+        "type": "other",
+        "address": "https://opencollective.com/vuejs",
+        "description": "OpenCollective supports payment via credit card, Google Pay, or US bank ACH transfer."
+      },
+      {
+        "guid": "bank-of-america",
+        "type": "bank",
+        "address": "",
+        "description": "For donations via bank transfers, please get in touch for bank details."
+      }
+    ],
+
+    "plans": [
+      {
+        "guid": "special",
+        "status": "active",
+        "name": "Global Special Sponsor",
+        "description": "Exclusive above-the-fold logo placement on vuejs.org home page / Most prominent logo placement in on the right sidebar of every content page on vuejs.org (3M+ page views per month / 500k+ unique MAU) / Most prominent logo placement in the README and BACKERS files of the vuejs/core repo.",
+        "amount": 5000,
+        "currency": "USD",
+        "frequency": "monthly",
+        "channels": [
+          "github-sponsors",
+          "open-collective",
+          "bank-of-america"
+        ]
+      },
+      {
+        "guid": "platinum",
+        "status": "active",
+        "name": "Platinum Sponsor",
+        "description": "Logo on the right sidebar of every content page on vuejs.org (3M+ page views per month / 500k+ unique MAU) / Large logo placement on vuejs.org front page + sponsors page + in the README and BACKERS files of the vuejs/core repo.",
+        "amount": 2000,
+        "currency": "USD",
+        "frequency": "monthly",
+        "channels": [
+          "github-sponsors",
+          "open-collective",
+          "bank-of-america"
+        ]
+      },
+      {
+        "guid": "gold",
+        "status": "active",
+        "name": "Gold Sponsor",
+        "description": "Medium logo placement on vuejs.org front page + sponsors page + in the README and BACKERS files of the vuejs/core repo.",
+        "amount": 500,
+        "currency": "USD",
+        "frequency": "monthly",
+        "channels": ["github-sponsors", "open-collective"]
+      },
+      {
+        "guid": "silver",
+        "status": "active",
+        "name": "Silver Sponsor",
+        "description": "Small logo placement on vuejs.org sponsors page + in the README and BACKERS files of the vuejs/core repo.",
+        "amount": 250,
+        "currency": "USD",
+        "frequency": "monthly",
+        "channels": ["github-sponsors", "open-collective"]
+      },
+      {
+        "guid": "bronze",
+        "status": "active",
+        "name": "Bronze Sponsor",
+        "description": "Small logo placement in the README and BACKERS files of the vuejs/core repo.",
+        "amount": 100,
+        "currency": "USD",
+        "frequency": "monthly",
+        "channels": ["github-sponsors", "open-collective"]
+      }
+    ],
+
+    "history": []
+  }
+}