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.

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

Gem summary UI #4061

Merged
merged 8 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
6 changes: 3 additions & 3 deletions ui/core/components/gear_picker.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { classNames, difficultyNames, professionNames, slotNames } from '../proto_utils/names.js';
import { difficultyNames, professionNames, slotNames } from '../proto_utils/names.js';
import { BaseModal } from './base_modal';
import { Component } from './component';
import { FiltersMenu } from './filters_menu';
Expand Down Expand Up @@ -125,7 +125,7 @@ export class ItemRenderer extends Component {
readonly socketsContainerElem: HTMLElement;

constructor(parent: HTMLElement, player: Player<any>) {
super(parent, 'item-picker-root');
super(parent, 'item-renderer-root');
this.player = player;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The nested item-picker-root class was causing rendering issues particularly on mobile


let iconElem = ref<HTMLAnchorElement>();
Expand Down Expand Up @@ -1309,4 +1309,4 @@ export class ItemList<T> {
}
return <></>;
}
}
}
7 changes: 6 additions & 1 deletion ui/core/components/individual_sim_ui/gear_tab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import { Stats } from "../../proto_utils/stats";
import { GearPicker } from "../gear_picker";
import { SavedDataManager } from "../saved_data_manager";
import { SimTab } from "../sim_tab";
import { GemSummary } from "./gem_summary";

export class GearTab extends SimTab {
protected simUI: IndividualSimUI<Spec>;
Expand All @@ -34,14 +35,18 @@ export class GearTab extends SimTab {

protected buildTabContent() {
this.buildGearPickers();

this.buildGemSummary();
this.buildSavedGearsetPicker();
}

private buildGearPickers() {
new GearPicker(this.leftPanel, this.simUI, this.simUI.player);
}

private buildGemSummary() {
new GemSummary(this.leftPanel, this.simUI, this.simUI.player);
}

private buildSavedGearsetPicker() {
const savedGearManager = new SavedDataManager<Player<any>, SavedGearSet>(this.rightPanel, this.simUI.player, {
header: { title: "Gear Sets" },
Expand Down
73 changes: 73 additions & 0 deletions ui/core/components/individual_sim_ui/gem_summary.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
import { SimUI } from "../../sim_ui";
import { Component } from "../../components/component";
import { Player } from "../../player";
import { setItemQualityCssClass } from "../../css_utils";
import { ActionId } from "../../proto_utils/action_id";
import { UIGem as Gem } from '../../proto/ui.js';
import { ContentBlock } from "../content_block";

interface GemSummaryData {
gem: Gem
count: number
}

export class GemSummary extends Component {
private readonly simUI: SimUI;
private readonly player: Player<any>;

private readonly container: ContentBlock;

constructor(parent: HTMLElement, simUI: SimUI, player: Player<any>) {
super(parent, 'gem-summary-root');
this.simUI = simUI;
this.player = player;

this.container = new ContentBlock(this.rootElem, 'gem-summary-container', {
header: {title: 'Gem Summary'}
});

player.gearChangeEmitter.on(() => this.updateTable());
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor nit, but looks like indentation got messed up here maybe?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah looks like my editor made these new lines use spaces instead of tabs. Nice catch! It looked fine for me because I use 2-space tab sizing but I'll bet it looks funky if you use anything else


private updateTable() {
this.container.bodyElement.innerHTML = ``;
const fullGemList = this.player.getGear().getAllGems(this.player.isBlacksmithing());
const gemCounts: Record<string, GemSummaryData> = {};

for (const gem of fullGemList) {
if (gemCounts[gem.name]) {
gemCounts[gem.name].count += 1
} else {
gemCounts[gem.name] = {
gem: gem,
count: 1,
}
}
}

for (const gemName of Object.keys(gemCounts)) {
const gemData = gemCounts[gemName]
const row = document.createElement('div');
row.classList.add('d-flex', 'align-items-center', 'justify-content-between')
row.innerHTML = `
<a class="gem-summary-link">
<img class="gem-icon"/>
<div>${gemName}</div>
</a>
<div>${gemData.count.toFixed(0)}</div>
`;

const gemLinkElem = row.querySelector('.gem-summary-link') as HTMLAnchorElement;
const gemIconElem = row.querySelector('.gem-icon') as HTMLImageElement;

setItemQualityCssClass(gemLinkElem, gemData.gem.quality);

ActionId.fromItemId(gemData.gem.id).fill().then(filledId => {
gemIconElem.src = filledId.iconUrl;
filledId.setWowheadHref(gemLinkElem);
});

this.container.bodyElement.appendChild(row);
}
}
}
59 changes: 32 additions & 27 deletions ui/scss/core/components/_gear_picker.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
@import "./filters_menu";

.gear-picker-root {
margin-bottom: var(--container-padding);
display: flex;
flex-wrap: wrap;
width: 100%;

.gear-picker-left,
.gear-picker-right {
Expand All @@ -19,6 +19,11 @@
margin-bottom: $block-spacer;
}

.item-renderer-root {
width: 100%;
display: flex;
}

.item-picker-icon {
@include wowhead-background-icon;
width: 4rem;
Expand All @@ -29,18 +34,20 @@

.gear-picker-left {
.item-picker-root {
flex-direction: row;
text-align: left;

// Add space to separate weapon categories
&:nth-child(6) {
margin-bottom: map.get($spacers, 5);
margin-bottom: var(--container-padding);
}

.item-renderer-root {
flex-direction: row;
text-align: left;
}
}
}

.gear-picker-right {
.item-picker-root {
.item-renderer-root {
flex-direction: row-reverse;
text-align: right;
}
Expand Down Expand Up @@ -85,25 +92,14 @@
}
}

@include media-breakpoint-down(xl) {
.gear-picker-right {
margin-bottom: 2 * map.get($spacers, 3);
}
}

@include media-breakpoint-down(md) {
.gear-picker-root {
.gear-picker-left {
.item-picker-root:last-child {
margin-bottom: map.get($spacers, 5);
}
}
flex-direction: column;

.gear-picker-left,
.gear-picker-right {
.item-picker-root {
flex-direction: row;
text-align: left;
}
width: 100%;
margin-right: 0;
}
}
}
Expand All @@ -125,18 +121,27 @@
}
}

@include media-breakpoint-down(md) {
@include media-breakpoint-down(xl) {
.gear-picker-root {
.gear-picker-left {
.item-picker-root:last-child {
margin-bottom: map.get($spacers, 5);
.item-picker-root {
// Increase the spacing to help separate the weapons/bonus item slots
&:nth-child(6) {
margin-bottom: calc(var(--container-padding) * 2);
}
}
}
}
}

.gear-picker-right {
@include media-breakpoint-down(md) {
.gear-picker-root {
.gear-picker-left {
.item-picker-root {
flex-direction: row;
text-align: left;
// Increase the spacing to help separate the weapons/bonus item slots
&:last-child {
margin-bottom: calc(var(--container-padding) * 2);
}
}
}
}
Expand Down
22 changes: 0 additions & 22 deletions ui/scss/core/components/_sim_title_dropdown.scss
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,3 @@
}
}
}

@include media-breakpoint-down(xxl) {
.sim-title {
.sim-link {
.sim-link-content {
padding-left: $gap-width-sm * 2;
padding-right: $gap-width-sm * 2;
}
}
}
}

@include media-breakpoint-down(lg) {
.sim-title {
.sim-link {
.sim-link-content {
padding-left: $gap-width-sm;
padding-right: $gap-width-sm;
}
}
}
}
7 changes: 7 additions & 0 deletions ui/scss/core/components/individual_sim_ui/_gear_tab.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#gear-tab {
.tab-pane-content-container {
.gear-tab-left {
flex-direction: column;
}
}
}
33 changes: 33 additions & 0 deletions ui/scss/core/components/individual_sim_ui/_gem_summary.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
.gem-summary-root {
width: 50%;

.gem-summary-link {
--gem-width: 2rem;

display: flex;
align-items: center;

.gem-icon {
position: unset;
margin-right: map-get($spacers, 1);
border-radius: 0;
border: $border-default;
}

&:not(:last-child) {
margin-bottom: map-get($spacers, 1);
}
}
}

@include media-breakpoint-down(xl) {
.gem-summary-root {
margin-bottom: var(--container-padding);
}
}

@include media-breakpoint-down(md) {
.gem-summary-root {
width: 100%;
}
}
2 changes: 2 additions & 0 deletions ui/scss/core/individual_sim_ui/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@
@import "../components/stat_weights_action";
@import "../components/unit_picker";

@import "../components/individual_sim_ui/gear_tab";
@import "../components/individual_sim_ui/settings_tab";
@import "../components/individual_sim_ui/rotation_tab";
@import "../components/individual_sim_ui/talents_tab";
@import "../components/individual_sim_ui/gem_summary";

@import "../talents/hunter_pet";
@import "../talents/glyphs_picker";
Expand Down
14 changes: 0 additions & 14 deletions ui/scss/core/sim_ui/_shared.scss
Original file line number Diff line number Diff line change
Expand Up @@ -111,20 +111,6 @@ td, th {
width: 100%;
min-height: unset;
}

.sim-content {
padding-left: $gap-width-sm;
padding-right: $gap-width-sm;
}
}
}
}

@include media-breakpoint-down(sm) {
.sim-ui {
.sim-content {
padding-left: $gap-width-sm;
padding-right: $gap-width-sm;
}
}
}
3 changes: 0 additions & 3 deletions ui/scss/core/sim_ui/_sidebar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,6 @@
@include media-breakpoint-down(xxl) {
.sim-sidebar {
.sim-sidebar-content {
padding-left: $gap-width-sm * 2;
padding-right: $gap-width-sm * 2;

.sim-sidebar-actions {
padding: 0;
margin: 0;
Expand Down
31 changes: 17 additions & 14 deletions ui/scss/shared/_gems.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,24 @@
margin-right: 1px;
}

.gem-icon {
@include wowhead-background-icon;
position: absolute;
width: calc(4 * var(--gem-width) / 5);
height: calc(4 * var(--gem-width) / 5);
inset: calc(var(--gem-width) / 10);
border-radius: 100%;
z-index: 1;
}

.gem-icon,
.socket-icon {
@include wowhead-background-icon;
position: absolute;
width: 100%;
height: 100%;
inset: 0;
}
}

.gem-icon {
@include wowhead-background-icon;
width: calc(4 * var(--gem-width) / 5);
height: calc(4 * var(--gem-width) / 5);
inset: calc(var(--gem-width) / 10);
border-radius: 100%;
z-index: 1;
}

.socket-icon {
@include wowhead-background-icon;
width: 100%;
height: 100%;
inset: 0;
}
2 changes: 1 addition & 1 deletion ui/scss/shared/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

:root {
--bs-body-font-size: 14px;
--container-padding: #{$gap-width-sm};
--container-padding: #{$gap-width};
font-size: var(--bs-body-font-size);
}

Expand Down
Loading