From fee7d8a548f4aaae8c2012b2ab22765d9b87316a Mon Sep 17 00:00:00 2001 From: jliddev Date: Tue, 22 Dec 2020 10:45:14 -0600 Subject: [PATCH] rework the funding links in details dialog --- .../addon-detail/addon-detail.component.html | 23 +------- .../funding-button.component.html | 6 ++ .../funding-button.component.scss | 19 +++++++ .../funding-button.component.spec.ts | 52 ++++++++++++++++++ .../funding-button.component.ts | 49 +++++++++++++++++ .../src/app/pages/home/home.module.ts | 15 +++-- wowup-electron/src/assets/i18n/de.json | 1 + wowup-electron/src/assets/i18n/en.json | 1 + wowup-electron/src/assets/i18n/es.json | 1 + wowup-electron/src/assets/i18n/fr.json | 1 + wowup-electron/src/assets/i18n/it.json | 1 + wowup-electron/src/assets/i18n/ko.json | 1 + wowup-electron/src/assets/i18n/nb.json | 1 + wowup-electron/src/assets/i18n/pt.json | 1 + wowup-electron/src/assets/i18n/ru.json | 1 + wowup-electron/src/assets/i18n/zh-TW.json | 1 + wowup-electron/src/assets/i18n/zh.json | 1 + .../src/assets/images/librepay_logo_small.png | Bin 0 -> 5285 bytes 18 files changed, 149 insertions(+), 26 deletions(-) create mode 100644 wowup-electron/src/app/components/funding-button/funding-button.component.html create mode 100644 wowup-electron/src/app/components/funding-button/funding-button.component.scss create mode 100644 wowup-electron/src/app/components/funding-button/funding-button.component.spec.ts create mode 100644 wowup-electron/src/app/components/funding-button/funding-button.component.ts create mode 100644 wowup-electron/src/assets/images/librepay_logo_small.png diff --git a/wowup-electron/src/app/components/addon-detail/addon-detail.component.html b/wowup-electron/src/app/components/addon-detail/addon-detail.component.html index 8f25ba4e..aede0ff8 100644 --- a/wowup-electron/src/app/components/addon-detail/addon-detail.component.html +++ b/wowup-electron/src/app/components/addon-detail/addon-detail.component.html @@ -34,26 +34,9 @@
-

Support this author

-
-
- - - - - - - - - - - - -
+

{{ 'DIALOGS.ADDON_DETAILS.FUNDING_LINK_TITLE' | translate }}

+
+
diff --git a/wowup-electron/src/app/components/funding-button/funding-button.component.html b/wowup-electron/src/app/components/funding-button/funding-button.component.html new file mode 100644 index 00000000..0e99a50d --- /dev/null +++ b/wowup-electron/src/app/components/funding-button/funding-button.component.html @@ -0,0 +1,6 @@ + + + {{ getFundingName() }} + \ No newline at end of file diff --git a/wowup-electron/src/app/components/funding-button/funding-button.component.scss b/wowup-electron/src/app/components/funding-button/funding-button.component.scss new file mode 100644 index 00000000..8936a799 --- /dev/null +++ b/wowup-electron/src/app/components/funding-button/funding-button.component.scss @@ -0,0 +1,19 @@ +@import "../../../variables.scss"; + +:host { + margin-right: 0.5em; + + &:last-child { + margin-right: 0; + } +} +.funding-button { + // background-color: $dark-3; + margin-right: 0.5em; + + .funding-icon { + height: 20px; + width: 20px; + margin-right: 0.5em; + } +} diff --git a/wowup-electron/src/app/components/funding-button/funding-button.component.spec.ts b/wowup-electron/src/app/components/funding-button/funding-button.component.spec.ts new file mode 100644 index 00000000..153f1874 --- /dev/null +++ b/wowup-electron/src/app/components/funding-button/funding-button.component.spec.ts @@ -0,0 +1,52 @@ +import { HttpClient, HttpClientModule } from "@angular/common/http"; +import { CUSTOM_ELEMENTS_SCHEMA } from "@angular/core"; +import { ComponentFixture, TestBed } from "@angular/core/testing"; +import { NoopAnimationsModule } from "@angular/platform-browser/animations"; +import { TranslateCompiler, TranslateLoader, TranslateModule } from "@ngx-translate/core"; +import { TranslateMessageFormatCompiler } from "ngx-translate-messageformat-compiler"; +import { httpLoaderFactory } from "../../app.module"; +import { MatModule } from "../../mat-module"; + +import { FundingButtonComponent } from "./funding-button.component"; + +describe("FundingButtonComponent", () => { + let component: FundingButtonComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [FundingButtonComponent], + imports: [ + MatModule, + HttpClientModule, + NoopAnimationsModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: httpLoaderFactory, + deps: [HttpClient], + }, + compiler: { + provide: TranslateCompiler, + useClass: TranslateMessageFormatCompiler, + }, + }), + ], + schemas: [CUSTOM_ELEMENTS_SCHEMA], + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(FundingButtonComponent); + component = fixture.componentInstance; + component.funding = { + platform: "TEST", + url: "TEST", + }; + fixture.detectChanges(); + }); + + it("should create", () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/wowup-electron/src/app/components/funding-button/funding-button.component.ts b/wowup-electron/src/app/components/funding-button/funding-button.component.ts new file mode 100644 index 00000000..668042b0 --- /dev/null +++ b/wowup-electron/src/app/components/funding-button/funding-button.component.ts @@ -0,0 +1,49 @@ +import { Component, Input, OnInit } from "@angular/core"; +import { AddonFundingLink } from "../../entities/addon"; + +@Component({ + selector: "app-funding-button", + templateUrl: "./funding-button.component.html", + styleUrls: ["./funding-button.component.scss"], +}) +export class FundingButtonComponent implements OnInit { + @Input("funding") funding: AddonFundingLink; + + constructor() {} + + ngOnInit(): void {} + + getTooltipKey() { + return `PAGES.MY_ADDONS.FUNDING_TOOLTIP.${this.funding.platform.toUpperCase()}`; + } + + getFundingIcon() { + switch (this.funding.platform) { + case "LIBERAPAY": + return "assets/images/librepay_logo_small.png"; + case "PATREON": + return "assets/images/patreon_logo_white.png"; + case "GITHUB": + return "assets/images/github_logo_small.png"; + case "CUSTOM": + default: + return "assets/images/custom_funding_logo_small.png"; + } + } + + getFundingName() { + switch (this.funding.platform) { + case "LIBERAPAY": + return "Liberapay"; + case "PATREON": + return "Patreon"; + case "GITHUB": + return "GitHub"; + case "PAYPAL": + return "PayPal"; + case "CUSTOM": + default: + return "Custom"; + } + } +} diff --git a/wowup-electron/src/app/pages/home/home.module.ts b/wowup-electron/src/app/pages/home/home.module.ts index b6ad8ebb..48231c98 100644 --- a/wowup-electron/src/app/pages/home/home.module.ts +++ b/wowup-electron/src/app/pages/home/home.module.ts @@ -1,5 +1,7 @@ import { CommonModule, DatePipe } from "@angular/common"; import { NgModule } from "@angular/core"; +import { ReactiveFormsModule } from "@angular/forms"; + import { AddonDetailComponent } from "../../components/addon-detail/addon-detail.component"; import { AddonInstallButtonComponent } from "../../components/addon-install-button/addon-install-button.component"; import { AddonProviderBadgeComponent } from "../../components/addon-provider-badge/addon-provider-badge.component"; @@ -10,21 +12,22 @@ import { GetAddonStatusColumnComponent } from "../../components/get-addon-status import { InstallFromUrlDialogComponent } from "../../components/install-from-url-dialog/install-from-url-dialog.component"; import { MyAddonStatusColumnComponent } from "../../components/my-addon-status-column/my-addon-status-column.component"; import { MyAddonsAddonCellComponent } from "../../components/my-addons-addon-cell/my-addons-addon-cell.component"; +import { OptionsAddonSectionComponent } from "../../components/options-addon-section/options-addon-section.component"; +import { OptionsAppSectionComponent } from "../../components/options-app-section/options-app-section.component"; +import { OptionsDebugSectionComponent } from "../../components/options-debug-section/options-debug-section.component"; +import { OptionsWowSectionComponent } from "../../components/options-wow-section/options-wow-section.component"; import { PotentialAddonTableColumnComponent } from "../../components/potential-addon-table-column/potential-addon-table-column.component"; import { ProgressButtonComponent } from "../../components/progress-button/progress-button.component"; import { ProgressSpinnerComponent } from "../../components/progress-spinner/progress-spinner.component"; import { TelemetryDialogComponent } from "../../components/telemetry-dialog/telemetry-dialog.component"; import { WowClientOptionsComponent } from "../../components/wow-client-options/wow-client-options.component"; -import { OptionsWowSectionComponent } from "../../components/options-wow-section/options-wow-section.component"; -import { OptionsAppSectionComponent } from "../../components/options-app-section/options-app-section.component"; -import { OptionsDebugSectionComponent } from "../../components/options-debug-section/options-debug-section.component"; -import { OptionsAddonSectionComponent } from "../../components/options-addon-section/options-addon-section.component"; +import { FundingButtonComponent } from "../../components/funding-button/funding-button.component"; import { DirectiveModule } from "../../directive.module"; +import { MatModule } from "../../mat-module"; import { DownloadCountPipe } from "../../pipes/download-count.pipe"; import { GetAddonListItemFilePropPipe } from "../../pipes/get-addon-list-item-file-prop.pipe"; import { InterfaceFormatPipe } from "../../pipes/interface-format.pipe"; import { RelativeDurationPipe } from "../../pipes/relative-duration-pipe"; -import { MatModule } from "../../mat-module"; import { SharedModule } from "../../shared/shared.module"; import { AboutComponent } from "../about/about.component"; import { GetAddonsComponent } from "../get-addons/get-addons.component"; @@ -32,7 +35,6 @@ import { MyAddonsComponent } from "../my-addons/my-addons.component"; import { OptionsComponent } from "../options/options.component"; import { HomeRoutingModule } from "./home-routing.module"; import { HomeComponent } from "./home.component"; -import { ReactiveFormsModule } from "@angular/forms"; @NgModule({ declarations: [ @@ -64,6 +66,7 @@ import { ReactiveFormsModule } from "@angular/forms"; OptionsAppSectionComponent, OptionsDebugSectionComponent, OptionsAddonSectionComponent, + FundingButtonComponent, ], imports: [CommonModule, SharedModule, HomeRoutingModule, MatModule, DirectiveModule, ReactiveFormsModule], providers: [DatePipe, GetAddonListItemFilePropPipe, DownloadCountPipe], diff --git a/wowup-electron/src/assets/i18n/de.json b/wowup-electron/src/assets/i18n/de.json index 18356bce..1c014579 100644 --- a/wowup-electron/src/assets/i18n/de.json +++ b/wowup-electron/src/assets/i18n/de.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Dieses Addon besitzt {dependencyCount} {dependencyCount, plural, one{Abhängigkeit} other{Abhängigkeiten}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Im Browser anzeigen", "VIEW_ON_PROVIDER_PREFIX": "Anzeigen auf" diff --git a/wowup-electron/src/assets/i18n/en.json b/wowup-electron/src/assets/i18n/en.json index f73f4df2..ed3c0cd8 100644 --- a/wowup-electron/src/assets/i18n/en.json +++ b/wowup-electron/src/assets/i18n/en.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "This addon has {dependencyCount} required {dependencyCount, plural, =1{dependency} other{dependencies}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "View in browser", "VIEW_ON_PROVIDER_PREFIX": "View on" diff --git a/wowup-electron/src/assets/i18n/es.json b/wowup-electron/src/assets/i18n/es.json index 546d41cd..2c685f4a 100644 --- a/wowup-electron/src/assets/i18n/es.json +++ b/wowup-electron/src/assets/i18n/es.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Este addon tiene {dependencyCount} {dependencyCount, plural, one{dependencia requerida} other{dependencias requeridas}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Ver en el navegador", "VIEW_ON_PROVIDER_PREFIX": "Ver en" diff --git a/wowup-electron/src/assets/i18n/fr.json b/wowup-electron/src/assets/i18n/fr.json index da44b9f7..5ba829e2 100644 --- a/wowup-electron/src/assets/i18n/fr.json +++ b/wowup-electron/src/assets/i18n/fr.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Cet addon a {dependencyCount} {dependencyCount, plural, one{dépendance requise} other{dépendances requises}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Voir dans le navigateur", "VIEW_ON_PROVIDER_PREFIX": "Voir sur" diff --git a/wowup-electron/src/assets/i18n/it.json b/wowup-electron/src/assets/i18n/it.json index 5ca913ca..7264485a 100644 --- a/wowup-electron/src/assets/i18n/it.json +++ b/wowup-electron/src/assets/i18n/it.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Questo addon ha {dependencyCount, plural, one{una dipendenza} other{{dependencyCount} dipendenze}} {dependencyCount, plural, one{richiesta} other{richieste}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Visualizza nel browser", "VIEW_ON_PROVIDER_PREFIX": "Visualizza su" diff --git a/wowup-electron/src/assets/i18n/ko.json b/wowup-electron/src/assets/i18n/ko.json index 1a07afbc..6ea5fc1b 100644 --- a/wowup-electron/src/assets/i18n/ko.json +++ b/wowup-electron/src/assets/i18n/ko.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "이 애드온은 {dependencyCount}개의 다른 애드온을 참조합니다.", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "브라우저에서 열기", "VIEW_ON_PROVIDER_PREFIX": "다음에서 보기: " diff --git a/wowup-electron/src/assets/i18n/nb.json b/wowup-electron/src/assets/i18n/nb.json index adaea52e..af482d86 100644 --- a/wowup-electron/src/assets/i18n/nb.json +++ b/wowup-electron/src/assets/i18n/nb.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "This addon has {dependencyCount} required {dependencyCount, plural, one{dependency} other{dependencies}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Se i nettleser", "VIEW_ON_PROVIDER_PREFIX": "View on" diff --git a/wowup-electron/src/assets/i18n/pt.json b/wowup-electron/src/assets/i18n/pt.json index ec55cde6..339250c3 100644 --- a/wowup-electron/src/assets/i18n/pt.json +++ b/wowup-electron/src/assets/i18n/pt.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Este Addon tem {dependencyCount} {dependencyCount, plural, one{dependência necessária} other{dependências necessárias}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Visualizar no navegador", "VIEW_ON_PROVIDER_PREFIX": "Ver em" diff --git a/wowup-electron/src/assets/i18n/ru.json b/wowup-electron/src/assets/i18n/ru.json index 523f2508..8d021ba8 100644 --- a/wowup-electron/src/assets/i18n/ru.json +++ b/wowup-electron/src/assets/i18n/ru.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "Эта модификация имеет {dependencyCount} {dependencyCount, plural, one{необходимую} other{необходимых}} {dependencyCount, plural, one{зависимость} few{зависимости} other{зависимостей}}", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "Посмотреть в браузере", "VIEW_ON_PROVIDER_PREFIX": "Посмотреть на" diff --git a/wowup-electron/src/assets/i18n/zh-TW.json b/wowup-electron/src/assets/i18n/zh-TW.json index 264ef287..689d8c24 100644 --- a/wowup-electron/src/assets/i18n/zh-TW.json +++ b/wowup-electron/src/assets/i18n/zh-TW.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "此插件有 {dependencyCount} 個依賴項", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "在瀏覽器中檢視", "VIEW_ON_PROVIDER_PREFIX": "在該網站上檢視：" diff --git a/wowup-electron/src/assets/i18n/zh.json b/wowup-electron/src/assets/i18n/zh.json index bd7b78fd..699e7dc9 100644 --- a/wowup-electron/src/assets/i18n/zh.json +++ b/wowup-electron/src/assets/i18n/zh.json @@ -109,6 +109,7 @@ "CHANGELOG_TAB": "Changelog", "DEPENDENCY_TEXT": "此插件有 {dependencyCount} 个依赖项", "DESCRIPTION_TAB": "Description", + "FUNDING_LINK_TITLE": "Support this author", "MISSING_DEPENDENCIES": "Missing dependencies", "VIEW_IN_BROWSER_BUTTON": "在浏览器中查看", "VIEW_ON_PROVIDER_PREFIX": "在该网站上查看：" diff --git a/wowup-electron/src/assets/images/librepay_logo_small.png b/wowup-electron/src/assets/images/librepay_logo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..7aef043e922977b1d62c12091663e48b2cfe2f5e GIT binary patch literal 5285 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