diff --git a/.github/workflows/deploy-backend-dev.yml b/.github/workflows/deploy-backend-dev.yml index 61c746c22..cfd00f868 100644 --- a/.github/workflows/deploy-backend-dev.yml +++ b/.github/workflows/deploy-backend-dev.yml @@ -3,7 +3,7 @@ name: DeployBackendDev on: push: branches: - - "master" + - "use-nuxt-image-to-show-images" jobs: deploy-backend-dev: diff --git a/.github/workflows/deploy-backend-prod.yml b/.github/workflows/deploy-backend-prod.yml index faee68c10..b511c13cc 100644 --- a/.github/workflows/deploy-backend-prod.yml +++ b/.github/workflows/deploy-backend-prod.yml @@ -3,7 +3,7 @@ name: DeployBackendProd on: push: branches: - - "master" + - "use-nuxt-image-to-show-images" jobs: deploy-backend-prod: diff --git a/nuxt-frontend/components/partials/NewHeader.vue b/nuxt-frontend/components/partials/NewHeader.vue index 4ab063768..5b168580b 100755 --- a/nuxt-frontend/components/partials/NewHeader.vue +++ b/nuxt-frontend/components/partials/NewHeader.vue @@ -269,8 +269,8 @@ export default { methods: { handleScroll() { let scrollY = this.podcastRef - ? this.podcastRef.scrollTop - : window.scrollY; + ? this.podcastRef.scrollTop + : window.scrollY; let pageYOffset = this.podcastRef ? scrollY : window.pageYOffset; let scrollUp = this.lastScrollY > scrollY && pageYOffset > 100; this.showNavbar = scrollUp || (this.showNavbar && pageYOffset > 0); @@ -286,10 +286,14 @@ export default { // Check if any child URL matches if (navbar.subMenus) { return navbar.subMenus.some( - (subMenu) => this.$route.path === subMenu.url, + (subMenu) => this.$route.path === subMenu.url ); } + if (name == "Portfolio" && this.$route.path.startsWith("/portfolio")) { + return true; + } + return false; }, }, diff --git a/post/tag.go b/post/tag.go index ef9f9caf9..a1bdbae80 100644 --- a/post/tag.go +++ b/post/tag.go @@ -32,7 +32,8 @@ func (repository *Repository) GetPostsByTag(c *gin.Context) { posts := []Post{} err = repository.Db.Select(&posts, `SELECT id, title, slug, tags as tag, is_featured, is_published, published_on, published_at, reading_time, summary FROM posts - WHERE `+query+` tags @> $1`, `[{"slug": "`+slug+`"}]`) + WHERE `+query+` tags @> $1`, `[{"slug": "`+slug+`"}] + ORDER BY published_on DESC`) if err != nil { log.Error("Error while fetching posts: ", err) c.AbortWithStatus(http.StatusInternalServerError)