diff --git a/packages/app/.gitignore b/packages/app/.gitignore
index d54f00b3..8521d6b7 100644
--- a/packages/app/.gitignore
+++ b/packages/app/.gitignore
@@ -5,4 +5,5 @@ dist-ssr
*.local
.vscode
yarn-error.log
-ios/**/**
\ No newline at end of file
+ios/**/**
+out/
\ No newline at end of file
diff --git a/packages/app/config/index.js b/packages/app/config/index.js
index 997ea298..22e20acc 100644
--- a/packages/app/config/index.js
+++ b/packages/app/config/index.js
@@ -10,6 +10,12 @@ const envOrigins = {
contentApi: `http://${window.location.hostname}:3050`,
streamingApi: `http://${window.location.hostname}:3002`,
},
+ "production": {
+ mainApi: "http://api.comty.pw",
+ authApi: "http://auth.comty.pw",
+ contentApi: "http://content.comty.pw",
+ streamingApi: "http://streaming.comty.pw",
+ },
"indev": {
mainApi: "https://indev_api.comty.pw",
authApi: `http://indev_auth.comty.pw`,
diff --git a/packages/app/electron/main/configs/config.js b/packages/app/electron/main/configs/config.js
new file mode 100644
index 00000000..2dbfdd50
--- /dev/null
+++ b/packages/app/electron/main/configs/config.js
@@ -0,0 +1,3 @@
+const Config = require('electron-config')
+
+module.exports = new Config({ name: 'config' });
\ No newline at end of file
diff --git a/packages/app/electron/main/icon.png b/packages/app/electron/main/icon.png
new file mode 100644
index 00000000..4a3d53b5
Binary files /dev/null and b/packages/app/electron/main/icon.png differ
diff --git a/packages/app/electron/main/index.js b/packages/app/electron/main/index.js
new file mode 100644
index 00000000..0fe2d761
--- /dev/null
+++ b/packages/app/electron/main/index.js
@@ -0,0 +1,254 @@
+const path = require("path")
+const {
+ app,
+ BrowserWindow,
+ ipcMain,
+ Tray,
+ Menu,
+ MenuItem,
+ dialog,
+ shell,
+ screen,
+ BrowserView,
+ systemPreferences,
+ Notification,
+ globalShortcut
+} = require("electron")
+
+const log = require("electron-log")
+const is = require("electron-is")
+const waitOn = require("wait-on")
+
+const srcPath = path.join(process.cwd())
+const distPath = path.join(process.cwd(), "dist")
+const devMode = is.dev()
+
+const packagejson = require(path.join(srcPath, "package.json"))
+
+let app_path = devMode ? "http://localhost:8000" : `file://${path.join(distPath, "index.html")}`
+
+let mainWindow = null
+let devtools = null
+let tray = null
+let watcher = null
+
+// This gets rid of this: https://github.com/electron/electron/issues/13186
+process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true
+// app.commandLine.appendSwitch("disable-web-security")
+//app.commandLine.appendSwitch("disable-gpu-vsync=gpu")
+app.commandLine.appendSwitch("disable-features", "OutOfBlinkCors")
+
+const gotTheLock = app.requestSingleInstanceLock()
+const notifySupport = Notification.isSupported()
+
+// Prevent multiple instances
+if (!gotTheLock) {
+ app.quit()
+}
+
+function relaunchApp() {
+ mainWindow.close()
+ app.relaunch()
+}
+
+function resumeApp() {
+ if (mainWindow) {
+ mainWindow.show()
+ mainWindow.focus()
+ } else {
+ createWindow()
+ }
+}
+
+function notify(params) {
+ if (!notifySupport || !params) return false
+ let options = {
+ title: "",
+ body: "",
+ icon: null,
+ timeoutType: "default"
+ }
+
+ const keys = Object.keys(params)
+ const values = Object.values(params)
+
+ for (let i = 0; i < keys.length; i++) {
+ options[keys[i]] = values[i]
+ }
+
+ new Notification(options).show()
+}
+
+function createWindow() {
+ mainWindow = new BrowserWindow({
+ title: packagejson.title,
+ icon: path.join(__dirname, "./icon.png"),
+ width: 1100,
+ height: 700,
+ minWidth: 1256,
+ minHeight: 755,
+ show: true,
+ frame: false,
+ transparent: false,
+ hasShadow: true,
+ //webgl: true,
+ visualEffectState: "followWindow",
+ backgroundColor: "#00ffffff",
+ webPreferences: {
+ preload: path.join(__dirname, "../preload"),
+ //enableRemoteModule: true,
+ enableBlinkFeatures: true,
+ experimentalFeatures: true,
+ nodeIntegration: true,
+ // Disable in dev since I think hot reload is messing with it
+ webSecurity: !is.dev()
+ }
+ })
+
+ if (devMode) {
+ app.commandLine.appendSwitch("remote-debugging-port", "9222")
+
+ globalShortcut.register("CommandOrControl+R", () => {
+ mainWindow.reload()
+ })
+
+ globalShortcut.register("F5", () => {
+ mainWindow.reload()
+ })
+
+ globalShortcut.register("CommandOrControl+Shift+I", () => {
+ mainWindow.webContents.toggleDevTools()
+ })
+
+ devtools = new BrowserWindow()
+
+ mainWindow.webContents.setDevToolsWebContents(devtools.webContents)
+
+ mainWindow.webContents.openDevTools({
+ mode: "detach"
+ })
+ }
+
+ mainWindow.webContents.session.webRequest.onHeadersReceived(
+ {
+ urls: ["http://*/*", "https://*/*"]
+ },
+ (details, callback) => {
+ delete details.responseHeaders["Access-Control-Allow-Origin"]
+ delete details.responseHeaders["access-control-allow-origin"]
+ if (details.url.includes("www.google-analytics.com")) {
+ details.responseHeaders["Access-Control-Allow-Origin"] = [app_path]
+ } else {
+ details.responseHeaders["Access-Control-Allow-Origin"] = ["*"]
+ }
+ callback({
+ cancel: false,
+ responseHeaders: details.responseHeaders
+ })
+ }
+ )
+
+ // load the app
+ mainWindow.loadURL(app_path)
+ mainWindow.focus()
+
+ // const handleRedirect = (e, url) => {
+ // if (url !== mainWindow.webContents.getURL()) {
+ // e.preventDefault()
+ // shell.openExternal(url)
+ // }
+ // }
+
+ // mainWindow.webContents.on("will-navigate", handleRedirect)
+ // mainWindow.webContents.on("new-window", handleRedirect)
+}
+
+app.on("ready", async () => {
+ if (!devMode) {
+ return createWindow()
+ }
+
+ loadWindow = new BrowserWindow({
+ width: 700,
+ height: 500,
+ frame: false,
+ resizable: false,
+ center: true,
+ transparent: true,
+ backgroundColor: "#00000000",
+ })
+
+ console.log("Starting on dev mode....")
+ notify({ title: "Starting development server..." })
+
+ loadWindow.loadURL(`file://${__dirname}/statics/loading_dev.html`)
+ loadWindow.focus()
+
+ await waitOn({ resources: [app_path] }, (err) => {
+ if (err) {
+ return console.error(err)
+ }
+ })
+
+ loadWindow.close()
+
+ createWindow()
+})
+
+app.on("window-all-closed", () => {
+ mainWindow = null
+})
+
+app.on("before-quit", async () => {
+ mainWindow.removeAllListeners("close")
+ mainWindow = null
+})
+
+ipcMain.handle("update-progress-bar", (event, p) => {
+ mainWindow.setProgressBar(p)
+})
+
+ipcMain.handle("hide-window", () => {
+ if (mainWindow) {
+ mainWindow.hide()
+ }
+})
+
+ipcMain.handle("show-window", () => {
+ if (mainWindow) {
+ mainWindow.show()
+ mainWindow.focus()
+ }
+})
+
+ipcMain.handle("min-max-window", () => {
+ if (mainWindow.isMaximized()) {
+ mainWindow.unmaximize()
+ } else if (mainWindow.maximizable) {
+ mainWindow.maximize()
+ }
+})
+
+ipcMain.handle("getSystemPreferences", () => {
+ return systemPreferences
+})
+
+ipcMain.handle("app.minimize", () => {
+ mainWindow.minimize()
+})
+
+ipcMain.handle("app.close", () => {
+ app.quit()
+})
+
+ipcMain.handle("open-devtools", () => {
+ mainWindow.webContents.openDevTools({ mode: "undocked" })
+})
+
+ipcMain.handle("appRelaunch", () => {
+ relaunchApp()
+})
+
+ipcMain.handle("inspectElement", (event, payload) => {
+ mainWindow.inspectElement(payload.x, payload.y)
+})
\ No newline at end of file
diff --git a/packages/app/electron/main/statics/loading.css b/packages/app/electron/main/statics/loading.css
new file mode 100644
index 00000000..8b3d3063
--- /dev/null
+++ b/packages/app/electron/main/statics/loading.css
@@ -0,0 +1,112 @@
+ body {
+ background-color: transparent;
+ border-radius: 12px;
+ font-family: 'Alata', sans-serif;
+ width: 100vw;
+ height: 100vh;
+ overflow: hidden;
+ user-select: none;
+ -webkit-app-region: drag;
+ }
+
+ .wrapper {
+ position: absolute;
+ top: 0;
+ right: 0;
+
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex-direction: column;
+ background-color: #efefef;
+ color: #2d2d2d;
+ border-radius: 12px;
+ text-align: center;
+
+ width: 100%;
+ height: 100%;
+ }
+
+ .bouncy-logo{
+ width: 100%;
+ height: auto;
+ margin: auto;
+ }
+
+ .bouncy-logo .ball {
+ height: auto;
+ width: 100%;
+ transform: translate(-10px, 0);
+ }
+
+ .bouncy-logo .ball svg {
+ width: 200px;
+ height: 200px;
+ margin: auto;
+
+ -webkit-animation-direction: alternate;
+ -webkit-animation-duration: 1s;
+ -webkit-animation-name: my-bounce;
+ -webkit-animation-iteration-count: infinite;
+ animation-direction: alternate;
+ animation-duration: 1s;
+ animation-name: my-bounce;
+ animation-iteration-count: infinite;
+ }
+
+ .shadow{
+ width: 100%;
+ height: auto;
+ }
+
+ .bouncy-logo .ball-shadow {
+ margin: auto;
+ background: radial-gradient(50% 50%, rgba(204, 204, 204, 0.45) 0%, transparent 100%);
+ height: 50px;
+ width: 200px;
+ -webkit-animation-direction: alternate;
+ -webkit-animation-duration: 1s;
+ -webkit-animation-name: my-grow;
+ -webkit-animation-iteration-count: infinite;
+ animation-direction: alternate;
+ animation-duration: 1s;
+ animation-name: my-grow;
+ animation-iteration-count: infinite;
+ }
+
+ @-webkit-keyframes my-grow {
+ from {
+ width: 200px;
+ height: 50px;
+ }
+ to {
+ width: 150px;
+ height: 10px;
+ }
+ }
+ @keyframes my-grow {
+ from {
+ width: 200px;
+ height: 50px;
+ }
+ to {
+ width: 150px;
+ height: 10px;
+ }
+ }
+ @-webkit-keyframes my-bounce {
+ from {
+ top: 0;
+ }
+ to {
+ top: 10%;
+ }
+ }
+ @keyframes my-bounce {
+ from {
+ top: 0;
+ }
+ to {
+ top: 10%;
+ }
+ }
\ No newline at end of file
diff --git a/packages/app/electron/main/statics/loading.html b/packages/app/electron/main/statics/loading.html
new file mode 100644
index 00000000..039634a8
--- /dev/null
+++ b/packages/app/electron/main/statics/loading.html
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/packages/app/electron/main/statics/loading_dev.html b/packages/app/electron/main/statics/loading_dev.html
new file mode 100644
index 00000000..d45f8e69
--- /dev/null
+++ b/packages/app/electron/main/statics/loading_dev.html
@@ -0,0 +1,24 @@
+
+
+
+
+
+
+
Starting the development server...
+
-
+
}
\ No newline at end of file
diff --git a/packages/app/src/theme/index.less b/packages/app/src/theme/index.less
index 01567292..ad8869b8 100644
--- a/packages/app/src/theme/index.less
+++ b/packages/app/src/theme/index.less
@@ -95,6 +95,16 @@ html {
height: 100%;
background-color: var(--layoutBackgroundColor) !important;
+
+ &.electron {
+ .layout_page {
+ padding-top: 35px;
+ }
+
+ .ant-layout-sider {
+ padding-top: 0px;
+ }
+ }
}
#nprogress {
@@ -231,6 +241,10 @@ html {
margin-bottom: 40px;
}
+ svg {
+ color: var(--text-color) !important;
+ }
+
.splash_logo {
width: 200px;
height: 200px;
diff --git a/packages/app/vite.config.js b/packages/app/vite.config.js
index 8e82569d..176c6546 100644
--- a/packages/app/vite.config.js
+++ b/packages/app/vite.config.js
@@ -1,11 +1,14 @@
+import path from "path"
import getConfig from "./.config.js"
import { defineConfig } from "vite"
-import reactRefresh from "@vitejs/plugin-react-refresh"
+import react from "@vitejs/plugin-react"
+
+//import electron, { onstart } from "vite-plugin-electron"
export default defineConfig({
plugins: [
- reactRefresh(),
+ react(),
],
...getConfig(),
})
\ No newline at end of file