From b138f4bccc49f3b74faf3df734a2f05e2e1bd6f7 Mon Sep 17 00:00:00 2001 From: Pablo Ferreiro Date: Fri, 18 Nov 2022 16:48:51 +0100 Subject: [PATCH] misc folder and date on /video --- Procfile | 2 +- composer.json | 2 +- composer.lock | 30 +++++++++--------- {scss => misc/scss}/README.md | 0 {scss => misc/scss}/bulma.scss | 0 {scss => misc/scss}/cssgg.scss | 0 {scss => misc/scss}/package.json | 4 +-- {scss => misc/scss}/yarn.lock | 0 {setup => misc/setup}/heroku/nginx.conf | 0 templates/layouts/hero.latte | 2 +- templates/views/video.latte | 41 +++++++++++++++++-------- 11 files changed, 49 insertions(+), 32 deletions(-) rename {scss => misc/scss}/README.md (100%) rename {scss => misc/scss}/bulma.scss (100%) rename {scss => misc/scss}/cssgg.scss (100%) rename {scss => misc/scss}/package.json (53%) rename {scss => misc/scss}/yarn.lock (100%) rename {setup => misc/setup}/heroku/nginx.conf (100%) diff --git a/Procfile b/Procfile index 334a218..d5cc3f5 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: vendor/bin/heroku-php-nginx -C setup/heroku/nginx.conf +web: vendor/bin/heroku-php-nginx -C misc/setup/heroku/nginx.conf diff --git a/composer.json b/composer.json index e582919..f3264f1 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,7 @@ { "name": "pablouser1/proxitok", "description": "An alternative frontend for TikTok", - "version": "2.4.3.0", + "version": "2.4.3.1", "license": "AGPL-3.0-or-later", "type": "project", "authors": [ diff --git a/composer.lock b/composer.lock index ffca478..54908d6 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "7dc0bdf9fcecc4c3a73fb2fb1eece6f4", + "content-hash": "3e8c7455c52a55b2b83c691e2e040468", "packages": [ { "name": "bramus/router", @@ -406,16 +406,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -430,7 +430,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -469,7 +469,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -485,20 +485,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-php80", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace" + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/cfa0ae98841b9e461207c13ab093d76b0fa7bace", - "reference": "cfa0ae98841b9e461207c13ab093d76b0fa7bace", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -507,7 +507,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -552,7 +552,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -568,7 +568,7 @@ "type": "tidelift" } ], - "time": "2022-05-10T07:21:04+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/process", diff --git a/scss/README.md b/misc/scss/README.md similarity index 100% rename from scss/README.md rename to misc/scss/README.md diff --git a/scss/bulma.scss b/misc/scss/bulma.scss similarity index 100% rename from scss/bulma.scss rename to misc/scss/bulma.scss diff --git a/scss/cssgg.scss b/misc/scss/cssgg.scss similarity index 100% rename from scss/cssgg.scss rename to misc/scss/cssgg.scss diff --git a/scss/package.json b/misc/scss/package.json similarity index 53% rename from scss/package.json rename to misc/scss/package.json index 878f447..5ec386e 100644 --- a/scss/package.json +++ b/misc/scss/package.json @@ -2,8 +2,8 @@ "name": "proxitok-scss", "private": true, "scripts": { - "bulma": "sass --style=compressed bulma.scss ../styles/vendor/bulma.min.css", - "cssgg": "sass --style=compressed cssgg.scss ../styles/vendor/cssgg.min.css" + "bulma": "sass --style=compressed bulma.scss ../../styles/vendor/bulma.min.css", + "cssgg": "sass --style=compressed cssgg.scss ../../styles/vendor/cssgg.min.css" }, "dependencies": { "bulma": "^0.9.3", diff --git a/scss/yarn.lock b/misc/scss/yarn.lock similarity index 100% rename from scss/yarn.lock rename to misc/scss/yarn.lock diff --git a/setup/heroku/nginx.conf b/misc/setup/heroku/nginx.conf similarity index 100% rename from setup/heroku/nginx.conf rename to misc/setup/heroku/nginx.conf diff --git a/templates/layouts/hero.latte b/templates/layouts/hero.latte index 847cda2..9976dea 100644 --- a/templates/layouts/hero.latte +++ b/templates/layouts/hero.latte @@ -9,7 +9,7 @@ {include '../components/navbar.latte'}
-
+
{block content}{/block}
diff --git a/templates/views/video.latte b/templates/views/video.latte index e1edaa9..da6a80c 100644 --- a/templates/views/video.latte +++ b/templates/views/video.latte @@ -1,24 +1,41 @@ {layout "../layouts/{$layout}.latte"} {block content} -
-
+
+
-

Video by {$detail->uniqueId}

-

{$item->desc}

- {include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount} -
-

{include '../components/icon.latte', icon: 'music', text: $item->music->title}

- -
-
- {include '../components/themes/common/share.latte', uniqueId: $detail->uniqueId, id: $item->id} - {include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $detail->uniqueId} +
+
+

+ +

+
+
+

+ {$detail->nickname} + + @{$detail->uniqueId} + + {date('M d, Y', $item->createTime)} +

+ {if !empty($item->challenges)} +

{include '../components/themes/common/tags.latte', challenges: $item->challenges}

+ {/if} +
+

{$item->desc}

+ {include '../components/themes/common/stats.latte', playCount: $item->stats->playCount, diggCount: $item->stats->diggCount, commentCount: $item->stats->commentCount, shareCount: $item->stats->shareCount} +
+ {include '../components/themes/common/share.latte', uniqueId: $detail->uniqueId, id: $item->id} + {include '../components/themes/common/download.latte', playAddr: $item->video->playAddr, id: $item->id, uniqueId: $detail->uniqueId} +
+
+
+