Skip to content

Commit

Permalink
27th Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shyam-Chen
Shyam-Chen committed Jun 21, 2024
1 parent 8c386c7 commit b6005b3
Show file tree
Hide file tree
Showing 42 changed files with 2,746 additions and 1,753 deletions.
77 changes: 40 additions & 37 deletions app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,45 +10,48 @@
"clean:android": "rimraf ./src-tauri/gen/android"
},
"dependencies": {
"@tauri-apps/api": ">=2.0.0-beta.0",
"@tauri-apps/plugin-shell": ">=2.0.0-beta.0",
"@unocss/reset": "^0.59.0",
"@vueuse/components": "^10.9.0",
"@vueuse/core": "^10.9.0",
"@tauri-apps/api": "2.0.0-beta.13",
"@tauri-apps/plugin-shell": "2.0.0-beta.6",
"@unocss/reset": "0.61.0",
"@vueuse/components": "10.11.0",
"@vueuse/core": "10.11.0",
"@x/ui": "workspace:*",
"date-fns": "^3.6.0",
"echarts": "^5.5.0",
"exceljs": "^4.4.0",
"lodash": "^4.17.21",
"ofetch": "^1.3.4",
"valibot": "^0.30.0",
"vue": "^3.4.21",
"vue-component-type-helpers": "^2.0.10",
"vue-formor": "^4.1.1",
"vue-localer": "^1.4.1",
"vue-qrcode-image": "^1.2.0",
"vue-router": "^4.3.0",
"vue-storer": "^0.6.0",
"vuedraggable": "^4.1.0"
"date-fns": "3.6.0",
"echarts": "5.5.0",
"exceljs": "4.4.0",
"fetch-event-stream": "0.1.5",
"lodash": "4.17.21",
"nprogress": "0.2.0",
"ofetch": "1.3.4",
"valibot": "0.30.0",
"vue": "3.4.29",
"vue-component-type-helpers": "2.0.21",
"vue-formor": "4.1.1",
"vue-localer": "1.5.2",
"vue-qrcode-image": "1.2.0",
"vue-router": "4.3.3",
"vue-storer": "0.6.0",
"vuedraggable": "4.1.0"
},
"devDependencies": {
"@iconify/json": "^2.2.197",
"@tauri-apps/cli": ">=2.0.0-beta.0",
"@types/lodash": "^4.14.202",
"@vitejs/plugin-vue": "^5.0.4",
"@vitest/coverage-v8": "^1.4.0",
"@vue/test-utils": "^2.4.5",
"happy-dom": "^14.7.0",
"private-ip-address": "^1.0.0",
"process-envify": "^2.0.0",
"rimraf": "^5.0.5",
"sass": "^1.74.1",
"tailwindcss": "^3.4.3",
"typescript": "^5.4.4",
"unocss": "^0.59.0",
"vite": "^5.2.8",
"vite-plugin-vue-routes": "^1.1.0",
"vitest": "^1.4.0",
"vue-tsc": "^2.0.10"
"@iconify/json": "2.2.219",
"@tauri-apps/cli": "2.0.0-beta.20",
"@types/lodash": "4.17.5",
"@types/nprogress": "0.2.3",
"@vitejs/plugin-vue": "5.0.5",
"@vitest/coverage-v8": "1.6.0",
"@vue/test-utils": "2.4.6",
"happy-dom": "14.12.0",
"private-ip-address": "1.0.0",
"process-envify": "2.0.0",
"rimraf": "5.0.5",
"sass": "1.77.5",
"tailwindcss": "3.4.4",
"typescript": "5.4.5",
"unocss": "0.61.0",
"vite": "5.3.1",
"vite-plugin-vue-routes": "1.1.0",
"vitest": "1.6.0",
"vue-tsc": "2.0.21"
}
}
Binary file removed app/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
30 changes: 30 additions & 0 deletions app/src-tauri/gen/apple/LaunchScreen.storyboard
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="s0d-6b-0kx">
<objects>
<viewController id="Y6W-OH-hqX" sceneMemberID="viewController">
<view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
</view>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
</objects>
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>
13 changes: 9 additions & 4 deletions app/src-tauri/gen/apple/my-app.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
D230CFF6A4DD2B29115BAB87 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E0077881E32877C0E440D19B /* WebKit.framework */; };
DF4A76406E6418547E005441 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A20C2ADFAF19C2651E5D0420 /* QuartzCore.framework */; };
DF809D69648DC91F609DA8C9 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B753C340792ADB0C13BB129 /* UIKit.framework */; };
F58E838D7F03459E7E9A96DC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 528C1747547F32E2DC7B6824 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -26,6 +27,7 @@
0E797FB7A504FB3C4191B74B /* main.rs */ = {isa = PBXFileReference; path = main.rs; sourceTree = "<group>"; };
3E93FEA913E9AB0588E52095 /* libtauri_lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libtauri_lib.a; sourceTree = "<group>"; };
480B87AF7AB363276809FF6D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
528C1747547F32E2DC7B6824 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
6CF815B5C84D3297940B2E0D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
86B363D5E8E1112D389F0DD0 /* my-app_iOS.app */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = wrapper.application; path = "my-app_iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8ABDCA298343990CA7608AB4 /* Metal.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Metal.framework; path = System/Library/Frameworks/Metal.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -115,6 +117,7 @@
children = (
EF5209BA357A402CF7AC1909 /* assets */,
9A801CD593D08CD40B9103C4 /* Assets.xcassets */,
528C1747547F32E2DC7B6824 /* LaunchScreen.storyboard */,
77DAC57EDBDA65AC366B4E46 /* Externals */,
36884B773300274B39975499 /* my-app_iOS */,
CCA94010C95AC222B64E9FF9 /* Sources */,
Expand Down Expand Up @@ -205,6 +208,7 @@
buildActionMask = 2147483647;
files = (
20F5CA3179D526F58B1FD89A /* Assets.xcassets in Resources */,
F58E838D7F03459E7E9A96DC /* LaunchScreen.storyboard in Resources */,
777A872D7DC515D036042BE7 /* assets in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -226,8 +230,9 @@
outputFileListPaths = (
);
outputPaths = (
"$(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libtauri_lib.a",
"$(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libtauri_lib.a",
"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libtauri_lib.a",
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libtauri_lib.a",
"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libtauri_lib.a",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
Expand Down Expand Up @@ -274,7 +279,7 @@
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = "tauri.starter.my-app";
PRODUCT_BUNDLE_IDENTIFIER = tauri.starter.dev;
PRODUCT_NAME = "Tauri Starter";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down Expand Up @@ -365,7 +370,7 @@
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)";
PRODUCT_BUNDLE_IDENTIFIER = "tauri.starter.my-app";
PRODUCT_BUNDLE_IDENTIFIER = tauri.starter.dev;
PRODUCT_NAME = "Tauri Starter";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand Down
10 changes: 6 additions & 4 deletions app/src-tauri/gen/apple/project.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: my-app
options:
bundleIdPrefix: tauri.starter
bundleIdPrefix: tauri.starter.dev
deploymentTarget:
iOS: 13.0
fileGroups: [../../src]
Expand All @@ -11,7 +11,7 @@ settingGroups:
app:
base:
PRODUCT_NAME: Tauri Starter
PRODUCT_BUNDLE_IDENTIFIER: tauri.starter.my-app
PRODUCT_BUNDLE_IDENTIFIER: tauri.starter.dev
DEVELOPMENT_TEAM: DEVELOPMENT_TEAM
targetTemplates:
app:
Expand All @@ -36,6 +36,7 @@ targets:
- path: assets
buildPhase: resources
type: folder
- path: LaunchScreen.storyboard
info:
path: my-app_iOS/Info.plist
properties:
Expand Down Expand Up @@ -86,5 +87,6 @@ targets:
name: Build Rust Code
basedOnDependencyAnalysis: false
outputFiles:
- $(SRCROOT)/target/aarch64-apple-ios/${CONFIGURATION}/deps/libtauri_lib.a
- $(SRCROOT)/target/x86_64-apple-ios/${CONFIGURATION}/deps/libtauri_lib.a
- $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libtauri_lib.a
- $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libtauri_lib.a
- $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libtauri_lib.a
19 changes: 14 additions & 5 deletions app/vite.config.ts
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { resolve } from 'node:path';
import vue from '@vitejs/plugin-vue';
import { internalIPv4 } from 'private-ip-address';
import { defineConfig } from 'vite';
import vueRoutes from 'vite-plugin-vue-routes';
import envify from 'process-envify';
import tailwindColors from 'tailwindcss/colors';
import { presetIcons, presetUno, transformerDirectives } from 'unocss';
import { presetIcons, presetUno, presetWebFonts, transformerDirectives } from 'unocss';
import unocss from 'unocss/vite';
import envify from 'process-envify';
import { defineConfig } from 'vite';
import vueRoutes from 'vite-plugin-vue-routes';

const mobile = !!/android|ios/.exec(process.env.TAURI_ENV_PLATFORM!);

Expand All @@ -18,7 +18,16 @@ export default defineConfig(async () => ({
vue(),
vueRoutes(),
unocss({
presets: [presetUno(), presetIcons()],
presets: [
presetUno(),
presetIcons(),
presetWebFonts({
fonts: {
sans: ['Roboto:400,500,600,700,800'],
mono: ['Roboto Mono:400,500,600,700,800'],
},
}),
],
transformers: [transformerDirectives({ enforce: 'pre' })],
theme: {
colors: {
Expand Down
Loading

0 comments on commit b6005b3

Please sign in to comment.