From a8d150db5cda8611bd847b96fdaad1bff5fa7518 Mon Sep 17 00:00:00 2001
From: Jai A <jai.a@tuta.io>
Date: Mon, 30 Nov 2020 15:34:04 -0700
Subject: [PATCH] Remove CurseForge integration - some more minor fixes

---
 assets/styles/components.scss |  2 +-
 assets/styles/global.scss     | 10 ----------
 components/EthicalAd.vue      |  2 +-
 layouts/default.vue           | 25 ++-----------------------
 pages/mods.vue                | 23 +----------------------
 5 files changed, 5 insertions(+), 57 deletions(-)

diff --git a/assets/styles/components.scss b/assets/styles/components.scss
index 7cc57245..e83f3fb9 100644
--- a/assets/styles/components.scss
+++ b/assets/styles/components.scss
@@ -103,7 +103,7 @@
 
   hr {
     margin: 20px 0;
-    color: var(--color-grey-2);
+    color: var(--color-divider);
   }
 }
 
diff --git a/assets/styles/global.scss b/assets/styles/global.scss
index ea25a01f..6a61a848 100644
--- a/assets/styles/global.scss
+++ b/assets/styles/global.scss
@@ -189,16 +189,6 @@ body {
   --font-weight-text: var(--font-weight-medium);
   --font-weight-heading: var(--font-weight-extrabold);
   --font-weight-title: var(--font-weight-extrabold);
-
-  // Temporary
-  --color-grey-7: #ff0000;
-  --color-grey-6: #ff0000;
-  --color-grey-5: #ff0000;
-  --color-grey-4: #ff0000;
-  --color-grey-3: #ff0000;
-  --color-grey-2: #ff0000;
-  --color-grey-1: #ff0000;
-  --color-grey-0: #ff0000;
 }
 
 svg {
diff --git a/components/EthicalAd.vue b/components/EthicalAd.vue
index f59cf9e1..30e0f8d3 100644
--- a/components/EthicalAd.vue
+++ b/components/EthicalAd.vue
@@ -74,7 +74,7 @@ export default {
 .alt {
   font-size: 14px;
   border-radius: var(--size-rounded-sm);
-  background-color: var(--color-grey-1);
+  background-color: var(--color-raised-bg);
   box-shadow: 0 2px 3px rgba(0, 0, 0, 0.15);
   padding: 0.7em 1em;
   margin: 1em 1em 2em 1em;
diff --git a/layouts/default.vue b/layouts/default.vue
index 3d8eaa6a..3a5a9cee 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -147,20 +147,12 @@
     </aside>
     <main>
       <notifications group="main" position="bottom right" />
-      <notifications
+      <!--<notifications
         group="ads"
         position="bottom right"
         :duration="-1"
         :ignore-duplicates="true"
-      />
-      <div class="alpha-alert hidden">
-        <div class="wrapper">
-          Modrinth is in early alpha. Beware of many bugs and broken and
-          unimplemented features. Join our
-          <a class="text-link" href="https://discord.gg/gFRbNQ2">Discord</a>
-          for updates!
-        </div>
-      </div>
+      />-->
       <Nuxt />
     </main>
   </div>
@@ -466,19 +458,6 @@ export default {
 
   main {
     grid-area: 'main';
-
-    .alpha-alert {
-      background-color: var(--color-bg);
-      border-radius: var(--size-rounded-md);
-      margin: 0.5rem;
-      overflow: hidden;
-      width: fit-content;
-
-      .wrapper {
-        border-left: 0.5rem solid var(--color-brand);
-        padding: 0.75rem 1rem;
-      }
-    }
   }
 }
 
diff --git a/pages/mods.vue b/pages/mods.vue
index 397b4fef..871bbeca 100644
--- a/pages/mods.vue
+++ b/pages/mods.vue
@@ -232,23 +232,6 @@
             >
               <ForgeLoader />
             </SearchFilter>
-            <h3>Host</h3>
-            <SearchFilter
-              :active-filters="facets"
-              display-name="Modrinth"
-              facet-name="host:modrinth"
-              @toggle="toggleFacet"
-            >
-              <Modrinth />
-            </SearchFilter>
-            <SearchFilter
-              :active-filters="facets"
-              display-name="CurseForge"
-              facet-name="host:curseforge"
-              @toggle="toggleFacet"
-            >
-              <FlameAnvil />
-            </SearchFilter>
             <h3>Versions</h3>
             <SearchFilter
               :active-filters="showVersions"
@@ -305,9 +288,6 @@ import WorldGenCategory from '~/assets/images/categories/worldgen.svg?inline'
 import ForgeLoader from '~/assets/images/categories/forge.svg?inline'
 import FabricLoader from '~/assets/images/categories/fabric.svg?inline'
 
-import Modrinth from '~/assets/images/categories/modrinth.svg?inline'
-import FlameAnvil from '~/assets/images/categories/flameanvil.svg?inline'
-
 import SearchIcon from '~/assets/images/utils/search.svg?inline'
 
 export default {
@@ -333,8 +313,6 @@ export default {
     WorldGenCategory,
     ForgeLoader,
     FabricLoader,
-    Modrinth,
-    FlameAnvil,
     SearchIcon,
   },
   async fetch() {
@@ -357,6 +335,7 @@ export default {
     if (this.$route.query.o)
       this.currentPage = Math.ceil(this.$route.query.o / this.maxResults) + 1
 
+    this.facets.push('host:modrinth')
     await this.fillInitialVersions()
     await this.onSearchChange(this.currentPage)
   },