2021-04-13 11:02:41 +02:00
|
|
|
<!--
|
|
|
|
Copyright: Ankitects Pty Ltd and contributors
|
|
|
|
License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
-->
|
2021-10-26 00:43:02 +02:00
|
|
|
<script lang="ts">
|
2021-10-07 15:31:49 +02:00
|
|
|
import { createEventDispatcher } from "svelte";
|
2022-02-04 09:36:34 +01:00
|
|
|
|
|
|
|
import * as tr2 from "../lib/ftl";
|
2021-10-07 15:31:49 +02:00
|
|
|
import type { Stats } from "../lib/proto";
|
|
|
|
import type { PreferenceStore } from "../sveltelib/preferences";
|
2020-11-01 05:26:58 +01:00
|
|
|
import type { GraphData, TableDatum } from "./card-counts";
|
2022-02-04 09:36:34 +01:00
|
|
|
import { gatherData, renderCards } from "./card-counts";
|
|
|
|
import Graph from "./Graph.svelte";
|
|
|
|
import type { SearchEventMap } from "./graph-helpers";
|
|
|
|
import { defaultGraphBounds } from "./graph-helpers";
|
|
|
|
import InputBox from "./InputBox.svelte";
|
2020-06-26 02:42:10 +02:00
|
|
|
|
2021-07-10 13:58:34 +02:00
|
|
|
export let sourceData: Stats.GraphsResponse;
|
|
|
|
export let preferences: PreferenceStore<Stats.GraphPreferences>;
|
2020-06-26 02:42:10 +02:00
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const { cardCountsSeparateInactive, browserLinksSupported } = preferences;
|
2021-01-26 12:41:22 +01:00
|
|
|
const dispatch = createEventDispatcher<SearchEventMap>();
|
2021-01-06 13:40:05 +01:00
|
|
|
|
2020-07-04 05:38:46 +02:00
|
|
|
let svg = null as HTMLElement | SVGElement | null;
|
|
|
|
|
2022-02-04 09:36:34 +01:00
|
|
|
const bounds = defaultGraphBounds();
|
2020-08-12 10:58:21 +02:00
|
|
|
bounds.width = 225;
|
|
|
|
bounds.marginBottom = 0;
|
2020-07-31 09:19:31 +02:00
|
|
|
|
2021-05-26 01:21:33 +02:00
|
|
|
let graphData = null as unknown as GraphData;
|
|
|
|
let tableData = null as unknown as TableDatum[];
|
2021-01-04 14:04:51 +01:00
|
|
|
|
2020-07-06 06:01:49 +02:00
|
|
|
$: {
|
2021-03-26 11:23:43 +01:00
|
|
|
graphData = gatherData(sourceData, $cardCountsSeparateInactive);
|
2020-08-12 10:58:21 +02:00
|
|
|
tableData = renderCards(svg as any, bounds, graphData);
|
2020-06-27 13:10:17 +02:00
|
|
|
}
|
|
|
|
|
2021-11-12 09:19:01 +01:00
|
|
|
const label = tr2.statisticsCountsSeparateSuspendedBuriedCards();
|
|
|
|
const total = tr2.statisticsCountsTotalCards();
|
2020-07-04 05:38:46 +02:00
|
|
|
</script>
|
|
|
|
|
2021-03-21 13:47:52 +01:00
|
|
|
<Graph title={graphData.title}>
|
|
|
|
<InputBox>
|
2021-01-22 14:56:41 +01:00
|
|
|
<label>
|
|
|
|
<input type="checkbox" bind:checked={$cardCountsSeparateInactive} />
|
|
|
|
{label}
|
|
|
|
</label>
|
2021-03-21 13:47:52 +01:00
|
|
|
</InputBox>
|
2021-01-04 14:04:51 +01:00
|
|
|
|
2020-08-12 10:58:21 +02:00
|
|
|
<div class="counts-outer">
|
2021-12-29 06:04:15 +01:00
|
|
|
<div class="svg-container" width={bounds.width} height={bounds.height}>
|
|
|
|
<svg
|
|
|
|
bind:this={svg}
|
|
|
|
viewBox={`0 0 ${bounds.width} ${bounds.height}`}
|
|
|
|
style="opacity: {graphData.totalCards ? 1 : 0}"
|
|
|
|
>
|
|
|
|
<g class="counts" />
|
|
|
|
</svg>
|
|
|
|
</div>
|
2020-08-12 10:58:21 +02:00
|
|
|
<div class="counts-table">
|
|
|
|
<table>
|
2020-11-01 05:26:58 +01:00
|
|
|
{#each tableData as d, _idx}
|
2020-08-12 10:58:21 +02:00
|
|
|
<tr>
|
2020-08-21 07:06:03 +02:00
|
|
|
<!-- prettier-ignore -->
|
2020-08-12 10:58:21 +02:00
|
|
|
<td>
|
2021-01-06 13:40:05 +01:00
|
|
|
<span style="color: {d.colour};">■ </span>
|
2021-01-25 16:33:18 +01:00
|
|
|
{#if browserLinksSupported}
|
2021-01-06 19:26:47 +01:00
|
|
|
<span class="search-link" on:click={() => dispatch('search', { query: d.query })}>{d.label}</span>
|
|
|
|
{:else}
|
|
|
|
<span>{d.label}</span>
|
|
|
|
{/if}
|
2020-08-12 10:58:21 +02:00
|
|
|
</td>
|
|
|
|
<td class="right">{d.count}</td>
|
|
|
|
<td class="right">{d.percent}</td>
|
|
|
|
</tr>
|
|
|
|
{/each}
|
|
|
|
|
|
|
|
<tr>
|
2020-11-01 05:26:58 +01:00
|
|
|
<td><span style="visibility: hidden;">■</span> {total}</td>
|
2020-08-12 10:58:21 +02:00
|
|
|
<td class="right">{graphData.totalCards}</td>
|
|
|
|
<td />
|
2020-07-31 09:19:31 +02:00
|
|
|
</tr>
|
2020-08-12 10:58:21 +02:00
|
|
|
</table>
|
|
|
|
</div>
|
2020-07-31 09:19:31 +02:00
|
|
|
</div>
|
2021-03-21 13:47:52 +01:00
|
|
|
</Graph>
|
2021-05-26 01:21:33 +02:00
|
|
|
|
|
|
|
<style lang="scss">
|
|
|
|
svg {
|
|
|
|
transition: opacity 1s;
|
|
|
|
}
|
|
|
|
|
|
|
|
.counts-outer {
|
|
|
|
display: flex;
|
|
|
|
justify-content: center;
|
2021-12-29 06:04:15 +01:00
|
|
|
margin: 0 4vw;
|
2021-05-26 01:21:33 +02:00
|
|
|
|
2021-12-29 06:04:15 +01:00
|
|
|
.svg-container {
|
|
|
|
width: 225px;
|
|
|
|
}
|
|
|
|
|
|
|
|
.counts-table {
|
|
|
|
display: flex;
|
|
|
|
flex-direction: column;
|
|
|
|
justify-content: center;
|
2021-05-26 01:21:33 +02:00
|
|
|
|
2021-12-29 06:04:15 +01:00
|
|
|
table {
|
|
|
|
border-spacing: 1em 0;
|
|
|
|
padding-left: 4vw;
|
|
|
|
|
|
|
|
td {
|
|
|
|
white-space: nowrap;
|
|
|
|
padding: 0 min(4vw, 40px);
|
|
|
|
|
|
|
|
&.right {
|
|
|
|
text-align: right;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-05-26 01:21:33 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-12-29 06:04:15 +01:00
|
|
|
/* On narrow devices, stack graph and table in a column */
|
|
|
|
@media only screen and (max-width: 600px) {
|
|
|
|
.counts-outer {
|
|
|
|
display: flex;
|
|
|
|
flex-direction: column;
|
|
|
|
align-items: center;
|
2021-05-26 01:21:33 +02:00
|
|
|
|
2021-12-29 06:04:15 +01:00
|
|
|
.svg-container {
|
|
|
|
width: 180px;
|
|
|
|
|
|
|
|
svg {
|
|
|
|
margin-left: 4vw;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
.counts-table table td {
|
|
|
|
padding: 0 min(6vw, 30px);
|
|
|
|
}
|
|
|
|
}
|
2021-05-26 01:21:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
.search-link:hover {
|
|
|
|
cursor: pointer;
|
Introduce new color palette using Sass maps (#2016)
* Remove --medium-border variable
* Implement color palette using Sass maps
I hand-picked the gray tones, the other colors are from the Tailwind CSS v3 palette.
Significant changes:
- light theme is brighter
- dark theme is darker
- borders are softer
I also deleted some platform- and night-mode-specific code.
* Use custom colors for note view switch
* Use same placeholder color for all inputs
* Skew color palette for more dark values
by removing gray[3], which wasn't used anywhere. Slight adjustments were made to the darker tones.
* Adjust frame- window- and border colors
* Give deck browser entries --frame-bg as background color
* Define styling for QComboBox and QLineEdit globally
* Experiment with CSS filter for inline-colors
Inside darker inputs, some colors like dark blue will be hard to read, so we could try to improve text-color contrast with global adjustments depending on the theme.
* Use different map structure for _vars.scss
after @hgiesel's idea: https://github.com/ankitects/anki/pull/2016#discussion_r947087871
* Move custom QLineEdit styles out of searchbar.py
* Merge branch 'main' into color-palette
* Revert QComboBox stylesheet override
* Align gray color palette more with macOS
* Adjust light theme
* Use --slightly-grey-text for options tab color
* Replace gray tones with more neutral values
* Improve categorization of global colors
by renaming almost all of them and sorting them into separate maps.
* Saturate highlight-bg in light theme
* Tweak gray tones
* Adjust box-shadow of EditingArea to make fields look inset
* Add Sass functions to access color palette and semantic variables
in response to https://github.com/ankitects/anki/pull/2016#issuecomment-1220571076
* Showcase use of access functions in several locations
@hgiesel in buttons.scss I access the color palette directly. Is this what you meant by "... keep it local to the component, and possibly make it global at a later time ..."?
* Fix focus box shadow transition and remove default shadow for a cleaner look
I couldn't quite get the inset look the way I wanted, because inset box-shadows do not respect the border radius, therefore causing aliasing.
* Tweak light theme border and shadow colors
* Add functions and colors to base_lib
* Add vars_lib as dependency to base_lib and button_mixins_lib
* Improve uses of default-themed variables
* Use old --frame-bg color and use darker tone for canvas-default
* Return CSS var by default and add palette-of function for raw value
* Showcase use of palette-of function
The #{...} syntax is required only because the use cases are CSS var definitions. In other cases a simple palette-of(keyword, theme) would suffice.
* Light theme: decrease brightness of canvas-default and adjust fg-default
* Use canvas-inset variable for switch knob
* Adjust light theme
* Add back box-shadow to EditingArea
* Light theme: darken background and flatten transition
also set hue and saturation of gray-8 to 0 (like all the other grays).
* Reduce flag colors to single default value
* Tweak card/note accent colors
* Experiment with inset look for fields again
Is this too dark in night mode? It's the same color used for all other text inputs.
* Dark theme: make border-default one shade darker
* Tweak inset shadow color
* Dark theme: make border-faint darker than canvas-default
meaning two shades darker than it currently was.
* Fix PlainTextInput not expanding
* Dark theme: use less saturated flag colors
* Adjust gray tones
* Fix nested variables not getting extracted correctly
* Rename canvas-outset to canvas-elevated
* Light theme: darken canvas-default
* Make canvas-elevated a bit darker
* Rename variables and use them in various components
* Refactor button mixins
* Remove fusion vars from Anki
* Adjust button gradients
* Refactor button mixins
* Fix deck browser table td background color
* Use color function in buttons.scss
* Rework QTabWidget stylesheet
* Fix crash on browser open
* Perfect QTableView header
* Fix bottom toolbar button gradient
* Fix focus outline of bottom toolbar buttons
* Fix custom webview scrollbar
* Fix uses of vars in various webviews
The command @use vars as * lead to repeated inclusion of the CSS vars.
* Enable primary button color with mixin
* Run prettier
* Fix Python code style issues
* Tweak colors
* Lighten scrollbar shades in light theme
* Fix code style issues caused by merge
* Fix harsh border color in editor
caused by leftover --medium-border variables, probably introduced with a merge commit.
* Compile Sass before extracting Python colors/props
This means the Python side doesn't need to worry about the map structure and Sass functions, just copy the output CSS values.
* Desaturate primary button colors by 10%
* Convert accidentally capitalized variable names to lowercase
* Simplify color definitions with qcolor function
* Remove default border-focus variable
* Remove redundant colon
* Apply custom scrollbar CSS only on Windows and Linux
* Make border-subtle color brighter than background in dark theme
* Make border-subtle color a shade brighter in light theme
* Use border-subtle for NoteEditor and EditorToolbar border
* Small patches
2022-09-16 06:11:18 +02:00
|
|
|
color: var(--accent-link);
|
2021-05-26 01:21:33 +02:00
|
|
|
text-decoration: underline;
|
|
|
|
}
|
|
|
|
</style>
|