Skip to content

Commit

Permalink
Merge pull request #85 from SylentButDedly/master
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisfried authored Jun 10, 2024
2 parents cd66aaf + a485d57 commit 24f1402
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 1 deletion.
12 changes: 12 additions & 0 deletions src/app/guardian/guardian.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,18 @@
mask-image: url('../../assets/icons/into-the-light.png');
background-color: inherit;
}

&.the-final-shape:before {
-webkit-mask-image: url('../../assets/icons/the-final-shape.png');
mask-image: url('../../assets/icons/the-final-shape.png');
background-color: inherit;
}

&.episode-echoes:before {
-webkit-mask-image: url('../../assets/icons/episode-echoes.png');
mask-image: url('../../assets/icons/episode-echoes.png');
background-color: inherit;
}
}

@media (prefers-reduced-motion) {
Expand Down
14 changes: 13 additions & 1 deletion src/app/guardian3d/guardian3d.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,19 @@
-webkit-mask-image: url('../../assets/icons/into-the-light.png');
mask-image: url('../../assets/icons/into-the-light.png');
background-color: inherit;
}
}

&.the-final-shape:before {
-webkit-mask-image: url('../../assets/icons/the-final-shape.png');
mask-image: url('../../assets/icons/the-final-shape.png');
background-color: inherit;
}

&.episode-echoes:before {
-webkit-mask-image: url('../../assets/icons/episode-echoes.png');
mask-image: url('../../assets/icons/episode-echoes.png');
background-color: inherit;
}
}

@media (prefers-reduced-motion) {
Expand Down
6 changes: 6 additions & 0 deletions src/app/guardian3d/guardian3d.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,12 @@ export class Guardian3DComponent implements OnInit, OnDestroy {
year: [],
}
this.seasons = [
{
number: 24,
name: 'Episode: Echoes',
days: [],
startDate: new Date('2024-06-04'),
},
{
number: 23,
name: 'Season of the Wish',
Expand Down
40 changes: 40 additions & 0 deletions src/app/pipes/milestone.pipe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ export class MilestonePipe implements PipeTransform {
case '2023-02-28':
case '2023-5-23':
case '2023-05-23':
case '2024-06-4':
case '2024-6-4':
return 'release'
case '2017-9-13':
case '2017-09-13':
Expand All @@ -75,6 +77,8 @@ export class MilestonePipe implements PipeTransform {
case '2022-08-26':
case '2023-3-10':
case '2023-03-10':
case '2024-06-07':
case '2024-6-7':
return 'raid'
case '2017-12-19':
case '2018-2-13':
Expand Down Expand Up @@ -657,6 +661,24 @@ export class MilestonePipe implements PipeTransform {
case '2024-6-4':
case '2024-06-04':
return ' | Launch: The Final Shape'
case '2024-6-7':
case '2024-06-07':
return ' | Salvations Edge Raid'
case '2024-6-11':
case '2024-06-11':
return ' | Episode: Echoes - Act I'
case '2024-7-2':
case '2024-07-02':
return ' | Iron Banner'
case '2024-7-16':
case '2024-07-16':
return ' | Episode: Echoes - Act II'
case '2024-8-6':
case '2024-08-06':
return ' | Solstice'
case '2024-8-27':
case '2024-08-27':
return ' | Episode: Echoes - Act III'
default:
return ''
}
Expand Down Expand Up @@ -826,11 +848,15 @@ export class MilestonePipe implements PipeTransform {
case '2024-01-23':
case '2024-04-02':
case '2024-4-2':
case '2024-7-2':
case '2024-07-02':
return (classes += 'iron-banner')
case '2022-7-19':
case '2022-07-19':
case '2023-7-18':
case '2023-07-18':
case '2024-8-6':
case '2024-08-06':
return (classes += 'solstice2022')
case '2017-9-13':
case '2017-09-13':
Expand All @@ -855,6 +881,8 @@ export class MilestonePipe implements PipeTransform {
case '2023-09-01':
case '2024-4-30':
case '2024-04-30':
case '2024-6-7':
case '2024-06-07':
return (classes += 'raid')
case '2022-8-23':
case '2022-08-23':
Expand Down Expand Up @@ -915,6 +943,8 @@ export class MilestonePipe implements PipeTransform {
case '2023-7-4':
case '2023-07-04':
case '2023-12-19':
case '2024-5-14':
case '2024-05-14':
return (classes += 'exotic-quest')
case '2023-8-22':
case '2023-08-22':
Expand All @@ -924,6 +954,16 @@ export class MilestonePipe implements PipeTransform {
case '2024-4-9':
case '2024-04-09':
return (classes += 'into-the-light')
case '2024-6-4':
case '2024-06-04':
return (classes += 'the-final-shape')
case '2024-6-11':
case '2024-06-11':
case '2024-7-16':
case '2024-07-16':
case '2024-8-27':
case '2024-08-27':
return (classes += 'episode-echoes')
default:
return ''
}
Expand Down
Binary file added src/assets/icons/episode-echoes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/icons/the-final-shape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 24f1402

Please sign in to comment.