From 1544fae988195ef7082534ab8fec6b502c478c56 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 28 Feb 2020 11:28:25 +0300 Subject: [PATCH 1/4] api article featured field --- modules/hudozka-api/src/core/Article.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/hudozka-api/src/core/Article.ts b/modules/hudozka-api/src/core/Article.ts index 6a248dff..0f093140 100644 --- a/modules/hudozka-api/src/core/Article.ts +++ b/modules/hudozka-api/src/core/Article.ts @@ -53,6 +53,7 @@ export default class Article { public version: any public preview: any public url: any + public featured: boolean constructor(data) { this.id = data.id @@ -70,6 +71,7 @@ export default class Article { this.file = data.file this.version = data.version this.preview = data.preview + this.featured = data.featured || false this.url = `/article/${this.id}` } @@ -92,6 +94,7 @@ export default class Article { version: this.version, preview: this.preview, url: this.url, + featured: this.featured, } } } From 2774e05bc781e164a4fa65bb73dd62d4630f12b9 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 28 Feb 2020 11:28:53 +0300 Subject: [PATCH 2/4] sync Image token is not joinable (drop fotorama support for a while) --- modules/sync/kazimir/Token.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sync/kazimir/Token.py b/modules/sync/kazimir/Token.py index 43d2c761..8c8d2c37 100644 --- a/modules/sync/kazimir/Token.py +++ b/modules/sync/kazimir/Token.py @@ -99,7 +99,7 @@ class ImageToken(Token): def __init__(self, data) -> None: super().__init__(name='image', data=data) - self.joinable = True + self.joinable = False self.build = None def merge(self, token: Token): From 7b83b03b0916102fd148fa248d5886052f62e683 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 28 Feb 2020 11:29:04 +0300 Subject: [PATCH 3/4] sync settings update --- modules/sync/settings.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/sync/settings.py b/modules/sync/settings.py index 4317e51c..65475075 100644 --- a/modules/sync/settings.py +++ b/modules/sync/settings.py @@ -81,9 +81,10 @@ collection_documents = 'documents' collection_articles = 'articles' collection_pages = 'pages' -hash_salt_articles = '6' +hash_salt_articles = '8' hash_salt_pages = '4' hash_salt_documents = '4' +hash_salt_images = '5' provider_name = value('provider')['name'] # env('SYNC_PROVIDER', 'fs') provider_root = value('provider')['root'] # env('SYNC_PROVIDER', 'fs') From 2ae7572e7eda3cdedc7d9c0a99ce05a2a52d8746 Mon Sep 17 00:00:00 2001 From: Roman Timashev Date: Fri, 28 Feb 2020 11:29:24 +0300 Subject: [PATCH 4/4] drop fotorama dependencies --- pages/_app.tsx | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pages/_app.tsx b/pages/_app.tsx index 9843426e..001090d6 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -40,11 +40,6 @@ export default class MyApp extends App { - {/* Fotorama + jQuery*/} -