Merge pull request #1 from vassbo/dev

v0.0.2
ChurchApps · Mar 6, 2022 · f1b8db6 · f1b8db6
2 parents ade29c3 + 15166be
commit f1b8db6
Show file tree

Hide file tree

Showing 60 changed files with 760 additions and 247 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,25 +25,25 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: npm run release
 
-  release:
-    name: "Release"
-    needs: publish
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v2
-      - name: List fetched artifacts
-        run: ls -R
-      - name: Emit a Github Release
-        uses: "marvinpinto/action-automatic-releases@latest"
-        with:
-          repo_token: "${{ secrets.GITHUB_TOKEN }}"
-          automatic_release_tag: "latest"
-          prerelease: true
-          draft: true
-          # files: |
-          #   *.exe
-          #   *.zip
-          #   *.dmg
-          #   *.deb
-          #   *.AppImage
-          #   LICENSE
+  # release:
+  #   name: "Release"
+  #   needs: publish
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/download-artifact@v2
+  #     - name: List fetched artifacts
+  #       run: ls -R
+  #     - name: Emit a Github Release
+  #       uses: "marvinpinto/action-automatic-releases@latest"
+  #       with:
+  #         repo_token: "${{ secrets.GITHUB_TOKEN }}"
+  #         automatic_release_tag: "latest"
+  #         prerelease: true
+  #         draft: true
+  #         files: |
+  #           *.exe
+  #           *.zip
+  #           *.dmg
+  #           *.deb
+  #           *.AppImage
+  #           LICENSE
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "freeshow",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "private": true,
   "main": "build/electron/index.js",
   "description": "An application for showing song lyrics and more for free!",
@@ -37,7 +37,7 @@
     "preversion": "npm-run-all -s"
   },
   "build": {
-    "appId": "net.freeshow.app",
+    "appId": "com.github.vassbo.freeshow",
     "productName": "FreeShow",
     "files": [
       "build/public/**/*",
@@ -81,25 +81,7 @@
       "publisherName": "FreeShow"
     }
   },
-  "config": {
-    "forge": {
-      "publishers": [
-        {
-          "name": "@electron-forge/publisher-github",
-          "config": {
-            "repository": {
-              "owner": "vassbo",
-              "name": "freeshow"
-            }
-          },
-          "draft": true,
-          "prerelease": true
-        }
-      ]
-    }
-  },
   "devDependencies": {
-    "@electron-forge/publisher-github": "^6.0.0-beta.63",
     "@rollup/plugin-commonjs": "^17.0.0",
     "@rollup/plugin-node-resolve": "^11.2.1",
     "@rollup/plugin-typescript": "^8.3.0",

diff --git a/public/lang/en.json b/public/lang/en.json
@@ -80,17 +80,17 @@
   },
   "menu": {
     "show": "Show",
-    "_title_show": "Go to show view",
+    "_title_show": "Showing",
     "edit": "Edit",
-    "_title_edit": "Go to edit view",
+    "_title_edit": "Editing",
     "stage": "Stage",
-    "_title_stage": "Go to stage view",
+    "_title_stage": "Stage view",
     "draw": "Draw",
-    "_title_draw": "Go to draw view",
+    "_title_draw": "Drawing",
     "calendar": "Calendar",
-    "_title_calendar": "Go to calendar",
+    "_title_calendar": "Events",
     "settings": "Settings",
-    "_title_settings": "Go to settings",
+    "_title_settings": "Settings",
     "_title_display": "Present",
     "_title_display_stop": "Stop presentation"
   },
@@ -206,6 +206,7 @@
     "delete_show_confirmation": "Are you sure you want to delete",
     "change_name": "Change name on",
     "about": "About",
+    "shortcuts": "Shortcuts",
     "icon": "Icons",
     "initialize": "Welcome",
     "unsaved": "You have not saved yet! Are you sure you want to quit?",
@@ -253,6 +254,7 @@
     "speech": "Speech",
     "startSpeaking": "Start Speaking",
     "stopSpeaking": "Stop Speaking",
+    "fullscreen": "Toggle Fullscreen",
     "resetZoom": "Reset Zoom",
     "zoomIn": "Zoom In",
     "zoomOut": "Zoom Out",
@@ -374,6 +376,7 @@
     "group_numbers": "Group numbers",
     "full_colors": "Full slide group colors",
     "auto_output": "Show output screen on startup",
+    "display_metadata": "Display metadata in show",
     "default_project_name": "Default project name",
     "resolution": "Resolution",
     "video_extensions": "Video extensions",
@@ -389,6 +392,7 @@
     "add_group": "Add group",
     "output_screen": "Output screen",
     "device_name": "Device name",
+    "password": "password",
     "port": "port",
     "max_connections": "Max connections",
     "allowed_connections": "Allowed connections",

diff --git a/public/lang/no.json b/public/lang/no.json
@@ -2,7 +2,7 @@
   "main": {
     "welcome": "Velkommen til FreeShow!",
     "quit": "Avslutt",
-    "docs": "Dokumenter",
+    "docs": "Dokumentasjon",
     "about": "Om",
     "unnamed": "Uten navn",
     "drop": "Slipp her",
@@ -80,14 +80,19 @@
   },
   "menu": {
     "show": "Presenter",
-    "_title_show": "Gå til visning",
-    "_title_display": "Presenter",
-    "_title_display_stop": "Stopp presentatsjon",
+    "_title_show": "Fremvisning",
     "edit": "Rediger",
+    "_title_edit": "Redigering",
     "stage": "Scene",
+    "_title_stage": "Scene-visning",
     "draw": "Tegne",
+    "_title_draw": "Tegning",
     "calendar": "Kalender",
-    "settings": "Innstillinger"
+    "_title_calendar": "Hendelser",
+    "settings": "Innstillinger",
+    "_title_settings": "Innstillinger",
+    "_title_display": "Presenter",
+    "_title_display_stop": "Stopp presentatsjon"
   },
   "empty": {
     "project_select": "Velg et prosjekt",
@@ -201,6 +206,7 @@
     "delete_show_confirmation": "Er du sikker på at du vil slette",
     "change_name": "Endre navn på",
     "about": "Om",
+    "shortcuts": "Hurtigtaster",
     "icon": "Ikoner",
     "initialize": "Velkommen",
     "unsaved": "Du har ikke lagret enda! Er du sikker på at du vil avslutte?",
@@ -248,6 +254,7 @@
     "speech": "Tale",
     "startSpeaking": "Start tale",
     "stopSpeaking": "Stopp tale",
+    "fullscreen": "Fullskjerm",
     "resetZoom": "Tilbakestill zoom",
     "zoomIn": "Zoom inn",
     "zoomOut": "Zoom ut",
@@ -369,6 +376,7 @@
     "group_numbers": "Gruppenummer",
     "full_colors": "Full lysbilde gruppefarger",
     "auto_output": "Vis utgangsskjerm ved oppstart",
+    "display_metadata": "Vis metadata i show",
     "default_project_name": "Standard prosjektnavn",
     "resolution": "Oppløsning",
     "video_extensions": "Videoutvidelse",
@@ -384,6 +392,7 @@
     "add_group": "Legg til gruppe",
     "output_screen": "Skjermutgang",
     "device_name": "Enhetsnavn",
+    "password": "passord",
     "port": "port",
     "max_connections": "Maks tilkoblinger",
     "allowed_connections": "Tillatte tilkoblinger",