Apple pay support, fix publish key (#2171)

* Apple pay support, fix publish key

* fix api url

apps/frontend/nuxt.config.ts

@@ -350,6 +350,11 @@ export default defineNuxtConfig({
         "unknown",
 
       turnstile: { siteKey: "0x4AAAAAAAW3guHM6Eunbgwu" },
+
+      stripePublishableKey:
+        process.env.RATE_LIMIT_IGNORE_KEY ||
+        globalThis.STRIPE_PUBLISHABLE_KEY ||
+        "pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b",
     },
   },
   typescript: {

apps/frontend/src/components/ui/Badge.vue

@@ -6,6 +6,7 @@
     <template v-else-if="type === 'admin'"> <ModrinthIcon /> Modrinth Team</template>
     <template v-else-if="type === 'moderator'"> <ModeratorIcon /> Moderator</template>
     <template v-else-if="type === 'creator'"><CreatorIcon /> Creator</template>
+    <template v-else-if="type === 'plus'"><PlusIcon /> Modrinth Plus</template>
 
     <!-- Project statuses -->
     <template v-else-if="type === 'approved'"><ListIcon /> Listed</template>
@@ -36,6 +37,7 @@
 
 <script setup>
 import ModrinthIcon from "~/assets/images/logo.svg?component";
+import PlusIcon from "~/assets/images/utils/plus.svg?component";
 import ModeratorIcon from "~/assets/images/sidebar/admin.svg?component";
 import CreatorIcon from "~/assets/images/utils/box.svg?component";
 import ListIcon from "~/assets/images/utils/list.svg?component";
@@ -114,6 +116,7 @@ defineProps({
   }
 
   &.type--unlisted,
+  &.type--plus,
   &.purple {
     --badge-color: var(--color-purple);
   }

apps/frontend/src/pages/plus.vue

@@ -3,7 +3,7 @@
     ref="purchaseModal"
     :product="midasProduct"
     :country="country"
-    publishable-key="pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b"
+    :publishable-key="config.public.stripePublishableKey"
     :send-billing-request="
       async (body) =>
         await useBaseFetch('billing/payment', { internal: true, method: 'POST', body })
@@ -73,7 +73,9 @@
         <SparklesIcon class="h-8 w-8 text-purple" />
         <span class="text-lg font-bold">Remove all ads</span>
         <span class="leading-5 text-secondary">
-          Never see an advertisement again on the Modrinth app or the website.
+          Never see an advertisement again on
+          <!--the Modrinth app or-->
+          the website.
         </span>
       </div>
       <div class="flex flex-col gap-4 rounded-xl bg-bg-raised p-4">

apps/frontend/src/pages/settings/billing/index.vue

@@ -34,7 +34,10 @@
             <span class="font-bold">Benefits</span>
             <div class="flex items-center gap-2">
               <CheckCircleIcon class="h-5 w-5 text-brand" />
-              <span>Ad-free browsing on modrinth.com and Modrinth App</span>
+              <span>
+                Ad-free browsing on modrinth.com
+                <!--and Modrinth App-->
+              </span>
             </div>
             <div class="flex items-center gap-2">
               <CheckCircleIcon class="h-5 w-5 text-brand" />
@@ -163,7 +166,7 @@
       ref="purchaseModal"
       :product="midasProduct"
       :country="country"
-      publishable-key="pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b"
+      :publishable-key="config.public.stripePublishableKey"
       :send-billing-request="
         async (body) =>
           await useBaseFetch('billing/payment', { internal: true, method: 'POST', body })
@@ -457,9 +460,7 @@ let elements = null;
 function loadStripe() {
   try {
     if (!stripe) {
-      stripe = Stripe(
-        "pk_test_51JbFxJJygY5LJFfKV50mnXzz3YLvBVe2Gd1jn7ljWAkaBlRz3VQdxN9mXcPSrFbSqxwAb0svte9yhnsmm7qHfcWn00R611Ce7b",
-      );
+      stripe = Stripe(props.publishableKey);
     }
   } catch {}
 }

apps/frontend/src/pages/user/[id].vue

@@ -40,6 +40,7 @@
           </div>
           <div class="sidebar__item">
             <Badge v-if="tags.staffRoles.includes(user.role)" :type="user.role" />
+            <Badge v-else-if="isPermission(user.badges, 1 << 0)" type="plus" />
             <Badge v-else-if="projects.length > 0" type="creator" />
           </div>
           <span v-if="user.bio" class="sidebar__item bio">{{ user.bio }}</span>

apps/frontend/src/public/.well-known/apple-developer-merchantid-domain-association

@@ -0,0 +1 @@
+7B227073704964223A2239373943394538343346343131343044463144313834343232393232313734313034353044314339464446394437384337313531303944334643463542433731222C2276657273696F6E223A312C22637265617465644F6E223A313731353230333737303832312C227369676E6174757265223A2233303830303630393261383634383836663730643031303730326130383033303830303230313031333130643330306230363039363038363438303136353033303430323031333038303036303932613836343838366637306430313037303130303030613038303330383230336533333038323033383861303033303230313032303230383136363334633862306533303537313733303061303630383261383634386365336430343033303233303761333132653330326330363033353530343033306332353431373037303663363532303431373037303663363936333631373436393666366532303439366537343635363737323631373436393666366532303433343132303264323034373333333132363330323430363033353530343062306331643431373037303663363532303433363537323734363936363639363336313734363936663665323034313735373436383666373236393734373933313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330316531373064333233343330333433323339333133373334333733323337356131373064333233393330333433323338333133373334333733323336356133303566333132353330323330363033353530343033306331633635363336333264373336643730326436323732366636623635373232643733363936373665356635353433333432643530353234663434333131343330313230363033353530343062306330623639346635333230353337393733373436353664373333313133333031313036303335353034306130633061343137303730366336353230343936653633326533313062333030393036303335353034303631333032353535333330353933303133303630373261383634386365336430323031303630383261383634386365336430333031303730333432303030346332313537376564656264366337623232313866363864643730393061313231386463376230626436663263323833643834363039356439346166346135343131623833343230656438313166333430376538333333316631633534633366376562333232306436626164356434656666343932383938393365376330663133613338323032313133303832303230643330306330363033353531643133303130316666303430323330303033303166303630333535316432333034313833303136383031343233663234396334346639336534656632376536633466363238366333666132626266643265346233303435303630383262303630313035303530373031303130343339333033373330333530363038326230363031303530353037333030313836323936383734373437303361326632663666363337333730326536313730373036633635326536333666366432663666363337333730333033343264363137303730366336353631363936333631333333303332333038323031316430363033353531643230303438323031313433303832303131303330383230313063303630393261383634383836663736333634303530313330383166653330383163333036303832623036303130353035303730323032333038316236306338316233353236353663363936313665363336353230366636653230373436383639373332303633363537323734363936363639363336313734363532303632373932303631366537393230373036313732373437393230363137333733373536643635373332303631363336333635373037343631366536333635323036663636323037343638363532303734363836353665323036313730373036633639363336313632366336353230373337343631366536343631373236343230373436353732366437333230363136653634323036333666366536343639373436393666366537333230366636363230373537333635326332303633363537323734363936363639363336313734363532303730366636633639363337393230363136653634323036333635373237343639363636393633363137343639366636653230373037323631363337343639363336353230373337343631373436353664363536653734373332653330333630363038326230363031303530353037303230313136326136383734373437303361326632663737373737373265363137303730366336353265363336663664326636333635373237343639363636393633363137343635363137353734363836663732363937343739326633303334303630333535316431663034326433303262333032396130323761303235383632333638373437343730336132663266363337323663326536313730373036633635326536333666366432663631373037303663363536313639363336313333326536333732366333303164303630333535316430653034313630343134393435376462366664353734383138363839383937363266376535373835303765373962353832343330306530363033353531643066303130316666303430343033303230373830333030663036303932613836343838366637363336343036316430343032303530303330306130363038326138363438636533643034303330323033343930303330343630323231303063366630323363623236313462623330333838386131363239383365316139336631303536663530666137386364623962613463613234316363313465323565303232313030626533636430646664313632343766363439343437353338306539643434633232386131303839306133613164633732346238623463623838383938313862633330383230326565333038323032373561303033303230313032303230383439366432666266336139386461393733303061303630383261383634386365336430343033303233303637333131623330313930363033353530343033306331323431373037303663363532303532366636663734323034333431323032643230343733333331323633303234303630333535303430623063316434313730373036633635323034333635373237343639363636393633363137343639366636653230343137353734363836663732363937343739333131333330313130363033353530343061306330613431373037303663363532303439366536333265333130623330303930363033353530343Line truncated