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

Show page thumbnails in pages list #221

Merged
merged 9 commits into from
Sep 5, 2023
Merged
Show file tree
Hide file tree
Changes from all 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
13 changes: 13 additions & 0 deletions assets/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,16 @@ a:focus {
box-sizing: border-box;
overflow: hidden;
}

// Make available to screen readers while hiding element visually:
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
border-width: 0;
}
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"stream-browserify": "^3.0.0"
},
"devDependencies": {
"@types/flexsearch": "^0.7.3",
"copy-webpack-plugin": "^9.0.1",
"css-loader": "^6.2.0",
"electron": "^25.1.1",
Expand Down Expand Up @@ -177,5 +178,8 @@
},
"lint-staged": {
"*.ts": "prettier --write"
},
"prettier": {
"trailingComma": "all"
}
}
145 changes: 73 additions & 72 deletions src/pageentry.js → src/pageentry.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import prettyBytes from "pretty-bytes";

import { LitElement, html, css, unsafeCSS } from "lit";
import { property, state } from "lit/decorators.js";

import "keyword-mark-element/lib/keyword-mark.js";

Expand All @@ -10,35 +11,41 @@ import { wrapCss } from "./misc";

// ===========================================================================
class PageEntry extends LitElement {
constructor() {
super();
this.query = "";
this.textSnippet = "";
this.page = null;
this.replayPrefix = "";
this.deleting = false;
this.editable = false;
this.iconValid = false;
this.index = 0;
this.isCurrent = false;
this.isSidebar = false;
}
@property({ type: String })
query = "";

static get properties() {
return {
query: { type: String },
textSnippet: { type: String },
page: { type: Object },
replayPrefix: { type: String },
deleting: { type: Boolean },
selected: { type: Boolean },
editable: { type: Boolean },
iconValid: { type: Boolean },
index: { type: Number },
isCurrent: { type: Boolean },
isSidebar: { type: Boolean },
};
}
@property({ type: String })
textSnippet: string | null = "";

@property({ type: Object })
page: any = null;

@property({ type: String })
replayPrefix = "";

@property({ type: Boolean })
deleting = false;

@property({ type: Boolean })
selected = false;

@property({ type: Boolean })
editable = false;

@property({ type: Number })
index = 0;

@property({ type: Boolean })
isCurrent = false;

@property({ type: Boolean })
isSidebar = false;

@state()
thumbnailValid = true;

@state()
iconValid = true;

static get styles() {
return wrapCss(css`
Expand Down Expand Up @@ -79,17 +86,28 @@ class PageEntry extends LitElement {
}

.favicon {
width: 24px !important;
height: 24px !important;
display: inline-block;
vertical-align: text-bottom;
}
img.favicon {

.media-left .favicon {
width: 2rem;
height: 2rem;
}
.media-left img.favicon {
filter: drop-shadow(1px 1px 2px grey);
}

.media-content .favicon {
width: 1.15rem;
height: 1.15rem;
margin: 0 0.25rem;
}

.media-left {
width: 6rem;
align-self: center;
text-align: center;
}

.delete-button {
Expand Down Expand Up @@ -148,10 +166,7 @@ class PageEntry extends LitElement {
display: inline;
}
${prefix} .col-index {
position: absolute;
top: 0px;
left: 0px;
margin-top: -0.75em;
display: none;
}
${prefix} .columns {
display: flex;
Expand All @@ -161,14 +176,15 @@ class PageEntry extends LitElement {
display: initial !important;
font-style: italic;
}
${prefix} .media-left {
padding-left: 0.75rem;
}
`;
}

updated(changedProperties) {
if (changedProperties.has("page") || changedProperties.has("query")) {
this.updateSnippet();
this.iconValid = !!this.page.favIconUrl;
//this.updateFavIcon();
this.deleting = false;
}
}
Expand Down Expand Up @@ -206,18 +222,7 @@ class PageEntry extends LitElement {
</div>
<div class="column">
<div class="media">
<figure class="media-left">
<p class="">
${this.iconValid
? html` <img
class="favicon"
@error="${() => (this.iconValid = false)}"
src="${this.replayPrefix}/${this.page
.timestamp}id_/${p.favIconUrl}"
/>`
: html` <span class="favicon"></span>`}
</p>
</figure>
<figure class="media-left">${this.renderPageIcon()}</figure>
<div class="media-content ${this.isCurrent ? "current" : ""}">
<div role="heading" aria-level="${this.isSidebar ? "4" : "3"}">
<a
Expand All @@ -237,7 +242,7 @@ class PageEntry extends LitElement {
<p class="has-text-dark text">
<keyword-mark keywords="${this.query}"
>${p.url}</keyword-mark
>
>${this.thumbnailValid ? this.renderFavicon() : ""}
</p>
<p class="has-text-grey-dark text is-inline-date">
${date ? date.toLocaleString() : ""}
Expand Down Expand Up @@ -276,32 +281,28 @@ class PageEntry extends LitElement {
`;
}

async updateFavIcon() {
if (!this.page.favIconUrl) {
this.favIconData = null;
return;
private renderPageIcon() {
if (!this.thumbnailValid) {
return this.renderFavicon();
}
return html`<img
class="thumbnail"
@error=${() => (this.thumbnailValid = false)}
src=${`${this.replayPrefix}/${this.page.timestamp}id_/urn:thumbnail:${this.page.url}`}
loading="lazy"
/>`;
}

const resp = await fetch(
`${this.replayPrefix}/${this.page.timestamp}id_/${this.page.favIconUrl}`,
);

if (resp.status != 200) {
this.favIconData = null;
private renderFavicon() {
if (!this.iconValid || !this.page.favIconUrl) {
return;
}

const payload = await resp.arrayBuffer();
const mime = resp.headers.get("content-type");

try {
this.favIconData = `data:${mime};base64,${btoa(
String.fromCharCode.apply(null, payload),
)}`;
} catch (e) {
console.log(e);
this.favIconData = null;
}
return html`<img
class="favicon"
@error=${() => (this.iconValid = false)}
src=${`${this.replayPrefix}/${this.page.timestamp}id_/${this.page.favIconUrl}`}
loading="lazy"
/>`;
}

updateSnippet() {
Expand Down
Loading
Loading