Added basic filename copy. Added HTTP helper to q. Fetching all actor release pages from Naughty America. Added various high res network logos.

This commit is contained in:
ThePendulum 2020-02-04 00:18:53 +01:00
parent bffa6d2c9e
commit ef602a3a15
42 changed files with 1483 additions and 54 deletions

View File

@ -208,11 +208,24 @@
class="link added"
>{{ formatDate(release.dateAdded, 'MMMM D, YYYY') }}</a>
</span>
<div class="row">
<Icon icon="paste2" />
<input
class="filename"
:value="filename"
@focus="copyFilename"
>
</div>
</div>
</div>
</template>
<script>
import config from 'config';
import format from 'template-format';
import Banner from './banner.vue';
import Actor from '../tile/actor.vue';
import Release from '../tile/release.vue';
@ -222,8 +235,19 @@ function pageTitle() {
return this.release && this.release.title;
}
function copyFilename(event) {
event.target.setSelectionRange(0, event.target.value.length);
document.execCommand('copy');
}
async function mounted() {
this.release = await this.$store.dispatch('fetchReleaseById', this.$route.params.releaseId);
this.filename = format(config.filename.pattern, {
...this.release,
date: this.formatDate(this.release.date, config.filename.date),
}, {
spreadSeparator: config.filename.separator,
});
}
export default {
@ -236,12 +260,16 @@ export default {
data() {
return {
release: null,
filename: null,
};
},
computed: {
pageTitle,
},
mounted,
methods: {
copyFilename,
},
};
</script>
@ -375,6 +403,12 @@ export default {
margin: 0 1rem .5rem 0;
}
.filename {
width: 100%;
padding: .5rem;
border: solid 1px $shadow-weak;
}
.link {
display: inline-block;
color: $link;

View File

@ -46,7 +46,7 @@ export default {
.logo {
width: 100%;
height: 5rem;
color: $text;
color: $text-contrast;
display: flex;
align-items: center;
justify-content: center;

View File

@ -0,0 +1,6 @@
<!-- Generated by IcoMoon.io -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<title>file-empty2</title>
<path d="M11 4h3.627c-0.078-0.126-0.172-0.266-0.286-0.421-0.347-0.473-0.831-1.027-1.362-1.558s-1.085-1.015-1.558-1.362c-0.155-0.114-0.295-0.208-0.421-0.286v3.627z"></path>
<path d="M10 4.5v-4.5h-7.75c-0.689 0-1.25 0.561-1.25 1.25v13.5c0 0.689 0.561 1.25 1.25 1.25h11.5c0.689 0 1.25-0.561 1.25-1.25v-9.75h-4.5c-0.276 0-0.5-0.224-0.5-0.5z"></path>
</svg>

After

Width:  |  Height:  |  Size: 511 B

View File

@ -0,0 +1,6 @@
<!-- Generated by IcoMoon.io -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<title>file-video2</title>
<path d="M11 4h3.627c-0.078-0.126-0.172-0.266-0.286-0.421-0.347-0.473-0.831-1.027-1.362-1.558s-1.085-1.015-1.558-1.362c-0.155-0.114-0.295-0.208-0.421-0.286v3.627z"></path>
<path d="M10.5 5c-0.276 0-0.5-0.224-0.5-0.5v-4.5h-7.75c-0.689 0-1.25 0.561-1.25 1.25v13.5c0 0.689 0.561 1.25 1.25 1.25h11.5c0.689 0 1.25-0.561 1.25-1.25v-9.75h-4.5zM12 14l-3-2v2h-5v-5h5v2l3-2v5z"></path>
</svg>

After

Width:  |  Height:  |  Size: 541 B

5
assets/img/paste2.svg Normal file
View File

@ -0,0 +1,5 @@
<!-- Generated by IcoMoon.io -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<title>paste2</title>
<path d="M13 5v-2.5c0-0.275-0.225-0.5-0.5-0.5h-3.5v-1c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1v1h-3.5c-0.275 0-0.5 0.225-0.5 0.5v10c0 0.275 0.225 0.5 0.5 0.5h4.5v3h7l3-3v-8h-3zM6 1.002c0.001-0.001 0.001-0.001 0.002-0.002h1.996c0.001 0.001 0.001 0.001 0.002 0.002v0.998h-2v-0.998zM3 4v-1h8v1h-8zM13 14.586v-1.586h1.586l-1.586 1.586zM15 12h-3v3h-5v-9h8v6z"></path>
</svg>

After

Width:  |  Height:  |  Size: 522 B

6
assets/img/paste3.svg Normal file
View File

@ -0,0 +1,6 @@
<!-- Generated by IcoMoon.io -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<title>paste3</title>
<path d="M8 8v2h0.5l0.5-1h1v4h-0.75v1h3.5v-1h-0.75v-4h1l0.5 1h0.5v-2z"></path>
<path d="M13 5v-2.5c0-0.275-0.225-0.5-0.5-0.5h-3.5v-1c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1v1h-3.5c-0.275 0-0.5 0.225-0.5 0.5v10c0 0.275 0.225 0.5 0.5 0.5h4.5v3h10v-11h-3zM6 1.002c0.001-0.001 0.001-0.001 0.002-0.002h1.996c0.001 0.001 0.001 0.001 0.002 0.002v0.998h-2v-0.998zM3 4v-1h8v1h-8zM15 15h-8v-9h8v9z"></path>
</svg>

After

Width:  |  Height:  |  Size: 557 B

5
assets/img/unlocked.svg Normal file
View File

@ -0,0 +1,5 @@
<!-- Generated by IcoMoon.io -->
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<title>unlocked</title>
<path d="M12 1c1.654 0 3 1.346 3 3v3h-2v-3c0-0.551-0.449-1-1-1h-2c-0.551 0-1 0.449-1 1v3h0.25c0.412 0 0.75 0.338 0.75 0.75v7.5c0 0.412-0.338 0.75-0.75 0.75h-8.5c-0.412 0-0.75-0.338-0.75-0.75v-7.5c0-0.412 0.338-0.75 0.75-0.75h6.25v-3c0-1.654 1.346-3 3-3h2z"></path>
</svg>

After

Width:  |  Height:  |  Size: 427 B

View File

@ -2,4 +2,9 @@ export default {
api: {
url: `${window.location.origin}/api`,
},
filename: {
pattern: '{site.name} - {title} ({actors.$n.name}, {date} {shootId})',
separator: ', ',
date: 'DD-MM-YYYY',
},
};

View File

@ -19,7 +19,7 @@ function initNetworksActions(store, _router) {
slug
url
sites(
orderBy: PRIORITY_DESC,
orderBy: [PRIORITY_DESC, NAME_ASC],
filter: {
enabled: {
equalTo: true,

5
package-lock.json generated
View File

@ -11143,6 +11143,11 @@
"resolved": "https://registry.npmjs.org/tarn/-/tarn-1.1.5.tgz",
"integrity": "sha512-PMtJ3HCLAZeedWjJPgGnCvcphbCOMbtZpjKgLq3qM5Qq9aQud+XHrL0WlrlgnTyS8U+jrjGbEXprFcQrxPy52g=="
},
"template-format": {
"version": "1.2.5",
"resolved": "https://registry.npmjs.org/template-format/-/template-format-1.2.5.tgz",
"integrity": "sha512-ZZqSfqYBMfPjouADYSRN9iaYlLr2PPVFYgULcV8cGMrJbifNXKvP7qx5PBFQjXg5mh1Gwkk+LTgdsZ8bmSvBdw=="
},
"terser": {
"version": "4.4.2",
"resolved": "https://registry.npmjs.org/terser/-/terser-4.4.2.tgz",

View File

@ -101,6 +101,7 @@
"sharp": "^0.23.4",
"showdown": "^1.9.1",
"source-map-support": "^0.5.16",
"template-format": "^1.2.5",
"tough-cookie": "^3.0.1",
"tty-table": "^2.8.3",
"url-pattern": "^1.0.3",

View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 920 210"><defs><style>.cls-1{fill:#3b3b3b;}.cls-2{fill:#fff;}.cls-3{fill:#d12327;}.cls-4{fill:#b72025;}</style></defs><title>21sextury-logo</title><path class="cls-1" d="M918.3,6.5H198.8V4.9l5.4-.2H918.3v2Z"/><path class="cls-1" d="M198.3,208.5c0.6-.6,1.1-1.6,1.8-1.7a31.2,31.2,0,0,1,5-.1H918.3c-0.3.7-.5,1.8-1,1.9a14,14,0,0,1-3.5.1H198.3Z"/><path class="cls-2" d="M918.3,49.5c-3.2,5.7-6.6,11.3-9.6,17.1q-14.2,27.2-28,54.5a14.4,14.4,0,0,0-1.2,6.2c-0.1,10.8-.1,21.6-0.1,32.8h-31c0-10.4.2-20.8-.1-31.3a26.9,26.9,0,0,0-2.5-10.9c-10.5-21.1-21.3-42.1-32.1-63.1-1.1-2.2-2.1-4.4-3.4-7.2,10.9,0,21.2-.1,31.5.2,1.3,0,3,2.2,3.7,3.7,5.4,12.5,10.5,25.1,15.7,37.7l2.8,6.6,17.2-40.5c3.3-7.7,3.2-7.7,11.7-7.7l25.5-.2v2Z"/><path class="cls-2" d="M441.4,82.9c6.5-11.2,12.3-21.6,18.5-31.8,1-1.6,3.4-3.3,5.2-3.3,41-.2,82-0.1,122.9-0.1l2.4,0.2V74.8H558.7v85.4H527.4v-85H495.1V51l-1.1-.4c-0.8,1-1.7,2-2.5,3.1-10.5,16-21,32-31.6,47.9-1.7,2.6-1.4,4.2.2,6.6,9.8,14.7,19.4,29.5,29,44.3l5.1,7.9c-11.2,0-21.6.1-32-.1-1.2,0-2.6-1.7-3.4-3-5.7-9.8-11.2-19.6-17.1-30a39.8,39.8,0,0,0-2.4,3.3c-5.1,9-10.1,18-15.3,26.9-0.8,1.3-2.6,2.8-4,2.8-10.1.2-20.3,0.1-31.3,0.1,1.2-1.9,1.9-3.3,2.8-4.6,10.2-15.6,20.3-31.3,30.7-46.7,2.3-3.4,1.9-5.6-.2-8.7-10.9-16.2-21.5-32.5-32.2-48.8-0.7-1.1-1.2-2.2-2.2-4,11.1,0,21.5-.1,31.9.2,1.3,0,2.8,2.1,3.6,3.5C429.1,61.5,434.9,71.7,441.4,82.9Z"/><path class="cls-2" d="M793.9,119.3l25.2,41.2H807.8c-6.8,0-13.7.2-20.5-.1a7.9,7.9,0,0,1-5.4-3.1c-5.3-8-10.3-16.3-15.4-24.5s-5.2-7.9-15.3-6.1v33.5H720.2V47.6h32.1c8,0,16.1-.6,23.9.4,16.3,2.2,26.9,12.2,31.7,27.5s1.1,28.6-9.9,40C796.8,116.7,795.6,117.7,793.9,119.3ZM751.3,98a4.8,4.8,0,0,0,1.2.5h16c5.7,0,8.8-3.3,9.6-9.9s-2.2-12.9-7-13.4c-6.5-.6-13.1-0.2-19.8-0.2V98Z"/><path class="cls-2" d="M670.8,47.9h30.6A3.4,3.4,0,0,1,702,49c-0.2,22.8.5,45.7-.9,68.4-1.3,21.1-14.4,37.1-33.1,41.8-21.1,5.3-40.9,3.2-56.1-14.6-7.7-9-11-20-11.3-31.4-0.6-21.1-.3-42.3-0.3-63.5a8.7,8.7,0,0,1,.4-1.7h30.7v5.6c0,17.3-.3,34.7.2,52a58.5,58.5,0,0,0,3.9,18.3c2.3,6.1,7.5,9.5,14.4,9.9s13.6-2.3,16.5-8.9a49.9,49.9,0,0,0,4.4-18.1c0.6-17.6.2-35.3,0.2-53C670.8,51.9,670.8,50.1,670.8,47.9Z"/><path class="cls-2" d="M305.2,47.9h78.5v27H336.4V90.4h40.4v25.1H336.4v17.9h48.7v26.8H305.2V47.9Z"/><path class="cls-2" d="M288.7,59.1L275.6,84.2c-6.8-2.8-13.1-5.8-19.7-7.8a38.6,38.6,0,0,0-13.2-1.5c-2.1.1-5.3,2.4-5.7,4.2s1.8,5.2,3.6,6c5.9,2.6,12.2,4.3,18.3,6.5s9.4,3.4,13.9,5.4c14.3,6.5,19.6,18,18.5,33.2-1,13.2-9,23.9-22.3,28.5-17.2,5.9-34.2,3.6-51-1.7-6.4-2-12.5-4.9-19.2-7.6L212.3,122c7.3,3.2,14.1,6.8,21.3,9,5.6,1.7,11.7,2.2,17.7,2.4,2.1,0.1,4.2-2.3,6.3-3.6-1.3-2.1-2.2-5-4.1-6.1-3.6-2-7.7-2.9-11.6-4.3-6.1-2.2-12.2-4.3-18.3-6.6C195,102,201.6,65.6,219.3,54.5c12-7.5,24.8-9.2,38.4-6.7A102,102,0,0,1,288.7,59.1Z"/><path class="cls-3" d="M90.4,92.1A88.7,88.7,0,0,0,101.2,47C100.5,28.3,87.6,6.1,64.5,2.5a28.5,28.5,0,0,0-4.8-.8,110.6,110.6,0,0,0-13.2.1l-3.4.6C17.2,7.2-1.3,36.6,5.2,62.7h28c-0.5-2.9-1-4.5-1-6.8,0.1-11.1,2.4-14.4,4.9-18.7,6.6-11.6,23-12.8,29.5-1.2a34.4,34.4,0,0,1,3.9,13.2C71.6,60,68.9,70.4,64.1,80q-16.8,34-34,67.8L71.8,127Z"/><path class="cls-3" d="M162.3,1.5h-6c-1.1,1.3-2.1,3-3.5,4L112.3,32.6c-1.4,1-3.8,2.1-3.9,3.3-0.3,8-.2,16.1-0.2,25.7l26-16V95.8l28.2-14.1Q162.4,41.6,162.3,1.5Z"/><path class="cls-4" d="M1.7,204H98.1V178.3H44.4l3.4-6.5,24-44.8L30.1,147.8,14.2,179.4C10.1,187.6,5.9,195.6,1.7,204Z"/><path class="cls-4" d="M162.2,204c0.1-1.8.3-3.2,0.3-4.7q0-56.5,0-112.9,0-2.4,0-4.7L134.3,95.8V204h27.9Z"/></svg>

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -0,0 +1 @@
<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1902.1 315"><style>.st0{fill:#fff}.st1{fill:#c0392b}</style><path class="st0" d="M904.3 312.7V2.3h150.3l188.3 236.3-2.5-236.3h89.4v310.4h-151.7L992.5 78.9l2.7 233.8h-90.9zm868.1-205.6h-92.6c-.3-10.5-2.3-18-5.9-22.5-6.1-7.6-17.1-11.4-33.2-11.6h-23.9l-33.2-.5-34.8.5c-22.6 0-36.2.1-40.9.3-4.7.2-9.8 1-15.2 2.4-10.9 2.6-18.6 7.9-23 15.9-4.4 8-6.6 32.8-6.6 74.4 0 24.6 1.7 41.2 5 50 5 13 15.2 21.2 30.7 24.6 8.6 2 28.3 3 59.1 3h39.3c24.3 0 39.9-.4 47.1-1.1 20.6-1.8 32.4-10.2 35.2-25 .5-3.3.7-8.9.7-16.6v-5h-119.6v-58h211.7v43c0 43.2-2.7 71.9-8 86-5.9 15.6-14.7 26.7-26.4 33.2-15.8 9-34.9 13.8-57.3 14.6-13.2.3-53.8.5-121.9.5-59 0-97.1-1.9-114.4-5.7-23.7-5-41.1-14.2-52.3-27.5-10.6-12.6-17.6-30.3-20.9-53.2-2-12.6-3-35-3-67.3 0-35 1.1-59.4 3.2-73.2 4.2-26.4 13-46 26.2-58.9 15.5-15.2 44.1-24.1 86-26.8 22.9-1.5 54.3-2.3 94.2-2.3 71.6 0 115.5 2 131.9 6.1 28.3 7 46.7 20.8 55 41.6 5.3 12.8 7.9 32.6 7.8 59.1z"/><path class="st1" d="M1811.8 227.6h90.3v85.1h-90.3z"/><path class="st0" d="M593.2.5L399.5 312.9h112.7l122.7-197.8 122.7 197.8h112.6L676.5.5z"/><path class="st1" d="M1813.2 2.3h88.9v183.5h-88.9z"/><path class="st0" d="M367 169.2c-9.6-6.8-26.6-11.4-51.2-13.9 19.3-3 32.8-7.7 40.7-14.1 13.5-10.9 20.2-30 20.2-57.3 0-16.5-2.2-29.9-6.6-40.3-5.5-13-15.2-23.1-29.1-30.2C326.6 6 302.8 2.3 269.7 2.3H.1v69.1h237.6c14.6 0 24.2.8 28.9 2.3 11.1 3.6 16.6 12.1 16.6 25.5 0 11.4-4.1 19-12.3 23-5 2.6-15.2 3.9-30.7 3.9H0v186.7h282.4c33.8 0 57.5-3.6 71-10.9 23.8-12.7 35.7-37.4 35.7-74.1 0-28.7-7.4-48.1-22.1-58.6zm-87.7 71.9c-4.5 1.7-14.1 2.5-28.7 2.5H81.4v-56.4h166.7c15.9 0 26 .8 30.2 2.3 10.6 3.8 15.9 12.7 15.9 26.6.1 13.3-4.9 21.6-14.9 25z"/><path class="st0" d="M.1 70.3h81.3v60.2H.1z"/></svg>

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View File

@ -0,0 +1,324 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="svg2"
xml:space="preserve"
width="201.59999"
height="36.947998"
viewBox="0 0 201.59999 36.947998"
sodipodi:docname="bang-bros.svg"
inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs6"><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath26"><path
d="m 3288.76,3864.54 v 192.81 h 80.62 c 14.95,0 26.39,-1.57 34.26,-4.75 19.43,-7.72 26.4,-29.72 26.4,-48.88 0,-26.08 -11.34,-46.8 -37.88,-54.26 7.23,-2.99 11.65,-5.23 16.32,-11.38 4.16,-5.47 9,-13.74 10.73,-17.84 l 23.51,-55.7 h -54.67 l -25.85,58.8 c -4.12,9.58 -8.56,19.3 -20.63,19.3 h -4.26 v -78.1 z m 48.55,114.45 h 20.45 c 12.66,0 23.72,6.44 23.72,19.93 0,15.33 -8.69,19.38 -22.89,19.38 h -21.28 z"
id="path24"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="336.58701"
y1="388.98499"
x2="336.58701"
y2="406.29001"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient34"><stop
style="stop-opacity:1;stop-color:#ff9804"
offset="0"
id="stop28" /><stop
style="stop-opacity:1;stop-color:#fab40d"
offset="0.390625"
id="stop30" /><stop
style="stop-opacity:1;stop-color:#ffe315"
offset="1"
id="stop32" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath44"><path
d="m 3431.28,3960.81 c 0,52.23 21.72,99.78 80.88,99.78 59.35,0 81.39,-45.21 81.39,-98.21 0,-52.22 -19.31,-101.08 -79.5,-101.08 -60.49,0 -82.77,44.84 -82.77,99.51 z m 48.33,-0.13 c 0,-22.05 3.85,-54.67 32.88,-54.67 30.69,0 32.73,34.49 32.73,57.31 0,22.03 -4.89,52.29 -33.17,52.29 -28.6,0 -32.44,-33.41 -32.44,-54.93 z"
id="path42"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="351.255"
y1="388.74701"
x2="351.255"
y2="406.63199"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient52"><stop
style="stop-opacity:1;stop-color:#ff9804"
offset="0"
id="stop46" /><stop
style="stop-opacity:1;stop-color:#fab40d"
offset="0.390625"
id="stop48" /><stop
style="stop-opacity:1;stop-color:#ffe315"
offset="1"
id="stop50" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath62"><path
d="m 3594.17,3928.32 45.93,3.54 c 1.75,-16.29 8.05,-32.58 27.44,-32.58 12,0 21.55,7.49 21.55,19.84 0,36.67 -89.02,14.42 -89.02,85.14 0,39.78 29.88,56.33 66.52,56.33 40.11,0 60.5,-17.75 64.48,-57.54 l -45.49,-3.32 c -1.96,14.29 -7.66,25.04 -23.69,25.04 -9.55,0 -16.98,-5.08 -16.98,-15.13 0,-10.22 11.6,-13.28 19.61,-15.35 21.14,-5.61 36.27,-11.31 45.38,-17.05 18.29,-11.49 26.2,-28.74 26.2,-49.91 0,-42.09 -28.08,-66.03 -69.25,-66.03 -46.41,0 -69.49,20.97 -72.68,67.02 z"
id="path60"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="366.52499"
y1="388.74701"
x2="366.52499"
y2="406.63199"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient70"><stop
style="stop-opacity:1;stop-color:#ff9804"
offset="0"
id="stop64" /><stop
style="stop-opacity:1;stop-color:#fab40d"
offset="0.390625"
id="stop66" /><stop
style="stop-opacity:1;stop-color:#ffe315"
offset="1"
id="stop68" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath88"><path
d="m 2341.48,4057.35 h 90.97 c 29.09,0 47.07,-19.31 47.07,-48.02 0,-19.07 -7.78,-34.57 -25.64,-42.24 23.37,-6.87 32.88,-24.17 32.88,-47.7 0,-39.62 -25.02,-54.85 -61.45,-54.85 h -83.83 z m 48.94,-75.67 h 21.17 c 13.26,0 20.3,4.88 20.3,18.72 0,13.21 -7.51,17.9 -19.97,17.9 h -21.5 z m 0,-75.67 h 24.76 c 13.79,0 22.86,5.32 22.86,20.11 0,14.54 -9.87,18.93 -22.97,18.93 h -24.65 z"
id="path86"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="241.42999"
y1="386.789"
x2="241.431"
y2="402.987"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient96"><stop
style="stop-opacity:1;stop-color:#c1bfbe"
offset="0"
id="stop90" /><stop
style="stop-opacity:1;stop-color:#e7e7e5"
offset="0.601563"
id="stop92" /><stop
style="stop-opacity:1;stop-color:#ffffff"
offset="1"
id="stop94" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath106"><path
d="m 2588.06,3896.31 h -55.01 l -7.91,-31.77 h -49.55 l 59.14,192.81 h 53.15 l 58.88,-192.81 h -50.84 z m -10.28,41.74 -17.15,69.31 -17.23,-69.31 z"
id="path104"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="256.13901"
y1="386.789"
x2="256.13901"
y2="402.987"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient114"><stop
style="stop-opacity:1;stop-color:#c1bfbe"
offset="0"
id="stop108" /><stop
style="stop-opacity:1;stop-color:#e7e7e5"
offset="0.601563"
id="stop110" /><stop
style="stop-opacity:1;stop-color:#ffffff"
offset="1"
id="stop112" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath124"><path
d="m 2645.31,4057.35 h 44.93 l 58.41,-106.46 v 106.46 h 45.48 v -192.81 h -45.48 l -58.09,105.87 v -105.87 h -45.25 z"
id="path122"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="271.991"
y1="386.789"
x2="271.991"
y2="402.987"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient132"><stop
style="stop-opacity:1;stop-color:#c1bfbe"
offset="0"
id="stop126" /><stop
style="stop-opacity:1;stop-color:#e7e7e5"
offset="0.601563"
id="stop128" /><stop
style="stop-opacity:1;stop-color:#ffffff"
offset="1"
id="stop130" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath142"><path
d="m 3135.34,4057.35 h 90.65 c 29.22,0 46.92,-19.54 46.92,-48.02 0,-18.95 -7.67,-34.54 -25.56,-42.24 23.43,-6.9 32.77,-24.33 32.77,-47.7 0,-39.35 -24.61,-54.85 -61.24,-54.85 h -83.54 z m 48.77,-75.67 h 21.11 c 13.32,0 20.23,4.98 20.23,18.72 0,13.12 -7.38,17.9 -19.9,17.9 h -21.44 z m 0,-75.67 h 24.68 c 13.87,0 22.78,5.42 22.78,20.11 0,14.46 -9.71,18.93 -22.89,18.93 h -24.57 z"
id="path140"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="320.78601"
y1="388.98499"
x2="320.78601"
y2="406.29001"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient150"><stop
style="stop-opacity:1;stop-color:#ff9804"
offset="0"
id="stop144" /><stop
style="stop-opacity:1;stop-color:#fab40d"
offset="0.390625"
id="stop146" /><stop
style="stop-opacity:1;stop-color:#ffe315"
offset="1"
id="stop148" /></linearGradient><clipPath
clipPathUnits="userSpaceOnUse"
id="clipPath160"><path
d="m 2888.59,3935.7 v 40.13 h 75.05 v -83.42 c -25.27,-21.15 -43.89,-31.11 -77.36,-31.11 -59.87,0 -82.62,45.29 -82.62,99.65 0,55.87 24.25,100.06 84.63,100.06 41.76,0 63.47,-12.8 73.16,-55 l -46.75,-10.32 c -3.7,13.98 -15.06,22.61 -27.43,22.61 -29.9,0 -34.89,-33.45 -34.89,-56.64 0,-24.94 4.36,-58.07 36.28,-58.07 12.81,0 21.84,5.36 31.98,12.65 v 19.46 z"
id="path158"
inkscape:connector-curvature="0"
style="clip-rule:evenodd" /></clipPath><linearGradient
x1="288.38501"
y1="386.47699"
x2="288.38599"
y2="403.255"
gradientUnits="userSpaceOnUse"
gradientTransform="scale(10)"
spreadMethod="pad"
id="linearGradient168"><stop
style="stop-opacity:1;stop-color:#c1bfbe"
offset="0"
id="stop162" /><stop
style="stop-opacity:1;stop-color:#e7e7e5"
offset="0.601563"
id="stop164" /><stop
style="stop-opacity:1;stop-color:#ffffff"
offset="1"
id="stop166" /></linearGradient></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1026"
id="namedview4"
showgrid="false"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0"
inkscape:zoom="11.313709"
inkscape:cx="40.061266"
inkscape:cy="26.944138"
inkscape:window-x="1230"
inkscape:window-y="930"
inkscape:window-maximized="1"
inkscape:current-layer="g12" /><g
id="g10"
inkscape:groupmode="layer"
inkscape:label="ink_ext_XXXXXX"
transform="matrix(1.3333333,0,0,-1.3333333,-307.19999,546.47465)"><g
id="g12"
transform="scale(0.1)"><path
d="m 3795.24,4098.56 c 11.42,0 20.76,-9.35 20.76,-20.76 v -235.6 c 0,-11.41 -9.34,-20.75 -20.76,-20.75 H 2324.76 c -11.42,0 -20.76,9.34 -20.76,20.75 v 235.6 c 0,11.41 9.34,20.76 20.76,20.76 h 1470.48"
style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path16"
inkscape:connector-curvature="0" /><path
d="m 2324.76,4088.4 c -5.83,0 -10.6,-4.77 -10.6,-10.6 v -235.6 c 0,-5.82 4.77,-10.6 10.6,-10.6 h 1470.48 c 5.83,0 10.6,4.77 10.6,10.6 v 235.6 c 0,5.83 -4.77,10.6 -10.6,10.6 H 2324.76"
style="fill:#080808;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path18"
inkscape:connector-curvature="0" /><g
id="g20"><g
id="g22"
clip-path="url(#clipPath26)"><path
d="m 3288.76,3864.54 v 192.81 h 80.62 c 14.95,0 26.39,-1.57 34.26,-4.75 19.43,-7.72 26.4,-29.72 26.4,-48.88 0,-26.08 -11.34,-46.8 -37.88,-54.26 7.23,-2.99 11.65,-5.23 16.32,-11.38 4.16,-5.47 9,-13.74 10.73,-17.84 l 23.51,-55.7 h -54.67 l -25.85,58.8 c -4.12,9.58 -8.56,19.3 -20.63,19.3 h -4.26 v -78.1 z m 48.55,114.45 h 20.45 c 12.66,0 23.72,6.44 23.72,19.93 0,15.33 -8.69,19.38 -22.89,19.38 h -21.28 v -39.31"
style="fill:url(#linearGradient34);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path36"
inkscape:connector-curvature="0" /></g></g><g
id="g38"><g
id="g40"
clip-path="url(#clipPath44)"><path
d="m 3431.28,3960.81 c 0,52.23 21.72,99.78 80.88,99.78 59.35,0 81.39,-45.21 81.39,-98.21 0,-52.22 -19.31,-101.08 -79.5,-101.08 -60.49,0 -82.77,44.84 -82.77,99.51 z m 48.33,-0.13 c 0,-22.05 3.85,-54.67 32.88,-54.67 30.69,0 32.73,34.49 32.73,57.31 0,22.03 -4.89,52.29 -33.17,52.29 -28.6,0 -32.44,-33.41 -32.44,-54.93"
style="fill:url(#linearGradient52);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path54"
inkscape:connector-curvature="0" /></g></g><g
id="g56"><g
id="g58"
clip-path="url(#clipPath62)"><path
d="m 3594.17,3928.32 45.93,3.54 c 1.75,-16.29 8.05,-32.58 27.44,-32.58 12,0 21.55,7.49 21.55,19.84 0,36.67 -89.02,14.42 -89.02,85.14 0,39.78 29.88,56.33 66.52,56.33 40.11,0 60.5,-17.75 64.48,-57.54 l -45.49,-3.32 c -1.96,14.29 -7.66,25.04 -23.69,25.04 -9.55,0 -16.98,-5.08 -16.98,-15.13 0,-10.22 11.6,-13.28 19.61,-15.35 21.14,-5.61 36.27,-11.31 45.38,-17.05 18.29,-11.49 26.2,-28.74 26.2,-49.91 0,-42.09 -28.08,-66.03 -69.25,-66.03 -46.41,0 -69.49,20.97 -72.68,67.02"
style="fill:url(#linearGradient70);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path72"
inkscape:connector-curvature="0" /></g></g><path
d="m 3766.77,3866.33 v 16.31 h 13.18 v -16.31 h -13.18"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path74"
inkscape:connector-curvature="0" /><path
d="m 3766.57,3919.74 1.54,14.28 c 9.52,-3.06 12.1,-12.31 12.1,-21.41 0,-11.46 -3.04,-23.94 -16.8,-23.94 -13.09,0 -17.07,11.61 -17.07,22.87 0,9.04 1.71,18.2 11.11,21.73 l 1.85,-14.14 c -3.06,-1.04 -3.9,-3.97 -3.9,-7.14 0,-5.6 3.58,-7.92 8.35,-7.92 4.31,0 7.53,2.63 7.53,7.69 0,3.76 -1.37,6.58 -4.71,7.98"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path76"
inkscape:connector-curvature="0" /><path
d="m 3763.62,3938.47 c -12.38,0 -17.28,11.57 -17.28,21.9 0,10.45 4.45,22.11 17.09,22.11 12.62,0 17.28,-11.61 17.28,-22.08 0,-10.18 -4.77,-21.93 -17.09,-21.93 z m -0.02,15.24 c 4.52,0 8.01,2.06 8.01,6.75 0,4.81 -3.53,6.71 -8.12,6.71 -4.39,0 -7.87,-2.06 -7.87,-6.62 0,-4.68 3.41,-6.84 7.98,-6.84"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path78"
inkscape:connector-curvature="0" /><path
d="m 3747.1,3990.46 v 13.72 h 4.78 c -4.03,3.97 -5.54,7.69 -5.54,13.28 0,4.9 1.11,8.92 5.54,11.65 -4,4.31 -5.54,7.47 -5.54,13.34 0,8.42 4.23,13.1 12.96,13.1 h 20.65 v -14.74 h -18.77 c -6.84,0 -7.36,-10.44 1.77,-10.44 h 17 v -14.74 h -18.1 c -3.24,0 -5.7,-0.93 -5.7,-4.63 0,-4.26 3.08,-5.81 7.03,-5.81 h 16.77 v -14.73 h -32.85"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path80"
inkscape:connector-curvature="0" /><g
id="g82"><g
id="g84"
clip-path="url(#clipPath88)"><path
d="m 2341.48,4057.35 h 90.97 c 29.09,0 47.07,-19.31 47.07,-48.02 0,-19.07 -7.78,-34.57 -25.64,-42.24 23.37,-6.87 32.88,-24.17 32.88,-47.7 0,-39.62 -25.02,-54.85 -61.45,-54.85 h -83.83 z m 48.94,-75.67 h 21.17 c 13.26,0 20.3,4.88 20.3,18.72 0,13.21 -7.51,17.9 -19.97,17.9 h -21.5 z m 0,-75.67 h 24.76 c 13.79,0 22.86,5.32 22.86,20.11 0,14.54 -9.87,18.93 -22.97,18.93 h -24.65 v -39.04"
style="fill:url(#linearGradient96);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path98"
inkscape:connector-curvature="0" /></g></g><g
id="g100"><g
id="g102"
clip-path="url(#clipPath106)"><path
d="m 2588.06,3896.31 h -55.01 l -7.91,-31.77 h -49.55 l 59.14,192.81 h 53.15 l 58.88,-192.81 h -50.84 z m -10.28,41.74 -17.15,69.31 -17.23,-69.31 z"
style="fill:url(#linearGradient114);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path116"
inkscape:connector-curvature="0" /></g></g><g
id="g118"><g
id="g120"
clip-path="url(#clipPath124)"><path
d="m 2645.31,4057.35 h 44.93 l 58.41,-106.46 v 106.46 h 45.48 v -192.81 h -45.48 l -58.09,105.87 v -105.87 h -45.25 v 192.81"
style="fill:url(#linearGradient132);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path134"
inkscape:connector-curvature="0" /></g></g><g
id="g136"><g
id="g138"
clip-path="url(#clipPath142)"><path
d="m 3135.34,4057.35 h 90.65 c 29.22,0 46.92,-19.54 46.92,-48.02 0,-18.95 -7.67,-34.54 -25.56,-42.24 23.43,-6.9 32.77,-24.33 32.77,-47.7 0,-39.35 -24.61,-54.85 -61.24,-54.85 h -83.54 z m 48.77,-75.67 h 21.11 c 13.32,0 20.23,4.98 20.23,18.72 0,13.12 -7.38,17.9 -19.9,17.9 h -21.44 z m 0,-75.67 h 24.68 c 13.87,0 22.78,5.42 22.78,20.11 0,14.46 -9.71,18.93 -22.89,18.93 h -24.57 v -39.04"
style="fill:url(#linearGradient150);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path152"
inkscape:connector-curvature="0" /></g></g><g
id="g154"><g
id="g156"
clip-path="url(#clipPath160)"><path
d="m 2888.59,3935.7 v 40.13 h 75.05 v -83.42 c -25.27,-21.15 -43.89,-31.11 -77.36,-31.11 -59.87,0 -82.62,45.29 -82.62,99.65 0,55.87 24.25,100.06 84.63,100.06 41.76,0 63.47,-12.8 73.16,-55 l -46.75,-10.32 c -3.7,13.98 -15.06,22.61 -27.43,22.61 -29.9,0 -34.89,-33.45 -34.89,-56.64 0,-24.94 4.36,-58.07 36.28,-58.07 12.81,0 21.84,5.36 31.98,12.65 v 19.46 h -32.05"
style="fill:url(#linearGradient168);fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path170"
inkscape:connector-curvature="0" /></g></g><path
d="m 3033.44,3870.55 -0.17,-17.88 h 0.02 c 0,-0.36 -0.02,-0.69 -0.08,-1.02 -0.2,-1.67 -0.87,-3.18 -1.83,-4.35 -0.19,-0.22 -0.39,-0.43 -0.59,-0.62 -1.39,-1.35 -3.22,-2.16 -5.25,-2.15 v -0.03 l -0.63,0.04 -13.96,0.2 c -2.38,0.03 -4.44,1.15 -5.84,2.92 -1.12,1.43 -1.81,3.31 -1.79,5.32 l 0.16,17.57 h -5.99 c -3.24,0 -5.88,2.64 -5.88,5.88 v 114.48 c 0,7.55 2.07,14.17 5.52,19.29 l -0.3,-0.02 c -2.53,-0.24 -5.3,-1.8 -8.34,-4.59 -2.38,-2.19 -6.1,-2.04 -8.29,0.34 -1.08,1.18 -1.59,2.69 -1.54,4.18 -0.11,4.2 -0.94,7.19 -2.28,9.16 -1.11,1.64 -2.73,2.56 -4.62,2.88 -2.4,0.41 -5.29,-0.02 -8.36,-1.11 -6.2,-2.21 -12.66,-6.95 -17.38,-13 -1.99,-2.54 -5.67,-2.99 -8.22,-1 -1.76,1.37 -2.52,3.56 -2.16,5.62 h -0.02 c 2.8,15.92 10.36,29.35 20.37,39.79 11.13,11.62 25.35,19.52 39.36,22.99 2.28,0.75 4.38,0.95 6.27,0.68 1.99,-0.29 3.72,-1.08 5.13,-2.31 1.38,-1.19 2.38,-2.73 2.97,-4.53 0.6,-1.82 0.76,-3.91 0.46,-6.14 -1.38,-11.42 -0.94,-19.52 0.98,-26.13 1.64,-5.66 4.47,-10.48 8.23,-15.53 h 60.77 c 0.44,0 0.88,-0.02 1.31,-0.04 3.77,5.07 6.6,9.89 8.25,15.57 1.93,6.61 2.37,14.71 0.98,26.13 -0.29,2.23 -0.14,4.32 0.46,6.14 0.59,1.8 1.59,3.34 2.98,4.53 1.41,1.23 3.13,2.02 5.13,2.31 1.88,0.27 3.99,0.07 6.27,-0.68 14.01,-3.47 28.23,-11.37 39.35,-22.99 10.01,-10.44 17.58,-23.87 20.38,-39.79 h -0.02 c 0.36,-2.06 -0.4,-4.25 -2.16,-5.62 -2.55,-1.99 -6.23,-1.54 -8.23,1 -4.72,6.05 -11.18,10.79 -17.38,13 -3.06,1.09 -5.96,1.52 -8.36,1.11 -1.89,-0.32 -3.5,-1.24 -4.62,-2.88 -1.34,-1.97 -2.17,-4.96 -2.27,-9.16 0.05,-1.49 -0.46,-3 -1.55,-4.18 -2.19,-2.38 -5.9,-2.53 -8.29,-0.34 -3.03,2.79 -5.8,4.35 -8.34,4.59 -1.05,0.09 -2.12,-0.04 -3.23,-0.41 3.28,-5.06 5.23,-11.51 5.23,-18.86 v -114.48 c 0,-3.24 -2.63,-5.88 -5.87,-5.88 h -5.99 l 0.16,-17.57 c 0.02,-2 -0.67,-3.89 -1.8,-5.32 -1.39,-1.77 -3.46,-2.89 -5.83,-2.92 -4.84,-0.07 -9.74,-0.21 -14.58,-0.21 v -0.03 c -0.37,0 -0.72,0.04 -1.06,0.1 -1.91,0.27 -3.58,1.24 -4.79,2.7 -0.19,0.24 -0.36,0.48 -0.52,0.74 -0.84,1.28 -1.35,2.87 -1.37,4.55 v 0.07 h -0.03 l 0.02,0.48 -0.16,17.41 h -30.79"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
id="path172"
inkscape:connector-curvature="0" /><path
d="m 3027.64,3876.43 -0.22,-23.76 c -0.01,-1.28 -0.87,-2.3 -1.89,-2.29 l -14.51,0.22 c -1.03,0.01 -1.86,1.06 -1.85,2.33 l 0.22,23.5 h -11.9 v 114.48 c 0,9.73 3.96,17.43 9.86,21.5 -7.68,5.72 -15.09,4.6 -22.83,-2.5 -0.45,27.96 -28.88,19.95 -43.11,1.74 5.5,31.37 31.09,52.28 55.77,58.21 5.29,1.74 7.86,-1.23 7.17,-6.04 -2.96,-24.42 2.05,-35.32 12.18,-48.25 0.33,0.02 0.65,0.03 0.98,0.03 h 62.65 c 1.41,0 2.79,-0.17 4.12,-0.49 l 0.06,0.44 c 10.14,12.94 15.16,23.84 12.19,48.27 -0.69,4.81 1.89,7.78 7.17,6.04 24.69,-5.93 50.27,-26.84 55.78,-58.21 -14.23,18.21 -42.66,26.22 -43.12,-1.74 -7.97,7.32 -15.6,8.29 -23.54,1.95 -0.27,-0.28 -0.54,-0.53 -0.82,-0.76 4.96,-4.29 8.18,-11.41 8.18,-20.19 v -114.48 h -11.9 l 0.22,-23.5 c 0.01,-1.27 -0.82,-2.32 -1.85,-2.33 l -14.51,-0.22 c -1.03,-0.01 -1.88,1.01 -1.89,2.29 l -0.23,23.76 z m 57.15,73.46 c 0.85,0 1.55,0.86 1.55,1.91 v 39.1 c 0,4.4 -2.91,8 -6.47,8 h -62.07 c -3.56,0 -6.47,-3.6 -6.47,-8 v -39.1 c 0,-1.05 0.69,-1.91 1.55,-1.91 z m -6.2,-19.22 c -5.08,0 -9.2,-4.42 -9.2,-9.88 0,-5.45 4.12,-9.88 9.2,-9.88 5.08,0 9.19,4.43 9.19,9.88 0,5.46 -4.11,9.88 -9.19,9.88 z m -59.51,0 c 5.08,0 9.19,-4.42 9.19,-9.88 0,-5.45 -4.11,-9.88 -9.19,-9.88 -5.08,0 -9.2,4.43 -9.2,9.88 0,5.46 4.12,9.88 9.2,9.88"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
id="path174"
inkscape:connector-curvature="0" /></g></g></svg>

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -0,0 +1,263 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 201.59999 36.947998"
height="36.947998"
width="201.59999"
xml:space="preserve"
id="svg2"
version="1.1"><metadata
id="metadata8"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs6"><clipPath
id="clipPath26"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path24"
d="m 3288.76,3864.54 v 192.81 h 80.62 c 14.95,0 26.39,-1.57 34.26,-4.75 19.43,-7.72 26.4,-29.72 26.4,-48.88 0,-26.08 -11.34,-46.8 -37.88,-54.26 7.23,-2.99 11.65,-5.23 16.32,-11.38 4.16,-5.47 9,-13.74 10.73,-17.84 l 23.51,-55.7 h -54.67 l -25.85,58.8 c -4.12,9.58 -8.56,19.3 -20.63,19.3 h -4.26 v -78.1 z m 48.55,114.45 h 20.45 c 12.66,0 23.72,6.44 23.72,19.93 0,15.33 -8.69,19.38 -22.89,19.38 h -21.28 z" /></clipPath><linearGradient
id="linearGradient34"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="406.29001"
x2="336.58701"
y1="388.98499"
x1="336.58701"><stop
id="stop28"
offset="0"
style="stop-opacity:1;stop-color:#ff9804" /><stop
id="stop30"
offset="0.390625"
style="stop-opacity:1;stop-color:#fab40d" /><stop
id="stop32"
offset="1"
style="stop-opacity:1;stop-color:#ffe315" /></linearGradient><clipPath
id="clipPath44"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path42"
d="m 3431.28,3960.81 c 0,52.23 21.72,99.78 80.88,99.78 59.35,0 81.39,-45.21 81.39,-98.21 0,-52.22 -19.31,-101.08 -79.5,-101.08 -60.49,0 -82.77,44.84 -82.77,99.51 z m 48.33,-0.13 c 0,-22.05 3.85,-54.67 32.88,-54.67 30.69,0 32.73,34.49 32.73,57.31 0,22.03 -4.89,52.29 -33.17,52.29 -28.6,0 -32.44,-33.41 -32.44,-54.93 z" /></clipPath><linearGradient
id="linearGradient52"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="406.63199"
x2="351.255"
y1="388.74701"
x1="351.255"><stop
id="stop46"
offset="0"
style="stop-opacity:1;stop-color:#ff9804" /><stop
id="stop48"
offset="0.390625"
style="stop-opacity:1;stop-color:#fab40d" /><stop
id="stop50"
offset="1"
style="stop-opacity:1;stop-color:#ffe315" /></linearGradient><clipPath
id="clipPath62"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path60"
d="m 3594.17,3928.32 45.93,3.54 c 1.75,-16.29 8.05,-32.58 27.44,-32.58 12,0 21.55,7.49 21.55,19.84 0,36.67 -89.02,14.42 -89.02,85.14 0,39.78 29.88,56.33 66.52,56.33 40.11,0 60.5,-17.75 64.48,-57.54 l -45.49,-3.32 c -1.96,14.29 -7.66,25.04 -23.69,25.04 -9.55,0 -16.98,-5.08 -16.98,-15.13 0,-10.22 11.6,-13.28 19.61,-15.35 21.14,-5.61 36.27,-11.31 45.38,-17.05 18.29,-11.49 26.2,-28.74 26.2,-49.91 0,-42.09 -28.08,-66.03 -69.25,-66.03 -46.41,0 -69.49,20.97 -72.68,67.02 z" /></clipPath><linearGradient
id="linearGradient70"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="406.63199"
x2="366.52499"
y1="388.74701"
x1="366.52499"><stop
id="stop64"
offset="0"
style="stop-opacity:1;stop-color:#ff9804" /><stop
id="stop66"
offset="0.390625"
style="stop-opacity:1;stop-color:#fab40d" /><stop
id="stop68"
offset="1"
style="stop-opacity:1;stop-color:#ffe315" /></linearGradient><clipPath
id="clipPath88"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path86"
d="m 2341.48,4057.35 h 90.97 c 29.09,0 47.07,-19.31 47.07,-48.02 0,-19.07 -7.78,-34.57 -25.64,-42.24 23.37,-6.87 32.88,-24.17 32.88,-47.7 0,-39.62 -25.02,-54.85 -61.45,-54.85 h -83.83 z m 48.94,-75.67 h 21.17 c 13.26,0 20.3,4.88 20.3,18.72 0,13.21 -7.51,17.9 -19.97,17.9 h -21.5 z m 0,-75.67 h 24.76 c 13.79,0 22.86,5.32 22.86,20.11 0,14.54 -9.87,18.93 -22.97,18.93 h -24.65 z" /></clipPath><linearGradient
id="linearGradient96"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="402.987"
x2="241.431"
y1="386.789"
x1="241.42999"><stop
id="stop90"
offset="0"
style="stop-opacity:1;stop-color:#c1bfbe" /><stop
id="stop92"
offset="0.601563"
style="stop-opacity:1;stop-color:#e7e7e5" /><stop
id="stop94"
offset="1"
style="stop-opacity:1;stop-color:#ffffff" /></linearGradient><clipPath
id="clipPath106"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path104"
d="m 2588.06,3896.31 h -55.01 l -7.91,-31.77 h -49.55 l 59.14,192.81 h 53.15 l 58.88,-192.81 h -50.84 z m -10.28,41.74 -17.15,69.31 -17.23,-69.31 z" /></clipPath><linearGradient
id="linearGradient114"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="402.987"
x2="256.13901"
y1="386.789"
x1="256.13901"><stop
id="stop108"
offset="0"
style="stop-opacity:1;stop-color:#c1bfbe" /><stop
id="stop110"
offset="0.601563"
style="stop-opacity:1;stop-color:#e7e7e5" /><stop
id="stop112"
offset="1"
style="stop-opacity:1;stop-color:#ffffff" /></linearGradient><clipPath
id="clipPath124"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path122"
d="m 2645.31,4057.35 h 44.93 l 58.41,-106.46 v 106.46 h 45.48 v -192.81 h -45.48 l -58.09,105.87 v -105.87 h -45.25 z" /></clipPath><linearGradient
id="linearGradient132"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="402.987"
x2="271.991"
y1="386.789"
x1="271.991"><stop
id="stop126"
offset="0"
style="stop-opacity:1;stop-color:#c1bfbe" /><stop
id="stop128"
offset="0.601563"
style="stop-opacity:1;stop-color:#e7e7e5" /><stop
id="stop130"
offset="1"
style="stop-opacity:1;stop-color:#ffffff" /></linearGradient><clipPath
id="clipPath142"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path140"
d="m 3135.34,4057.35 h 90.65 c 29.22,0 46.92,-19.54 46.92,-48.02 0,-18.95 -7.67,-34.54 -25.56,-42.24 23.43,-6.9 32.77,-24.33 32.77,-47.7 0,-39.35 -24.61,-54.85 -61.24,-54.85 h -83.54 z m 48.77,-75.67 h 21.11 c 13.32,0 20.23,4.98 20.23,18.72 0,13.12 -7.38,17.9 -19.9,17.9 h -21.44 z m 0,-75.67 h 24.68 c 13.87,0 22.78,5.42 22.78,20.11 0,14.46 -9.71,18.93 -22.89,18.93 h -24.57 z" /></clipPath><linearGradient
id="linearGradient150"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="406.29001"
x2="320.78601"
y1="388.98499"
x1="320.78601"><stop
id="stop144"
offset="0"
style="stop-opacity:1;stop-color:#ff9804" /><stop
id="stop146"
offset="0.390625"
style="stop-opacity:1;stop-color:#fab40d" /><stop
id="stop148"
offset="1"
style="stop-opacity:1;stop-color:#ffe315" /></linearGradient><clipPath
id="clipPath160"
clipPathUnits="userSpaceOnUse"><path
style="clip-rule:evenodd"
id="path158"
d="m 2888.59,3935.7 v 40.13 h 75.05 v -83.42 c -25.27,-21.15 -43.89,-31.11 -77.36,-31.11 -59.87,0 -82.62,45.29 -82.62,99.65 0,55.87 24.25,100.06 84.63,100.06 41.76,0 63.47,-12.8 73.16,-55 l -46.75,-10.32 c -3.7,13.98 -15.06,22.61 -27.43,22.61 -29.9,0 -34.89,-33.45 -34.89,-56.64 0,-24.94 4.36,-58.07 36.28,-58.07 12.81,0 21.84,5.36 31.98,12.65 v 19.46 z" /></clipPath><linearGradient
id="linearGradient168"
spreadMethod="pad"
gradientTransform="scale(10)"
gradientUnits="userSpaceOnUse"
y2="403.255"
x2="288.38599"
y1="386.47699"
x1="288.38501"><stop
id="stop162"
offset="0"
style="stop-opacity:1;stop-color:#c1bfbe" /><stop
id="stop164"
offset="0.601563"
style="stop-opacity:1;stop-color:#e7e7e5" /><stop
id="stop166"
offset="1"
style="stop-opacity:1;stop-color:#ffffff" /></linearGradient></defs><g
transform="matrix(1.3333333,0,0,-1.3333333,-307.19999,546.47465)"
id="g10"><g
transform="scale(0.1)"
id="g12"><g
id="g20"><g
clip-path="url(#clipPath26)"
id="g22"><path
id="path36"
style="fill:url(#linearGradient34);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3288.76,3864.54 v 192.81 h 80.62 c 14.95,0 26.39,-1.57 34.26,-4.75 19.43,-7.72 26.4,-29.72 26.4,-48.88 0,-26.08 -11.34,-46.8 -37.88,-54.26 7.23,-2.99 11.65,-5.23 16.32,-11.38 4.16,-5.47 9,-13.74 10.73,-17.84 l 23.51,-55.7 h -54.67 l -25.85,58.8 c -4.12,9.58 -8.56,19.3 -20.63,19.3 h -4.26 v -78.1 z m 48.55,114.45 h 20.45 c 12.66,0 23.72,6.44 23.72,19.93 0,15.33 -8.69,19.38 -22.89,19.38 h -21.28 v -39.31" /></g></g><g
id="g38"><g
clip-path="url(#clipPath44)"
id="g40"><path
id="path54"
style="fill:url(#linearGradient52);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3431.28,3960.81 c 0,52.23 21.72,99.78 80.88,99.78 59.35,0 81.39,-45.21 81.39,-98.21 0,-52.22 -19.31,-101.08 -79.5,-101.08 -60.49,0 -82.77,44.84 -82.77,99.51 z m 48.33,-0.13 c 0,-22.05 3.85,-54.67 32.88,-54.67 30.69,0 32.73,34.49 32.73,57.31 0,22.03 -4.89,52.29 -33.17,52.29 -28.6,0 -32.44,-33.41 -32.44,-54.93" /></g></g><g
id="g56"><g
clip-path="url(#clipPath62)"
id="g58"><path
id="path72"
style="fill:url(#linearGradient70);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3594.17,3928.32 45.93,3.54 c 1.75,-16.29 8.05,-32.58 27.44,-32.58 12,0 21.55,7.49 21.55,19.84 0,36.67 -89.02,14.42 -89.02,85.14 0,39.78 29.88,56.33 66.52,56.33 40.11,0 60.5,-17.75 64.48,-57.54 l -45.49,-3.32 c -1.96,14.29 -7.66,25.04 -23.69,25.04 -9.55,0 -16.98,-5.08 -16.98,-15.13 0,-10.22 11.6,-13.28 19.61,-15.35 21.14,-5.61 36.27,-11.31 45.38,-17.05 18.29,-11.49 26.2,-28.74 26.2,-49.91 0,-42.09 -28.08,-66.03 -69.25,-66.03 -46.41,0 -69.49,20.97 -72.68,67.02" /></g></g><path
id="path74"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3766.77,3866.33 v 16.31 h 13.18 v -16.31 h -13.18" /><path
id="path76"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3766.57,3919.74 1.54,14.28 c 9.52,-3.06 12.1,-12.31 12.1,-21.41 0,-11.46 -3.04,-23.94 -16.8,-23.94 -13.09,0 -17.07,11.61 -17.07,22.87 0,9.04 1.71,18.2 11.11,21.73 l 1.85,-14.14 c -3.06,-1.04 -3.9,-3.97 -3.9,-7.14 0,-5.6 3.58,-7.92 8.35,-7.92 4.31,0 7.53,2.63 7.53,7.69 0,3.76 -1.37,6.58 -4.71,7.98" /><path
id="path78"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3763.62,3938.47 c -12.38,0 -17.28,11.57 -17.28,21.9 0,10.45 4.45,22.11 17.09,22.11 12.62,0 17.28,-11.61 17.28,-22.08 0,-10.18 -4.77,-21.93 -17.09,-21.93 z m -0.02,15.24 c 4.52,0 8.01,2.06 8.01,6.75 0,4.81 -3.53,6.71 -8.12,6.71 -4.39,0 -7.87,-2.06 -7.87,-6.62 0,-4.68 3.41,-6.84 7.98,-6.84" /><path
id="path80"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3747.1,3990.46 v 13.72 h 4.78 c -4.03,3.97 -5.54,7.69 -5.54,13.28 0,4.9 1.11,8.92 5.54,11.65 -4,4.31 -5.54,7.47 -5.54,13.34 0,8.42 4.23,13.1 12.96,13.1 h 20.65 v -14.74 h -18.77 c -6.84,0 -7.36,-10.44 1.77,-10.44 h 17 v -14.74 h -18.1 c -3.24,0 -5.7,-0.93 -5.7,-4.63 0,-4.26 3.08,-5.81 7.03,-5.81 h 16.77 v -14.73 h -32.85" /><g
id="g82"><g
clip-path="url(#clipPath88)"
id="g84"><path
id="path98"
style="fill:url(#linearGradient96);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 2341.48,4057.35 h 90.97 c 29.09,0 47.07,-19.31 47.07,-48.02 0,-19.07 -7.78,-34.57 -25.64,-42.24 23.37,-6.87 32.88,-24.17 32.88,-47.7 0,-39.62 -25.02,-54.85 -61.45,-54.85 h -83.83 z m 48.94,-75.67 h 21.17 c 13.26,0 20.3,4.88 20.3,18.72 0,13.21 -7.51,17.9 -19.97,17.9 h -21.5 z m 0,-75.67 h 24.76 c 13.79,0 22.86,5.32 22.86,20.11 0,14.54 -9.87,18.93 -22.97,18.93 h -24.65 v -39.04" /></g></g><g
id="g100"><g
clip-path="url(#clipPath106)"
id="g102"><path
id="path116"
style="fill:url(#linearGradient114);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 2588.06,3896.31 h -55.01 l -7.91,-31.77 h -49.55 l 59.14,192.81 h 53.15 l 58.88,-192.81 h -50.84 z m -10.28,41.74 -17.15,69.31 -17.23,-69.31 z" /></g></g><g
id="g118"><g
clip-path="url(#clipPath124)"
id="g120"><path
id="path134"
style="fill:url(#linearGradient132);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 2645.31,4057.35 h 44.93 l 58.41,-106.46 v 106.46 h 45.48 v -192.81 h -45.48 l -58.09,105.87 v -105.87 h -45.25 v 192.81" /></g></g><g
id="g136"><g
clip-path="url(#clipPath142)"
id="g138"><path
id="path152"
style="fill:url(#linearGradient150);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3135.34,4057.35 h 90.65 c 29.22,0 46.92,-19.54 46.92,-48.02 0,-18.95 -7.67,-34.54 -25.56,-42.24 23.43,-6.9 32.77,-24.33 32.77,-47.7 0,-39.35 -24.61,-54.85 -61.24,-54.85 h -83.54 z m 48.77,-75.67 h 21.11 c 13.32,0 20.23,4.98 20.23,18.72 0,13.12 -7.38,17.9 -19.9,17.9 h -21.44 z m 0,-75.67 h 24.68 c 13.87,0 22.78,5.42 22.78,20.11 0,14.46 -9.71,18.93 -22.89,18.93 h -24.57 v -39.04" /></g></g><g
id="g154"><g
clip-path="url(#clipPath160)"
id="g156"><path
id="path170"
style="fill:url(#linearGradient168);fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 2888.59,3935.7 v 40.13 h 75.05 v -83.42 c -25.27,-21.15 -43.89,-31.11 -77.36,-31.11 -59.87,0 -82.62,45.29 -82.62,99.65 0,55.87 24.25,100.06 84.63,100.06 41.76,0 63.47,-12.8 73.16,-55 l -46.75,-10.32 c -3.7,13.98 -15.06,22.61 -27.43,22.61 -29.9,0 -34.89,-33.45 -34.89,-56.64 0,-24.94 4.36,-58.07 36.28,-58.07 12.81,0 21.84,5.36 31.98,12.65 v 19.46 h -32.05" /></g></g><path
id="path172"
style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 3033.44,3870.55 -0.17,-17.88 h 0.02 c 0,-0.36 -0.02,-0.69 -0.08,-1.02 -0.2,-1.67 -0.87,-3.18 -1.83,-4.35 -0.19,-0.22 -0.39,-0.43 -0.59,-0.62 -1.39,-1.35 -3.22,-2.16 -5.25,-2.15 v -0.03 l -0.63,0.04 -13.96,0.2 c -2.38,0.03 -4.44,1.15 -5.84,2.92 -1.12,1.43 -1.81,3.31 -1.79,5.32 l 0.16,17.57 h -5.99 c -3.24,0 -5.88,2.64 -5.88,5.88 v 114.48 c 0,7.55 2.07,14.17 5.52,19.29 l -0.3,-0.02 c -2.53,-0.24 -5.3,-1.8 -8.34,-4.59 -2.38,-2.19 -6.1,-2.04 -8.29,0.34 -1.08,1.18 -1.59,2.69 -1.54,4.18 -0.11,4.2 -0.94,7.19 -2.28,9.16 -1.11,1.64 -2.73,2.56 -4.62,2.88 -2.4,0.41 -5.29,-0.02 -8.36,-1.11 -6.2,-2.21 -12.66,-6.95 -17.38,-13 -1.99,-2.54 -5.67,-2.99 -8.22,-1 -1.76,1.37 -2.52,3.56 -2.16,5.62 h -0.02 c 2.8,15.92 10.36,29.35 20.37,39.79 11.13,11.62 25.35,19.52 39.36,22.99 2.28,0.75 4.38,0.95 6.27,0.68 1.99,-0.29 3.72,-1.08 5.13,-2.31 1.38,-1.19 2.38,-2.73 2.97,-4.53 0.6,-1.82 0.76,-3.91 0.46,-6.14 -1.38,-11.42 -0.94,-19.52 0.98,-26.13 1.64,-5.66 4.47,-10.48 8.23,-15.53 h 60.77 c 0.44,0 0.88,-0.02 1.31,-0.04 3.77,5.07 6.6,9.89 8.25,15.57 1.93,6.61 2.37,14.71 0.98,26.13 -0.29,2.23 -0.14,4.32 0.46,6.14 0.59,1.8 1.59,3.34 2.98,4.53 1.41,1.23 3.13,2.02 5.13,2.31 1.88,0.27 3.99,0.07 6.27,-0.68 14.01,-3.47 28.23,-11.37 39.35,-22.99 10.01,-10.44 17.58,-23.87 20.38,-39.79 h -0.02 c 0.36,-2.06 -0.4,-4.25 -2.16,-5.62 -2.55,-1.99 -6.23,-1.54 -8.23,1 -4.72,6.05 -11.18,10.79 -17.38,13 -3.06,1.09 -5.96,1.52 -8.36,1.11 -1.89,-0.32 -3.5,-1.24 -4.62,-2.88 -1.34,-1.97 -2.17,-4.96 -2.27,-9.16 0.05,-1.49 -0.46,-3 -1.55,-4.18 -2.19,-2.38 -5.9,-2.53 -8.29,-0.34 -3.03,2.79 -5.8,4.35 -8.34,4.59 -1.05,0.09 -2.12,-0.04 -3.23,-0.41 3.28,-5.06 5.23,-11.51 5.23,-18.86 v -114.48 c 0,-3.24 -2.63,-5.88 -5.87,-5.88 h -5.99 l 0.16,-17.57 c 0.02,-2 -0.67,-3.89 -1.8,-5.32 -1.39,-1.77 -3.46,-2.89 -5.83,-2.92 -4.84,-0.07 -9.74,-0.21 -14.58,-0.21 v -0.03 c -0.37,0 -0.72,0.04 -1.06,0.1 -1.91,0.27 -3.58,1.24 -4.79,2.7 -0.19,0.24 -0.36,0.48 -0.52,0.74 -0.84,1.28 -1.35,2.87 -1.37,4.55 v 0.07 h -0.03 l 0.02,0.48 -0.16,17.41 h -30.79" /><path
id="path174"
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
d="m 3027.64,3876.43 -0.22,-23.76 c -0.01,-1.28 -0.87,-2.3 -1.89,-2.29 l -14.51,0.22 c -1.03,0.01 -1.86,1.06 -1.85,2.33 l 0.22,23.5 h -11.9 v 114.48 c 0,9.73 3.96,17.43 9.86,21.5 -7.68,5.72 -15.09,4.6 -22.83,-2.5 -0.45,27.96 -28.88,19.95 -43.11,1.74 5.5,31.37 31.09,52.28 55.77,58.21 5.29,1.74 7.86,-1.23 7.17,-6.04 -2.96,-24.42 2.05,-35.32 12.18,-48.25 0.33,0.02 0.65,0.03 0.98,0.03 h 62.65 c 1.41,0 2.79,-0.17 4.12,-0.49 l 0.06,0.44 c 10.14,12.94 15.16,23.84 12.19,48.27 -0.69,4.81 1.89,7.78 7.17,6.04 24.69,-5.93 50.27,-26.84 55.78,-58.21 -14.23,18.21 -42.66,26.22 -43.12,-1.74 -7.97,7.32 -15.6,8.29 -23.54,1.95 -0.27,-0.28 -0.54,-0.53 -0.82,-0.76 4.96,-4.29 8.18,-11.41 8.18,-20.19 v -114.48 h -11.9 l 0.22,-23.5 c 0.01,-1.27 -0.82,-2.32 -1.85,-2.33 l -14.51,-0.22 c -1.03,-0.01 -1.88,1.01 -1.89,2.29 l -0.23,23.76 z m 57.15,73.46 c 0.85,0 1.55,0.86 1.55,1.91 v 39.1 c 0,4.4 -2.91,8 -6.47,8 h -62.07 c -3.56,0 -6.47,-3.6 -6.47,-8 v -39.1 c 0,-1.05 0.69,-1.91 1.55,-1.91 z m -6.2,-19.22 c -5.08,0 -9.2,-4.42 -9.2,-9.88 0,-5.45 4.12,-9.88 9.2,-9.88 5.08,0 9.19,4.43 9.19,9.88 0,5.46 -4.11,9.88 -9.19,9.88 z m -59.51,0 c 5.08,0 9.19,-4.42 9.19,-9.88 0,-5.45 -4.11,-9.88 -9.19,-9.88 -5.08,0 -9.2,4.43 -9.2,9.88 0,5.46 4.12,9.88 9.2,9.88" /></g></g></svg>

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

@ -0,0 +1,267 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
height="52.743801"
width="225.2"
id="svg107"
version="1.1"
viewBox="0 0 225.19999 52.7438">
<metadata
id="metadata111">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs7">
<style
id="style2">.cls-1{isolation:isolate}.cls-2{filter:url(#dropShadow)}.cls-3{fill:#b3b3b3}.cls-4{fill:#424242}.cls-5{fill:#333}.cls-6{fill:#f2f2f2}.cls-7,.cls-8{fill:#d49c6b}.cls-8{opacity:0.5}.cls-13,.cls-8{mix-blend-mode:multiply}.cls-9{opacity:0.25}.cls-10{fill:#fff}.cls-11{fill:#ff7cae}.cls-12,.cls-13{opacity:0.3}.cls-12{mix-blend-mode:overlay}.cls-13{fill:#ff7bac}.cls-14{fill:none}</style>
<filter
height="70"
width="70"
name="dropShadow"
id="dropShadow">
<feGaussianBlur
id="feGaussianBlur4"
stdDeviation="3" />
</filter>
</defs>
<g
transform="translate(-9.2213157,-6.6378787)"
style="isolation:isolate"
id="g105"
class="cls-1">
<g
data-name="Layer 2"
id="Layer_2">
<g
id="Final">
<g
id="g101">
<g
id="g97">
<g
id="g25"
transform="translate(0.45131569,1.6480917)">
<path
style="fill:#424242"
id="path21"
d="m 8.77,10 h 15.9 c 3.9,0 6.65,1 8.47,2.79 a 6.8,6.8 0 0 1 2,5 v 0.09 c 0,3.59 -2,5.71 -4.78,6.91 3.76,1.24 6.15,3.37 6.15,7.58 v 0.09 c 0,5.31 -4.34,8.55 -11.74,8.55 h -16 z m 13.78,12.36 c 2.61,0 4.07,-0.88 4.07,-2.7 v -0.09 c 0,-1.68 -1.33,-2.66 -3.9,-2.66 h -5.58 v 5.45 z m 1.24,11.75 c 2.61,0 4.12,-1 4.12,-2.84 v -0.09 c 0,-1.68 -1.33,-2.79 -4.21,-2.79 h -6.56 v 5.72 z"
class="cls-4" />
<path
style="fill:#424242"
id="path23"
d="m 36,10 h 8.59 v 23.48 h 15 V 41 H 36 Z"
class="cls-4" />
</g>
<g
id="g37"
transform="translate(0.45131569,1.6480917)">
<path
style="fill:#424242"
id="path27"
d="m 85.46,10 h 9.08 l 5.46,18 6,-18 h 7.4 l 6,18 5.32,-18 h 8.91 l -10.37,31.24 h -7.49 l -6.25,-17.86 -6.2,17.86 h -7.49 z"
class="cls-4" />
<path
style="fill:#424242"
id="path29"
d="m 132.6,10 h 13.3 c 7.84,0 12.89,4 12.89,10.9 V 21 c 0,7.31 -5.63,11.17 -13.34,11.17 H 141.2 V 41 h -8.6 z m 12.68,15.42 c 3.05,0 4.92,-1.59 4.92,-4 V 21.3 c 0,-2.66 -1.87,-4.08 -5,-4.08 h -4 v 8.2 z"
class="cls-4" />
<path
style="fill:#424242"
id="path31"
d="m 165.61,9.78 h 8.29 L 187.11,41 h -9.22 l -2.26,-5.54 h -12 L 161.45,41 h -9 z m 7.54,19 -3.46,-8.78 -3.5,8.82 z"
class="cls-4" />
<path
style="fill:#424242"
id="path33"
d="m 182.89,36.41 4.79,-5.72 a 16,16 0 0 0 10.06,3.73 c 2.3,0 3.54,-0.8 3.54,-2.13 V 32.2 c 0,-1.28 -1,-2 -5.23,-3 -6.6,-1.51 -11.69,-3.37 -11.69,-9.75 v -0.09 c 0,-5.76 4.56,-9.92 12,-9.92 a 19.55,19.55 0 0 1 12.77,4.12 l -4.3,6.07 a 15.61,15.61 0 0 0 -8.69,-3.06 c -2.08,0 -3.1,0.89 -3.1,2 v 0.09 c 0,1.41 1.06,2 5.36,3 7.14,1.55 11.57,3.85 11.57,9.66 v 0.09 c 0,6.33 -5,10.1 -12.54,10.1 a 21.68,21.68 0 0 1 -14.54,-5.1 z"
class="cls-4" />
<path
style="fill:#424242"
id="path35"
d="m 206.91,36.41 4.79,-5.72 a 15.93,15.93 0 0 0 10.05,3.73 c 2.31,0 3.55,-0.8 3.55,-2.13 V 32.2 c 0,-1.28 -1,-2 -5.23,-3 -6.6,-1.51 -11.7,-3.37 -11.7,-9.75 v -0.09 c 0,-5.76 4.57,-9.92 12,-9.92 a 19.54,19.54 0 0 1 12.76,4.12 l -4.3,6.07 a 15.56,15.56 0 0 0 -8.68,-3.06 c -2.08,0 -3.1,0.89 -3.1,2 v 0.09 c 0,1.41 1.06,2 5.36,3 7.13,1.55 11.56,3.85 11.56,9.66 v 0.09 c 0,6.33 -5,10.1 -12.54,10.1 a 21.67,21.67 0 0 1 -14.52,-5.1 z"
class="cls-4" />
</g>
<path
style="fill:#333333"
id="path39"
d="m 86.381316,12.718092 7.69,23.19 a 20.6,20.6 0 0 0 -5,-20.93 21.42,21.42 0 0 0 -2.69,-2.26 z"
class="cls-5" />
<g
id="g51"
transform="translate(0.45131569,1.6480917)">
<g
id="g47">
<rect
style="fill:#f2f2f2"
id="rect41"
ry="2.49"
rx="2.49"
height="17.35"
width="4.98"
y="33.119999"
x="64.489998"
class="cls-6" />
<rect
style="fill:#f2f2f2"
id="rect43"
ry="2.49"
rx="2.49"
height="17.35"
width="4.98"
y="37.349998"
x="70.669998"
class="cls-6" />
<path
style="fill:#f2f2f2"
id="path45"
d="m 84.58,11 a 20.59,20.59 0 0 0 -33.46,22.7 2.57,2.57 0 0 1 0.29,1.4 c 0,0.37 -0.71,1 -0.71,1 L 39.5,47.26 a 6.23,6.23 0 0 0 8.81,8.8 l 11.2,-11.2 c 0,0 0.64,-0.68 1,-0.74 A 2.49,2.49 0 0 1 61.88,44.45 20.58,20.58 0 0 0 84.58,11 Z"
class="cls-6" />
</g>
<path
style="fill:#f2f2f2"
id="path49"
d="m 70.07,44.6 a 0.62,0.62 0 0 0 -0.62,0.62 v 1.56 a 0.61,0.61 0 0 1 0.62,-0.61 0.61,0.61 0 0 1 0.61,0.61 V 45.22 A 0.61,0.61 0 0 0 70.07,44.6 Z"
class="cls-6" />
</g>
<rect
style="fill:#d49c6b"
id="rect53"
transform="rotate(45)"
ry="1.45"
rx="1.45"
height="32.299999"
width="2.9100001"
y="-24.514105"
x="67.596901"
class="cls-7" />
<path
style="opacity:0.5;mix-blend-mode:multiply;fill:#d49c6b"
id="path55"
d="m 70.841316,26.818092 a 1.47,1.47 0 0 0 -2.06,0 l -11.66,11.67 a 15.45,15.45 0 0 0 1.24,2.87 l 12.48,-12.48 a 1.45,1.45 0 0 0 0,-2.06 z"
class="cls-8" />
<g
style="opacity:0.25"
id="g59"
class="cls-9"
transform="translate(0.45131569,1.6480917)">
<path
style="fill:#ffffff"
id="path57"
d="M 43.17,51.5 64,30.72 a 1.44,1.44 0 0 1 2,0 l 0.14,0.16 a 1.46,1.46 0 0 0 -2.48,-1 L 42.88,50.63 a 1.45,1.45 0 0 0 -0.14,1.89 1.41,1.41 0 0 1 0.43,-1.02 z"
class="cls-10" />
</g>
<g
id="g85"
transform="translate(0.45131569,1.6480917)">
<circle
style="fill:#ff7cae"
id="circle61"
transform="rotate(-76.49,70.01807,25.547721)"
r="15.81"
cy="25.549999"
cx="70.019997"
class="cls-11" />
<g
id="g79">
<path
style="fill:#ffffff"
id="path63"
d="m 71,25.34 0.39,-0.12 a 10.29,10.29 0 0 0 1,-0.33 12,12 0 0 0 2.53,-1.33 13.23,13.23 0 0 0 2.76,-2.56 17.49,17.49 0 0 0 2.42,-4 24,24 0 0 0 1,-2.7 15.87,15.87 0 0 0 -5.65,-3.6 c 0.06,0.32 0.1,0.64 0.14,1 a 22.53,22.53 0 0 1 0.14,4.15 14.35,14.35 0 0 1 -0.7,3.62 11.28,11.28 0 0 1 -1.44,2.84 10.55,10.55 0 0 1 -1.72,1.9 8.71,8.71 0 0 1 -0.76,0.62 c -0.12,0.08 -0.22,0.17 -0.32,0.24 l -0.28,0.18 -0.52,0.34 0.61,-0.14 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path65"
d="m 70.53,24.73 c 0.07,-0.11 0.13,-0.23 0.2,-0.36 a 9.82,9.82 0 0 0 0.46,-0.92 12.64,12.64 0 0 0 0.81,-2.73 13.59,13.59 0 0 0 0.15,-3.84 17.91,17.91 0 0 0 -1.08,-4.5 25.6,25.6 0 0 0 -1.18,-2.65 15.85,15.85 0 0 0 -6.54,1.46 c 0.26,0.19 0.52,0.38 0.77,0.58 a 21.72,21.72 0 0 1 3,2.83 14,14 0 0 1 2.07,3.06 10.87,10.87 0 0 1 1,3 10.54,10.54 0 0 1 0.13,2.56 c 0,0.37 -0.06,0.69 -0.1,1 -0.04,0.31 0,0.28 -0.06,0.4 l -0.07,0.32 -0.13,0.61 0.33,-0.53 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path67"
d="m 69.81,24.61 c 0,-0.12 -0.08,-0.25 -0.12,-0.4 a 8.6,8.6 0 0 0 -0.33,-1 11.92,11.92 0 0 0 -1.36,-2.5 13.5,13.5 0 0 0 -2.61,-2.82 18,18 0 0 0 -4,-2.43 c -0.86,-0.38 -1.77,-0.72 -2.71,-1 a 15.71,15.71 0 0 0 -3.59,5.65 l 1,-0.13 a 21.71,21.71 0 0 1 4.15,-0.14 13.93,13.93 0 0 1 3.62,0.7 10.8,10.8 0 0 1 2.88,1.46 10.19,10.19 0 0 1 1.9,1.72 7.19,7.19 0 0 1 0.62,0.76 l 0.24,0.32 0.18,0.28 0.34,0.52 -0.14,-0.61 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path69"
d="M 69.21,25 68.85,24.81 C 68.58,24.67 68.28,24.5 67.92,24.35 a 11.52,11.52 0 0 0 -2.72,-0.85 13.27,13.27 0 0 0 -3.84,-0.15 17.88,17.88 0 0 0 -4.51,1.08 25.46,25.46 0 0 0 -2.64,1.18 15.73,15.73 0 0 0 1.45,6.54 l 0.58,-0.77 a 23.1,23.1 0 0 1 2.84,-3 14.24,14.24 0 0 1 3.05,-2.06 10.93,10.93 0 0 1 3,-1 10.49,10.49 0 0 1 2.56,-0.13 8.08,8.08 0 0 1 1,0.1 l 0.4,0.06 0.33,0.07 0.6,0.13 -0.52,-0.33 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path71"
d="m 69.08,25.76 -0.39,0.12 a 8.08,8.08 0 0 0 -1,0.33 11.7,11.7 0 0 0 -2.53,1.32 13.47,13.47 0 0 0 -2.82,2.61 17.94,17.94 0 0 0 -2.42,4 24.91,24.91 0 0 0 -1,2.71 15.85,15.85 0 0 0 5.65,3.59 c 0,-0.32 -0.1,-0.64 -0.14,-1 a 22.42,22.42 0 0 1 -0.14,-4.14 14.27,14.27 0 0 1 0.7,-3.62 10.94,10.94 0 0 1 3.16,-4.75 8.45,8.45 0 0 1 0.76,-0.61 l 0.32,-0.25 0.28,-0.18 0.52,-0.33 -0.6,0.13 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path73"
d="m 69.51,26.36 c -0.07,0.11 -0.13,0.23 -0.2,0.36 a 8.14,8.14 0 0 0 -0.45,0.93 11.81,11.81 0 0 0 -0.86,2.72 13.63,13.63 0 0 0 -0.15,3.84 17.88,17.88 0 0 0 1.08,4.51 25.46,25.46 0 0 0 1.18,2.64 15.54,15.54 0 0 0 6.54,-1.46 l -0.77,-0.57 a 22.39,22.39 0 0 1 -3,-2.84 14.18,14.18 0 0 1 -2.07,-3.05 11,11 0 0 1 -1,-3 11.12,11.12 0 0 1 -0.14,-2.56 c 0,-0.37 0.07,-0.69 0.11,-1 0.04,-0.31 0,-0.27 0,-0.39 l 0.07,-0.33 0.13,-0.6 -0.33,0.52 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path75"
d="m 70.23,26.49 c 0,0.12 0.08,0.25 0.12,0.39 a 10.18,10.18 0 0 0 0.33,1 11.61,11.61 0 0 0 1.32,2.51 13.4,13.4 0 0 0 2.6,2.82 17.94,17.94 0 0 0 4,2.42 24.91,24.91 0 0 0 2.71,1 15.87,15.87 0 0 0 3.56,-5.63 l -1,0.14 a 23.44,23.44 0 0 1 -4.15,0.14 14.35,14.35 0 0 1 -3.62,-0.7 11.11,11.11 0 0 1 -2.84,-1.44 10.93,10.93 0 0 1 -1.9,-1.72 8.71,8.71 0 0 1 -0.62,-0.76 L 70.5,26.33 70.32,26.06 70,25.55 l 0.14,0.6 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path77"
d="m 70.83,26.06 0.37,0.2 a 10,10 0 0 0 0.92,0.45 11.62,11.62 0 0 0 2.73,0.85 13.21,13.21 0 0 0 3.84,0.16 17.91,17.91 0 0 0 4.5,-1.08 25.57,25.57 0 0 0 2.64,-1.19 15.68,15.68 0 0 0 -1.45,-6.53 C 84.19,19.18 84,19.44 83.8,19.69 a 23.63,23.63 0 0 1 -2.83,3 14.55,14.55 0 0 1 -3.06,2.06 11,11 0 0 1 -3,1 10.59,10.59 0 0 1 -2.57,0.13 8.31,8.31 0 0 1 -1,-0.1 c -0.14,0 -0.28,0 -0.4,-0.06 L 70.62,25.66 70,25.55 l 0.52,0.33 z"
class="cls-10" />
</g>
<g
style="opacity:0.3;mix-blend-mode:overlay"
id="g83"
class="cls-12">
<path
style="fill:#ffffff"
id="path81"
d="m 57,26.58 a 1,1 0 0 1 -1,-1 14.13,14.13 0 0 1 14,-14.14 1.035,1.035 0 1 1 0,2.07 12,12 0 0 0 -12,12 1,1 0 0 1 -1,1.07 z"
class="cls-10" />
</g>
</g>
<path
style="opacity:0.3;mix-blend-mode:multiply;fill:#ff7bac"
id="path87"
d="m 86.221316,25.778092 a 15.81,15.81 0 0 1 -31.5,0 15.81,15.81 0 1 0 31.5,0 z"
class="cls-13" />
<g
id="g95"
transform="translate(0.45131569,1.6480917)">
<path
style="fill:#ffffff"
id="path89"
d="m 39.68,47.43 11.2,-11.2 c 0,0 0.65,-0.6 0.71,-1 a 2.69,2.69 0 0 0 -0.3,-1.41 20.62,20.62 0 0 1 4.35,-22.7 20.59,20.59 0 0 1 29,-0.08 L 84.58,11 a 20.59,20.59 0 0 0 -33.46,22.7 2.57,2.57 0 0 1 0.29,1.4 c 0,0.37 -0.71,1 -0.71,1 L 39.5,47.26 a 6.24,6.24 0 0 0 0,8.8 l 0.1,0.08 a 6.22,6.22 0 0 1 0.08,-8.71 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path91"
d="M 70.85,52.38 V 46.9 a 0.62,0.62 0 0 0 -0.28,-0.45 0.63,0.63 0 0 1 0.1,0.28 v 5.48 a 2.5,2.5 0 0 0 0.83,1.84 2.51,2.51 0 0 1 -0.65,-1.67 z"
class="cls-10" />
<path
style="fill:#ffffff"
id="path93"
d="M 64.66,48.16 V 45.42 L 64.49,45.36 V 48 a 2.49,2.49 0 0 0 0.82,1.84 2.46,2.46 0 0 1 -0.65,-1.68 z"
class="cls-10" />
</g>
</g>
<rect
style="fill:none"
y="0"
x="0"
id="rect99"
height="64.540001"
width="242.41"
class="cls-14" />
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -0,0 +1,320 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 225.19999 52.7438"
version="1.1"
id="svg107"
sodipodi:docname="blow-pass_light.svg"
width="225.2"
height="52.743801"
inkscape:version="0.92.4 5da689c313, 2019-01-14">
<metadata
id="metadata111">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1026"
id="namedview109"
showgrid="false"
inkscape:zoom="13.954865"
inkscape:cx="81.968726"
inkscape:cy="32.210155"
inkscape:window-x="1230"
inkscape:window-y="930"
inkscape:window-maximized="1"
inkscape:current-layer="g101"
fit-margin-top="0"
fit-margin-left="0"
fit-margin-right="0"
fit-margin-bottom="0" />
<defs
id="defs7">
<style
id="style2">.cls-1{isolation:isolate}.cls-2{filter:url(#dropShadow)}.cls-3{fill:#b3b3b3}.cls-4{fill:#424242}.cls-5{fill:#333}.cls-6{fill:#f2f2f2}.cls-7,.cls-8{fill:#d49c6b}.cls-8{opacity:0.5}.cls-13,.cls-8{mix-blend-mode:multiply}.cls-9{opacity:0.25}.cls-10{fill:#fff}.cls-11{fill:#ff7cae}.cls-12,.cls-13{opacity:0.3}.cls-12{mix-blend-mode:overlay}.cls-13{fill:#ff7bac}.cls-14{fill:none}</style>
<filter
id="dropShadow"
name="dropShadow"
width="70"
height="70">
<feGaussianBlur
stdDeviation="3"
id="feGaussianBlur4" />
</filter>
</defs>
<g
class="cls-1"
id="g105"
style="isolation:isolate"
transform="translate(-9.2213157,-6.6378787)">
<g
id="Layer_2"
data-name="Layer 2">
<g
id="Final">
<g
id="g101">
<g
id="g97">
<g
transform="translate(0.45131569,1.6480917)"
id="g25">
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 8.77,10 h 15.9 c 3.9,0 6.65,1 8.47,2.79 a 6.8,6.8 0 0 1 2,5 v 0.09 c 0,3.59 -2,5.71 -4.78,6.91 3.76,1.24 6.15,3.37 6.15,7.58 v 0.09 c 0,5.31 -4.34,8.55 -11.74,8.55 h -16 z m 13.78,12.36 c 2.61,0 4.07,-0.88 4.07,-2.7 v -0.09 c 0,-1.68 -1.33,-2.66 -3.9,-2.66 h -5.58 v 5.45 z m 1.24,11.75 c 2.61,0 4.12,-1 4.12,-2.84 v -0.09 c 0,-1.68 -1.33,-2.79 -4.21,-2.79 h -6.56 v 5.72 z"
id="path21"
style="fill:#ffffff;fill-opacity:1" />
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 36,10 h 8.59 v 23.48 h 15 V 41 H 36 Z"
id="path23"
style="fill:#ffffff;fill-opacity:1" />
</g>
<g
transform="translate(0.45131569,1.6480917)"
id="g37">
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 85.46,10 h 9.08 l 5.46,18 6,-18 h 7.4 l 6,18 5.32,-18 h 8.91 l -10.37,31.24 h -7.49 l -6.25,-17.86 -6.2,17.86 h -7.49 z"
id="path27"
style="fill:#ffffff;fill-opacity:1" />
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 132.6,10 h 13.3 c 7.84,0 12.89,4 12.89,10.9 V 21 c 0,7.31 -5.63,11.17 -13.34,11.17 H 141.2 V 41 h -8.6 z m 12.68,15.42 c 3.05,0 4.92,-1.59 4.92,-4 V 21.3 c 0,-2.66 -1.87,-4.08 -5,-4.08 h -4 v 8.2 z"
id="path29"
style="fill:#ffffff;fill-opacity:1" />
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 165.61,9.78 h 8.29 L 187.11,41 h -9.22 l -2.26,-5.54 h -12 L 161.45,41 h -9 z m 7.54,19 -3.46,-8.78 -3.5,8.82 z"
id="path31"
style="fill:#ffffff;fill-opacity:1" />
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 182.89,36.41 4.79,-5.72 a 16,16 0 0 0 10.06,3.73 c 2.3,0 3.54,-0.8 3.54,-2.13 V 32.2 c 0,-1.28 -1,-2 -5.23,-3 -6.6,-1.51 -11.69,-3.37 -11.69,-9.75 v -0.09 c 0,-5.76 4.56,-9.92 12,-9.92 a 19.55,19.55 0 0 1 12.77,4.12 l -4.3,6.07 a 15.61,15.61 0 0 0 -8.69,-3.06 c -2.08,0 -3.1,0.89 -3.1,2 v 0.09 c 0,1.41 1.06,2 5.36,3 7.14,1.55 11.57,3.85 11.57,9.66 v 0.09 c 0,6.33 -5,10.1 -12.54,10.1 a 21.68,21.68 0 0 1 -14.54,-5.1 z"
id="path33"
style="fill:#ffffff;fill-opacity:1" />
<path
inkscape:connector-curvature="0"
class="cls-4"
d="m 206.91,36.41 4.79,-5.72 a 15.93,15.93 0 0 0 10.05,3.73 c 2.31,0 3.55,-0.8 3.55,-2.13 V 32.2 c 0,-1.28 -1,-2 -5.23,-3 -6.6,-1.51 -11.7,-3.37 -11.7,-9.75 v -0.09 c 0,-5.76 4.57,-9.92 12,-9.92 a 19.54,19.54 0 0 1 12.76,4.12 l -4.3,6.07 a 15.56,15.56 0 0 0 -8.68,-3.06 c -2.08,0 -3.1,0.89 -3.1,2 v 0.09 c 0,1.41 1.06,2 5.36,3 7.13,1.55 11.56,3.85 11.56,9.66 v 0.09 c 0,6.33 -5,10.1 -12.54,10.1 a 21.67,21.67 0 0 1 -14.52,-5.1 z"
id="path35"
style="fill:#ffffff;fill-opacity:1" />
</g>
<path
inkscape:connector-curvature="0"
class="cls-5"
d="m 86.381316,12.718092 7.69,23.19 a 20.6,20.6 0 0 0 -5,-20.93 21.42,21.42 0 0 0 -2.69,-2.26 z"
id="path39"
style="fill:#e5e5e5;fill-opacity:1" />
<g
transform="translate(0.45131569,1.6480917)"
id="g51">
<g
id="g47">
<rect
class="cls-6"
x="64.489998"
y="33.119999"
width="4.98"
height="17.35"
rx="2.49"
ry="2.49"
id="rect41"
style="fill:#f2f2f2" />
<rect
class="cls-6"
x="70.669998"
y="37.349998"
width="4.98"
height="17.35"
rx="2.49"
ry="2.49"
id="rect43"
style="fill:#f2f2f2" />
<path
inkscape:connector-curvature="0"
class="cls-6"
d="m 84.58,11 a 20.59,20.59 0 0 0 -33.46,22.7 2.57,2.57 0 0 1 0.29,1.4 c 0,0.37 -0.71,1 -0.71,1 L 39.5,47.26 a 6.23,6.23 0 0 0 8.81,8.8 l 11.2,-11.2 c 0,0 0.64,-0.68 1,-0.74 A 2.49,2.49 0 0 1 61.88,44.45 20.58,20.58 0 0 0 84.58,11 Z"
id="path45"
style="fill:#f2f2f2" />
</g>
<path
inkscape:connector-curvature="0"
class="cls-6"
d="m 70.07,44.6 a 0.62,0.62 0 0 0 -0.62,0.62 v 1.56 a 0.61,0.61 0 0 1 0.62,-0.61 0.61,0.61 0 0 1 0.61,0.61 V 45.22 A 0.61,0.61 0 0 0 70.07,44.6 Z"
id="path49"
style="fill:#f2f2f2" />
</g>
<rect
class="cls-7"
x="67.596901"
y="-24.514105"
width="2.9100001"
height="32.299999"
rx="1.45"
ry="1.45"
transform="rotate(45)"
id="rect53"
style="fill:#d49c6b" />
<path
inkscape:connector-curvature="0"
class="cls-8"
d="m 70.841316,26.818092 a 1.47,1.47 0 0 0 -2.06,0 l -11.66,11.67 a 15.45,15.45 0 0 0 1.24,2.87 l 12.48,-12.48 a 1.45,1.45 0 0 0 0,-2.06 z"
id="path55"
style="opacity:0.5;mix-blend-mode:multiply;fill:#d49c6b" />
<g
transform="translate(0.45131569,1.6480917)"
class="cls-9"
id="g59"
style="opacity:0.25">
<path
inkscape:connector-curvature="0"
class="cls-10"
d="M 43.17,51.5 64,30.72 a 1.44,1.44 0 0 1 2,0 l 0.14,0.16 a 1.46,1.46 0 0 0 -2.48,-1 L 42.88,50.63 a 1.45,1.45 0 0 0 -0.14,1.89 1.41,1.41 0 0 1 0.43,-1.02 z"
id="path57"
style="fill:#ffffff" />
</g>
<g
transform="translate(0.45131569,1.6480917)"
id="g85">
<circle
class="cls-11"
cx="70.019997"
cy="25.549999"
r="15.81"
transform="rotate(-76.49,70.01807,25.547721)"
id="circle61"
style="fill:#ff7cae" />
<g
id="g79">
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 71,25.34 0.39,-0.12 a 10.29,10.29 0 0 0 1,-0.33 12,12 0 0 0 2.53,-1.33 13.23,13.23 0 0 0 2.76,-2.56 17.49,17.49 0 0 0 2.42,-4 24,24 0 0 0 1,-2.7 15.87,15.87 0 0 0 -5.65,-3.6 c 0.06,0.32 0.1,0.64 0.14,1 a 22.53,22.53 0 0 1 0.14,4.15 14.35,14.35 0 0 1 -0.7,3.62 11.28,11.28 0 0 1 -1.44,2.84 10.55,10.55 0 0 1 -1.72,1.9 8.71,8.71 0 0 1 -0.76,0.62 c -0.12,0.08 -0.22,0.17 -0.32,0.24 l -0.28,0.18 -0.52,0.34 0.61,-0.14 z"
id="path63"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 70.53,24.73 c 0.07,-0.11 0.13,-0.23 0.2,-0.36 a 9.82,9.82 0 0 0 0.46,-0.92 12.64,12.64 0 0 0 0.81,-2.73 13.59,13.59 0 0 0 0.15,-3.84 17.91,17.91 0 0 0 -1.08,-4.5 25.6,25.6 0 0 0 -1.18,-2.65 15.85,15.85 0 0 0 -6.54,1.46 c 0.26,0.19 0.52,0.38 0.77,0.58 a 21.72,21.72 0 0 1 3,2.83 14,14 0 0 1 2.07,3.06 10.87,10.87 0 0 1 1,3 10.54,10.54 0 0 1 0.13,2.56 c 0,0.37 -0.06,0.69 -0.1,1 -0.04,0.31 0,0.28 -0.06,0.4 l -0.07,0.32 -0.13,0.61 0.33,-0.53 z"
id="path65"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 69.81,24.61 c 0,-0.12 -0.08,-0.25 -0.12,-0.4 a 8.6,8.6 0 0 0 -0.33,-1 11.92,11.92 0 0 0 -1.36,-2.5 13.5,13.5 0 0 0 -2.61,-2.82 18,18 0 0 0 -4,-2.43 c -0.86,-0.38 -1.77,-0.72 -2.71,-1 a 15.71,15.71 0 0 0 -3.59,5.65 l 1,-0.13 a 21.71,21.71 0 0 1 4.15,-0.14 13.93,13.93 0 0 1 3.62,0.7 10.8,10.8 0 0 1 2.88,1.46 10.19,10.19 0 0 1 1.9,1.72 7.19,7.19 0 0 1 0.62,0.76 l 0.24,0.32 0.18,0.28 0.34,0.52 -0.14,-0.61 z"
id="path67"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="M 69.21,25 68.85,24.81 C 68.58,24.67 68.28,24.5 67.92,24.35 a 11.52,11.52 0 0 0 -2.72,-0.85 13.27,13.27 0 0 0 -3.84,-0.15 17.88,17.88 0 0 0 -4.51,1.08 25.46,25.46 0 0 0 -2.64,1.18 15.73,15.73 0 0 0 1.45,6.54 l 0.58,-0.77 a 23.1,23.1 0 0 1 2.84,-3 14.24,14.24 0 0 1 3.05,-2.06 10.93,10.93 0 0 1 3,-1 10.49,10.49 0 0 1 2.56,-0.13 8.08,8.08 0 0 1 1,0.1 l 0.4,0.06 0.33,0.07 0.6,0.13 -0.52,-0.33 z"
id="path69"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 69.08,25.76 -0.39,0.12 a 8.08,8.08 0 0 0 -1,0.33 11.7,11.7 0 0 0 -2.53,1.32 13.47,13.47 0 0 0 -2.82,2.61 17.94,17.94 0 0 0 -2.42,4 24.91,24.91 0 0 0 -1,2.71 15.85,15.85 0 0 0 5.65,3.59 c 0,-0.32 -0.1,-0.64 -0.14,-1 a 22.42,22.42 0 0 1 -0.14,-4.14 14.27,14.27 0 0 1 0.7,-3.62 10.94,10.94 0 0 1 3.16,-4.75 8.45,8.45 0 0 1 0.76,-0.61 l 0.32,-0.25 0.28,-0.18 0.52,-0.33 -0.6,0.13 z"
id="path71"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 69.51,26.36 c -0.07,0.11 -0.13,0.23 -0.2,0.36 a 8.14,8.14 0 0 0 -0.45,0.93 11.81,11.81 0 0 0 -0.86,2.72 13.63,13.63 0 0 0 -0.15,3.84 17.88,17.88 0 0 0 1.08,4.51 25.46,25.46 0 0 0 1.18,2.64 15.54,15.54 0 0 0 6.54,-1.46 l -0.77,-0.57 a 22.39,22.39 0 0 1 -3,-2.84 14.18,14.18 0 0 1 -2.07,-3.05 11,11 0 0 1 -1,-3 11.12,11.12 0 0 1 -0.14,-2.56 c 0,-0.37 0.07,-0.69 0.11,-1 0.04,-0.31 0,-0.27 0,-0.39 l 0.07,-0.33 0.13,-0.6 -0.33,0.52 z"
id="path73"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 70.23,26.49 c 0,0.12 0.08,0.25 0.12,0.39 a 10.18,10.18 0 0 0 0.33,1 11.61,11.61 0 0 0 1.32,2.51 13.4,13.4 0 0 0 2.6,2.82 17.94,17.94 0 0 0 4,2.42 24.91,24.91 0 0 0 2.71,1 15.87,15.87 0 0 0 3.56,-5.63 l -1,0.14 a 23.44,23.44 0 0 1 -4.15,0.14 14.35,14.35 0 0 1 -3.62,-0.7 11.11,11.11 0 0 1 -2.84,-1.44 10.93,10.93 0 0 1 -1.9,-1.72 8.71,8.71 0 0 1 -0.62,-0.76 L 70.5,26.33 70.32,26.06 70,25.55 l 0.14,0.6 z"
id="path75"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 70.83,26.06 0.37,0.2 a 10,10 0 0 0 0.92,0.45 11.62,11.62 0 0 0 2.73,0.85 13.21,13.21 0 0 0 3.84,0.16 17.91,17.91 0 0 0 4.5,-1.08 25.57,25.57 0 0 0 2.64,-1.19 15.68,15.68 0 0 0 -1.45,-6.53 C 84.19,19.18 84,19.44 83.8,19.69 a 23.63,23.63 0 0 1 -2.83,3 14.55,14.55 0 0 1 -3.06,2.06 11,11 0 0 1 -3,1 10.59,10.59 0 0 1 -2.57,0.13 8.31,8.31 0 0 1 -1,-0.1 c -0.14,0 -0.28,0 -0.4,-0.06 L 70.62,25.66 70,25.55 l 0.52,0.33 z"
id="path77"
style="fill:#ffffff" />
</g>
<g
class="cls-12"
id="g83"
style="opacity:0.3;mix-blend-mode:overlay">
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 57,26.58 a 1,1 0 0 1 -1,-1 14.13,14.13 0 0 1 14,-14.14 1.035,1.035 0 1 1 0,2.07 12,12 0 0 0 -12,12 1,1 0 0 1 -1,1.07 z"
id="path81"
style="fill:#ffffff" />
</g>
</g>
<path
inkscape:connector-curvature="0"
class="cls-13"
d="m 86.221316,25.778092 a 15.81,15.81 0 0 1 -31.5,0 15.81,15.81 0 1 0 31.5,0 z"
id="path87"
style="opacity:0.3;mix-blend-mode:multiply;fill:#ff7bac" />
<g
transform="translate(0.45131569,1.6480917)"
id="g95">
<path
inkscape:connector-curvature="0"
class="cls-10"
d="m 39.68,47.43 11.2,-11.2 c 0,0 0.65,-0.6 0.71,-1 a 2.69,2.69 0 0 0 -0.3,-1.41 20.62,20.62 0 0 1 4.35,-22.7 20.59,20.59 0 0 1 29,-0.08 L 84.58,11 a 20.59,20.59 0 0 0 -33.46,22.7 2.57,2.57 0 0 1 0.29,1.4 c 0,0.37 -0.71,1 -0.71,1 L 39.5,47.26 a 6.24,6.24 0 0 0 0,8.8 l 0.1,0.08 a 6.22,6.22 0 0 1 0.08,-8.71 z"
id="path89"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="M 70.85,52.38 V 46.9 a 0.62,0.62 0 0 0 -0.28,-0.45 0.63,0.63 0 0 1 0.1,0.28 v 5.48 a 2.5,2.5 0 0 0 0.83,1.84 2.51,2.51 0 0 1 -0.65,-1.67 z"
id="path91"
style="fill:#ffffff" />
<path
inkscape:connector-curvature="0"
class="cls-10"
d="M 64.66,48.16 V 45.42 L 64.49,45.36 V 48 a 2.49,2.49 0 0 0 0.82,1.84 2.46,2.46 0 0 1 -0.65,-1.68 z"
id="path93"
style="fill:#ffffff" />
</g>
</g>
<rect
class="cls-14"
width="242.41"
height="64.540001"
id="rect99"
x="0"
y="0"
style="fill:none" />
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 885 B

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1931,6 +1931,12 @@ const sites = [
url: 'https://www.naughtyamerica.com/site/big-cock-bully',
network: 'naughtyamerica',
},
{
slug: 'bigcockhero',
name: 'Big Cock Hero',
url: 'https://www.naughtyamerica.com/site/big-cock-hero',
network: 'naughtyamerica',
},
{
slug: 'mysistershotfriend',
name: "My Sister's Hot Friend",
@ -3081,6 +3087,7 @@ const sites = [
name: 'Ashley Sage Ellison',
slug: 'ashleysageellison',
url: 'https://www.bigboobbundle.com/ashleysageellison',
parameters: { path: '/videos', actors: ['Ashley Sage Ellison'] },
network: 'score',
},
{
@ -3088,12 +3095,14 @@ const sites = [
slug: 'autumnjade',
url: 'https://www.bigboobbundle.com/autumn-jade',
network: 'score',
parameters: { path: '/videos', actors: ['Autumn Jade'] },
},
{
name: 'Big Boob Bundle',
slug: 'bigboobbundle',
url: 'https://www.bigboobbundle.com',
network: 'score',
enabled: false, // all content appears to be on subsites
},
{
name: 'Big Boobs POV',
@ -3105,12 +3114,14 @@ const sites = [
name: 'Big Tit Angela White',
slug: 'bigtitangelawhite',
url: 'https://www.bigboobbundle.com/bigtitangelawhite',
parameters: { path: '/videos', actors: ['Angela White'] }, // no dates available
network: 'score',
},
{
name: 'Big Tit Hitomi',
slug: 'bigtithitomi',
url: 'https://www.bigboobbundle.com/bigtithitomi',
parameters: { path: '/videos', actors: ['Hitomi'] },
network: 'score',
},
{
@ -3123,6 +3134,7 @@ const sites = [
name: 'Big Tit Terry Nova',
slug: 'bigtitterrynova',
url: 'https://www.bigboobbundle.com/bigtitterrynova',
parameters: { path: '/videos', actors: ['Terry Nova'] },
network: 'score',
},
{

View File

@ -437,19 +437,18 @@ async function scrapeBasicActors() {
}
async function associateActors(mappedActors, releases) {
const actorNames = Object.keys(mappedActors);
const actorSlugs = actorNames.map(name => slugify(name));
const actorMap = Object.keys(mappedActors).reduce((acc, actorName) => ({ ...acc, [actorName]: slugify(actorName) }), {});
const [existingActorEntries, existingAssociationEntries] = await Promise.all([
knex('actors')
.whereIn('name', actorNames)
.orWhereIn('slug', actorSlugs),
.whereIn('name', Object.keys(actorMap))
.orWhereIn('slug', Object.values(actorMap)),
knex('releases_actors').whereIn('release_id', releases.map(release => release.id)),
]);
const associations = await Promise.map(Object.entries(mappedActors), async ([actorName, releaseIds]) => {
try {
const actorEntry = existingActorEntries.find(actor => actor.name === actorName)
const actorEntry = existingActorEntries.find(actor => actor.slug === actorMap[actorName])
|| await storeActor({ name: actorName });
return releaseIds
@ -469,7 +468,7 @@ async function associateActors(mappedActors, releases) {
await knex('releases_actors').insert(associations.filter(association => association).flat());
// basic actor scraping is failure prone, don't together with actor association
// basic actor scraping is failure prone, don't run together with actor association
// await scrapebasicactors(),
}

View File

@ -6,7 +6,7 @@ const cheerio = require('cheerio');
const moment = require('moment');
const slugify = require('../utils/slugify');
const { ex } = require('../utils/q');
const { ex, get } = require('../utils/q');
function titleExtractor(pathname) {
const components = pathname.split('/')[2].split('-');
@ -100,7 +100,13 @@ function scrapeScene(html, url, site) {
};
}
function scrapeProfile(html) {
async function fetchActorReleases(url) {
const { qus } = await get(url);
return qus('.contain-block:not(.live-scenes) .scene-item > a:first-child'); // live scenes repeat on all pages
}
async function scrapeProfile(html) {
const { q, qus } = ex(html);
const profile = {};
@ -109,7 +115,11 @@ function scrapeProfile(html) {
const avatar = q('img.performer-pic', 'src');
if (avatar) profile.avatar = `https:${avatar}`;
profile.releases = qus('.scene-item > a:first-child');
const releases = qus('.scene-item > a:first-child');
const otherPages = qus('.pagination a:not([rel=next]):not([rel=prev])');
const olderReleases = await Promise.all(otherPages.map(async page => fetchActorReleases(page)));
profile.releases = releases.concat(olderReleases.flat());
return profile;
}

View File

@ -28,7 +28,7 @@ async function fetchPhotos(url) {
return [];
}
function scrapeAll(html) {
function scrapeAll(html, site) {
return exa(html, '.container .video, .container-fluid .video').map(({ q, qa, qd, ql }) => {
const release = {};
@ -45,8 +45,8 @@ function scrapeAll(html) {
release.date = qd('.i-date', 'MMM DD', /\w+ \d{1,2}$/)
|| qd('.dt-box', 'MMM.DD YYYY');
release.actors = qa('.model, .i-model', true);
release.duration = ql('.i-amount');
release.actors = site.parameters?.actors || qa('.model, .i-model', true);
release.duration = ql('.i-amount, .amount');
const posterEl = q('.item-img img');
@ -64,20 +64,40 @@ function scrapeAll(html) {
}).filter(Boolean);
}
async function scrapeScene(html, url) {
const { q, qa, qtext, qi, qd, ql, qu, qis, qp, qt } = ex(html, '#videos-page, #content');
async function scrapeScene(html, url, site) {
const { q, qa, qtext, qi, qd, ql, qu, qis, qp } = ex(html, '#videos-page, #content');
const release = {};
[release.entryId] = new URL(url).pathname.split('/').slice(-2);
release.title = q('h2.text-uppercase, h2.title, #breadcrumb-top + h1', true);
release.title = q('h2.text-uppercase, h2.title, #breadcrumb-top + h1', true)
|| q('h1.m-title', true)?.split('»').slice(-1)[0].trim();
release.description = qtext('.p-desc, .desc');
release.actors = qa('.value a[href*=models], .value a[href*=performer], .value a[href*=teen-babes]', true);
if (release.actors.length === 0) {
const actorEl = qa('.stat').find(stat => /Featuring/.test(stat.textContent))
const actorString = qtext(actorEl);
console.log(actorString);
/*
?.split(/, and|,/g)
.map(actor => actor.trim())
|| [];
*/
}
console.log(release.actors);
if (release.actors.length === 0) release.actors = site.parameters?.actors;
release.tags = qa('a[href*=tag]', true);
const dateEl = qa('.value').find(el => /\w+ \d+\w+, \d{4}/.test(el.textContent));
release.date = qd(dateEl, null, 'MMMM Do, YYYY');
release.date = qd(dateEl, null, 'MMMM Do, YYYY')
|| qd('.date', 'MMMM Do, YYYY', /\w+ \d{1,2}\w+, \d{4}/)
|| qd('.info .holder', 'MM/DD/YYYY', /\d{2}\/\d{2}\/\d{4}/);
const durationEl = qa('value').find(el => /\d{1,3}:\d{2}/.test(el.textContent));
release.duration = ql(durationEl);
@ -94,25 +114,23 @@ async function scrapeScene(html, url) {
]);
}
const trailer = qt();
const trailers = qa('a[href*=Trailers]');
if (trailer) {
release.trailer = [
{
// don't rely on trailer always being 720p by default
src: trailer.replace(/\d+p\.mp4/, '720p.mp4'),
quality: 720,
},
{
src: trailer.replace(/\d+p\.mp4/, '360p.mp4'),
quality: 360,
},
];
if (trailers) {
release.trailer = trailers.map((trailer) => {
const src = `https:${trailer.href}`;
const format = trailer.textContent.trim().match(/^\w+/)[0].toLowerCase();
const quality = parseInt(trailer.textContent.trim().match(/\d+([a-zA-Z]+)?$/)[0], 10);
return format === 'mp4' ? { src, quality } : null;
}).filter(Boolean);
}
const stars = q('.rate-box').dataset.score;
if (stars) release.rating = { stars };
console.log(release);
return release;
}

View File

@ -60,21 +60,24 @@ function destructConfigNetworks(networks = []) {
}
async function findSiteByUrl(url) {
const { hostname } = new URL(url);
const domain = hostname.replace(/www.|tour./, '');
const { origin, pathname } = new URL(url);
// const domain = hostname.replace(/www.|tour./, '');
const dirUrl = `${origin}${pathname.split('/').slice(0, 2).join('/')}`; // allow for sites on URI directory
const sites = await knex('sites')
const site = await knex('sites')
.leftJoin('networks', 'sites.network_id', 'networks.id')
.select(
'sites.*',
'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
)
.where('sites.url', 'like', `%${domain}`)
.orWhere('sites.url', 'like', url)
.orWhere('sites.url', url);
.where('sites.url', url)
.orWhere('sites.url', origin)
.orWhere('sites.url', dirUrl)
// .orWhere('sites.url', 'like', `%${domain}`)
.first();
if (sites.length > 0) {
const curatedSite = curateSite(sites[0], true);
if (site) {
const curatedSite = curateSite(site, true);
return curatedSite;
}

View File

@ -5,7 +5,6 @@ const path = require('path');
const fs = require('fs-extra');
const argv = require('../argv');
const knex = require('../knex');
async function init() {
@ -26,6 +25,8 @@ async function init() {
return file;
}));
knex.destroy();
}
init();

View File

@ -2,6 +2,7 @@
const { JSDOM } = require('jsdom');
const moment = require('moment');
const bhttp = require('bhttp');
function prefixProtocol(url, protocol = 'https') {
if (protocol && /^\/\//.test(url)) {
@ -22,7 +23,7 @@ function q(context, selector, attrArg, trim = true) {
return trim ? value?.trim() : value;
}
return context.querySelector(selector);
return selector ? context.querySelector(selector) : context;
}
function qall(context, selector, attrArg, trim = true) {
@ -36,7 +37,7 @@ function qall(context, selector, attrArg, trim = true) {
}
function qtext(context, selector, trim = true) {
const el = q(context, selector, false, trim);
const el = q(context, selector, null, trim);
if (!el) return null;
const text = Array.from(el.childNodes)
@ -147,7 +148,7 @@ const funcs = {
qus: qurls,
};
function ctx(element, window) {
function init(element, window) {
if (!element) return null;
const contextFuncs = Object.entries(funcs) // dynamically attach methods with context
@ -166,30 +167,58 @@ function ctx(element, window) {
};
}
function ctxa(context, selector, window) {
return Array.from(context.querySelectorAll(selector)).map(element => ctx(element, window));
function initAll(context, selector, window) {
return Array.from(context.querySelectorAll(selector))
.map(element => init(element, window));
}
function ex(html, selector) {
function extract(html, selector) {
const { window } = new JSDOM(html);
if (selector) {
return ctx(window.document.querySelector(selector), window);
return init(window.document.querySelector(selector), window);
}
return ctx(window.document, window);
return init(window.document, window);
}
function exa(html, selector) {
function extractAll(html, selector) {
const { window } = new JSDOM(html);
return ctxa(window.document, selector, window);
return initAll(window.document, selector, window);
}
async function get(url, selector, headers, all = false) {
const res = await bhttp.get(url, {
headers,
});
if (res.statusCode === 200) {
return all
? extractAll(res.body.toString(), selector)
: extract(res.body.toString(), selector);
}
return null;
}
async function getAll(url, selector, headers) {
return get(url, selector, headers, true);
}
module.exports = {
ex,
exa,
ctx,
ctxa,
extract,
extractAll,
init,
initAll,
get,
getAll,
context: init,
contextAll: initAll,
ex: extract,
exa: extractAll,
ctx: init,
ctxa: initAll,
geta: getAll,
...funcs,
};