Merge branch 'stable' into add-statistics
This commit is contained in:
commit
2cbc9bfda4
14 changed files with 212 additions and 72 deletions
1
.github/FUNDING.yml
vendored
Normal file
1
.github/FUNDING.yml
vendored
Normal file
|
@ -0,0 +1 @@
|
|||
github: grandeljay
|
|
@ -5,7 +5,9 @@ your wishes for any kind of occasion ([demo](https://wishthis.online)).
|
|||
|
||||
![View wishlist](/src/assets/img/wishlist-view.png "View wishlist")
|
||||
|
||||
Join the [Discord](https://discord.gg/WrUXnpNyza)!
|
||||
Join the conversation on:
|
||||
* [Discord](https://discord.gg/WrUXnpNyza)
|
||||
* [Matrix](https://matrix.to/#/#wishthis:matrix.org)
|
||||
|
||||
## Warning
|
||||
wishthis is a work in progress and may break at any time. Do not rely on it and make sure you have backups of your data.
|
||||
|
|
|
@ -15,6 +15,12 @@
|
|||
"src": "/src/assets/img/logo-square.svg",
|
||||
"sizes": "any",
|
||||
"purpose": "any"
|
||||
},
|
||||
{
|
||||
"src": "/src/assets/img/logo-square.png",
|
||||
"sizes": "512x512",
|
||||
"type": "image/png",
|
||||
"purpose": "any"
|
||||
}
|
||||
],
|
||||
"shortcuts": [],
|
||||
|
|
|
@ -41,6 +41,25 @@ img {
|
|||
height: 100%;
|
||||
}
|
||||
|
||||
/** Overlay */
|
||||
.ui.card .overlay {
|
||||
transition: 0.4s ease opacity;
|
||||
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
||||
z-index: 1;
|
||||
opacity: 0;
|
||||
|
||||
background-color: rgba(255, 255, 255, 0.6);
|
||||
}
|
||||
.ui.card:hover .overlay {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
/** Image */
|
||||
.ui.card > .image > img.preview{
|
||||
height: 25vh;
|
||||
|
@ -56,11 +75,13 @@ img {
|
|||
height: 1.25em;
|
||||
width: auto;
|
||||
|
||||
z-index: 1;
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
.ui.card > .image > img.favicon + span.provider {
|
||||
padding-left: 3em;
|
||||
|
||||
z-index: 2;
|
||||
}
|
||||
|
||||
/** Provider name */
|
||||
|
@ -74,9 +95,7 @@ img {
|
|||
padding: calc(0.91666667em * 1.5) 0.91666667em;
|
||||
|
||||
line-height: 1;
|
||||
background-color: rgba(255, 255, 255, 0.6);
|
||||
user-select: none;
|
||||
|
||||
opacity: 0;
|
||||
}
|
||||
.ui.card:hover > .image > span.provider {
|
||||
|
@ -94,6 +113,7 @@ img {
|
|||
|
||||
opacity: 0;
|
||||
background-color: transparent;
|
||||
z-index: 2;
|
||||
}
|
||||
.ui.card:hover > .image > button {
|
||||
animation: buttonWorking 2s linear infinite paused;
|
||||
|
@ -114,13 +134,43 @@ img {
|
|||
}
|
||||
|
||||
/** Content */
|
||||
.ui.card > .content > .header + .description,
|
||||
.ui.card > .content > .meta + .description,
|
||||
.ui.cards > .card > .content > .header + .description,
|
||||
.ui.cards > .card > .content > .meta + .description {
|
||||
max-height: calc(2em * var(--lineHeight));
|
||||
.ui.card > .content > .description {
|
||||
position: absolute;
|
||||
left: 1em;
|
||||
right: 1em;
|
||||
max-height: calc(3em * var(--lineHeight));
|
||||
}
|
||||
|
||||
overflow: hidden;
|
||||
.ui.card > .content > .description-fade {
|
||||
position: absolute;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
left: 0;
|
||||
|
||||
height: 4em;
|
||||
width: 100%;
|
||||
background-image: linear-gradient(0deg, rgba(255,255,255,1) 0.75em, rgba(255,255,255,0.8995799003195029) 45%, rgba(255,255,255,0) 100%);
|
||||
}
|
||||
|
||||
/** Buttons */
|
||||
.ui.card > .extra.buttons,
|
||||
.ui.cards > .card > .extra.buttons {
|
||||
transition: 0.4s ease opacity;
|
||||
|
||||
display: flex;
|
||||
|
||||
opacity: 0;
|
||||
background-color: inherit;
|
||||
z-index: 2;
|
||||
}
|
||||
.ui.card:hover > .extra.buttons,
|
||||
.ui.cards > .card:hover > .extra.buttons {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
.ui.card > .extra.buttons > .button,
|
||||
.ui.cards > .card > .extra.buttons > .button {
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
6
src/assets/css/wishlists.css
Normal file
6
src/assets/css/wishlists.css
Normal file
|
@ -0,0 +1,6 @@
|
|||
/**
|
||||
* Progress
|
||||
*/
|
||||
.ui.progress {
|
||||
display: none;
|
||||
}
|
|
@ -13,7 +13,7 @@
|
|||
"type": "image/png"
|
||||
}
|
||||
],
|
||||
"theme_color": "#f4f4f4",
|
||||
"theme_color": "#5829bb",
|
||||
"background_color": "#f4f4f4",
|
||||
"display": "standalone"
|
||||
}
|
||||
|
|
|
@ -2,14 +2,14 @@
|
|||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="173.43971"
|
||||
height="173.43971"
|
||||
viewBox="0 0 45.889258 45.889259"
|
||||
width="511.99997"
|
||||
height="511.99991"
|
||||
viewBox="0 0 135.46666 135.46665"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
|
||||
sodipodi:docname="logo-square.svg"
|
||||
inkscape:export-filename="F:\laragon\www\wishthis\src\assets\img\logo-square.png"
|
||||
inkscape:export-filename="C:\laragon\www\wishthis\src\assets\img\logo-square.png"
|
||||
inkscape:export-xdpi="96"
|
||||
inkscape:export-ydpi="96"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
|
@ -26,9 +26,9 @@
|
|||
inkscape:pagecheckerboard="0"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="4.3994184"
|
||||
inkscape:cx="93.194136"
|
||||
inkscape:cy="76.146428"
|
||||
inkscape:zoom="0.13748183"
|
||||
inkscape:cx="-414.60026"
|
||||
inkscape:cy="996.49535"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1027"
|
||||
inkscape:window-x="-8"
|
||||
|
@ -56,46 +56,50 @@
|
|||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(157.69673,48.62)">
|
||||
transform="translate(157.69673,48.619999)">
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.266341"
|
||||
id="rect8818"
|
||||
width="45.889256"
|
||||
height="45.889256"
|
||||
width="135.46666"
|
||||
height="135.46664"
|
||||
x="-157.69673"
|
||||
y="-48.619999" />
|
||||
<g
|
||||
aria-label="wishthis"
|
||||
transform="matrix(0.26458333,0,0,0.26458333,2.8945021,19.028796)"
|
||||
transform="matrix(0.781059,0,0,0.781059,316.37406,151.08155)"
|
||||
id="text1572"
|
||||
style="font-size:40px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:Raleway;white-space:pre;shape-inside:url(#rect1574)">
|
||||
style="font-size:40px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:Raleway;white-space:pre;shape-inside:url(#rect1574);stroke-width:0.338749">
|
||||
<path
|
||||
d="m -567.37914,-175.40063 h 2.68 l -8.96,20.84 h -2.36 l -4.36,-10.36 -4.32,10.36 h -2.36 l -8.96,-20.84 h 2.64 l 7.6,18.04 3.84,-9.4 -3.52,-8.6 h 2.44 l 2.64,6.76 2.68,-6.76 h 2.4 l -3.48,8.6 3.84,9.4 z"
|
||||
id="path1932" />
|
||||
id="path1932"
|
||||
style="stroke-width:0.338749" />
|
||||
<path
|
||||
d="m -561.09915,-154.56063 v -20.84 h 2.72 v 20.84 z m 0,-25.2 v -4 h 2.72 v 4 z"
|
||||
id="path1934" />
|
||||
id="path1934"
|
||||
style="stroke-width:0.338749" />
|
||||
<path
|
||||
d="m -545.53914,-154.16063 q -2.56,0 -4.76,-0.84 -2.2,-0.84 -3.8,-2.56 l 1.12,-1.92 q 1.76,1.64 3.52,2.4 1.8,0.72 3.8,0.72 2.44,0 3.96,-0.96 1.52,-1 1.52,-2.84 0,-1.24 -0.76,-1.88 -0.72,-0.68 -2.12,-1.08 -1.36,-0.44 -3.28,-0.92 -2.16,-0.6 -3.64,-1.24 -1.44,-0.68 -2.2,-1.68 -0.72,-1.04 -0.72,-2.68 0,-2.04 1,-3.36 1.04,-1.36 2.8,-2.04 1.8,-0.72 4,-0.72 2.4,0 4.24,0.76 1.84,0.76 3,2.12 l -1.32,1.84 q -1.12,-1.28 -2.68,-1.88 -1.52,-0.64 -3.4,-0.64 -1.28,0 -2.44,0.36 -1.16,0.32 -1.92,1.12 -0.72,0.76 -0.72,2.12 0,1.12 0.56,1.76 0.56,0.6 1.68,1.04 1.12,0.4 2.76,0.88 2.36,0.64 4.12,1.32 1.76,0.64 2.72,1.68 0.96,1.04 0.96,2.92 0,2.92 -2.2,4.56 -2.2,1.64 -5.8,1.64 z"
|
||||
id="path1936" />
|
||||
id="path1936"
|
||||
style="stroke-width:0.338749" />
|
||||
<path
|
||||
d="m -515.53914,-154.56063 h -2.72 v -11.64 q 0,-3.52 -1.24,-5.28 -1.24,-1.8 -3.56,-1.8 -1.52,0 -3.04,0.8 -1.48,0.76 -2.64,2.12 -1.12,1.32 -1.6,3.04 v 12.76 h -2.72 v -29.2 h 2.72 v 13.08 q 1.24,-2.32 3.44,-3.68 2.24,-1.4 4.76,-1.4 1.8,0 3.04,0.64 1.28,0.64 2.04,1.88 0.8,1.2 1.16,2.84 0.36,1.6 0.36,3.64 z"
|
||||
id="path1938" />
|
||||
id="path1938"
|
||||
style="stroke-width:0.338749" />
|
||||
<path
|
||||
d="m -497.73914,-155.64063 q -0.68,0.28 -1.64,0.64 -0.96,0.36 -2.08,0.56 -1.08,0.24 -2.2,0.24 -1.48,0 -2.72,-0.52 -1.24,-0.52 -2,-1.64 -0.72,-1.16 -0.72,-3 v -12.04 h -2.76 v -4.12 h 2.76 v -6.8 h 5.36 v 6.8 h 4.4 v 4.12 h -4.4 v 10.24 q 0.04,1.08 0.6,1.56 0.56,0.48 1.4,0.48 0.84,0 1.64,-0.28 0.8,-0.28 1.28,-0.48 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.338749"
|
||||
id="path1940" />
|
||||
<path
|
||||
d="m -475.4591,-154.56063 h -5.36 v -11.76 q 0,-2.44 -0.96,-3.64 -0.92,-1.2 -2.56,-1.2 -0.96,0 -2.04,0.56 -1.08,0.56 -1.96,1.56 -0.84,0.96 -1.24,2.24 v 12.24 h -5.36 v -29.2 h 5.36 v 12.12 q 1.16,-2 3.16,-3.12 2,-1.12 4.36,-1.12 2.04,0 3.32,0.72 1.28,0.68 2,1.88 0.72,1.16 1,2.64 0.28,1.44 0.28,3 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.338749"
|
||||
id="path1942" />
|
||||
<path
|
||||
d="m -470.7791,-154.56063 v -20.96 h 5.36 v 20.96 z m 0,-23.88 v -5.32 h 5.36 v 5.32 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.338749"
|
||||
id="path1944" />
|
||||
<path
|
||||
d="m -452.85913,-154.16063 q -2.68,0 -5.12,-0.88 -2.44,-0.88 -4.2,-2.6 l 1.92,-3.48 q 1.88,1.52 3.68,2.24 1.84,0.72 3.52,0.72 1.56,0 2.48,-0.56 0.96,-0.56 0.96,-1.68 0,-0.76 -0.52,-1.16 -0.52,-0.44 -1.52,-0.76 -0.96,-0.32 -2.36,-0.72 -2.32,-0.76 -3.88,-1.48 -1.56,-0.72 -2.36,-1.8 -0.76,-1.12 -0.76,-2.84 0,-2.08 1.04,-3.56 1.08,-1.52 2.96,-2.36 1.92,-0.84 4.48,-0.84 2.24,0 4.24,0.72 2,0.68 3.64,2.24 l -2.16,3.4 q -1.6,-1.24 -3.04,-1.8 -1.44,-0.6 -2.92,-0.6 -0.84,0 -1.6,0.2 -0.72,0.2 -1.2,0.68 -0.44,0.44 -0.44,1.28 0,0.76 0.4,1.2 0.44,0.4 1.28,0.72 0.88,0.32 2.12,0.72 2.52,0.72 4.24,1.48 1.76,0.76 2.64,1.88 0.88,1.08 0.88,3 0,3.12 -2.28,4.88 -2.28,1.76 -6.12,1.76 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.338749"
|
||||
id="path1946" />
|
||||
</g>
|
||||
</g>
|
||||
|
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.8 KiB |
|
@ -2,9 +2,9 @@
|
|||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
width="40.10025mm"
|
||||
height="7.8316665mm"
|
||||
viewBox="0 0 40.10025 7.8316665"
|
||||
width="512"
|
||||
height="99.994713"
|
||||
viewBox="0 0 135.46667 26.456935"
|
||||
version="1.1"
|
||||
id="svg5"
|
||||
inkscape:version="1.1.2 (0a00cf5339, 2022-02-04, custom)"
|
||||
|
@ -23,9 +23,9 @@
|
|||
inkscape:pagecheckerboard="0"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="3.1108586"
|
||||
inkscape:cx="134.04659"
|
||||
inkscape:cy="37.288741"
|
||||
inkscape:zoom="0.38885733"
|
||||
inkscape:cx="-380.60232"
|
||||
inkscape:cy="619.76459"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1027"
|
||||
inkscape:window-x="-8"
|
||||
|
@ -37,7 +37,8 @@
|
|||
fit-margin-right="0"
|
||||
fit-margin-bottom="0"
|
||||
borderlayer="true"
|
||||
inkscape:showpageshadow="false" />
|
||||
inkscape:showpageshadow="false"
|
||||
units="px" />
|
||||
<defs
|
||||
id="defs2">
|
||||
<rect
|
||||
|
@ -51,39 +52,43 @@
|
|||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(157.69673,48.62)">
|
||||
transform="translate(157.69673,48.619995)">
|
||||
<g
|
||||
aria-label="wishthis"
|
||||
transform="scale(0.26458333)"
|
||||
transform="matrix(0.89381537,0,0,0.89381537,375.03434,115.62808)"
|
||||
id="text1572"
|
||||
style="font-size:40px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:Raleway;white-space:pre;shape-inside:url(#rect1574)">
|
||||
style="font-size:40px;line-height:1.25;font-family:Raleway;-inkscape-font-specification:Raleway;white-space:pre;shape-inside:url(#rect1574);stroke-width:0.296016">
|
||||
<path
|
||||
d="m -567.37914,-175.40063 h 2.68 l -8.96,20.84 h -2.36 l -4.36,-10.36 -4.32,10.36 h -2.36 l -8.96,-20.84 h 2.64 l 7.6,18.04 3.84,-9.4 -3.52,-8.6 h 2.44 l 2.64,6.76 2.68,-6.76 h 2.4 l -3.48,8.6 3.84,9.4 z"
|
||||
id="path3159" />
|
||||
id="path3159"
|
||||
style="stroke-width:0.296016" />
|
||||
<path
|
||||
d="m -561.09915,-154.56063 v -20.84 h 2.72 v 20.84 z m 0,-25.2 v -4 h 2.72 v 4 z"
|
||||
id="path3161" />
|
||||
id="path3161"
|
||||
style="stroke-width:0.296016" />
|
||||
<path
|
||||
d="m -545.53914,-154.16063 q -2.56,0 -4.76,-0.84 -2.2,-0.84 -3.8,-2.56 l 1.12,-1.92 q 1.76,1.64 3.52,2.4 1.8,0.72 3.8,0.72 2.44,0 3.96,-0.96 1.52,-1 1.52,-2.84 0,-1.24 -0.76,-1.88 -0.72,-0.68 -2.12,-1.08 -1.36,-0.44 -3.28,-0.92 -2.16,-0.6 -3.64,-1.24 -1.44,-0.68 -2.2,-1.68 -0.72,-1.04 -0.72,-2.68 0,-2.04 1,-3.36 1.04,-1.36 2.8,-2.04 1.8,-0.72 4,-0.72 2.4,0 4.24,0.76 1.84,0.76 3,2.12 l -1.32,1.84 q -1.12,-1.28 -2.68,-1.88 -1.52,-0.64 -3.4,-0.64 -1.28,0 -2.44,0.36 -1.16,0.32 -1.92,1.12 -0.72,0.76 -0.72,2.12 0,1.12 0.56,1.76 0.56,0.6 1.68,1.04 1.12,0.4 2.76,0.88 2.36,0.64 4.12,1.32 1.76,0.64 2.72,1.68 0.96,1.04 0.96,2.92 0,2.92 -2.2,4.56 -2.2,1.64 -5.8,1.64 z"
|
||||
id="path3163" />
|
||||
id="path3163"
|
||||
style="stroke-width:0.296016" />
|
||||
<path
|
||||
d="m -515.53914,-154.56063 h -2.72 v -11.64 q 0,-3.52 -1.24,-5.28 -1.24,-1.8 -3.56,-1.8 -1.52,0 -3.04,0.8 -1.48,0.76 -2.64,2.12 -1.12,1.32 -1.6,3.04 v 12.76 h -2.72 v -29.2 h 2.72 v 13.08 q 1.24,-2.32 3.44,-3.68 2.24,-1.4 4.76,-1.4 1.8,0 3.04,0.64 1.28,0.64 2.04,1.88 0.8,1.2 1.16,2.84 0.36,1.6 0.36,3.64 z"
|
||||
id="path3165" />
|
||||
id="path3165"
|
||||
style="stroke-width:0.296016" />
|
||||
<path
|
||||
d="m -497.73914,-155.64063 q -0.68,0.28 -1.64,0.64 -0.96,0.36 -2.08,0.56 -1.08,0.24 -2.2,0.24 -1.48,0 -2.72,-0.52 -1.24,-0.52 -2,-1.64 -0.72,-1.16 -0.72,-3 v -12.04 h -2.76 v -4.12 h 2.76 v -6.8 h 5.36 v 6.8 h 4.4 v 4.12 h -4.4 v 10.24 q 0.04,1.08 0.6,1.56 0.56,0.48 1.4,0.48 0.84,0 1.64,-0.28 0.8,-0.28 1.28,-0.48 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.296016"
|
||||
id="path3167" />
|
||||
<path
|
||||
d="m -475.4591,-154.56063 h -5.36 v -11.76 q 0,-2.44 -0.96,-3.64 -0.92,-1.2 -2.56,-1.2 -0.96,0 -2.04,0.56 -1.08,0.56 -1.96,1.56 -0.84,0.96 -1.24,2.24 v 12.24 h -5.36 v -29.2 h 5.36 v 12.12 q 1.16,-2 3.16,-3.12 2,-1.12 4.36,-1.12 2.04,0 3.32,0.72 1.28,0.68 2,1.88 0.72,1.16 1,2.64 0.28,1.44 0.28,3 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.296016"
|
||||
id="path3169" />
|
||||
<path
|
||||
d="m -470.7791,-154.56063 v -20.96 h 5.36 v 20.96 z m 0,-23.88 v -5.32 h 5.36 v 5.32 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.296016"
|
||||
id="path3171" />
|
||||
<path
|
||||
d="m -452.85913,-154.16063 q -2.68,0 -5.12,-0.88 -2.44,-0.88 -4.2,-2.6 l 1.92,-3.48 q 1.88,1.52 3.68,2.24 1.84,0.72 3.52,0.72 1.56,0 2.48,-0.56 0.96,-0.56 0.96,-1.68 0,-0.76 -0.52,-1.16 -0.52,-0.44 -1.52,-0.76 -0.96,-0.32 -2.36,-0.72 -2.32,-0.76 -3.88,-1.48 -1.56,-0.72 -2.36,-1.8 -0.76,-1.12 -0.76,-2.84 0,-2.08 1.04,-3.56 1.08,-1.52 2.96,-2.36 1.92,-0.84 4.48,-0.84 2.24,0 4.24,0.72 2,0.68 3.64,2.24 l -2.16,3.4 q -1.6,-1.24 -3.04,-1.8 -1.44,-0.6 -2.92,-0.6 -0.84,0 -1.6,0.2 -0.72,0.2 -1.2,0.68 -0.44,0.44 -0.44,1.28 0,0.76 0.4,1.2 0.44,0.4 1.28,0.72 0.88,0.32 2.12,0.72 2.52,0.72 4.24,1.48 1.76,0.76 2.64,1.88 0.88,1.08 0.88,3 0,3.12 -2.28,4.88 -2.28,1.76 -6.12,1.76 z"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9"
|
||||
style="font-weight:bold;-inkscape-font-specification:'Raleway Bold';fill:#6435c9;stroke-width:0.296016"
|
||||
id="path3173" />
|
||||
</g>
|
||||
</g>
|
||||
|
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 5.4 KiB |
|
@ -33,10 +33,15 @@ $(function () {
|
|||
/**
|
||||
* Selection
|
||||
*/
|
||||
var progress = $('.ui.progress');
|
||||
|
||||
$(document).on('change', '.ui.dropdown.wishlists', function () {
|
||||
var wishlistValue = $('.ui.dropdown.wishlists').dropdown('get value');
|
||||
var wishlistIndex = $('.ui.dropdown.wishlists select').prop('selectedIndex') - 1;
|
||||
|
||||
progress.progress('reset');
|
||||
progress.addClass('indeterminate');
|
||||
|
||||
$('[name="wishlist_delete_id"]').val(wishlistValue);
|
||||
|
||||
if (wishlistValue) {
|
||||
|
@ -66,6 +71,18 @@ $(function () {
|
|||
/**
|
||||
* Generate cache
|
||||
*/
|
||||
var cards = $('.ui.card[data-cache="false"]');
|
||||
|
||||
if (cards.length > 0) {
|
||||
progress.slideDown();
|
||||
progress.removeClass('indeterminate');
|
||||
progress.progress({
|
||||
total: cards.length
|
||||
});
|
||||
} else {
|
||||
progress.slideUp();
|
||||
}
|
||||
|
||||
var timerInterval = 1200;
|
||||
var timerCache = setTimeout(
|
||||
function generateCacheCards() {
|
||||
|
@ -90,9 +107,9 @@ $(function () {
|
|||
function generateCacheCard(card) {
|
||||
card = $(card);
|
||||
|
||||
var href = card.find('.content [href]').prop('href');
|
||||
var href = card.find('.content [href]').prop('href');
|
||||
var product_id = card.data('id');
|
||||
var refresh = card.find('button.refresh');
|
||||
var refresh = card.find('button.refresh');
|
||||
|
||||
card.addClass('loading');
|
||||
card.attr('data-cache', true);
|
||||
|
@ -120,7 +137,7 @@ $(function () {
|
|||
if (!elementImage.length) {
|
||||
card.prepend(
|
||||
'<div class="image">' +
|
||||
'<img class="preview" src="' + info.image + '" loading="lazy">' +
|
||||
'<img class="preview" src="' + info.image + '" loading="lazy">' +
|
||||
'</div>'
|
||||
);
|
||||
} else {
|
||||
|
@ -184,7 +201,8 @@ $(function () {
|
|||
if (info.description) {
|
||||
if (!elementContentDescription.length) {
|
||||
elementContent.append(
|
||||
'<div class="description">' + info.description + '</div>'
|
||||
'<div class="description">' + info.description + '</div>' +
|
||||
'<div class="description-fade"></div>'
|
||||
);
|
||||
}
|
||||
}
|
||||
|
@ -193,6 +211,7 @@ $(function () {
|
|||
* Finish
|
||||
*/
|
||||
card.removeClass('loading');
|
||||
progress.progress('increment');
|
||||
}
|
||||
|
||||
refresh.removeClass('working');
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* cache.php
|
||||
*
|
||||
* Cache embed requests.
|
||||
*
|
||||
* @see https://github.com/oscarotero/Embed/issues/471
|
||||
*
|
||||
* @author Jay Trees <github.jay@grandel.anonaddy.me>
|
||||
*/
|
||||
|
||||
|
|
39
src/classes/emebd-uri-interface.php
Normal file
39
src/classes/emebd-uri-interface.php
Normal file
|
@ -0,0 +1,39 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Return the canonical URL
|
||||
*
|
||||
* @see https://github.com/oscarotero/Embed/issues/478
|
||||
*/
|
||||
|
||||
namespace Embed\Detectors;
|
||||
|
||||
use Psr\Http\Message\UriInterface;
|
||||
|
||||
class Url extends Detector
|
||||
{
|
||||
public function detect(): UriInterface
|
||||
{
|
||||
$oembed = $this->extractor->getOEmbed();
|
||||
|
||||
return $oembed->url('url')
|
||||
?: $oembed->url('web_page')
|
||||
?: $this->getCanonical()
|
||||
?: $this->extractor->getUri();
|
||||
}
|
||||
|
||||
protected function getCanonical(): ?UriInterface
|
||||
{
|
||||
$document = $this->extractor->getDocument();
|
||||
|
||||
foreach ($document->select('.//link[@canonical]')->nodes() as $node) {
|
||||
$href = $node->getAttribute('href');
|
||||
|
||||
if ($href) {
|
||||
return $this->extractor->resolveUri($href);
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
|
@ -89,26 +89,28 @@ class Wishlist
|
|||
?>
|
||||
<div class="column">
|
||||
<div class="ui fluid card stretch" data-id="<?= $product['id'] ?>" data-index="<?= $cardIndex ?>" data-cache="<?= $exists ?>">
|
||||
<div class="overlay"></div>
|
||||
|
||||
<?php if ($info->image) { ?>
|
||||
<div class="image">
|
||||
<div class="image">
|
||||
<?php if ($info->image) { ?>
|
||||
<img class="preview" src="<?= $info->image ?>" loading="lazy"/>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($info->favicon) { ?>
|
||||
<img class="favicon" src="<?= $info->favicon ?>" loading="lazy"/>
|
||||
<?php } ?>
|
||||
<?php if ($info->favicon) { ?>
|
||||
<img class="favicon" src="<?= $info->favicon ?>" loading="lazy"/>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($info->providerName) { ?>
|
||||
<span class="provider"><?= $info->providerName ?></span>
|
||||
<?php } ?>
|
||||
<?php if ($info->providerName) { ?>
|
||||
<span class="provider"><?= $info->providerName ?></span>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($userIsCurrent) { ?>
|
||||
<button class="ui icon button refresh">
|
||||
<i class="refresh icon"></i>
|
||||
</button>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
<?php if ($userIsCurrent) { ?>
|
||||
<button class="ui icon button refresh">
|
||||
<i class="refresh icon"></i>
|
||||
</button>
|
||||
<?php } ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="content">
|
||||
<?php if ($info->title) { ?>
|
||||
|
@ -131,6 +133,7 @@ class Wishlist
|
|||
<div class="description">
|
||||
<?= $info->description ?>
|
||||
</div>
|
||||
<div class="description-fade"></div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
|
@ -143,7 +146,7 @@ class Wishlist
|
|||
<?php } ?>
|
||||
|
||||
<?php if ($info->url) { ?>
|
||||
<a class="ui small right labeled icon button" href="<?= $info->url ?>" target="_blank">
|
||||
<a class="ui small labeled icon button" href="<?= $info->url ?>" target="_blank">
|
||||
<i class="external icon"></i>
|
||||
View
|
||||
</a>
|
||||
|
@ -156,7 +159,6 @@ class Wishlist
|
|||
</a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
|
|
@ -68,6 +68,12 @@ $page->navigation();
|
|||
|
||||
<h2 class="ui header">Products</h2>
|
||||
|
||||
<div class="ui primary progress">
|
||||
<div class="bar">
|
||||
<div class="progress"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="wishlist-cards"></div>
|
||||
</div>
|
||||
</main>
|
||||
|
|
Loading…
Reference in a new issue