move electron folder
14
.github/workflows/build-and-release-desktop.yml
vendored
@ -62,24 +62,24 @@ jobs:
|
||||
|
||||
- name: "Install dependencies"
|
||||
run: yarn install --froze-lockfile
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Build typescript"
|
||||
run: yarn build
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Build app"
|
||||
run: yarn bundle --publish never
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
if: ${{ github.event_name != 'release' }}
|
||||
|
||||
- name: "Build & publish App"
|
||||
run: yarn release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
if: ${{ github.event_name == 'release' }}
|
||||
|
||||
- name: Upload Linux .AppImage artifact
|
||||
@ -87,18 +87,18 @@ jobs:
|
||||
if: startsWith(matrix.os, 'ubuntu')
|
||||
with:
|
||||
name: workadventure-desktop-linux-x64.AppImage
|
||||
path: desktop/build/workadventure-desktop-*-x86_64.AppImage
|
||||
path: desktop/electron/build/workadventure-desktop-*-x86_64.AppImage
|
||||
|
||||
- name: Upload Windows .exe artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
if: startsWith(matrix.os, 'windows')
|
||||
with:
|
||||
name: workadventure-desktop-win-x64.exe
|
||||
path: desktop/build/workadventure-desktop-*.exe
|
||||
path: desktop/electron/build/workadventure-desktop-*.exe
|
||||
|
||||
- name: Upload MacOS .dmg artifact
|
||||
uses: actions/upload-artifact@v2
|
||||
if: startsWith(matrix.os, 'macos')
|
||||
with:
|
||||
name: workadventure-mac.dmg
|
||||
path: desktop/build/workadventure-desktop-*.dmg
|
||||
path: desktop/electron/build/workadventure-desktop-*.dmg
|
||||
|
10
.github/workflows/continuous_integration.yml
vendored
@ -194,23 +194,23 @@ jobs:
|
||||
|
||||
- name: "Build"
|
||||
run: yarn build
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Typecheck"
|
||||
run: yarn typecheck
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Lint"
|
||||
run: yarn lint
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Jasmine"
|
||||
run: yarn test
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
- name: "Prettier"
|
||||
run: yarn pretty-check
|
||||
working-directory: "desktop"
|
||||
working-directory: "desktop/electron"
|
||||
|
||||
continuous-integration-desktop-local-app:
|
||||
name: "Continuous Integration Desktop Local App"
|
||||
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 16 KiB |
@ -3,7 +3,8 @@ appId: re.workadventu.desktop
|
||||
files:
|
||||
- "dist/**/*"
|
||||
- "assets/**/*"
|
||||
- "local-app/dist/**/*"
|
||||
- from: "../local-app/dist/"
|
||||
to: "local-app/dist"
|
||||
|
||||
directories:
|
||||
output: ./build
|
@ -7,9 +7,9 @@
|
||||
"license": "SEE LICENSE IN LICENSE.txt",
|
||||
"scripts": {
|
||||
"build": "tsup-node ./src/main.ts ./src/preload-local-app/preload.ts ./src/preload-app/preload.ts",
|
||||
"build:local-app": "cd local-app && yarn && yarn build",
|
||||
"build:local-app": "cd ../local-app && yarn && yarn build",
|
||||
"dev": "yarn build --watch --onSuccess 'yarn electron dist/main.js'",
|
||||
"dev:local-app": "cd local-app && yarn && yarn dev",
|
||||
"dev:local-app": "cd ../local-app && yarn && yarn dev",
|
||||
"bundle": "yarn build:local-app && yarn build && electron-builder install-app-deps && electron-builder",
|
||||
"release": "yarn bundle",
|
||||
"typecheck": "tsc --noEmit",
|
@ -53,12 +53,12 @@
|
||||
>
|
||||
<Link
|
||||
to="/settings"
|
||||
class="flex mt-auto justify-center items-center text-4xl no-underline cursor-pointer"
|
||||
class="flex mt-auto mb-4 justify-center items-center text-4xl no-underline cursor-pointer"
|
||||
>
|
||||
<CogIcon width="30" height="30" class="fill-gray-200 hover:fill-gray-500" />
|
||||
</Link>
|
||||
{#if isDevelopment}
|
||||
<button class="text-8px text-red-500 mt-8 mb-4" on:click={() => location.reload()}>Refresh</button>
|
||||
<button class="text-8px text-red-500 my-4" on:click={() => location.reload()}>Refresh</button>
|
||||
{/if}
|
||||
</aside>
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
<script lang="ts">
|
||||
import { onMount } from "svelte";
|
||||
|
||||
import Logo from "~/../../assets/icons/logo.svg";
|
||||
import Logo from "~/../../electron/assets/icons/logo.svg";
|
||||
|
||||
let version = "";
|
||||
|
||||
|