Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert #504（Release 1.0.7と為す） #522

Merged
merged 6 commits into from
Oct 14, 2023
Merged

Revert #504（Release 1.0.7と為す） #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4c12eb
/groups PushQueryの調整
hibiyahibiyahibiya Sep 5, 2023
c12e6f8
/groups ブックマーク機構の最適化
hibiyahibiyahibiya Sep 5, 2023
4173e80
Merge pull request #419 from hibiya-itchief/hihihib-#386-調整
hibiyahibiyahibiya Oct 4, 2023
8910ad6
feat: 映像配信を本当に見られるように
hibiyahibiyahibiya Oct 14, 2023
a3cb972
fix: lintfix
hibiyahibiyahibiya Oct 14, 2023
b70d200
Merge pull request #521 from hibiya-itchief/hihihib-revert-#504
hibiyahibiyahibiya Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pages/groups/_groupId/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@
</v-chip>
</v-chip-group>
</v-card-actions>
<!-- 一時的に映像配信を非表示
<v-card-actions style="width: 100%; display: block">
<v-card-actions style="width: 100%; display: block">
<div
v-for="link in links"
:key="link.id"
Expand All @@ -59,7 +58,6 @@
>
</v-card-actions>
<v-divider></v-divider>
-->
<v-card-actions v-if="editable == true" class="py-1">
<v-btn
color="blue-grey"
Expand Down
24 changes: 17 additions & 7 deletions pages/groups/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,7 @@ type Data = {
sort_displayname: string
query_cache: any
search_result_number: number
storage_bookmarks: (string | null)[]
display_bookmarks: boolean
selectedTag: Tag | undefined
}
Expand All @@ -255,6 +256,7 @@ export default Vue.extend({
search_result_number: 0,
search_query: '',
sort_displayname: 'デフォルト順',
storage_bookmarks: [],
display_bookmarks: false,
query_cache: undefined,
}
Expand All @@ -281,7 +283,10 @@ export default Vue.extend({
// クエリパラメータを見て検索バー内の文字列を再現など
if (typeof this.$route.query.q === 'string') {
this.search_query = this.$route.query.q
this.PushQuery(null, undefined, null, null, null)
// 検索中はタグ選択ができないため、created時もtを削除
if (this.$route.query.t !== undefined) {
this.PushQuery(null, undefined, null, null, null)
}
this.SearchGroups()
}
if (
Expand Down Expand Up @@ -318,10 +323,14 @@ export default Vue.extend({
}
},
mounted() {
for (let i = 0; i < localStorage.length; i++) {
this.storage_bookmarks.push(localStorage.key(i))
}
this.nowloading = false
},
methods: {
// それぞれ、Qは検索バーの内容、Tはタグ、Bはブックマーク、Sはソート(並び替え)、Rは昇順/降順の切り替え(ReverseのR)
PushQuery(Q: any, T: any, B: any, S: any, R: any) {
Q = Q === null ? this.$route.query.q : Q
T = T === null ? this.$route.query.t : T
Expand All @@ -330,6 +339,7 @@ export default Vue.extend({
R = R === null ? this.$route.query.r : R
this.$router.push({ query: { q: Q, t: T, b: B, s: S, r: R } }) // nullは「現在のクエリを維持」と同義
},
SortGroups(sort: 'id' | 'groupname' | 'title') {
if (sort === 'groupname') {
this.sort_displayname = '団体名順'
Expand Down Expand Up @@ -435,13 +445,13 @@ export default Vue.extend({
FilterBookmarks(id: string) {
// お気に入りならtrue
if (this.nowloading === true) return false
for (let i = 0; i < localStorage.length; i++) {
if ('seiryofes.groups.favorite.' + id === localStorage.key(i)) {
return true
}
if (this.nowloading === true) {
return false
} else {
return this.storage_bookmarks.includes(
'seiryofes.groups.favorite.' + id
)
}
return false
},
HashColor(text: string) {
Expand Down
Loading