-
-
Notifications
You must be signed in to change notification settings - Fork 463
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.
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
feat(usersettings): add ability to hide tags on details page #3810
Open
jordanjones98
wants to merge
6
commits into
sct:develop
Choose a base branch
from
jordanjones98:feat-hide-detail-page-tags
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
2e6be33
feat(usersettings): add ability to hide tags on details page
jordanjones98 3020832
feat: change tags to dropdown and add option to default collapse the …
jordanjones98 3fe2252
fix: add back hasFlag import
jordanjones98 c278868
feat(details): create new keyword disclosure shared component
jordanjones98 e1eb8fa
fix(migration): fix collapse tags column
jordanjones98 3782b92
Merge branch 'develop' into feat-hide-detail-page-tags
jordanjones98 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| import type { MigrationInterface, QueryRunner } from 'typeorm'; | ||
|
|
||
| export class AddCollapseTagsColumn1710339059307 implements MigrationInterface { | ||
| name = 'AddCollapseTagsColumn1710339059307'; | ||
|
|
||
| public async up(queryRunner: QueryRunner): Promise<void> { | ||
| await queryRunner.query( | ||
| `CREATE TABLE "temporary_user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar NOT NULL DEFAULT (''), "region" varchar, "originalLanguage" varchar, "pgpKey" varchar, "discordId" varchar, "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "pushoverSound" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "notificationTypes" text, "userId" integer, "collapseTags" boolean, CONSTRAINT "REL_986a2b6d3c05eb4091bb8066f7" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)` | ||
| ); | ||
| await queryRunner.query( | ||
| `INSERT INTO "temporary_user_settings"("id", "locale", "region", "originalLanguage", "pgpKey", "discordId", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "pushoverSound", "telegramChatId", "telegramSendSilently", "watchlistSyncMovies", "watchlistSyncTv", "notificationTypes", "userId") SELECT "id", "locale", "region", "originalLanguage", "pgpKey", "discordId", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "pushoverSound", "telegramChatId", "telegramSendSilently", "watchlistSyncMovies", "watchlistSyncTv", "notificationTypes", "userId" FROM "user_settings"` | ||
| ); | ||
| await queryRunner.query(`DROP TABLE "user_settings"`); | ||
| await queryRunner.query( | ||
| `ALTER TABLE "temporary_user_settings" RENAME TO "user_settings"` | ||
| ); | ||
| } | ||
|
|
||
| public async down(queryRunner: QueryRunner): Promise<void> { | ||
| await queryRunner.query( | ||
| `ALTER TABLE "user_settings" RENAME TO "temporary_user_settings"` | ||
| ); | ||
| await queryRunner.query( | ||
| `CREATE TABLE "user_settings" ("id" integer PRIMARY KEY AUTOINCREMENT NOT NULL, "locale" varchar NOT NULL DEFAULT (''), "region" varchar, "originalLanguage" varchar, "pgpKey" varchar, "discordId" varchar, "pushbulletAccessToken" varchar, "pushoverApplicationToken" varchar, "pushoverUserKey" varchar, "pushoverSound" varchar, "telegramChatId" varchar, "telegramSendSilently" boolean, "watchlistSyncMovies" boolean, "watchlistSyncTv" boolean, "notificationTypes" text, "userId" integer, CONSTRAINT "REL_986a2b6d3c05eb4091bb8066f7" UNIQUE ("userId"), CONSTRAINT "FK_986a2b6d3c05eb4091bb8066f78" FOREIGN KEY ("userId") REFERENCES "user" ("id") ON DELETE CASCADE ON UPDATE NO ACTION)` | ||
| ); | ||
| await queryRunner.query( | ||
| `INSERT INTO "user_settings"("id", "locale", "region", "originalLanguage", "pgpKey", "discordId", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "pushoverSound", "telegramChatId", "telegramSendSilently", "watchlistSyncMovies", "watchlistSyncTv", "notificationTypes", "userId") SELECT "id", "locale", "region", "originalLanguage", "pgpKey", "discordId", "pushbulletAccessToken", "pushoverApplicationToken", "pushoverUserKey", "pushoverSound", "telegramChatId", "telegramSendSilently", "watchlistSyncMovies", "watchlistSyncTv", "notificationTypes", "userId" FROM "temporary_user_settings"` | ||
| ); | ||
| await queryRunner.query(`DROP TABLE "temporary_user_settings"`); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import Tag from '@app/components/Common/Tag'; | ||
| import { useUser } from '@app/hooks/useUser'; | ||
| import { Disclosure, Transition } from '@headlessui/react'; | ||
| import { ChevronDownIcon } from '@heroicons/react/24/solid'; | ||
| import type { Keyword } from '@server/models/common'; | ||
| import Link from 'next/link'; | ||
|
|
||
| interface KeywordDisclosureProps { | ||
| keywords: Keyword[]; | ||
| type: 'tv' | 'movies'; | ||
| } | ||
|
|
||
| const KeywordDisclosure = ({ keywords, type }: KeywordDisclosureProps) => { | ||
| const { user } = useUser(); | ||
|
|
||
| return ( | ||
| <> | ||
| {keywords.length > 0 && ( | ||
| <Disclosure defaultOpen={!user?.settings?.collapseTags}> | ||
| {({ open }) => ( | ||
| <> | ||
| <Disclosure.Button | ||
| className={`mt-2 flex w-full items-center justify-between space-x-2 border-gray-700 bg-gray-800 px-4 py-2 text-gray-200 ${ | ||
| open | ||
| ? 'rounded-t-md border-t border-l border-r' | ||
| : 'rounded-md border' | ||
| }`} | ||
| > | ||
| <span className="text-lg">Tags</span> | ||
| <ChevronDownIcon | ||
| className={`${ | ||
| open ? 'rotate-180' : '' | ||
| } h-6 w-6 text-gray-500`} | ||
| /> | ||
| </Disclosure.Button> | ||
| <Transition | ||
| show={open} | ||
| enter="transition-opacity duration-100 ease-out" | ||
| enterFrom="opacity-0" | ||
| enterTo="opacity-100" | ||
| leave="transition-opacity duration-75 ease-out" | ||
| leaveFrom="opacity-100" | ||
| leaveTo="opacity-0" | ||
| > | ||
| <Disclosure.Panel className="w-full rounded-b-md border-b border-l border-r border-gray-700 px-4 py-4"> | ||
| {keywords.map((keyword) => ( | ||
| <Link | ||
| href={`/discover/${type}?keywords=${keyword.id}`} | ||
| key={`keyword-id-${keyword.id}`} | ||
| > | ||
| <a className="mr-2 inline-flex last:mr-0"> | ||
| <Tag>{keyword.name}</Tag> | ||
| </a> | ||
| </Link> | ||
| ))} | ||
| </Disclosure.Panel> | ||
| </Transition> | ||
| </> | ||
| )} | ||
| </Disclosure> | ||
| )} | ||
| </> | ||
| ); | ||
| }; | ||
|
|
||
| export default KeywordDisclosure; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Think this sounds slightly better: Collapse tags by default on the Movie/Series details page