Skip to content

Commit

Permalink
v2 HM Dashboard x2 (#3)
Browse files Browse the repository at this point in the history
* Initial Commit

* Fixing TS issues

* Updating gtag, Trying to fix CSS loader

* Adding error message constant, Fixing redirects and loading new miner data, Adding redirect fix

* Removing redirects

* Updating README, Trying to fix redirects

* Update _redirects

* Update nuxt.config.js

* Updating utilities to utils, Updating responsiveness, Removing redirects

* Correcting overflow, Fixing css  for hovering over favourite star

* Correcting responsiveness

* Update _hotspot.vue

* Updating styling for toasts and spacing around title for hotspot

* Fixing hotspot display

* Fixing responsiveness, Fixing colors on mobile, Dividing sections up

* Removing commented code

* Adding to v2 documentation in README

* Adding Rewards|Witnesses|Nearby|Location sections, Updating navbar, Updating interfaces, Updating styles/css of UI elements, Updating store and how data is logged

* Updating tooltips, Updating dark mode loading overlay

* Removing unused css, Adding additional margin to toast on mobile

* Updating README content, Updating settings css, Updating message constants, Updating failed deletion of any cache

* Updating margin for toast notifications on mobile

* Updating scroll padding on mobile

* Testing netlify badge

* Updating README, Updating media queries, Removing unused option from navbar

* Removing testing packages and utils, Updating README, Updating unused code, Updating settings button colors, Linting files

* Fixing styling, Adding suggested/random hotspots to be searched for new user

* Fixing TS errors

* Testing mobile responsiveness

* Testing mobile responsiveness x2

* Fixing mobile responsiveness, Updating settings buttons styles

* Adjusting padding on mobile

* Fixing section padding

* Fixing bug

* Removing unused state variable

* Create package-lock.json

* Revert "Merge branch 'main' into develop"

This reverts commit 0ffebe9, reversing
changes made to e89b725.

* Update Home.vue to be synced with main branch

* Updating styling
  • Loading branch information
Michael Pereira authored Sep 12, 2021
1 parent e2a80e2 commit 16a4895
Show file tree
Hide file tree
Showing 5 changed files with 13,306 additions and 12 deletions.
10 changes: 5 additions & 5 deletions assets/scss/dark-mode.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ html {

&:hover:not([disabled]):not(.is-dark) {
background-color: $dark-mode-button-color;
color: $dark-mode-button-hover-color !important;
color: $dark-mode-button-hover-color;
}

@each $state-class, $state-color, $state-text in $state-colors {
Expand All @@ -49,13 +49,13 @@ html {


button.is-dark {
background-color: white !important;
background-color: white;
font-weight: bold;

&:hover {
background-color: transparent !important;
border-color: white !important;
color: white !important;
background-color: transparent;
border-color: white;
color: white;
}
}

Expand Down
4 changes: 3 additions & 1 deletion assets/scss/theme-default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ $toast-border-radius: 0em;
}

.settings-button:hover {
color: #2d3140 !important;
background-color: rgb(252, 93, 105) !important;
border-color: rgb(252, 93, 105)!important;
color: $dark-mode-color !important;
}

#hm {
Expand Down
6 changes: 1 addition & 5 deletions components/sections/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,8 @@ export default class Home extends Vue {
type: 'Suggested Hotspots', items: hotspots.miners
}]
}
if (this.userInput === '') {
const results = []
if (Object.keys(this.$store.getters.favourites).length > 0) {
results.push({
type: 'Favourites', items: Object.values(this.$store.getters.favourites).filter((option: any) => {
Expand All @@ -77,7 +75,7 @@ export default class Home extends Vue {
})
})
}
if (this.$store.getters.recentlyViewed.length > 0) {
results.push({
type: 'Search Results', items: this.$store.getters.recentlyViewed.filter((option: any) => {
Expand All @@ -87,13 +85,11 @@ export default class Home extends Vue {
})
})
}
if (Object.keys(this.$store.getters.favourites).length === 0) {
results.push({
type: 'Suggested Hotspots', items: hotspots.miners
})
}
return results
} else {
return [{
Expand Down
Loading

0 comments on commit 16a4895

Please sign in to comment.