mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-01 11:50:28 +02:00
Code Issues Releases Wiki Activity

Fixes and test live

Browse Source
This commit is contained in:
trendschau
2023-11-10 14:49:16 +01:00
parent f196a6cba0
commit d189f7918e
6 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/typemill/Controllers/ControllerApiSystemVersions.php
View File

@@ -29,7 +29,7 @@ class ControllerApiSystemVersions extends Controller
$type = $params['type'];
$data = $params['data'];
$url = 'https://typemill.net/api/v1/checkversion';
$url2 = 'http://localhost/typemillPlugins/api/v1/checkversion';
# $url2 = 'http://localhost/typemillPlugins/api/v1/checkversion';
if($type == 'plugins')
{
@@ -76,7 +76,7 @@ class ControllerApiSystemVersions extends Controller
);
$context = stream_context_create($opts);
$versions = file_get_contents($url2, false, $context);
$versions = file_get_contents($url, false, $context);
$versions = json_decode($versions, true);
$updateVersions = [];

3
system/typemill/Models/License.php
View File

@@ -160,7 +160,7 @@ class License
$authstring = $this->getPublicKeyPem();
$authstring = hash('sha256', substr($authstring, 0, 50));
$options = array (
'http' => array (
'method' => 'POST',
@@ -248,6 +248,7 @@ class License
return hash('sha256', trim($mail) . 'TYla5xa8JUur');
}
# we have it in static license, too so use it from static and delete this duplicate.
private function getPublicKeyPem()
{
$pkeyfile = getcwd() . DIRECTORY_SEPARATOR . 'settings' . DIRECTORY_SEPARATOR . "public_key.pem";

10
system/typemill/author/css/output.css
View File

@@ -1447,11 +1447,21 @@ video {
background-color: rgb(0 0 0 / 0.75);
}
.bg-stone-300 {
--tw-bg-opacity: 1;
background-color: rgb(214 211 209 / var(--tw-bg-opacity));
}
.bg-yellow-500 {
--tw-bg-opacity: 1;
background-color: rgb(234 179 8 / var(--tw-bg-opacity));
}
.bg-stone-500 {
--tw-bg-opacity: 1;
background-color: rgb(120 113 108 / var(--tw-bg-opacity));
}
.bg-opacity-90 {
--tw-bg-opacity: 0.9;
}

2
system/typemill/author/js/typemillutils.js
View File

@@ -15,8 +15,6 @@ let typemillUtilities = {
this.addYoutubePlayButton(youtubeItem);
}
}
console.info(this.youtubeItems);
},
addYoutubePlayButton: function(element)

4
system/typemill/author/js/vue-plugins.js
View File

@@ -19,6 +19,10 @@ const app = Vue.createApp({
<h2 class="text-xl font-bold mb-3">{{plugin.name}}</h2>
<div class="text-xs my-3">{{ $filters.translate('author') }}: <a :href="plugin.homepage" class="hover:underline text-teal-500">{{plugin.author}}</a> | {{ $filters.translate('version') }}: {{plugin.version}}</div>
<p>{{plugin.description}}</p>
<ul v-if="plugin.dependencies" class="flex text-xs my-3">
<li class="py-1 mr-1">Dependencies: </li>
<li v-for="dependency in plugin.dependencies" class="py-1 px-2 mr-1 text-white bg-stone-700 dark:bg-stone-600">{{ dependency }}</li>
</ul>
</div>
<div class="w-full mt-6 flex justify-between">
<button v-if="hasSettings(pluginname)" @click="setCurrent(pluginname)" class="flex-1 flex items-center justify-center space-x-4 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">

2
system/typemill/author/system/system.twig
View File

@@ -3,7 +3,7 @@
{% block content %}
<h1 class="text-3xl font-bold mb-4">{{ translate('System') }} </h1>
<h1 class="text-3xl font-bold mb-4">{{ translate('System') }} <span class="text-xs font-normal text-stone-700">version {{settings.version}}</span></h1>
<div id="system" v-cloak></div>