merge master into current branch

ff14-advanced-market-search · Nov 22, 2024 · a22d541 · a22d541
2 parents 31f9626 + 3f706dc
commit a22d541
Show file tree

Hide file tree

Showing 32 changed files with 836 additions and 235 deletions.
diff --git a/app/components/Common/Banner.tsx b/app/components/Common/Banner.tsx
@@ -16,7 +16,7 @@ export default function Banner() {
           </p>
           <p className="mt-3 text-sm md:mt-0 md:ml-6">
             <a
-              href="https://discord.gg/836C8wDVNq"
+              href="https://discord.gg/saddlebag-exchange-973380473281724476"
               className="whitespace-nowrap font-medium text-blue-700 dark:text-gray-100 hover:text-blue-600 dark:hover:text-blue-100">
               Discord
               <span aria-hidden="true"> &rarr;</span>

diff --git a/app/components/FFXIVResults/UndercutAlert/Results.tsx b/app/components/FFXIVResults/UndercutAlert/Results.tsx
@@ -333,7 +333,7 @@ export const UndercutDescription = () => (
     Copy this to your clipboard and use it in our{' '}
     <a
       className="underline"
-      href="https://discord.gg/836C8wDVNq"
+      href="https://discord.gg/saddlebag-exchange-973380473281724476"
       target="_blank"
       rel="noreferrer">
       discord server
@@ -354,7 +354,7 @@ export const SalesAlertDescription = () => (
     To use Sales Alerts copy this to your clipboard and use it in our{' '}
     <a
       className="underline"
-      href="https://discord.gg/836C8wDVNq"
+      href="https://discord.gg/saddlebag-exchange-973380473281724476"
       target="_blank"
       rel="noreferrer">
       discord server

diff --git a/app/components/WoWResults/FullScan/Results.tsx b/app/components/WoWResults/FullScan/Results.tsx
@@ -143,54 +143,54 @@ export const Results = ({ data }: { data: WoWScanResponseWithPayload }) => {
       <Section>
         <>
           <SmallTable
-            data={data.profitable_items}
+            data={data.profit_w_sales}
             columnList={profitableItemsColumnList}
             mobileColumnList={mobileProfitableItemsList}
             columnSelectOptions={profiableSelectOptions}
             sortingOrder={[{ id: 'profit', desc: true }]}
-            title="Profitable Items"
+            title="Profitable Items With Sales"
             description="This shows items you can buy on your home server and sell on your new server for a profit!"
-            csvOptions={profitableItemsCSVOptions}
             fitScreen={true}
+            csvOptions={{
+              ...profitableItemsCSVOptions,
+              filename: 'saddlebag-profit-with-sales.csv'
+            }}
           />
           <SmallTable
-            data={data.out_of_stock}
+            data={data.out_w_sales}
             columnList={oosColumnList}
             mobileColumnList={mobileOosList}
             columnSelectOptions={oosSelectOptions}
             sortingOrder={[{ id: 'historicPrice', desc: true }]}
-            title="Out of Stock Items"
+            title="Out of Stock Items With Sales"
             description="This shows items that are not listed on the new server. You can buy on your home server and sell them for any price you want on your new server!"
             fitScreen={true}
-            csvOptions={outOfStockCSVOptions}
+            csvOptions={{
+              ...outOfStockCSVOptions,
+              filename: 'saddlebag-oos-with-sales.csv'
+            }}
           />
           <SmallTable
-            data={data.profit_w_sales}
+            data={data.profitable_items}
             columnList={profitableItemsColumnList}
             mobileColumnList={mobileProfitableItemsList}
             columnSelectOptions={profiableSelectOptions}
             sortingOrder={[{ id: 'profit', desc: true }]}
-            title="Profitable Items With Sales"
+            title="Profitable Items"
             description="This shows items you can buy on your home server and sell on your new server for a profit!"
+            csvOptions={profitableItemsCSVOptions}
             fitScreen={true}
-            csvOptions={{
-              ...profitableItemsCSVOptions,
-              filename: 'saddlebag-profit-with-sales.csv'
-            }}
           />
           <SmallTable
-            data={data.out_w_sales}
+            data={data.out_of_stock}
             columnList={oosColumnList}
             mobileColumnList={mobileOosList}
             columnSelectOptions={oosSelectOptions}
             sortingOrder={[{ id: 'historicPrice', desc: true }]}
-            title="Out of Stock Items With Sales"
+            title="Out of Stock Items"
             description="This shows items that are not listed on the new server. You can buy on your home server and sell them for any price you want on your new server!"
             fitScreen={true}
-            csvOptions={{
-              ...outOfStockCSVOptions,
-              filename: 'saddlebag-oos-with-sales.csv'
-            }}
+            csvOptions={outOfStockCSVOptions}
           />
         </>
       </Section>

diff --git a/app/components/navigation/sidebar/Sidebar.tsx b/app/components/navigation/sidebar/Sidebar.tsx
@@ -95,7 +95,7 @@ const WikiLink = () => (
 
 const DiscordLink = () => (
   <a
-    href={'https://discord.gg/836C8wDVNq'}
+    href={'https://discord.gg/saddlebag-exchange-973380473281724476'}
     target="_blank"
     rel="noreferrer"
     className={`text-gray-300 hover:bg-gray-500 hover:text-white group flex items-center px-2 py-2 text-base font-medium rounded-md`}>

diff --git a/app/requests/WoW/ShortagePredictor.ts b/app/requests/WoW/ShortagePredictor.ts
@@ -11,6 +11,7 @@ export interface ShortagePredictorProps {
   homeRealmName: string
   desiredPriceVsAvgPercent: number
   desiredQuantityVsAvgPercent: number
+  expansionNumber: number
 }
 
 export interface Prediction {
@@ -60,7 +61,8 @@ const WoWShortagePredictor: (
   region,
   homeRealmName,
   desiredPriceVsAvgPercent,
-  desiredQuantityVsAvgPercent
+  desiredQuantityVsAvgPercent,
+  expansionNumber
 }) => {
   return fetch(`${address}/api/wow/commodityfutures`, {
     method: 'POST',
@@ -77,7 +79,8 @@ const WoWShortagePredictor: (
       region,
       homeRealmName,
       desired_price_vs_avg_percent: desiredPriceVsAvgPercent,
-      desired_quantity_vs_avg_percent: desiredQuantityVsAvgPercent
+      desired_quantity_vs_avg_percent: desiredQuantityVsAvgPercent,
+      expansionNumber: expansionNumber
     })
   })
 }

diff --git a/app/routes/[robots.txt].tsx b/app/routes/[robots.txt].tsx
@@ -26,7 +26,6 @@ export const loader: LoaderFunction = () => {
   Allow: /allagan-data
   Allow: /wow/best-deals/recommended
   Allow: /wow/upload-timers
-  Allow: /wow/shopping-list
   Allow: /wow/marketshare/recommended
   Allow: /wow/shortage-predictor
   Allow: /wow/legacy-marketshare
@@ -43,10 +42,11 @@ export const loader: LoaderFunction = () => {
   Disallow: /build/
   Disallow: /queries/full-scan
   Disallow: /ffxiv/marketshare
-  Disallow: /ffxiv/craftsim/queries
+  Disallow: /ffxiv/craftsim
   Disallow: /wow/best-deals
   Disallow: /wow/export-search
   Disallow: /wow/marketshare
+  Disallow: /wow/shopping-list
 
   Sitemap: https://saddlebagexchange.com/sitemap.xml
   `

diff --git a/app/routes/[sitemap.xml].tsx b/app/routes/[sitemap.xml].tsx
@@ -111,21 +111,21 @@ export const loader: LoaderFunction = async () => {
   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
   <priority>0.80</priority>
 </url>
-<url>
-  <loc>https://saddlebagexchange.com/wow/shopping-list</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://saddlebagexchange.com/wow/export-search</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://saddlebagexchange.com/wow/marketshare</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
+// <url>
+//   <loc>https://saddlebagexchange.com/wow/shopping-list</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
+// <url>
+//   <loc>https://saddlebagexchange.com/wow/export-search</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
+// <url>
+//   <loc>https://saddlebagexchange.com/wow/marketshare</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
 <url>
   <loc>https://saddlebagexchange.com/wow/marketshare/recommended</loc>
   <lastmod>2024-06-21T00:27:48+00:00</lastmod>
@@ -181,26 +181,26 @@ export const loader: LoaderFunction = async () => {
   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
   <priority>0.80</priority>
 </url>
-<url>
-  <loc>https://saddlebagexchange.com/queries/full-scan</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://saddlebagexchange.com/ffxiv/marketshare</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://saddlebagexchange.com/ffxiv/craftsim</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
-<url>
-  <loc>https://saddlebagexchange.com/wow/best-deals</loc>
-  <lastmod>2024-05-07T00:27:48+00:00</lastmod>
-  <priority>0.80</priority>
-</url>
+// <url>
+//   <loc>https://saddlebagexchange.com/queries/full-scan</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
+// <url>
+//   <loc>https://saddlebagexchange.com/ffxiv/marketshare</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
+// <url>
+//   <loc>https://saddlebagexchange.com/ffxiv/craftsim</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
+// <url>
+//   <loc>https://saddlebagexchange.com/wow/best-deals</loc>
+//   <lastmod>2024-05-07T00:27:48+00:00</lastmod>
+//   <priority>0.80</priority>
+// </url>
 <url>
   <loc>https://saddlebagexchange.com/wow/pet-marketshare</loc>
   <lastmod>2024-05-11T00:27:48+00:00</lastmod>

diff --git a/app/routes/_public._index.tsx b/app/routes/_public._index.tsx
@@ -81,6 +81,7 @@ export default function Index() {
             </div>
           </div>
         </section>
+        <Banner />
 
         {/* Features Section */}
         <section className="py-16 bg-gray-50">
@@ -279,7 +280,8 @@ export default function Index() {
             <div className="mt-8">
               <a
                 // href="/signup"
-                href="/blog"
+                // href="/blog"
+                href="https://discord.gg/saddlebag-exchange-973380473281724476"
                 className="inline-block bg-white text-purple-600 font-semibold py-3 px-6 rounded-md shadow-md hover:bg-gray-100">
                 Get Started
               </a>

diff --git a/app/routes/_public.allagan-data.tsx b/app/routes/_public.allagan-data.tsx
@@ -13,6 +13,7 @@ import UniversalisBadgedLink from '~/components/utilities/UniversalisBadgedLink'
 import type { AllaganResults, InBagsReport } from '~/requests/FFXIV/allagan'
 import AllaganRequest from '~/requests/FFXIV/allagan'
 import { getUserSessionData } from '~/sessions'
+import Banner from '~/components/Common/Banner'
 
 const formName = 'allaganData'
 
@@ -126,6 +127,7 @@ const Index = () => {
 
   return (
     <PageWrapper>
+      <Banner />
       <SmallFormContainer
         title="Allagan Data"
         description={
@@ -419,7 +421,7 @@ const CommandInstructions = ({
     Copy this to your clipboard and use it in our{' '}
     <a
       className="underline"
-      href="https://discord.gg/836C8wDVNq"
+      href="https://discord.gg/saddlebag-exchange-973380473281724476"
       target="_blank"
       rel="noreferrer">
       discord server

diff --git a/app/routes/_public.options.tsx b/app/routes/_public.options.tsx
@@ -35,6 +35,7 @@ import SelectDCandWorld from '~/components/form/select/SelectWorld'
 import type { WoWServerData, WoWServerRegion } from '~/requests/WoW/types'
 import { PageWrapper } from '~/components/Common'
 import { setCookie } from '~/utils/cookies'
+import Banner from '~/components/Common/Banner'
 
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
@@ -203,6 +204,7 @@ export default function Options() {
 
   return (
     <PageWrapper>
+      <Banner />
       <Form
         method="POST"
         onSubmit={(e) => {

diff --git a/app/routes/_public.price-sniper.tsx b/app/routes/_public.price-sniper.tsx
@@ -16,6 +16,7 @@ import HQCheckbox from '~/components/form/HQCheckbox'
 import CodeBlock from '~/components/Common/CodeBlock'
 import ItemSelect from '~/components/form/select/ItemSelect'
 import CheckBox from '~/components/form/CheckBox'
+import Banner from '~/components/Common/Banner'
 
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
@@ -101,6 +102,7 @@ const Index = () => {
   return (
     <PageWrapper>
       <>
+        <Banner />
         <SmallFormContainer
           title="Input for Price Sniper Alerts"
           description={description}

diff --git a/app/routes/_public.undercut.tsx b/app/routes/_public.undercut.tsx
@@ -13,6 +13,7 @@ import z from 'zod'
 import { parseZodErrorsToDisplayString } from '~/utils/zodHelpers'
 import { parseStringToNumber } from '~/utils/zodHelpers'
 import { getUserSessionData } from '~/sessions'
+import Banner from '~/components/Common/Banner'
 
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
@@ -141,6 +142,7 @@ const Index = () => {
 
   return (
     <PageWrapper>
+      <Banner />
       <SmallFormContainer
         title="Input for undercut alerts"
         description={Description()}

diff --git a/app/routes/blog._index.tsx b/app/routes/blog._index.tsx
@@ -153,8 +153,7 @@ export default function Index() {
         <div className="py-6">
           <div className="max-w-7xl mx-auto px-4 sm:px-6 md:px-8">
             <h1 className="text-2xl font-semibold text-blue-900 dark:text-gray-100">
-              Shit blog post so google with index us, the good guides are on
-              github
+              Blogs - WIP
             </h1>
             <div
               className={`not-prose my-12 grid grid-cols-1 gap-6 sm:grid-cols-2`}>

diff --git a/app/routes/blog.ffxiv.bs1.tsx b/app/routes/blog.ffxiv.bs1.tsx
@@ -1,3 +1,5 @@
+import Banner from '~/components/Common/Banner'
+
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
   return {
@@ -17,6 +19,7 @@ export const links: LinksFunction = () => [
 const HowtoCrossServerTradeinFFXIV = () => {
   return (
     <div className={`m-12`}>
+      <Banner />
       <main className="flex-1">
         <h1 id="mastering-gil-earning-on-the-ffxiv-marketboard">
           Mastering Gil Earning on the FFXIV Marketboard

diff --git a/app/routes/blog.ffxiv.bs10.tsx b/app/routes/blog.ffxiv.bs10.tsx
@@ -1,3 +1,5 @@
+import Banner from '~/components/Common/Banner'
+
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
   return {
@@ -17,6 +19,7 @@ export const links: LinksFunction = () => [
 const howtocrossservertradeinffxiv = () => {
   return (
     <div className={`m-12`}>
+      <Banner />
       <main className="flex-1">
         <h1>
           Diversification and Risk Management in Gil Making and Gold Making

diff --git a/app/routes/blog.ffxiv.bs11.tsx b/app/routes/blog.ffxiv.bs11.tsx
@@ -1,3 +1,5 @@
+import Banner from '~/components/Common/Banner'
+
 // Overwrite default meta in the root.tsx
 export const meta: MetaFunction = () => {
   return {
@@ -18,6 +20,7 @@ export const links: LinksFunction = () => [
 const howtocrossservertradeinffxiv = () => {
   return (
     <div className={`m-12`}>
+      <Banner />
       <main className="flex-1">
         <h1>
           <strong> Leveraging Social Trading Platforms</strong>