mirror of
https://github.com/typemill/typemill.git
synced 2025-01-17 05:18:19 +01:00
update dependencies, fix page meta, fix license-check for themes
This commit is contained in:
trendschau
parent
94609ac861
commit
5ccc2b3679
@ -26,7 +26,7 @@
|
||||
"vlucas/valitron": "^1.4",
|
||||
"symfony/yaml": "^5.4",
|
||||
"symfony/event-dispatcher": "^5.4",
|
||||
"erusev/parsedown": "^1.8.0-beta-4",
|
||||
"erusev/parsedown": "dev-master",
|
||||
"erusev/parsedown-extra": "dev-master",
|
||||
"jbroadway/urlify": "1.1.3",
|
||||
"laminas/laminas-permissions-acl": "^2.10",
|
||||
|
||||
95
composer.lock
generated
95
composer.lock
generated
@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "c3d172c51dcde3725ee22925a93865a5",
|
||||
"content-hash": "eb7c3aa9209071a36f2500b26a1c577c",
|
||||
"packages": [
|
||||
{
|
||||
"name": "akrabat/proxy-detection-middleware",
|
||||
@ -62,25 +62,26 @@
|
||||
},
|
||||
{
|
||||
"name": "erusev/parsedown",
|
||||
"version": "1.8.0-beta-7",
|
||||
"version": "dev-master",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/erusev/parsedown.git",
|
||||
"reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955"
|
||||
"reference": "999fcf788675b65b5344e2744443fc4d5f76cc14"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955",
|
||||
"reference": "fe7a50eceb4a3c867cc9fa9c0aa906b1067d1955",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown/zipball/999fcf788675b65b5344e2744443fc4d5f76cc14",
|
||||
"reference": "999fcf788675b65b5344e2744443fc4d5f76cc14",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-mbstring": "*",
|
||||
"php": ">=5.3.0"
|
||||
"php": ">=7.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35"
|
||||
"phpunit/phpunit": "^7.5|^8.5|^9.6"
|
||||
},
|
||||
"default-branch": true,
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
@ -106,9 +107,9 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/erusev/parsedown/issues",
|
||||
"source": "https://github.com/erusev/parsedown/tree/1.8.0-beta-7"
|
||||
"source": "https://github.com/erusev/parsedown/tree/master"
|
||||
},
|
||||
"time": "2019-03-17T18:47:21+00:00"
|
||||
"time": "2024-11-10T07:39:46+00:00"
|
||||
},
|
||||
{
|
||||
"name": "erusev/parsedown-extra",
|
||||
@ -116,22 +117,23 @@
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/erusev/parsedown-extra.git",
|
||||
"reference": "cd57cf183be7b56e90498091c0a7955ad4df223c"
|
||||
"reference": "acebd175967ac1224dc710ab6082e5a28c202c85"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/cd57cf183be7b56e90498091c0a7955ad4df223c",
|
||||
"reference": "cd57cf183be7b56e90498091c0a7955ad4df223c",
|
||||
"url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/acebd175967ac1224dc710ab6082e5a28c202c85",
|
||||
"reference": "acebd175967ac1224dc710ab6082e5a28c202c85",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"erusev/parsedown": "^1.8.0|^1.8.0-beta-4",
|
||||
"erusev/parsedown": "dev-master",
|
||||
"ext-dom": "*",
|
||||
"ext-libxml": "*",
|
||||
"ext-mbstring": "*",
|
||||
"php": ">=5.3.6"
|
||||
"php": ">=7.1"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^4.8.35"
|
||||
"phpunit/phpunit": "^7.5|^8.5|^9.6"
|
||||
},
|
||||
"default-branch": true,
|
||||
"type": "library",
|
||||
@ -148,7 +150,7 @@
|
||||
{
|
||||
"name": "Emanuil Rusev",
|
||||
"email": "hello@erusev.com",
|
||||
"homepage": "http://erusev.com"
|
||||
"homepage": "https://erusev.com"
|
||||
}
|
||||
],
|
||||
"description": "An extension of Parsedown that adds support for Markdown Extra.",
|
||||
@ -163,7 +165,7 @@
|
||||
"issues": "https://github.com/erusev/parsedown-extra/issues",
|
||||
"source": "https://github.com/erusev/parsedown-extra/tree/master"
|
||||
},
|
||||
"time": "2024-09-29T09:07:37+00:00"
|
||||
"time": "2024-11-03T08:25:00+00:00"
|
||||
},
|
||||
{
|
||||
"name": "fig/http-message-util",
|
||||
@ -406,16 +408,16 @@
|
||||
},
|
||||
{
|
||||
"name": "laravel/serializable-closure",
|
||||
"version": "v1.3.5",
|
||||
"version": "v1.3.6",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/laravel/serializable-closure.git",
|
||||
"reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c"
|
||||
"reference": "f865a58ea3a0107c336b7045104c75243fa59d96"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
|
||||
"reference": "1dc4a3dbfa2b7628a3114e43e32120cce7cdda9c",
|
||||
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/f865a58ea3a0107c336b7045104c75243fa59d96",
|
||||
"reference": "f865a58ea3a0107c336b7045104c75243fa59d96",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -463,7 +465,7 @@
|
||||
"issues": "https://github.com/laravel/serializable-closure/issues",
|
||||
"source": "https://github.com/laravel/serializable-closure"
|
||||
},
|
||||
"time": "2024-09-23T13:33:08+00:00"
|
||||
"time": "2024-11-11T17:06:04+00:00"
|
||||
},
|
||||
{
|
||||
"name": "nikic/fast-route",
|
||||
@ -1584,16 +1586,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher",
|
||||
"version": "v5.4.40",
|
||||
"version": "v5.4.45",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/event-dispatcher.git",
|
||||
"reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4"
|
||||
"reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/a54e2a8a114065f31020d6a89ede83e34c3b27a4",
|
||||
"reference": "a54e2a8a114065f31020d6a89ede83e34c3b27a4",
|
||||
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/72982eb416f61003e9bb6e91f8b3213600dcf9e9",
|
||||
"reference": "72982eb416f61003e9bb6e91f8b3213600dcf9e9",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1649,7 +1651,7 @@
|
||||
"description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.40"
|
||||
"source": "https://github.com/symfony/event-dispatcher/tree/v5.4.45"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1665,7 +1667,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-05-31T14:33:22+00:00"
|
||||
"time": "2024-09-25T14:11:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/event-dispatcher-contracts",
|
||||
@ -1748,16 +1750,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/finder",
|
||||
"version": "v5.4.43",
|
||||
"version": "v5.4.45",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/finder.git",
|
||||
"reference": "ae25a9145a900764158d439653d5630191155ca0"
|
||||
"reference": "63741784cd7b9967975eec610b256eed3ede022b"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/ae25a9145a900764158d439653d5630191155ca0",
|
||||
"reference": "ae25a9145a900764158d439653d5630191155ca0",
|
||||
"url": "https://api.github.com/repos/symfony/finder/zipball/63741784cd7b9967975eec610b256eed3ede022b",
|
||||
"reference": "63741784cd7b9967975eec610b256eed3ede022b",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -1791,7 +1793,7 @@
|
||||
"description": "Finds files and directories via an intuitive fluent interface",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/finder/tree/v5.4.43"
|
||||
"source": "https://github.com/symfony/finder/tree/v5.4.45"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -1807,7 +1809,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-08-13T14:03:51+00:00"
|
||||
"time": "2024-09-28T13:32:08+00:00"
|
||||
},
|
||||
{
|
||||
"name": "symfony/polyfill-ctype",
|
||||
@ -2126,16 +2128,16 @@
|
||||
},
|
||||
{
|
||||
"name": "symfony/yaml",
|
||||
"version": "v5.4.44",
|
||||
"version": "v5.4.45",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/yaml.git",
|
||||
"reference": "7025b964f123bbf1896d7563db6ec7f1f63e918a"
|
||||
"reference": "a454d47278cc16a5db371fe73ae66a78a633371e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/7025b964f123bbf1896d7563db6ec7f1f63e918a",
|
||||
"reference": "7025b964f123bbf1896d7563db6ec7f1f63e918a",
|
||||
"url": "https://api.github.com/repos/symfony/yaml/zipball/a454d47278cc16a5db371fe73ae66a78a633371e",
|
||||
"reference": "a454d47278cc16a5db371fe73ae66a78a633371e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2181,7 +2183,7 @@
|
||||
"description": "Loads and dumps YAML files",
|
||||
"homepage": "https://symfony.com",
|
||||
"support": {
|
||||
"source": "https://github.com/symfony/yaml/tree/v5.4.44"
|
||||
"source": "https://github.com/symfony/yaml/tree/v5.4.45"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -2197,20 +2199,20 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-16T14:36:56+00:00"
|
||||
"time": "2024-09-25T14:11:13+00:00"
|
||||
},
|
||||
{
|
||||
"name": "twig/twig",
|
||||
"version": "v3.11.1",
|
||||
"version": "v3.11.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/twigphp/Twig.git",
|
||||
"reference": "ff063afc691e1cfda6714f1915ed766cb108d188"
|
||||
"reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/ff063afc691e1cfda6714f1915ed766cb108d188",
|
||||
"reference": "ff063afc691e1cfda6714f1915ed766cb108d188",
|
||||
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
|
||||
"reference": "3b06600ff3abefaf8ff55d5c336cd1c4253f8c7e",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@ -2265,7 +2267,7 @@
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/twigphp/Twig/issues",
|
||||
"source": "https://github.com/twigphp/Twig/tree/v3.11.1"
|
||||
"source": "https://github.com/twigphp/Twig/tree/v3.11.3"
|
||||
},
|
||||
"funding": [
|
||||
{
|
||||
@ -2277,7 +2279,7 @@
|
||||
"type": "tidelift"
|
||||
}
|
||||
],
|
||||
"time": "2024-09-10T10:40:14+00:00"
|
||||
"time": "2024-11-07T12:34:41+00:00"
|
||||
},
|
||||
{
|
||||
"name": "vlucas/valitron",
|
||||
@ -2343,6 +2345,7 @@
|
||||
"aliases": [],
|
||||
"minimum-stability": "dev",
|
||||
"stability-flags": {
|
||||
"erusev/parsedown": 20,
|
||||
"erusev/parsedown-extra": 20
|
||||
},
|
||||
"prefer-stable": true,
|
||||
|
||||
@ -9,4 +9,4 @@ meta:
|
||||
time: 17-24-48
|
||||
hide: false
|
||||
noindex: false
|
||||
template: landingpage
|
||||
template: ''
|
||||
|
||||
@ -208,16 +208,24 @@ class License
|
||||
|
||||
public function checkIfTest(array $urlinfo)
|
||||
{
|
||||
$thishost = parse_url($urlinfo['baseurl'], PHP_URL_HOST);
|
||||
$thishost = str_replace("www.", "", $thishost);
|
||||
$test = substr($thishost, 0, 9);
|
||||
$thishost = parse_url($urlinfo['baseurl'], PHP_URL_HOST);
|
||||
$thishost = str_replace("www.", "", $thishost); // Remove "www."
|
||||
|
||||
if($test == 'localhost' OR $test == '127.0.0.1')
|
||||
{
|
||||
return true;
|
||||
}
|
||||
if ($thishost === 'localhost' || $thishost === '127.0.0.1')
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
$subdomains = ['typemilltest.', 'try.'];
|
||||
foreach ($subdomains as $subdomain)
|
||||
{
|
||||
if (strpos($thishost, $subdomain) === 0)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private function validateLicense($data)
|
||||
|
||||
@ -116,13 +116,26 @@ const app = Vue.createApp({
|
||||
<div :class="messageClass" class="block w-full h-8 px-3 py-1 my-1 text-white transition duration-100">{{ message }}</div>
|
||||
<div class="w-full mt-6 flex justify-between">
|
||||
<button type="submit" @click.prevent="save()" class="flex-1 p-3 bg-stone-700 dark:bg-stone-600 hover:bg-stone-900 hover:dark:bg-stone-900 text-white cursor-pointer transition duration-100">Save</button>
|
||||
<a v-if="!checkLicense(license, theme.license)" href="https://typemill.net/buy" target="_blank" class="flex-1 ml-3 p-3 py-4 text-center bg-teal-500 hover:bg-teal-600 text-white cursor-pointer transition duration-100">Buy a license</a>
|
||||
<a v-if="!checkLicense(license, theme.license)" href="https://typemill.net/license/buy" target="_blank" class="flex-1 ml-3 p-3 py-4 text-center bg-teal-500 hover:bg-teal-600 text-white cursor-pointer transition duration-100">Buy a license</a>
|
||||
<a v-else-if="theme.paypal" :href="theme.paypal" target="_blank" class="flex-1 ml-3 p-3 py-4 text-center bg-teal-500 hover:bg-teal-600 text-white cursor-pointer transition duration-100">Donate {{theme.amount}},-</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</li>
|
||||
</ul>
|
||||
<div class="my-5 text-center">
|
||||
<modal v-if="showModal" @close="showModal = false">
|
||||
<template #header>
|
||||
<h3>{{ $filters.translate('License required') }}</h3>
|
||||
</template>
|
||||
<template #body>
|
||||
<p>{{ $filters.translate(modalMessage) }}</p>
|
||||
</template>
|
||||
<template #button>
|
||||
<a :href="getLinkToLicense()" class="focus:outline-none px-4 p-3 mr-3 text-white bg-teal-500 hover:bg-teal-700 transition duration-100">{{ $filters.translate('Check your license') }}</a>
|
||||
</template>
|
||||
</modal>
|
||||
</div>
|
||||
</div>
|
||||
</Transition>`,
|
||||
data() {
|
||||
@ -244,9 +257,9 @@ const app = Vue.createApp({
|
||||
{
|
||||
if(error.response)
|
||||
{
|
||||
self.showModal = true;
|
||||
self.formData[themename]['active'] = false;
|
||||
self.modalMessage = handleErrorMessage(error);
|
||||
self.messageClass = 'bg-rose-500';
|
||||
self.showModal = true;
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user