diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..affc14b3 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +*.js linguist-language=go +*.css linguist-language=go +*.vue linguist-language=go \ No newline at end of file diff --git a/paopao-api/internal/dao/search.go b/paopao-api/internal/dao/search.go index 35c02081..e7cb3e0f 100644 --- a/paopao-api/internal/dao/search.go +++ b/paopao-api/internal/dao/search.go @@ -145,6 +145,7 @@ func (d *Dao) QuerySearch(indexName, query string, offset, limit int) (*zinc.Que "content": query, }, }, + "sort": []string{"-is_top", "-latest_replied_on"}, "from": offset, "size": limit, }) @@ -161,7 +162,7 @@ func (d *Dao) QueryTagSearch(indexName, query string, offset, limit int) (*zinc. "query": map[string]interface{}{ "term": "tags." + query + ":1", }, - "sort": []string{"-is_top", "-latest_replied_on"}, + "sort_fields": []string{"-is_top", "-latest_replied_on"}, "from": offset, "max_results": limit, }) diff --git a/paopao-web/.gitignore b/paopao-web/.gitignore index a547bf36..ba6b09ec 100644 --- a/paopao-web/.gitignore +++ b/paopao-web/.gitignore @@ -22,3 +22,6 @@ dist-ssr *.njsproj *.sln *.sw? + +package-lock.json +components.d.ts \ No newline at end of file diff --git a/paopao-web/index.html b/paopao-web/index.html index cf97ccbc..ce4d1a56 100644 --- a/paopao-web/index.html +++ b/paopao-web/index.html @@ -10,7 +10,7 @@
- + \ No newline at end of file diff --git a/paopao-web/package.json b/paopao-web/package.json index 8ff0d9c4..9abe49d5 100644 --- a/paopao-web/package.json +++ b/paopao-web/package.json @@ -29,7 +29,10 @@ "vuex": "^4.0.2" }, "devDependencies": { + "@types/node": "^17.0.35", "@vitejs/plugin-vue": "^2.3.1", + "@vue/compiler-sfc": "^3.2.36", + "typescript": "^4.7.2", "vite": "^2.9.2" } } diff --git a/paopao-web/src/App.vue b/paopao-web/src/App.vue index 2531715d..7aee9478 100644 --- a/paopao-web/src/App.vue +++ b/paopao-web/src/App.vue @@ -35,7 +35,7 @@ - diff --git a/paopao-web/src/components/message-item.vue b/paopao-web/src/components/message-item.vue index f5369b9e..f2b8759a 100644 --- a/paopao-web/src/components/message-item.vue +++ b/paopao-web/src/components/message-item.vue @@ -65,7 +65,7 @@ -