Merge pull request #2 from skarab42/main

Mise a jour depuis le projet source
giboow · Feb 7, 2021 · b200621 · b200621
2 parents 3d746ab + 0abdfdb
commit b200621
Show file tree

Hide file tree

Showing 366 changed files with 13,477 additions and 1,943 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,4 @@
+# These are supported funding model platforms
+
+github: skarab42
+custom: ["tipeee.com/skarab42/","paypal.me/skarab"]
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,6 +1,9 @@
 name: Build/release
 
-on: push
+on:
+  push:
+    tags:
+      - "v*"
 
 jobs:
   release:
@@ -17,11 +20,12 @@ jobs:
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 12
 
       - name: Build/release Electron app
         uses: samuelmeuli/action-electron-builder@v1
         with:
+          args: -c.snap.publish=github
           # GitHub token, automatically provided to the action
           # (No need to define this secret in the repo settings)
           github_token: ${{ secrets.github_token }}

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,9 @@ node_modules/
 dist/
 *_.*
 *_
+
+yarn-error.log
+
+.idea/
+
+.DS_Store
diff --git a/.prettierrc b/.prettierrc
@@ -2,6 +2,7 @@
   "semi": true,
   "tabWidth": 2,
   "useTabs": false,
+  "endOfLine": "crlf",
   "singleQuote": false,
   "trailingComma": "es5",
   "svelteStrictMode": true,

diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/README.md b/README.md
@@ -1,8 +1,20 @@
-# Marv - Twitch Bot
+# Marv // StreamDeck Like // Twitch Bot
 
 WIP Projet développé en live sur la chaîne [twitch.tv/skarab42](https://www.twitch.tv/skarab42).
 
-# Project setup
+![Marv - v0.6.01](docs/images/screenshot.png)
+
+# Installation
+
+- Download and install from [here](https://github.com/skarab42/marv/releases) (win/mac/linux).
+
+## OBS WebSocket
+
+- For OBS to work with Marv you need to install [obs-websocket](https://github.com/Palakis/obs-websocket/releases).
+
+# Contribute ?!
+
+## Project setup
 
 ```bash
 # Clone this repository
@@ -13,6 +25,8 @@ cd marv
 
 # install all dependencies
 yarn install
+yarn build
+yarn app:build
 
 # run application in development mode
 yarn watch
@@ -22,7 +36,26 @@ yarn start
 
 # build application in production mode
 yarn build
+yarn app:build
 
 # lint project
 yarn lint
 ```
+
+## How to build with npm (easier from ubuntu?):
+
+```
+cd marv
+npm install
+npm run tailwind:build --prod
+npm run client:build
+npm run app:build
+```
+
+Credit: thermo74 :)
+
+## Translations
+
+- Spanish by TerminabloxHD
+- French by Skarab42
+- English by Skarab42
diff --git a/app/client/css/index.css b/app/client/css/index.css
diff --git a/app/client/overlay.html b/app/client/overlay.html
@@ -5,7 +5,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>overlay - marv</title>
     <link rel="icon" href="icon.png" />
-    <link rel="stylesheet" href="css/index.css" />
     <link rel="stylesheet" href="css/tailwind.css" />
   </head>
   <body class="w-full h-full">

diff --git a/app/main/index.js b/app/main/index.js
@@ -2,15 +2,27 @@
 
 const { app } = require("electron");
 const server = require("./server");
-const tray = require("./tray");
 
-app.requestSingleInstanceLock() || app.quit();
+let mainWindow;
 
-app.on("window-all-closed", (event) => {
-  event.preventDefault();
-});
-
-app.whenReady().then(() => {
-  server.start();
+async function onServerReady() {
+  const tray = require("./tray");
+  mainWindow = require("./window/mainWindow");
+  const settings = require("../server/libs/settings");
+  mainWindow({ showOnLoad: await settings.get("app.openOnStartup") });
   tray();
-});
+}
+
+function init() {
+  app.on("window-all-closed", (event) => {
+    event.preventDefault();
+  });
+
+  app.whenReady().then(() => {
+    server.start(onServerReady);
+  });
+}
+
+app.requestSingleInstanceLock() ? init() : app.quit();
+
+app.on("second-instance", () => mainWindow());