diff --git a/README.md b/README.md index 6f70b1a..c4f0424 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ Anubias is project help you to make your mobile apps so easy and native. : ) ## Requirment - - vue cli - - electron js cli + - vue cli ``npm install -g @vue/cli`` + - electron js cli ``npm install electron -g`` ## Project setup ``` diff --git a/package.json b/package.json index adc9e13..825732a 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,6 @@ "version": "1.0.0-alpha", "private": false, "description": "anubias desktop application", - "asarUnpack": ["**/*.node"], "author": { "name": "xStack Team" }, @@ -12,7 +11,7 @@ "build": "vue-cli-service build", "lint": "vue-cli-service lint", "electron:build": "vue-cli-service electron:build", - "electron:serve": "vue-cli-service electron:serve", + "electron:serve": "vue-cli-service electron:serve ", "postinstall": "electron-builder install-app-deps", "postuninstall": "electron-builder install-app-deps", "test": "echo \"Error: no test specified\" && exit 1" @@ -23,7 +22,7 @@ "alertifyjs": "^1.13.1", "brace": "^0.11.1", "core-js": "^3.6.5", - "electron": "^12.0.7", + "electron": "^13.1.8", "flickity": "^2.2.2", "fs": "0.0.1-security", "html2canvas": "^1.0.0-rc.7", @@ -41,16 +40,16 @@ "vue-router": "^3.5.1" }, "devDependencies": { + "script-loader": "^0.7.2", "@vue/cli-plugin-babel": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-service": "~4.5.0", "babel-eslint": "^10.1.0", - "electron": "^11.0.0", + "electron": "^13.0.0", "electron-devtools-installer": "^3.1.0", "eslint": "^6.7.2", "eslint-plugin-vue": "^6.2.2", - "script-loader": "^0.7.2", - "vue-cli-plugin-electron-builder": "~2.0.0-rc.6", + "vue-cli-plugin-electron-builder": "~2.1.1", "vue-template-compiler": "^2.6.11" }, "eslintConfig": { diff --git a/anubias-engine b/resources/anubias-engine similarity index 100% rename from anubias-engine rename to resources/anubias-engine diff --git a/anubias_sample/.gitignore b/resources/anubias_sample/.gitignore similarity index 100% rename from anubias_sample/.gitignore rename to resources/anubias_sample/.gitignore diff --git a/anubias_sample/.metadata b/resources/anubias_sample/.metadata similarity index 100% rename from anubias_sample/.metadata rename to resources/anubias_sample/.metadata diff --git a/anubias_sample/README.md b/resources/anubias_sample/README.md similarity index 100% rename from anubias_sample/README.md rename to resources/anubias_sample/README.md diff --git a/anubias_sample/android/.gitignore b/resources/anubias_sample/android/.gitignore similarity index 100% rename from anubias_sample/android/.gitignore rename to resources/anubias_sample/android/.gitignore diff --git a/anubias_sample/android/app/build.gradle b/resources/anubias_sample/android/app/build.gradle similarity index 100% rename from anubias_sample/android/app/build.gradle rename to resources/anubias_sample/android/app/build.gradle diff --git a/anubias_sample/android/app/src/debug/AndroidManifest.xml b/resources/anubias_sample/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from anubias_sample/android/app/src/debug/AndroidManifest.xml rename to resources/anubias_sample/android/app/src/debug/AndroidManifest.xml diff --git a/anubias_sample/android/app/src/main/AndroidManifest.xml b/resources/anubias_sample/android/app/src/main/AndroidManifest.xml similarity index 100% rename from anubias_sample/android/app/src/main/AndroidManifest.xml rename to resources/anubias_sample/android/app/src/main/AndroidManifest.xml diff --git a/anubias_sample/android/app/src/main/kotlin/com/example/anubias_sample/MainActivity.kt b/resources/anubias_sample/android/app/src/main/kotlin/com/example/anubias_sample/MainActivity.kt similarity index 100% rename from anubias_sample/android/app/src/main/kotlin/com/example/anubias_sample/MainActivity.kt rename to resources/anubias_sample/android/app/src/main/kotlin/com/example/anubias_sample/MainActivity.kt diff --git a/anubias_sample/android/app/src/main/res/drawable-v21/launch_background.xml b/resources/anubias_sample/android/app/src/main/res/drawable-v21/launch_background.xml similarity index 100% rename from anubias_sample/android/app/src/main/res/drawable-v21/launch_background.xml rename to resources/anubias_sample/android/app/src/main/res/drawable-v21/launch_background.xml diff --git a/anubias_sample/android/app/src/main/res/drawable/launch_background.xml b/resources/anubias_sample/android/app/src/main/res/drawable/launch_background.xml similarity index 100% rename from anubias_sample/android/app/src/main/res/drawable/launch_background.xml rename to resources/anubias_sample/android/app/src/main/res/drawable/launch_background.xml diff --git a/anubias_sample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/resources/anubias_sample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from anubias_sample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to resources/anubias_sample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/anubias_sample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/resources/anubias_sample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from anubias_sample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to resources/anubias_sample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/anubias_sample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/resources/anubias_sample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from anubias_sample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to resources/anubias_sample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/anubias_sample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/resources/anubias_sample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from anubias_sample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to resources/anubias_sample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/anubias_sample/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/resources/anubias_sample/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from anubias_sample/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to resources/anubias_sample/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/anubias_sample/android/app/src/main/res/values-night/styles.xml b/resources/anubias_sample/android/app/src/main/res/values-night/styles.xml similarity index 100% rename from anubias_sample/android/app/src/main/res/values-night/styles.xml rename to resources/anubias_sample/android/app/src/main/res/values-night/styles.xml diff --git a/anubias_sample/android/app/src/main/res/values/styles.xml b/resources/anubias_sample/android/app/src/main/res/values/styles.xml similarity index 100% rename from anubias_sample/android/app/src/main/res/values/styles.xml rename to resources/anubias_sample/android/app/src/main/res/values/styles.xml diff --git a/anubias_sample/android/app/src/profile/AndroidManifest.xml b/resources/anubias_sample/android/app/src/profile/AndroidManifest.xml similarity index 100% rename from anubias_sample/android/app/src/profile/AndroidManifest.xml rename to resources/anubias_sample/android/app/src/profile/AndroidManifest.xml diff --git a/anubias_sample/android/build.gradle b/resources/anubias_sample/android/build.gradle similarity index 100% rename from anubias_sample/android/build.gradle rename to resources/anubias_sample/android/build.gradle diff --git a/anubias_sample/android/gradle.properties b/resources/anubias_sample/android/gradle.properties similarity index 100% rename from anubias_sample/android/gradle.properties rename to resources/anubias_sample/android/gradle.properties diff --git a/anubias_sample/android/gradle/wrapper/gradle-wrapper.properties b/resources/anubias_sample/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from anubias_sample/android/gradle/wrapper/gradle-wrapper.properties rename to resources/anubias_sample/android/gradle/wrapper/gradle-wrapper.properties diff --git a/anubias_sample/android/settings.gradle b/resources/anubias_sample/android/settings.gradle similarity index 100% rename from anubias_sample/android/settings.gradle rename to resources/anubias_sample/android/settings.gradle diff --git a/anubias_sample/assets/icon.png b/resources/anubias_sample/assets/icon.png similarity index 100% rename from anubias_sample/assets/icon.png rename to resources/anubias_sample/assets/icon.png diff --git a/anubias_sample/assets/images/sample.jpg b/resources/anubias_sample/assets/images/sample.jpg similarity index 100% rename from anubias_sample/assets/images/sample.jpg rename to resources/anubias_sample/assets/images/sample.jpg diff --git a/anubias_sample/flutter_launcher_icons.yaml b/resources/anubias_sample/flutter_launcher_icons.yaml similarity index 100% rename from anubias_sample/flutter_launcher_icons.yaml rename to resources/anubias_sample/flutter_launcher_icons.yaml diff --git a/anubias_sample/ios/.gitignore b/resources/anubias_sample/ios/.gitignore similarity index 100% rename from anubias_sample/ios/.gitignore rename to resources/anubias_sample/ios/.gitignore diff --git a/anubias_sample/ios/Flutter/AppFrameworkInfo.plist b/resources/anubias_sample/ios/Flutter/AppFrameworkInfo.plist similarity index 100% rename from anubias_sample/ios/Flutter/AppFrameworkInfo.plist rename to resources/anubias_sample/ios/Flutter/AppFrameworkInfo.plist diff --git a/anubias_sample/ios/Flutter/Debug.xcconfig b/resources/anubias_sample/ios/Flutter/Debug.xcconfig similarity index 100% rename from anubias_sample/ios/Flutter/Debug.xcconfig rename to resources/anubias_sample/ios/Flutter/Debug.xcconfig diff --git a/anubias_sample/ios/Flutter/Release.xcconfig b/resources/anubias_sample/ios/Flutter/Release.xcconfig similarity index 100% rename from anubias_sample/ios/Flutter/Release.xcconfig rename to resources/anubias_sample/ios/Flutter/Release.xcconfig diff --git a/anubias_sample/ios/Runner.xcodeproj/project.pbxproj b/resources/anubias_sample/ios/Runner.xcodeproj/project.pbxproj similarity index 100% rename from anubias_sample/ios/Runner.xcodeproj/project.pbxproj rename to resources/anubias_sample/ios/Runner.xcodeproj/project.pbxproj diff --git a/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to resources/anubias_sample/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/anubias_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/resources/anubias_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme similarity index 100% rename from anubias_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme rename to resources/anubias_sample/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme diff --git a/anubias_sample/ios/Runner.xcworkspace/contents.xcworkspacedata b/resources/anubias_sample/ios/Runner.xcworkspace/contents.xcworkspacedata similarity index 100% rename from anubias_sample/ios/Runner.xcworkspace/contents.xcworkspacedata rename to resources/anubias_sample/ios/Runner.xcworkspace/contents.xcworkspacedata diff --git a/anubias_sample/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/resources/anubias_sample/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from anubias_sample/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to resources/anubias_sample/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/anubias_sample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/resources/anubias_sample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings similarity index 100% rename from anubias_sample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings rename to resources/anubias_sample/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings diff --git a/anubias_sample/ios/Runner/AppDelegate.swift b/resources/anubias_sample/ios/Runner/AppDelegate.swift similarity index 100% rename from anubias_sample/ios/Runner/AppDelegate.swift rename to resources/anubias_sample/ios/Runner/AppDelegate.swift diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json rename to resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json diff --git a/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@2x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png b/resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png rename to resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/LaunchImage@3x.png diff --git a/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md b/resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md similarity index 100% rename from anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md rename to resources/anubias_sample/ios/Runner/Assets.xcassets/LaunchImage.imageset/README.md diff --git a/anubias_sample/ios/Runner/Base.lproj/LaunchScreen.storyboard b/resources/anubias_sample/ios/Runner/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from anubias_sample/ios/Runner/Base.lproj/LaunchScreen.storyboard rename to resources/anubias_sample/ios/Runner/Base.lproj/LaunchScreen.storyboard diff --git a/anubias_sample/ios/Runner/Base.lproj/Main.storyboard b/resources/anubias_sample/ios/Runner/Base.lproj/Main.storyboard similarity index 100% rename from anubias_sample/ios/Runner/Base.lproj/Main.storyboard rename to resources/anubias_sample/ios/Runner/Base.lproj/Main.storyboard diff --git a/anubias_sample/ios/Runner/Info.plist b/resources/anubias_sample/ios/Runner/Info.plist similarity index 100% rename from anubias_sample/ios/Runner/Info.plist rename to resources/anubias_sample/ios/Runner/Info.plist diff --git a/anubias_sample/ios/Runner/Runner-Bridging-Header.h b/resources/anubias_sample/ios/Runner/Runner-Bridging-Header.h similarity index 100% rename from anubias_sample/ios/Runner/Runner-Bridging-Header.h rename to resources/anubias_sample/ios/Runner/Runner-Bridging-Header.h diff --git a/anubias_sample/lib/fnc/functions.dart b/resources/anubias_sample/lib/fnc/functions.dart similarity index 100% rename from anubias_sample/lib/fnc/functions.dart rename to resources/anubias_sample/lib/fnc/functions.dart diff --git a/anubias_sample/lib/fnc/general.dart b/resources/anubias_sample/lib/fnc/general.dart similarity index 100% rename from anubias_sample/lib/fnc/general.dart rename to resources/anubias_sample/lib/fnc/general.dart diff --git a/anubias_sample/lib/main.dart b/resources/anubias_sample/lib/main.dart similarity index 100% rename from anubias_sample/lib/main.dart rename to resources/anubias_sample/lib/main.dart diff --git a/anubias_sample/lib/pages/page.dart b/resources/anubias_sample/lib/pages/page.dart similarity index 100% rename from anubias_sample/lib/pages/page.dart rename to resources/anubias_sample/lib/pages/page.dart diff --git a/anubias_sample/lib/pages/temp.dart b/resources/anubias_sample/lib/pages/temp.dart similarity index 100% rename from anubias_sample/lib/pages/temp.dart rename to resources/anubias_sample/lib/pages/temp.dart diff --git a/anubias_sample/pubspec.lock b/resources/anubias_sample/pubspec.lock similarity index 100% rename from anubias_sample/pubspec.lock rename to resources/anubias_sample/pubspec.lock diff --git a/anubias_sample/pubspec.yaml b/resources/anubias_sample/pubspec.yaml similarity index 100% rename from anubias_sample/pubspec.yaml rename to resources/anubias_sample/pubspec.yaml diff --git a/anubias_sample/test/widget_test.dart b/resources/anubias_sample/test/widget_test.dart similarity index 100% rename from anubias_sample/test/widget_test.dart rename to resources/anubias_sample/test/widget_test.dart diff --git a/anubias_sample/version b/resources/anubias_sample/version similarity index 100% rename from anubias_sample/version rename to resources/anubias_sample/version diff --git a/resources/icons/256x256.png b/resources/icons/256x256.png new file mode 100644 index 0000000..6737113 Binary files /dev/null and b/resources/icons/256x256.png differ diff --git a/resources/icons/512x512.png b/resources/icons/512x512.png new file mode 100644 index 0000000..5b9245f Binary files /dev/null and b/resources/icons/512x512.png differ diff --git a/resources/icons/favicon.ico b/resources/icons/favicon.ico new file mode 100644 index 0000000..6bfe9bf Binary files /dev/null and b/resources/icons/favicon.ico differ diff --git a/resources/icons/icon.icns b/resources/icons/icon.icns new file mode 100644 index 0000000..2522e7e Binary files /dev/null and b/resources/icons/icon.icns differ diff --git a/resources/icons/icon.png b/resources/icons/icon.png new file mode 100644 index 0000000..6737113 Binary files /dev/null and b/resources/icons/icon.png differ diff --git a/src/background.js b/src/background.js index 69415b2..64252fb 100644 --- a/src/background.js +++ b/src/background.js @@ -11,8 +11,10 @@ const cp = require('child_process'); const ipc = require('electron').ipcMain const dialog = require('electron').dialog const isDevelopment = process.env.NODE_ENV !== 'production'; +const isDev = process.mainModule.filename.indexOf('app.asar') === -1; + var win; -var underDebug ; +var underDebug; // Scheme must be registered before the app is ready protocol.registerSchemesAsPrivileged([ @@ -22,13 +24,24 @@ protocol.registerSchemesAsPrivileged([ async function createWindow() { // Create the browser window. + let iconPath = 'public/256x256.png'; + if (isDev){ + if (process.platform == 'darwin'){ + iconPath = 'public/icon.icns'; + } + }else{ + iconPath = process.resourcesPath +'/resources/icons/512x512.png'; + if (process.platform == 'darwin'){ + iconPath = process.resourcesPath +'/resources/icons/icon.icns'; + } + } win = new BrowserWindow({ - icon: 'public/256x256.png', + icon:iconPath, width: 1000, height: 600, - minHeight:600, - minWidth:800, - frame:false, + minHeight: 600, + minWidth: 800, + frame: false, webPreferences: { // Use pluginOptions.nodeIntegration, leave this alone @@ -109,7 +122,7 @@ ipc.on('open-file-dialog', function (event) { dialog.showOpenDialog({ properties: ['openFile'] }, function (files) { - if (files){ + if (files) { event.sender.send('selected-file', files); } }) @@ -206,7 +219,11 @@ ipc.on('save-as-file-project', function (event, arg) { win.webContents.send('message', {type: 'error', 'msg': 'error: ' + path.basename(filename)}); } // otherwise we saved send msg to ide saved :) - win.webContents.send('message', {type: 'success', 'msg': path.basename(filename) + ' saved', 'save':true}); + win.webContents.send('message', { + type: 'success', + 'msg': path.basename(filename) + ' saved', + 'save': true + }); }); } catch (e) { win.webContents.send('message', {type: 'error', 'error': e.message}); @@ -233,7 +250,7 @@ ipc.on('save-project', function (event, arg) { win.webContents.send('message', {type: 'error', 'msg': 'error: ' + path.basename(filename)}); } // otherwise we saved send msg to ide saved :) - win.webContents.send('message', {type: 'success', 'msg': path.basename(filename) + ' saved', 'save':true }); + win.webContents.send('message', {type: 'success', 'msg': path.basename(filename) + ' saved', 'save': true}); }); } catch (e) { win.webContents.send('message', {type: 'error', 'error': e.message}); @@ -247,16 +264,27 @@ ipc.on('save-project', function (event, arg) { ipc.on('command', function (eventevent, data) { // - let cwd = __dirname + '/..'; + let cwd = __dirname; + if ( isDev ) { + cwd = '/..'; + }else{ + cwd = process.resourcesPath; + } + cwd += '/resources'; if (data.cwd) { cwd = cwd + '/' + data.cwd; } + // fs.writeFileSync('/home/freeman/log', process.resourcesPath); let child = cp.exec(data.command, { cwd: cwd, + env: { + NODE_ENV: 'production', + PATH: process.env.PATH + } }, function (error, stdout, stderr) { if (!error) { // win.webContents.send('terminal', stdout); - if (data.isUpdate !== undefined){ + if (data.isUpdate !== undefined) { win.webContents.send('build-success', true); } // win.webContents.send('message', {type: 'info', 'msg': stderr}); @@ -265,10 +293,10 @@ ipc.on('command', function (eventevent, data) { win.webContents.send('terminal-error', error.message); } }); - if (data.isDebug !== undefined){ + if (data.isDebug !== undefined) { underDebug = child; } - child.stdout.on('data', function(data) { + child.stdout.on('data', function (data) { win.webContents.send('terminal', data); }); }); @@ -280,7 +308,7 @@ ipc.on('update-project', function (eventevent, data) { underDebug.stdin.write("R"); win.webContents.send('message', {type: 'success', 'msg': 'hot restart'}); - } catch(e) { + } catch (e) { win.webContents.send('message', {type: 'error', 'msg': error.message}); } diff --git a/src/components/pages/MainAppPage.vue b/src/components/pages/MainAppPage.vue index 1edb7fb..ccd17f7 100644 --- a/src/components/pages/MainAppPage.vue +++ b/src/components/pages/MainAppPage.vue @@ -233,8 +233,9 @@ import actionControl from '../elements/ActionControlElement'; import optionControl from '../elements/OptionControlElement'; import {Drag, Drop} from "vue-easy-dnd"; import VueContext from 'vue-context'; +/*eslint-disable */ import Sortable from '@/assets/js/Sortable.min'; - +/*eslint-enable */ // import editor from '../elements/TitleElement'; // const {remote} = require("electron"); diff --git a/vue.config.js b/vue.config.js index 72c3cf9..1651b51 100644 --- a/vue.config.js +++ b/vue.config.js @@ -3,39 +3,53 @@ module.exports = { electronBuilder: { preload: './src/preload.js', // Or, for multiple preload files: - "appId": "app.anubias.desktop", - "productName": "Anubias", - "copyright": "Copyright © 2021 ${author}", - "mac": { - "target": "dmg", - "icon": "./public/icon.icns", - "category": "public.app-category.developer-tools" - }, - "win": { - "target": [ - "nsis", - "msi" + // "appId": "app.anubias.desktop", + // "productName": "Anubias", + // "copyright": "Copyright © 2021 ${author}", + // // "asar": false, + // "mac": { + // "target": "dmg", + // "icon": "./public/icon.icns", + // "category": "public.app-category.developer-tools" + // }, + // "win": { + // "target": [ + // "nsis", + // "msi" + // ], + // "icon": "./public/256x256.png" + // }, + // "linux": { + // // "category": "Development", + // "target": "AppImage", + // "desktop": "Anubias" + // }, + // "directories": { + // "buildResources": "public", + // }, + // // "publish": null, + // "fileAssociations": [ + // { + // "ext": "anb", + // "name": "Anbuias project", + // "role": "Anubias", + // "perMachine": true, + // "description": "Anubias project file to develop native app anywhere painless" + // } + // ], + builderOptions: { + extraResources: [ + { + "from": "resources", + "to": "resources", + "filter": ["**/*"] + } ], - "icon": "./public/256x256.png" - }, - "linux": { - "category": "Development", - "target": "AppImage", - "desktop": "Anubias" - }, - "directories": { - "buildResources": "public" }, - "fileAssociations": [ - { - "ext": "anb", - "name": "Anbuias project", - "role": "Anubias", - "perMachine": true, - "description": "Anubias project file to develope native app anywhere painless" - } - ] - // preload: { preload: 'src/preload.js', otherPreload: 'src/preload2.js' } + "files": [ + "**/*" + ], + } } }; \ No newline at end of file