fix: conflict

IEA-Paris · Aug 30, 2024 · 6d05900 · 6d05900
1 parent 276e6ea
commit 6d05900
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/modules/publio/lib/article/files/generateBibliographyFilesForExport.js b/modules/publio/lib/article/files/generateBibliographyFilesForExport.js
@@ -24,8 +24,8 @@ RefWorks https://en.wikipedia.org/wiki/RefWorks
 CFF https://citation-file-format.github.io/ https://developers.zenodo.org/#depositions
 Wikipedia Vitation Style 1 templates https://en.wikipedia.org/wiki/Template:Citation_Style_articleation/cs1
 */
-
-  const cites = new Citation(article.bibliography)
+  /*   console.log('gzeenratin cite for: ', article.slug)
+  const cites = new Citation(article.bibliography) */
   // TODO generate da thing
   // https://www.youtube.com/watch?v=btPJPFnesV4
   return [article, media, authors, issues, options]

diff --git a/modules/publio/lib/article/insertCitationElements.js b/modules/publio/lib/article/insertCitationElements.js
@@ -132,7 +132,6 @@ export default (article, media, authors, issues, options) => {
         return { [style]: obj }
       })
       .reduce((rst, tick) => Object.assign(rst, tick), {})
-
     return [article, media, authors, issues, options]
   } catch (error) {
     console.log('error generating citation references: ', error)

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "clean:cache:pwa": "rm -rf ./node_modules/.cache/pwa || :",
     "clean:cache:nuxt": "rm -rf ./node_modules/.cache/nuxt || :",
     "prepare": " APP_ID=${APP_ID:-PPIAS} &&  yarn clean ",
-    "copy": "rm -rf ./static/*&& cp -r ./submodules/$npm_package_config_name/config.js ./config.js&&cp -r ./submodules/$npm_package_config_name/generated . && cp -r ./submodules/$npm_package_config_name/static . && cp -r ./submodules/$npm_package_config_name/bibliography ./static && cp -r ./submodules/$npm_package_config_name/svg ./static&& cp -r ./submodules/$npm_package_config_name/thumbnails ./static&& cp -r ./submodules/$npm_package_config_name/pdfs ./static && cp -r ./admin ./static",
+    "copy": "rm -rf ./static/*&& cp -r ./submodules/$npm_package_config_name/config.js ./config.js&&cp -r ./submodules/$npm_package_config_name/generated .&&cp -r ./submodules/$npm_package_config_name/static . && cp -r ./admin ./static && cp -r ./submodules/$npm_package_config_name/bibliography ./static",
     "configCMS": "node scripts/configCMS.mjs",
     "dev": "yarn copy && yarn prepare && yarn configCMS && nuxt",
     "build": "nuxt build",

diff --git a/pages/print/_slug/index.vue b/pages/print/_slug/index.vue
@@ -362,7 +362,9 @@ export default {
     text-align: left;
     page-break-before: always;
   }
-
+  .nuxt-content.article-body blockquote h2 {
+    margin-top: 0px;
+  }
   .nuxt-content.article-body h2,
   #bibliography,
   #footnotes {

diff --git a/scripts/configCMS.mjs b/scripts/configCMS.mjs
@@ -438,7 +438,7 @@ collections:
               Other,
             ],
         }
-      - { label: 'Article', name: 'body', widget: 'markdown', media_folder: '/static', public_folder: '/'  }
+      - { label: 'Article', name: 'body', widget: 'markdown', allow_multiple: false, media_folder: '/static', public_folder: '/'  }
   - name: 'issues' # Used in routes, e.g., /admin/collections/blog
     label: 'Issues' # Used in the UI
     identifier_field: title

diff --git a/submodules/PPIAS b/submodules/PPIAS
+16 −1		articles/paris-ias-ideas/grub-street-revisited-1.md
+29 −0		authors/d/darnton-robert.md
+1 −1		media/b/bioet-2019-1-cognition-la-bioethique-aux-frontieres-de-la-vie-.md
+ −		pdfs/grub-street-revisited-1.pdf