🦄 Conflicts

This commit is contained in:
Timeraa
2019-04-16 16:30:31 +02:00
12 changed files with 24 additions and 1141 deletions

View File

@@ -1,370 +0,0 @@
[
{
"term": "tab.installed.heading",
"definition": "Thank you for installing PreMiD",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.subHeading.didInstallQuestion",
"definition": "Did you install the application yet?",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.subHeading.notInstalled",
"definition": "No? Follow these steps:",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.instructions.download",
"definition": "Download the latest version from $1",
"context": "",
"term_plural": "",
"reference": "",
"comment": "$1 gets replaced by a value"
},
{
"term": "tab.installed.instructions.github",
"definition": "my GitHub repository",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Link to the GitHub project"
},
{
"term": "tab.installed.instructions.wait",
"definition": "Open the installer and wait until it installed",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.instructions.warnings",
"definition": "You may receive a warning about FireWall and SmartScreen (Its not a virus i promise!)",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.instructions.autostart",
"definition": "The application should start automatically, you can check this by looking at your Taskbar (Windows) or your Menubar (MacOS)",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.subHeading.ready",
"definition": "Yes? You are ready to go!",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.intro",
"definition": "Start by using one of our supported services and enjoy the sweet taste of coolness!",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Pls leave <br> as is."
},
{
"term": "tab.updated.heading",
"definition": "PreMiD has been updated!",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.subHeading.whatsNew",
"definition": "Whats new?",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.subHeading.whatChanged",
"definition": "What changed?",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "presence.playback.playing",
"definition": "Playing back",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "presence.playback.paused",
"definition": "Playback paused",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.tabs.options",
"definition": "Options",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.tabs.credits",
"definition": "Credits",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.options.headings.general",
"definition": "General",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.options.headings.presences",
"definition": "Presences",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.options.enabled",
"definition": "Enabled",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.options.titleMenubar",
"definition": "Title Menubar",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Menubar is a name (Mac OS only)"
},
{
"term": "popup.options.mediaControls",
"definition": "Media Controls",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Media Control keys (Keyboard\/headphones)"
},
{
"term": "popup.options.checkForUpdates",
"definition": "Check for updates",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.options.darkTheme",
"definition": "Dark Theme",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Dark Theme option in preferences"
},
{
"term": "connectionInfo.connected",
"definition": "Connected to %SERVICE%",
"context": "",
"term_plural": "",
"reference": "",
"comment": "%SERVICE% will be replaced."
},
{
"term": "connectionInfo.disconnected",
"definition": "Disconnected from %SERVICE%",
"context": "",
"term_plural": "",
"reference": "",
"comment": "%SERVICE% will be replaced."
},
{
"term": "popup.options.systemStartup",
"definition": "System Startup",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Startup option in preferences"
},
{
"term": "presence.episode",
"definition": "Episode",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "presence.browsing",
"definition": "Browsing...",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Status when just browsing around"
},
{
"term": "presence.watching",
"definition": "watching",
"context": "",
"term_plural": "",
"reference": "",
"comment": "Status when watching (e.g.: 44 watching)"
},
{
"term": "tab.installed.letsStart",
"definition": "Let's Start!",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.getSupport",
"definition": "Get Support",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.installed.likeThisProject",
"definition": "Like this project? Star it on $1!",
"context": "",
"term_plural": "",
"reference": "",
"comment": "$1 will be replaced with the GitHub repository."
},
{
"term": "tab.updated.gotIt",
"definition": "Got it!",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.added0",
"definition": "New Design!",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.added1",
"definition": "Rabb.it support",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.nextVersion.added2",
"definition": "Amazon Prime support",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.added3",
"definition": "Anime4You support",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.nextVersion.added4",
"definition": "CrunchyRoll support",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.changed0",
"definition": "Lots of bugs killed, they won't bug you anymore",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "tab.updated.changed1",
"definition": "Lots of rewrites",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "extension.description",
"definition": "PreMiD adds Discord Rich Presence integration, Media controls and much more to YouTube\/YouTube Music, Twitch etc...",
"context": "",
"term_plural": "",
"reference": "",
"comment": "This is the description of the extension."
},
{
"term": "popup.options.connectInfo",
"definition": "Connection Info",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.error",
"definition": "Error",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "popup.error.message",
"definition": "Could not load credits",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
},
{
"term": "presence.lookingForAnime",
"definition": "Searching for Anime...",
"context": "",
"term_plural": "",
"reference": "",
"comment": ""
}
]

BIN
gitassets/PreMiD_Icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

View File

@@ -10,13 +10,13 @@ if (os == 'darwin') {
createDMG(
{
appPath: '../out/PreMiD-darwin-x64/PreMiD.app',
appPath: '../dist/PreMiD-darwin-x64/PreMiD.app',
name: 'PreMiD',
background: './dmg-background.png',
icon: './appIcon.icns',
contents: [
{ x: 500, y: 250, type: 'link', path: '/Applications' },
{ x: 175, y: 250, type: 'file', path: path.join(__dirname, '../out/PreMiD-darwin-x64/PreMiD.app') }
{ x: 175, y: 250, type: 'file', path: path.join(__dirname, '../dist/PreMiD-darwin-x64/PreMiD.app') }
],
out: '../dist/installer/',
overwrite: true
@@ -31,7 +31,7 @@ if (os == 'darwin') {
var electronInstaller = require('electron-winstaller');
resultPromise = electronInstaller.createWindowsInstaller({
appDirectory: './out/PreMiD-win32-x64',
appDirectory: './dist/PreMiD-win32-x64',
outputDirectory: './dist/installer/',
exe: './PreMiD.exe',
iconUrl: 'https://raw.githubusercontent.com/Timeraa/PreMiD/master/installer_assets/appIcon.ico',

View File

@@ -1,15 +1,17 @@
var chalk = require('chalk')
var chalk = require('chalk');
console.log(chalk.yellow("Creating installer for Windows..."))
console.log(chalk.yellow('Creating installer for Windows...'));
var electronInstaller = require('electron-winstaller');
resultPromise = electronInstaller.createWindowsInstaller({
appDirectory: './out/PreMiD-win32-ia32',
outputDirectory: './dist/installer/',
exe: './PreMiD.exe',
iconUrl: 'https://raw.githubusercontent.com/Timeraa/PreMiD/master/installer_assets/appIcon.ico',
noMsi: true
appDirectory: './dist/PreMiD-win32-ia32',
outputDirectory: './dist/installer/',
exe: './PreMiD.exe',
iconUrl: 'https://raw.githubusercontent.com/Timeraa/PreMiD/master/installer_assets/appIcon.ico',
noMsi: true
});
resultPromise.then(() => console.log(chalk.green("Created installer for Windows!")), (e) => console.log(`No dice: ${e.message}`));
resultPromise.then(
() => console.log(chalk.green('Created installer for Windows!')),
(e) => console.log(`No dice: ${e.message}`)
);

746
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,28 +1,24 @@
{
"name": "premid",
"productName": "PreMiD",
"version": "1.2.0",
"description": "Discord Rich Presence, Media Controls... for websites.",
"main": "index.js",
"version": "2.0.0",
"repository": "https://github.com/Timeraa/PreMiD",
"scripts": {
"start": "npm start --prefix src/.",
"dev": "npm run dev --prefix src/.",
"pkgmac": "electron-packager ./src/ --out=./out/ --asar --overwrite --icon=./installer_assets/appIcon.ico --osx-sign.identity='Florian Metz'",
"pkgwin": "electron-packager ./src/ --out=./out/ --overwrite --icon=./installer_assets/appIcon.ico",
"pkgwin32": "electron-packager ./src/ --out=./out/ --overwrite --icon=./installer_assets/appIcon.ico --platform=win32 --arch=ia32",
"pkglinux": "electron-packager ./src/ --out=./out/ --overwrite --icon=./appIcon.ico --asar --platform=linux --arch=x64",
"installer-mac": "npm run pkgmac && node installer_assets/installer",
"pkgmac": "electron-packager ./src/ --out=./dist/ --asar --overwrite --icon=./installer_assets/appIcon.ico --osx-sign.identity='Florian Metz'",
"pkgwin": "electron-packager ./src/ --out=./dist/ --overwrite --icon=./installer_assets/appIcon.ico",
"pkgwin32": "electron-packager ./src/ --out=./dist/ --overwrite --icon=./installer_assets/appIcon.ico --platform=win32 --arch=ia32",
"pkglinux": "electron-packager ./src/ --out=./dist/ --overwrite --icon=./appIcon.ico --asar --platform=linux --arch=x64",
"installer-mac": "npm run pkgmac && sudo pkgbuild --install-location /Applications --component ./dist/PreMiD-darwin-x64/PreMiD.app ./dist/installer/PreMiD.pkg --identifier eu.Timeraa.PreMiD --version 2.0 --timestamp=none",
"installer-win": "npm run pkgwin && node installer_assets/installer",
"installer-win32": "npm run pkgwin32 && node installer_assets/installerWin32",
"installer-linux": "npm run pkglinux && electron-installer-debian --src out/PreMiD-linux-x64/ --dest dist/installer/ --arch amd64"
"installer-linux": "npm run pkglinux && electron-installer-debian --src dist/PreMiD-linux-x64/ --dest dist/installer/ --arch amd64"
},
"author": "Timeraa",
"license": "MIT",
"devDependencies": {
"chalk": "^2.4.2",
"electron-installer-debian": "^1.1.1",
"electron-installer-dmg": "^1.0.0",
"electron-installer-windows": "^1.1.1",
"electron-packager": "^12.2.0",
"electron-winstaller": "^2.7.0"
@@ -32,7 +28,6 @@
"dotenv": "^6.2.0",
"node-fetch": "^2.3.0",
"request": "^2.88.0",
"request-promise-native": "^1.0.7",
"socket.io": "^2.2.0"
"request-promise-native": "^1.0.7"
}
}

View File

@@ -1,5 +1,5 @@
{
"productVersion": "1.0",
"productVersion": "2.0",
"productName": "PreMiD",
"name": "premid",
"description": "Discord Rich Presence for websites.",

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB