Skip to content

Commit

Permalink
1.9.0 changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@fribbels
fribbels committed May 25, 2023
1 parent 5e9541a commit 70e72c9
Show file tree
Hide file tree
Showing 60 changed files with 11,374 additions and 507 deletions.
143 changes: 82 additions & 61 deletions app/app.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@
<span class="darkSlider round"></span>
</label>
</div>
<div class="coffeeContainer">
<!-- <div class="coffeeContainer">
<img class="coffeeContainerImage" id="coffeeImage" src="./assets/coffee.png">
</div>
</div> -->

<div class="tabset">
<div class="tabset" style="white-space: nowrap;">
<!-- Tab 1 -->
<input type="radio" name="tabset" id="tab1" checked>
<label for="tab1" class="tabLabel" id="tab1label" data-t>Optimizer</label>
Expand Down Expand Up @@ -75,6 +75,18 @@
<!-- Tab 7 -->
<input type="radio" name="tabset" id="tab8" >
<label for="tab8" class="tabLabel" data-t>Information</label>

<input type="radio" name="tabset" id="tab9" disabled>
<label for="tab9" class="tabLabelLink" data-t onclick="electron.shell.openExternal('https://fribbels.github.io/e7/hero-library.html');" >Hero Library ⧉</label>

<input type="radio" name="tabset" id="tab10" disabled >
<label for="tab10" class="tabLabelLink" data-t onclick="electron.shell.openExternal('https://fribbels.github.io/e7/gw-meta.html');" >GW Meta ⧉</label>

<input type="radio" name="tabset" id="tab11" disabled >
<label for="tab11" class="tabLabelLink" data-t onclick="electron.shell.openExternal('https://www.buymeacoffee.com/fribbels');" >Donate ⧉</label>

<input type="radio" name="tabset" id="tab12" disabled >
<label for="tab12" class="tabLabelLink" data-t onclick="electron.shell.openExternal('https://discord.gg/rDmB4Un7qg');" >Discord ⧉</label>
<!-- Tab 10 -->
<!-- <input type="radio" name="tabset" id="tab10" style="display: none">
<label for="tab10" class="tabLabel" style="display: none" data-t>Subprocess Debugger</label>
Expand All @@ -91,7 +103,7 @@
<div class="panelLabelText" data-t>Hero</div>
<img src="./assets/tooltip.png" class="tooltipImageRight" id="heroTooltip"></img>
</div>
<select id="inputHeroAdd" class="gearPreviewButton"></select>
<select id="inputHeroAdd" class="gearPreviewButton controlsPanel"></select>


<div class="horizontalSpace" ></div>
Expand All @@ -101,13 +113,13 @@
</div>

<div class="horizontalSpace" ></div>
<input type="submit" value="Start" class="gearPreviewButton" id="submitOptimizerRequest" data-t ><br>
<input type="submit" value="Start" class="gearPreviewButton controlsPanel" id="submitOptimizerRequest" data-t ><br>
<div class="horizontalSpace" ></div>
<input type="submit" value="Filter" class="gearPreviewButton" id="submitOptimizerFilter" data-t ><br>
<input type="submit" value="Filter" class="gearPreviewButton controlsPanel" id="submitOptimizerFilter" data-t ><br>
<div class="horizontalSpace" ></div>
<input type="submit" value="Cancel" class="gearPreviewButton" id="submitOptimizerCancel" data-t ><br>
<input type="submit" value="Cancel" class="gearPreviewButton controlsPanel" id="submitOptimizerCancel" data-t ><br>
<div class="horizontalSpace" ></div>
<input type="submit" value="Reset filters" class="gearPreviewButton" id="submitOptimizerReset" data-t >
<input type="submit" value="Reset filters" class="gearPreviewButton controlsPanel" id="submitOptimizerReset" data-t >

</div>
<div class="vertical"></div>
Expand Down Expand Up @@ -237,7 +249,7 @@
</div>
<div class="horizontalSpace"></div>

<select id="optionsEnhanceLimit" class="optionsExcludeGearFrom">
<select id="optionsEnhanceLimit" class="optionsExcludeGearFrom optionsShortSelector">
<option value="0" data-t>+0 and higher</option>
<option value="3" data-t>+3 and higher</option>
<option value="6" data-t>+6 and higher</option>
Expand All @@ -247,8 +259,16 @@
</select><br>
<div class="horizontalSpace" ></div>

<select multiple="multiple" id="optionsExcludeGearFrom" class="optionsExcludeGearFrom">
<select multiple="multiple" id="optionsExcludeGearFrom" class="optionsExcludeGearFrom optionsShortSelector">
</select><br>

<div class="horizontalSpace" ></div>
<div class="horizontalSpace" ></div>
<div class="horizontalSpace" ></div>

<input type="submit" class="gearActionButtonSmaller" value="Add bonus stats" id="addBonusStatsOptimizerButton" data-t>
<input type="submit" class="gearActionButtonSmaller" value="Add substat mods" id="addSubstatModsOptimizerButton" data-t>
<input type="submit" class="gearActionButtonSmaller" value="Change skill options" id="skillOptionsButton" data-t>
</div>

<div class="vertical"></div>
Expand Down Expand Up @@ -289,16 +309,42 @@
<input type="number" id="inputMinResLimit" class="optimizer-number-input stat-number-input">
<div class="inputStatLabel" data-t>Res</div>
<input type="number" id="inputMaxResLimit" class="optimizer-number-input stat-number-input"><br>

<input type="number" id="inputMinCpLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>Cp</div>
<input type="number" id="inputMaxCpLimit" class="optimizer-number-input rating-number-input"><br>



<div class="horizontalSpace" ></div>
<div class="horizontalSpace" ></div>
<div class="horizontalSpace" ></div>
<div class="horizontalSpace" ></div>
<div class="horizontalSpace" style="height:1px"></div>

<div class="panelLabel">
<img src="./assets/tooltip.png" class="tooltipImageLeft" id="filterSkillsTooltip"></img>
<div class="panelLabelText" id="statsLabel" data-content=" (clear)" data-t>Skill filters</div>
</div>

<input type="number" id="inputMinS1Limit" class="optimizer-number-input stat-number-input">
<div class="inputStatLabel" data-t>S1</div>
<input type="number" id="inputMaxS1Limit" class="optimizer-number-input stat-number-input"><br>

<input type="number" id="inputMinS2Limit" class="optimizer-number-input stat-number-input">
<div class="inputStatLabel" data-t>S2</div>
<input type="number" id="inputMaxS2Limit" class="optimizer-number-input stat-number-input"><br>

<input type="number" id="inputMinS3Limit" class="optimizer-number-input stat-number-input">
<div class="inputStatLabel" data-t>S3</div>
<input type="number" id="inputMaxS3Limit" class="optimizer-number-input stat-number-input"><br>
</div>

<div id="placeholder-panel" class="constraints-panel-col-small">
<div class="panelLabel">
<img src="./assets/tooltip.png" class="tooltipImageLeft" id="filterRatingsTooltip"></img>
<div class="panelLabelText" id="ratingsLabel" data-content=" (clear)" data-t>Rating filters</div>
</div>
<input type="number" id="inputMinCpLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>Cp</div>
<input type="number" id="inputMaxCpLimit" class="optimizer-number-input rating-number-input"><br>

<input type="number" id="inputMinHppsLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>HpS</div>
Expand Down Expand Up @@ -337,9 +383,13 @@
<input type="number" id="inputMaxDmgDLimit" class="optimizer-number-input rating-number-input"><br>

<input type="number" id="inputMinScoreLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>Score</div>
<div class="inputStatLabel" data-t>GS</div>
<input type="number" id="inputMaxScoreLimit" class="optimizer-number-input rating-number-input"><br>

<input type="number" id="inputMinBSLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>BS</div>
<input type="number" id="inputMaxBSLimit" class="optimizer-number-input rating-number-input"><br>

<input type="number" id="inputMinPriorityLimit" class="optimizer-number-input rating-number-input">
<div class="inputStatLabel" data-t>Prio</div>
<input type="number" id="inputMaxPriorityLimit" class="optimizer-number-input rating-number-input"><br>
Expand Down Expand Up @@ -443,7 +493,7 @@
<option value="Health" data-t>Health</option>
<option value="DefensePercent" data-t>Defense %</option>
<option value="Defense" data-t>Defense</option>
</select><br>
</select>

<select multiple="multiple" id="inputRingStat" class="inputGearFilterSelect">
<option value="EffectivenessPercent" data-t>Effectiveness</option>
Expand Down Expand Up @@ -572,27 +622,27 @@
</div>

<div class="leftRightText">
<text id="" class="leftRightTextContent" data-t>Filtered weapons</text>
<text id="" class="leftRightTextContent" data-t>Weapons</text>
<text id="filteredWeaponsNum" class="leftRightTextContent">0</text>
</div>
<div class="leftRightText">
<text id="l1" class="leftRightTextContent" data-t>Filtered helmets</text>
<text id="l1" class="leftRightTextContent" data-t>Helmets</text>
<text id="filteredHelmetsNum" class="leftRightTextContent">0</text>
</div>
<div class="leftRightText">
<text id="l1" class="leftRightTextContent" data-t>Filtered armors</text>
<text id="l1" class="leftRightTextContent" data-t>Armors</text>
<text id="filteredArmorsNum" class="leftRightTextContent">0</text>
</div>
<div class="leftRightText">
<text id="l1" class="leftRightTextContent" data-t>Filtered necklaces</text>
<text id="l1" class="leftRightTextContent" data-t>Necklaces</text>
<text id="filteredNecklacesNum" class="leftRightTextContent">0</text>
</div>
<div class="leftRightText">
<text id="a1" class="leftRightTextContent" data-t>Filtered rings</text>
<text id="a1" class="leftRightTextContent" data-t>Rings</text>
<text id="filteredRingsNum" class="leftRightTextContent">0</text>
</div>
<div class="leftRightText">
<text id="a1" class="leftRightTextContent" data-t>Filtered boots</text>
<text id="a1" class="leftRightTextContent" data-t>Boots</text>
<text id="filteredBootsNum" class="leftRightTextContent">0</text>
</div>

Expand Down Expand Up @@ -1326,12 +1376,6 @@
</div>
</div>
</div>
<!--
<div id="setsFilterBar"></div>
<div id="statFilterBar"></div>
<div id="gearFilterBar"></div>
<div id="enhanceFilterBar"></div>
<div id="levelFilterBar"></div> -->
</div>


Expand Down Expand Up @@ -1489,19 +1533,6 @@

<div id="enhancingSection" class="tab-panel">

<!-- <div id="detectorStatus">
<div id="statusSymbol">
</div>
<div id="statusText">
Status: Off - Start the detector and interact with an ingame item (for example, un/locking it) to continue
</div>
</div>
<input type="submit" class="importerButton" value="Start item detector" id="startCompanion" data-t>
<input type="submit" class="importerButton" value="Stop item detector" id="stopCompanion" data-t> -->

<div class="enhanceGuide" data-t>
Click on the magnifying glass on an item to analyze it.
</div>
Expand All @@ -1528,10 +1559,16 @@
<div class="radarChart" id="chart2">
</div>
</div>

<div class="enhanceThirdRow">
<div class="gsChart" id="gsChart">
</div>
</div>
</div>


<div id="importer-section" class="tab-panel">
<div class="importerWrapper">


<button type="button" class="collapsible active" id="importCollapseButton1" data-t>Save / Load optimizer data</button>
Expand Down Expand Up @@ -1723,25 +1760,6 @@ <h3 data-t>Options</h3>
<label class="importerRadioLabel" for="heroImporterHeroRadioChoice3" data-t>Import all 5+ star heroes</label>
</div>

<!--
<select id="importHeroesLimitEnhance" class="importerButton">
<option value=0 data-t>All</option>
<option value=3 data-t>+3 and up</option>
<option value=6 selected data-t>+6 and up</option>
<option value=9 data-t>+9 and up</option>
<option value=12 data-t>+12 and up</option>
<option value=15 >+15</option>
</select>
<br>
<br>
<select id="importHeroesLimitHeroes" class="importerButton">
<option value="optimizer" selected data-t>Only import optimizer heroes</option>
<option value="sixstar" data-t>Import all 6 star heroes</option>
<option value="fivestar" data-t>Import all 5+ star heroes</option>
</select>
-->
<br>


Expand Down Expand Up @@ -1780,7 +1798,7 @@ <h3 data-t>Options</h3>



<button type="button" class="collapsible" id="importCollapseButton2" data-t>Import gear from screenshots</button>
<button type="button" style="display: none" class="collapsible" id="importCollapseButton2" data-t>Import gear from screenshots</button>
<div class="content" id="importCollapseContent2">
<p><h2 data-t>
NOTE: The screenshot tool has some issues importing data accurately since the item backgrounds were changed. The automatic importer is recommended.
Expand Down Expand Up @@ -1839,7 +1857,7 @@ <h3 data-t>Options</h3>



<button type="button" class="collapsible" id="importCollapseButton2" data-t>Import gear from Zarroc optimizer</button>
<button type="button" class="collapsible" id="importCollapseButton2" style="display: none" data-t>Import gear from Zarroc optimizer</button>
<div class="content" id="importCollapseContent2">
<p data-t>
Select the Zarroc optimizer file here.
Expand All @@ -1857,6 +1875,7 @@ <h3 data-t>Options</h3>
<input type="submit" class="importerButton" value="Erase data" id="eraseButton" data-t>
</div>
</div>
</div>



Expand Down Expand Up @@ -2027,6 +2046,8 @@ <h2 data-t>Languages</h2>
<div class="switchText languageToggle" onclick="location.href='app.html?lng=ja';" style="cursor: pointer;">日本語</div>
<span class="switchText"> | </span>
<div class="switchText languageToggle" onclick="location.href='app.html?lng=ko';" style="cursor: pointer;">한국어</div>
<span class="switchText"> | </span>
<div class="switchText languageToggle" onclick="location.href='app.html?lng=ru';" style="cursor: pointer;">Русский язык</div>
<br><br>
</div>

Expand Down
Binary file added app/assets/link.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
54 changes: 54 additions & 0 deletions app/css/darktheme.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,4 +271,58 @@ input[type=checkbox]:checked:after {
}
.active, .collapsible:hover {
background-color: var(--inactive-color);
}


/* Tabs */


.tabsWrapperBody {
text-align: center;
/* font-family: 'Jost', sans-serif;*/
/* background-color: var(--bg-color);*/
}

.tabsWrapper {
/* width: 700px;*/
margin: auto;
/* background-color: var(--inactive-color);*/
border-radius: 10px;
/* box-shadow: 0px 5px 15px rgba(0, 0, 0, .1);*/
}

.tabsButtonWrapper {
display: grid;
grid-template-columns: 1fr 1fr 1fr;
}

.tab-button {
letter-spacing: 3px;
border: none;
padding: 10px;
background-color: var(--bg-color);
color: var(--font-color);
font-size: 18px;
cursor: pointer;
transition: 0.5s;
}

.tab-button:hover {
background-color: var(--inactive-color);
}

.tab-button.active {
background-color: var(--inactive-color);
}

.tabsContent {
display: none;
padding: 10px 20px;
margin-top: 0px;

}

.tabsContent.active {
display: block;
background-color: var(--inactive-color);
}
Loading

0 comments on commit 70e72c9

Please sign in to comment.