Merge branch 'main' into btcpayEarner

Author: itsMikeLowrey

README.md

@@ -1 +1,3 @@
 This is the repo for Anon Shop. This software is licensed under the MIT License.
+Here is the trello where I post what I am working on and my fixes for feedback issues. 
+https://trello.com/b/WWzxXCUd/anon-shop

src/assets/faq.js

@@ -26,7 +26,7 @@ const faq = {
     ],
     [
       `Do you offer refunds?`,
-      `Due to Amazon return scams, you must make an account and use the included gift recipient to make a return.`,
+      `Due to Amazon return scams, you must make an account and use the included gift recipient to make a return on delivered items.`,
     ]
   ],
   "Locker Questions": [
@@ -46,7 +46,7 @@ const faq = {
     ],
     [
       `How long does it take to process an order?`,
-      `I aim to process all orders within 12 hours.`,
+      `I aim to process all orders within 24 hours.`,
     ],
     [
       `How long does shipping take?`,
@@ -66,13 +66,13 @@ const faq = {
         </ol>
         I also have a full demo of Anonymous Locker <a href="https://res.cloudinary.com/dylevfpbl/video/upload/v1669001384/Untitled.mp4">here</a>.`,
     ],
-    [
+/*     [
       "How Much is This Service?",
       `My service is 3% on top of the amazon order subtotal plus a flat 5 dollar base service fee. My service assumes that the sales tax
         charged by amazon is 8%. This is higher than most purchases will experience, 
         so I will gladly refund you any extra taxes you pay once I place your order
         and get the exact amount.`,
-    ],
+    ], */
     [
       "Why Should I hide my shipping address?",
       `Let's say you wanted to buy a hardware wallet. 
@@ -114,8 +114,7 @@ const faq = {
     ],
     [
       `What happens If I don't pick my order up from the locker?`,
-      `If you don't pick up your order and Amazon returns the order we charge a 30% restocking fee on items returned.
-            You should communicate if you can not pick up your item in time. I can arrange delivery around your schedule, just let me know
+      `If you don't pick up your order you will lose your funds. If you can not pick up your orders, I would recommend you use the home delivery option.
             `,
     ],
     [

src/assets/terms.md

@@ -1,7 +1,7 @@
 #### Current Service Stipulations
 
 <ol>
-    <li>If an item you order is returned to Amazon because you did not pick the item up, we charge a 30% restocking of every item returned.</li>
+    <li>If an item you order is returned to Amazon because you did not pick the item up, you do not get a refund.</li>
     <li>Items must be fulfilled by amazon since only amazon can ship to amazon lockers.</li>
     <li>At this time we do not offer refunds on any purchases unless I can not fulfill your order.</li>
     <li>The minimum order is 25 dollars.</li>
@@ -11,6 +11,8 @@
     <li> You should check your order every other day so that you do not miss important information about your order.</li>
     <li> You must be 21 years and older to use this service. By using this service, you are ensuring that you are at least 21 years of age.
     </li>
+    <li> You also agree to abide by the terms and conditions of the websites that you have orders made from.
+    </li>
 </ol>
 
 We reserve the right to refuse and refund any order for any reason.

src/components/footerGlobal.vue

@@ -44,7 +44,7 @@ const info = [
         text: 'Place Order', link: '/orders'
       },
     {
-        text: 'Blog', link: '/blog'
+        text: 'Blog', link: 'https://blog.anonshop.app/'
       },
       {
         text: 'About Us', link: '/about'
@@ -110,4 +110,4 @@ a:hover
 a:active
   color:$link-color
   text-decoration: none
-</style>
+</style>

src/components/orders/orderBook.vue

@@ -11,7 +11,7 @@
                   <div class="row">
                     <div class="col">XMR Earned<br/></div>
                     <div class="col desktop-only">USD Cost</div>
-                    <div class="col">XMR/USD</div>
+                    <div class="col">USD/XMR</div>
                     <div class="col desktop-only">Description</div>
                     <div class="col desktop-only">Country</div>
                     <div class="col desktop-only">Number of Items</div>

src/views/messageMeView.vue

@@ -69,6 +69,43 @@ const text = ref('')
 const successMessage = ref('')
 const buttonDisabled = ref(false)
 const questions = [
+{
+    q: `Hi. If your order passphrase started with master or Ivory, please check on your order again. Your chat should work now. If you are neither of these people, and you do not have a 
+    chat to message me in; You should message me(using the ask me a question) here with: 1. the first word in your passphrase 2. The exact amount of XMR paid(not including transaction fees) and the address you sent payment to.`,
+      a: `See above.`
+    },
+{
+    q: `hey it's been over a full day, please respond to my order`,
+      a: `You might need to refresh your page since I have responded to all orders at this time. If my message is not there, please send me the first word of your passphrase, since there might be an issue with your chat functionality.`
+    },
+{
+    q: `How can I find the Amazon Locker nearest to me?
+
+The official website (amazon.com/findalocker) appears to be authwalled, requiring login to access Therefore, if I search for a locker with my account, and then place the order through you, I've deanonymized myself.
+
+How can I search for Amazon Lockers in my area anonymously, without authenticating with an Amazon account?
+`,
+      a: `At checkout you can enter your zipcode. I will find some lockers near you and give you options
+      when we chat about your order. If none of these locker options work for you, we generally issue you a full refund.`
+    },
+{
+    q: `I need to buy something very expensive. What assurance do I have that the "Earner" won't take my funds and not place the order?`,
+      a: `We hold the funds until both parties are satisfied. That means that the earner can't take your funds. You must tell us that the order
+      went fine, before we release the funds to the earner.`
+    },
+  {
+    q: `How do you handle items that aren't eligible for Amazon lockers? I've used lockers before and sometimes it wouldn't let me order certain items to lockers. Unfortunately there doesn't seem to be a good of way of knowing this without logging into an account to check beforehand.
+    `,
+      a: `If an item ships from Amazon it can fit into a locker. There are some size restrictions lockers also. You can look up
+      an item and ensure that it says, "Ships from Amazon.com" without logging in. If your item can not ship to a locker, you must use the home delivery option.`
+    },
+    {
+    q: `Can I order from websites such as, AliExpress, AliBaba or Shein??
+          Or is this exclusive to Amazon?
+      + Can I order to an address in a third world country (middle east) or is it exclusive to the US? and if not when are you planning to expand this service to support more countries?
+      `,
+    a: `If a website ships to you, we can order it for you. Returns might not be possible though.`
+    },  
     {
     q: `Can you check if this page is working properly ?
   https ://anonshop.app/registerEarner

yarn.lock

@@ -4596,9 +4596,9 @@ json-stable-stringify-without-jsonify@^1.0.1:
   integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
@@ -4978,9 +4978,9 @@ minimatch@^3.0.4, minimatch@^3.1.1:
     brace-expansion "^1.1.7"
 
 minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
-  integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 minipass@^3.1.1:
   version "3.3.4"