From 37ca8015bd1275b66df0981efc83825ff5f20917 Mon Sep 17 00:00:00 2001 From: SylentButDedly Date: Thu, 24 Aug 2023 22:32:41 -0400 Subject: [PATCH 1/5] Update Dates --- src/app/guardian/guardian.component.scss | 6 ++++++ src/app/guardian3d/guardian3d.component.scss | 6 ++++++ src/app/pipes/milestone.pipe.ts | 16 +++++++++++++++- src/assets/icons/season-of-the-witch.png | Bin 0 -> 899 bytes 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/assets/icons/season-of-the-witch.png diff --git a/src/app/guardian/guardian.component.scss b/src/app/guardian/guardian.component.scss index 460b2f1..1cdd850 100644 --- a/src/app/guardian/guardian.component.scss +++ b/src/app/guardian/guardian.component.scss @@ -262,6 +262,12 @@ mask-image: url('../../assets/icons/exotic-quest.png'); background-color: inherit; } + + &.season-of-the-witch:before { + -webkit-mask-image: url('../../assets/icons/season-of-the-witch.png'); + mask-image: url('../../assets/icons/season-of-the-witch.png'); + background-color: inherit; + } } @media (prefers-reduced-motion) { diff --git a/src/app/guardian3d/guardian3d.component.scss b/src/app/guardian3d/guardian3d.component.scss index 23d82a1..05537c8 100644 --- a/src/app/guardian3d/guardian3d.component.scss +++ b/src/app/guardian3d/guardian3d.component.scss @@ -262,6 +262,12 @@ mask-image: url('../../assets/icons/exotic-quest.png'); background-color: inherit; } + + &.season-of-the-witch:before { + -webkit-mask-image: url('../../assets/icons/season-of-the-witch.png'); + mask-image: url('../../assets/icons/season-of-the-witch.png'); + background-color: inherit; + } } @media (prefers-reduced-motion) { diff --git a/src/app/pipes/milestone.pipe.ts b/src/app/pipes/milestone.pipe.ts index f9bb156..05e26b1 100644 --- a/src/app/pipes/milestone.pipe.ts +++ b/src/app/pipes/milestone.pipe.ts @@ -593,9 +593,15 @@ export class MilestonePipe implements PipeTransform { case '2023-7-11': case '2023-07-11': return ' | Iron Banner' + case '2023-7-18': + case '2023-07-18': + return ' | Solstice' case '2023-8-22': case '2023-08-22': - return ' | Season of [REDACTED]' + return ' | Season of the Witch' + case '2023-9-1': + case '2023-09-01': + return ' Crota\'s End Raid' default: return '' } @@ -641,6 +647,7 @@ export class MilestonePipe implements PipeTransform { case '2020-08-11': case '2021-7-6': case '2021-07-06': + case '2023-07-18': return (classes += 'solstice') case '2018-9-4': case '2018-09-04': @@ -735,6 +742,8 @@ export class MilestonePipe implements PipeTransform { return (classes += 'iron-banner') case '2022-7-19': case '2022-07-19': + case '2023-7-18': + case '2023-07-18': return (classes += 'solstice2022') case '2017-9-13': case '2017-09-13': @@ -755,6 +764,8 @@ export class MilestonePipe implements PipeTransform { case '2022-08-26': case '2023-3-10': case '2023-03-10': + case '2023-9-1': + case '2023-09-01': return (classes += 'raid') case '2022-8-23': case '2022-08-23': @@ -813,6 +824,9 @@ export class MilestonePipe implements PipeTransform { case '2023-7-4': case '2023-07-04': return (classes += 'exotic-quest') + case '2023-8-22': + case '2023-08-22': + return (classes += 'season-of-the-witch') default: return '' } diff --git a/src/assets/icons/season-of-the-witch.png b/src/assets/icons/season-of-the-witch.png new file mode 100644 index 0000000000000000000000000000000000000000..9bd6dcc0ea3a366948267c39d551f3e07ce62360 GIT binary patch literal 899 zcmV-}1AP36P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0~kp}K~zXf?Uvt9 z(oqz^zjLV3^nq+{jPf7Ql{tO#L7fk5`r>?d%;~FhWrK>*gX5v)v^Cm-nH1}(xn`M& z7CIS$%>ok=4Utq35fuoC0V;IPch?@&wQh<}el~W_J>SFqan3#G`(@5K=Opy^_rI8! zn9z~o*`m|whBJiu`S~xzOid1v)D#sJ@rcUsc)UwQrG|O~)z#HvloE+V3x`jmu2!qH zC=Z@xm6@3tqe7v0hPv15btMvsIO@&K&G-F&{}0r&%J%m5I{dt->-Bow^767Bb&JLF z5$^-)G*G7?ola*U|AMBbCYj6S+VJ^&ezcdCmfko>2@TX6FqurBP}bJgURhaL2|?IH zLZR?(et!PN#l^+1tP=%)-9T$=t9)~Fa}7fqiA1)nR;y`eXD7D0y84~V<>rM#p=3NB zPZk#!bHm~Amf38!!v-fYMfjg+G#c#d>r;{G=#b0hic~6<#EA}r6IWJNcD1y$bgNXV z=jiY8c%0<%5r&3_UbB-P1Bb{X6ciNX84Lz}NlA%-&*uvY3kxr!9Zno+Z*PBGS69cE z$z-D3+}sNs4kxFkrsm1?^z?0r##Q3?6Qbu^2OuI*w4I2Gii)m|j*bUp$UrK55c0{f zv9Whhiob}NX=`hfH#9WdBg6kktJS_;SXi(I0)aJHAcmoY3fRZe!{-MQ866!RMyXUP z)w{d9Y}z1w3EZU9>9iS*#t*C`4PvplHl)dQVT!(|v%r`~htm zjpikBrK7&S{tk3L16Bauawt0oh8>#Ew}F8H4RK>SJ3Ajjs@+plQ}36SmTbXba3dCr zg&Yot1ye%YP7hoFPbQU0A3?sQm?8{)Sy|al;*vcuH6*$jJmJX5$Qv@u3=R&yB5wZ- zbti0WY`jKP#_e`{=jP_v_X1K?Rdt=H*<*Hg){Lj!+uKWFX`&4}VgPMWF&@^50_q6Z z?RNH+YqQxtLu>9ueSCa;5+z(xH_EI7m(VW~iMq*<1#dlcLkSsXm*c*C&g5(8oYRM4 ZegnoGAHD{Hf*k+=002ovPDHLkV1npGrWODI literal 0 HcmV?d00001 From ab8c540fced8da2c6d9a3963ce649dd4e13d2380 Mon Sep 17 00:00:00 2001 From: SylentButDedly Date: Thu, 24 Aug 2023 22:36:47 -0400 Subject: [PATCH 2/5] Missing bar --- src/app/pipes/milestone.pipe.ts | 2 +- src/environments/environment.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/pipes/milestone.pipe.ts b/src/app/pipes/milestone.pipe.ts index 05e26b1..157a4a3 100644 --- a/src/app/pipes/milestone.pipe.ts +++ b/src/app/pipes/milestone.pipe.ts @@ -601,7 +601,7 @@ export class MilestonePipe implements PipeTransform { return ' | Season of the Witch' case '2023-9-1': case '2023-09-01': - return ' Crota\'s End Raid' + return ' | Crota\'s End Raid' default: return '' } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 8fd12ce..d0938d7 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,9 +8,9 @@ export const environment = { production: true, bungie: { - apiKey: 'cd01c0cb258c48228cdbc0f468674257', + apiKey: '0450a4df81c84adeb86d9f4dcf552901', authUrl: 'https://www.bungie.net/en/OAuth/Authorize', - clientId: '36111', - redirect: 'https://chrisfried.github.io/secret-scrublandeux/auth', + clientId: '40469', + redirect: 'https://localhost:4200', }, } From 03b152cb4d3ddea743fbd32b758d10a233e49a33 Mon Sep 17 00:00:00 2001 From: SylentButDedly Date: Thu, 24 Aug 2023 22:37:39 -0400 Subject: [PATCH 3/5] remove from old icon --- src/app/pipes/milestone.pipe.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pipes/milestone.pipe.ts b/src/app/pipes/milestone.pipe.ts index 157a4a3..db12bd6 100644 --- a/src/app/pipes/milestone.pipe.ts +++ b/src/app/pipes/milestone.pipe.ts @@ -647,7 +647,6 @@ export class MilestonePipe implements PipeTransform { case '2020-08-11': case '2021-7-6': case '2021-07-06': - case '2023-07-18': return (classes += 'solstice') case '2018-9-4': case '2018-09-04': From a19e3b796b257c1ef38b4845702cc39f75f89609 Mon Sep 17 00:00:00 2001 From: SylentButDedly Date: Thu, 24 Aug 2023 22:40:15 -0400 Subject: [PATCH 4/5] revert this --- src/environments/environment.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/environments/environment.ts b/src/environments/environment.ts index d0938d7..8fd12ce 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -8,9 +8,9 @@ export const environment = { production: true, bungie: { - apiKey: '0450a4df81c84adeb86d9f4dcf552901', + apiKey: 'cd01c0cb258c48228cdbc0f468674257', authUrl: 'https://www.bungie.net/en/OAuth/Authorize', - clientId: '40469', - redirect: 'https://localhost:4200', + clientId: '36111', + redirect: 'https://chrisfried.github.io/secret-scrublandeux/auth', }, } From 2f9a10da87b2fdb24e1281ebd963734dcd3ea72f Mon Sep 17 00:00:00 2001 From: SylentButDedly Date: Fri, 1 Sep 2023 11:11:21 -0400 Subject: [PATCH 5/5] Add iron banner dates --- src/app/pipes/milestone.pipe.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/app/pipes/milestone.pipe.ts b/src/app/pipes/milestone.pipe.ts index db12bd6..7a965ee 100644 --- a/src/app/pipes/milestone.pipe.ts +++ b/src/app/pipes/milestone.pipe.ts @@ -602,6 +602,11 @@ export class MilestonePipe implements PipeTransform { case '2023-9-1': case '2023-09-01': return ' | Crota\'s End Raid' + case '2023-9-5': + case '2023-09-05': + case '2023-10-10': + case '2023-11-14': + return ' | Iron Banner' default: return '' } @@ -738,6 +743,10 @@ export class MilestonePipe implements PipeTransform { case '2023-06-20': case '2023-7-11': case '2023-07-11': + case '2023-9-5': + case '2023-09-05': + case '2023-10-10': + case '2023-11-14': return (classes += 'iron-banner') case '2022-7-19': case '2022-07-19':