Merge pull request #36 from tmshv/fix/card-and-article-updates

Card and article updates
This commit is contained in:
tmshv authored and GitHub committed 2020-02-28 11:33:41 +03:00
commit b9277795cf
4 files changed
+6 -7

No files matched your search

+3
View File
@@ -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,
}
}
}
+1 -1
View File
@@ -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):
+2 -1
View File
@@ -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')
-5
View File
@@ -40,11 +40,6 @@ export default class MyApp extends App {
<link href='/static/shadow-font/style.css' rel='stylesheet' />
{/* Fotorama + jQuery*/}
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" />
<link href="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.css" rel="stylesheet" />
<script src="//cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.4/fotorama.js" />
{/* Opa */}
<script src="/static/opa.js" />
<link rel="stylesheet" href="/static/opa.css" />