v1.2.0-dev.12 (#572)

* wip * fix display of remote projects * hide worker windows * change date element to inter type * use auto mode for cert finding
performant-software · Sep 4, 2024 · 88eedd4 · 88eedd4
1 parent e81966e
commit 88eedd4
Show file tree

Hide file tree

Showing 12 changed files with 354 additions and 282 deletions.
diff --git a/faircopy_scripts/turtle/create-config.js b/faircopy_scripts/turtle/create-config.js
@@ -70,7 +70,7 @@ const createConfig = function createConfig(teiSchema) {
     }
 
     // initialize menus, parse from config file to internal format
-    const menuGroupsJSON = fs.readFileSync(`scripts/turtle/menu-groups-en.json`).toString('utf-8')
+    const menuGroupsJSON = fs.readFileSync(`faircopy_scripts/turtle/menu-groups-en.json`).toString('utf-8')
     const menus = parseMenus(menuGroupsJSON,elements)
 
     return { menus, elements, vocabs }

diff --git a/faircopy_scripts/turtle/create-elements.js b/faircopy_scripts/turtle/create-elements.js
@@ -4,8 +4,8 @@ const fs = require('fs');
 const createElements = function createElements(elGroups,specs,keepReportData,exp) {
     const elements = []
     const expSuffix = exp ? '-exp' : ''
-    const icons = JSON.parse(fs.readFileSync(`scripts/turtle/inline-icons${expSuffix}.json`).toString('utf-8'))
-    const defaultNodes = JSON.parse(fs.readFileSync(`scripts/turtle/default-nodes${expSuffix}.json`).toString('utf-8'))
+    const icons = JSON.parse(fs.readFileSync(`faircopy_scripts/turtle/inline-icons${expSuffix}.json`).toString('utf-8'))
+    const defaultNodes = JSON.parse(fs.readFileSync(`faircopy_scripts/turtle/default-nodes${expSuffix}.json`).toString('utf-8'))
 
     elements.push( ...createNodes(elGroups,true,defaultNodes,specs) )
     elements.push( ...createInlineNodes(elGroups,icons,specs) )

diff --git a/faircopy_scripts/turtle/element-report.js b/faircopy_scripts/turtle/element-report.js
@@ -8,7 +8,7 @@ const {getAllElements} = require('./parse-util')
 const teiSpecsDir = '../TEI/P5/Source/Specs'
 
 const runReport = async function runReport() {
-    const elementGroups = JSON.parse(fs.readFileSync(`scripts/turtle/exp-element-groups.json`).toString('utf-8'))
+    const elementGroups = JSON.parse(fs.readFileSync(`faircopy_scripts/turtle/exp-element-groups.json`).toString('utf-8'))
     const allElements = getAllElements(elementGroups)
     const specs = load( teiSpecsDir, allElements )
 

diff --git a/faircopy_scripts/turtle/exp-element-groups.json b/faircopy_scripts/turtle/exp-element-groups.json
@@ -246,6 +246,7 @@
         "corr",
         "country",
         "damage",
+        "date",
         "del",
         "district",
         "emph",
@@ -285,7 +286,6 @@
         "abbr",
         "catchwords",
         "cl",
-        "date",
         "distinct",
         "email",
         "expan",

diff --git a/faircopy_scripts/turtle/index.js b/faircopy_scripts/turtle/index.js
@@ -15,7 +15,7 @@ const teiSpecsDir = '../TEI/P5/Source/Specs'
 async function run() {
     const exp = true
     const expPrefix = exp ? 'exp-' : ''
-    const elementGroups = JSON.parse(fs.readFileSync(`scripts/turtle/${expPrefix}element-groups.json`).toString('utf-8'))
+    const elementGroups = JSON.parse(fs.readFileSync(`faircopy_scripts/turtle/${expPrefix}element-groups.json`).toString('utf-8'))
     const allElements = getAllElements(elementGroups)
     const specs = load( teiSpecsDir, allElements )
 
@@ -24,11 +24,11 @@ async function run() {
     const modules = createModules(allElements,specs)
 
     const teiSimpleConfig = { elements, attrs, elementGroups, modules }
-    fs.writeFileSync("public/main-process/config/tei-simple.json",JSON.stringify(teiSimpleConfig, null, '\t'))
+    fs.writeFileSync("src/tei-simple.json",JSON.stringify(teiSimpleConfig, null, '\t'))
 
     // new project config is based on schema
     const fairCopyConfig = createConfig(teiSimpleConfig)
-    fs.writeFileSync("public/main-process/config/faircopy-config.json",JSON.stringify(fairCopyConfig, null, '\t'))
+    fs.writeFileSync("src/faircopy-config.json",JSON.stringify(fairCopyConfig, null, '\t'))
 }
 
 // A wise turtle that understands ODD and ProseMirror

diff --git a/forge.config.example.js b/forge.config.example.js
@@ -47,8 +47,7 @@ module.exports = {
           loadingGif: './src/render/img/install_spinner.gif',
           iconURL: 'https://raw.githubusercontent.com/performant-software/faircopy/main/render/icons/icon.ico',
           setupIcon: './src/render/icons/icon.ico',
-          certificateFile: 'LOCATION OF APP SIGNING CERTIFICATE',
-          certificatePassword: 'CERTIFICATE PASSWORD',
+          signWithParams: '/a',
           platform: 'win32'
         }
       }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "faircopy",
   "productName": "FairCopy",
-  "version": "1.2.0-dev.11",
+  "version": "1.2.0-dev.12",
   "description": "A word processor for the humanities scholar.",
   "main": "./.webpack/main",
   "private": true,