add: deimos fish (#464)

reorganize how open world views are organized to make it easier to copy

Co-authored-by: Tobiah <[email protected]>

src/assets/less/coloration.less

@@ -66,6 +66,15 @@ table, [class*='badge-'] {
   border-bottom-color: @border-color;
 }
 
+a.nav-link > a {
+  color: @text-color;
+}
+
+/* When things support :has, this should work...seemlessly? */
+li.nav-item.b-nav-dropdown:has(.active) {
+  color: @link-color;
+}
+
 /****** Badges ********/
 .badge-warning {
   background-color: @warning-bg;
@@ -111,6 +120,12 @@ table, [class*='badge-'] {
 }
 
 /******** Buttons ********/
+.btn {
+  color: @text-color;
+  background-color: transparent;
+  border-color: transparent;
+}
+
 .btn-primary {
   background-color: @primary-bg;
   border-color: @primary-bg;

src/components/DropdownNavItem.vue

@@ -1,22 +1,24 @@
 <template>
   <span>
-    <b-dd-item
-      v-if="isLocal"
-      :to="target"
-      exact
-      v-b-tooltip.bottom
-      :title="!labelIfMobile && !$isMobile() ? label : ''"
-    >
+    <b-dd-item v-if="isLocal && !labelIfMobile && !$isMobile()" :to="target" exact>
       <i :class="`${icon} faIcon`"></i>
-      {{ labelIfMobile ? ($isMobile() ? label : '') : label }}
+      {{ label }}
+    </b-dd-item>
+    <b-dd-item v-if="isLocal && !labelIfMobile && $isMobile()" :to="target" exact>
+      <i :class="`${icon} faIcon`"></i>
+      {{ label }}
+    </b-dd-item>
+    <b-dd-item v-if="isLocal && labelIfMobile && !$isMobile()" :to="target" exact>
+      <i :class="`${icon} faIcon`"></i>
+      {{ label }}
     </b-dd-item>
     <b-dd-item
+      v-else-if="!isLocal"
       :href="target"
       rel="noopener"
       target="_blank"
       v-b-tooltip.bottom
       :title="labelIfMobile && !$isMobile() ? label : ''"
-      v-else
     >
       <i :class="`${icon} faIcon`"></i>
       {{ labelIfMobile ? ($isMobile() ? label : '') : label }}

src/components/FishImg.vue

@@ -77,6 +77,17 @@ export default {
           synathid: import('@/assets/img/fish/synathid.webp'),
           boot: import('@/assets/img/fish/boot.webp'),
           crewmensboot: import('@/assets/img/fish/crewmensboot.webp'),
+          amniophysi: import('@/assets/img/fish/amniophysi.webp'),
+          aquapulmo: import('@/assets/img/fish/aquapulmo.webp'),
+          barbisteo: import('@/assets/img/fish/barbisteo.webp'),
+          chondricord: import('@/assets/img/fish/chondricord.webp'),
+          cryptosuctus: import('@/assets/img/fish/cryptosuctus.webp'),
+          duroid: import('@/assets/img/fish/duroid.webp'),
+          glutinox: import('@/assets/img/fish/glutinox.webp'),
+          kymaeros: import('@/assets/img/fish/kymaeros.webp'),
+          myxostomata: import('@/assets/img/fish/myxostomata.webp'),
+          ostimyr: import('@/assets/img/fish/ostimyr.webp'),
+          vitreospina: import('@/assets/img/fish/vitreospina.webp'),
         },
         parts: {
           antenna: import('@/assets/img/fish/part/antenna.webp'),
@@ -106,6 +117,14 @@ export default {
           saganmodule: import('@/assets/img/fish/part/saganmodule.webp'),
           ecosynthanalyzer: import('@/assets/img/fish/part/ecosynthanalyzer.webp'),
           crewmensboot: import('@/assets/img/fish/crewmensboot.webp'),
+          dendrite: import('@/assets/img/fish/part/dendrite.webp'),
+          spinal: import('@/assets/img/fish/part/spinal.webp'),
+          muscle: import('@/assets/img/fish/part/muscle.webp'),
+          pustulent: import('@/assets/img/fish/part/pustulent.webp'),
+          sebum: import('@/assets/img/fish/part/sebum.webp'),
+          foremount: import('@/assets/img/fish/part/foremount.webp'),
+          filter: import('@/assets/img/fish/part/filter.webp'),
+          sporulate: import('@/assets/img/fish/part/sporulate.webp'),
         },
         common: {
           standing: import('@/assets/img/general/standing.svg'),
@@ -121,6 +140,11 @@ export default {
           lanzosm: import('@/assets/img/fish/common/lanzo-icon.webp'),
           tuloksm: import('@/assets/img/fish/common/tulok-icon.webp'),
           peramsm: import('@/assets/img/fish/common/peram-icon.webp'),
+          spari: import('@/assets/img/fish/common/spari.webp'),
+          ebisu: import('@/assets/img/fish/common/ebisu.webp'),
+          gills: import('@/assets/img/fish/common/gills.webp'),
+          tumor: import('@/assets/img/fish/common/tumor.webp'),
+          bladder: import('@/assets/img/fish/common/bladder.webp'),
         },
         bait: {
           cuthol: import('@/assets/img/fish/bait/cuthol-bait.webp'),
@@ -137,6 +161,8 @@ export default {
           tromyzon: import('@/assets/img/fish/bait/tromyzon-bait.webp'),
           charamote: import('@/assets/img/fish/bait/charamote-bait.webp'),
           synathid: import('@/assets/img/fish/bait/synathid-bait.webp'),
+          vome: import('@/assets/img/fish/bait/vome.webp'),
+          fass: import('@/assets/img/fish/bait/fass.webp'),
         },
         guide: {
           guide1: import('@/assets/img/fish/guide/guide1.webp'),
@@ -149,6 +175,10 @@ export default {
           vallisguide3: import('@/assets/img/fish/guide/vallisguide3.webp'),
           vallisguide4: import('@/assets/img/fish/guide/vallisguide4.webp'),
         },
+        time: {
+          vome: import('@/assets/img/fish/times/vome.webp'),
+          fass: import('@/assets/img/fish/times/fass.webp'),
+        },
       },
       typeId: this.type,
       itemId: this.item,

src/components/Invasion.vue

@@ -7,9 +7,7 @@
       <i :id="`${invasion.id}_tooltip`" class="fas fa-sm fa-info-circle ml-2" />
       <b-tooltip :target="`${invasion.id}_tooltip`" placement="right" class="text-center">
         <TimeBadge :starttime="invasion.activation" :counter="true" :interval="1000" />
-        <div class="eta">
-          ({{ eta(invasion) }})*
-        </div>
+        <div class="eta">({{ eta(invasion) }})*</div>
       </b-tooltip>
     </div>
     <b-row class="invasion-rewards p-0">
@@ -67,7 +65,7 @@
           :id="`${this.id}-defender-progress`"
         />
         <small class="justify-content-center d-flex position-absolute w-100 progress-value">
-          {{ invasion.completion.toFixed(2)}}% - {{eta(invasion)}}
+          {{ invasion.completion.toFixed(2) }}% - {{ eta(invasion) }}
         </small>
         <b-tooltip :target="`${this.id}-attacker-progress`" placement="bottom" class="text-center">
           <HubImg :src="atkFactionImg" class="hubimg" name="Attacking Faction" width="20px" height="20px" />

src/components/Navbar.vue

@@ -19,6 +19,9 @@
           <DropdownItem :isLocal="true" icon="fas fa-map-marker-alt" target="/vallis/map" :label="$t('nav.map')" />
           <DropdownItem :isLocal="true" icon="fas fa-fish" target="/vallis/fish" :label="$t('nav.fish')" />
           <DropdownItem :isLocal="true" icon="fas fa-info" target="/vallis/fish/howto" :label="$t('nav.howto')" />
+          <b-dd-divider />
+          <b-dd-header><i class="fas fa-biohazard faIcon"></i> {{ $t('nav.owdeimos') }}</b-dd-header>
+          <DropdownItem :isLocal="true" icon="fas fa-fish" target="/deimos/fish" :label="$t('nav.fish')" />
         </b-nav-item-dropdown>
         <b-nav-item-dropdown left>
           <template slot="button-content"><i class="fas fa-tools faIcon"></i> {{ $t('nav.extras') }}</template>

src/components/modalDialogs/About.vue

@@ -29,12 +29,12 @@
         </a>
         <br /><br />
         Warframe and the Warframe logo are registered trademarks of Digital Extremes Ltd. Warframe Hub is not affiliated
-        with Digital Extremes Ltd. in any way. 
-        <br /><br />
-        Information may be out of date or inaccurate with what DE sends us because this is a community-driven open source 
-        project. We encourage you to report any discrepencies as a 
-        <a href="https://github.com/WFCD/warframe-hub/issues/new/choose" target="_blank" rel="noopener">GitHub Issue</a>.
+        with Digital Extremes Ltd. in any way.
         <br /><br />
+        Information may be out of date or inaccurate with what DE sends us because this is a community-driven open
+        source project. We encourage you to report any discrepencies as a
+        <a href="https://github.com/WFCD/warframe-hub/issues/new/choose" target="_blank" rel="noopener">GitHub Issue</a
+        >. <br /><br />
         You are entitled to a copy of this project AS IS, and you are free to modify it to your heart's desires. You
         must include a copy of this license to all future modification and releases. You can read more about the terms
         of the

src/lang/en.json

@@ -41,6 +41,7 @@
     "howto": "How to Fish",
     "owearth": "Plains",
     "owvenus": "Orb Vallis",
+    "owdeimos": "Cambion Drift",
     "ow": "Open World",
     "projects": "Projects",
     "extras": "Extras",

src/router.js

@@ -3,13 +3,15 @@ import Router from 'vue-router';
 
 import Timer from './views/Timer.vue';
 
-import PoEMap from './views/PoEMap.vue';
-import PoEFish from './views/Fish.vue';
-import HowToFish from './views/HowToFish.vue';
+import PoEMap from './views/OpenWorld/Venus/Map.vue';
+import PoEFish from './views/OpenWorld/Venus/Fish.vue';
+import HowToFish from './views/OpenWorld/Venus/HowToFish.vue';
 
-import VallisFish from './views/VallisFish.vue';
-import VallisMap from './views/VallisMap.vue';
-import HowToFishVallis from './views/HowToFishVallis.vue';
+import VallisFish from './views/OpenWorld/Earth/Fish.vue';
+import VallisMap from './views/OpenWorld/Earth/Map.vue';
+import HowToFishVallis from './views/OpenWorld/Earth/HowToFish.vue';
+
+import CambionFish from './views/OpenWorld/Deimos/Fish.vue';
 
 import RivenData from './views/RivenData.vue';
 import Synthesis from './views/Synthesis.vue';
@@ -114,7 +116,7 @@ const routes = [
     name: 'Vallis Fish',
     component: VallisFish,
     meta: {
-      title: 'Warframe Hub | Orb Vallis Fish',
+      title: 'Warframe Hub | OV - Fish',
       metaTags: [
         {
           name: 'description',
@@ -163,6 +165,24 @@ const routes = [
       ],
     },
   },
+  {
+    path: '/deimos/fish',
+    name: 'Cambion Drift Fish',
+    component: CambionFish,
+    meta: {
+      title: 'Warframe Hub | Deimos - Fish',
+      metaTags: [
+        {
+          name: 'description',
+          content: 'Fish Information and resources for the Cambion Drift',
+        },
+        {
+          name: 'og:description',
+          content: 'Fish Information and resources for the Cambion Drift',
+        },
+      ],
+    },
+  },
   {
     path: '/riven/data',
     name: 'Riven Data',