diff --git a/packages/gui/.prettierrc b/packages/gui/.prettierrc index 1176c1f..ea07536 100644 --- a/packages/gui/.prettierrc +++ b/packages/gui/.prettierrc @@ -4,7 +4,7 @@ "singleQuote": true, "trailingComma": "none", "printWidth": 100, - "plugins": ["prettier-plugin-svelte"], + "plugins": ["prettier-plugin-svelte", "prettier-plugin-tailwindcss"], "pluginSearchDirs": ["."], "overrides": [{ "files": "*.svelte", "options": { "parser": "svelte" } }] } diff --git a/packages/gui/package.json b/packages/gui/package.json index 77b5824..fd63afa 100644 --- a/packages/gui/package.json +++ b/packages/gui/package.json @@ -27,8 +27,9 @@ "eslint-config-prettier": "^8.3.0", "eslint-plugin-svelte3": "^4.0.0", "postcss": "^8.4.19", - "prettier": "^2.6.2", + "prettier": "^2.7.1", "prettier-plugin-svelte": "^2.7.0", + "prettier-plugin-tailwindcss": "^0.2.0", "svelte": "^3.49.0", "svelte-check": "^2.8.0", "svelte-preprocess": "^4.10.7", diff --git a/packages/gui/src-tauri/Cargo.lock b/packages/gui/src-tauri/Cargo.lock index 084781c..f276b59 100644 --- a/packages/gui/src-tauri/Cargo.lock +++ b/packages/gui/src-tauri/Cargo.lock @@ -1622,6 +1622,16 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "os_pipe" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6a252f1f8c11e84b3ab59d7a488e48e4478a93937e027076638c49536204639" +dependencies = [ + "libc", + "windows-sys 0.42.0", +] + [[package]] name = "overload" version = "0.1.1" @@ -2339,6 +2349,16 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shared_child" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "siphasher" version = "0.3.10" @@ -2552,6 +2572,7 @@ dependencies = [ "objc", "once_cell", "open", + "os_pipe", "percent-encoding", "rand 0.8.5", "raw-window-handle", @@ -2561,6 +2582,7 @@ dependencies = [ "serde_json", "serde_repr", "serialize-to-javascript", + "shared_child", "state", "tar", "tauri-macros", diff --git a/packages/gui/src-tauri/Cargo.toml b/packages/gui/src-tauri/Cargo.toml index 8e3c1b4..6576123 100644 --- a/packages/gui/src-tauri/Cargo.toml +++ b/packages/gui/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.2.0", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.2.0", features = ["http-all", "shell-open", "window-all"] } +tauri = { version = "1.2.0", features = ["fs-read-dir", "http-all", "shell-all", "window-all"] } uuid = "1.2.1" futures = "0.3" diff --git a/packages/gui/src-tauri/src/handlers/packages.rs b/packages/gui/src-tauri/src/handlers/packages.rs index 6df1455..4e77c9a 100644 --- a/packages/gui/src-tauri/src/handlers/packages.rs +++ b/packages/gui/src-tauri/src/handlers/packages.rs @@ -1,4 +1,5 @@ #[tauri::command] pub fn install_package(package: String) { println!("installing: {}", package); + } \ No newline at end of file diff --git a/packages/gui/src-tauri/tauri.conf.json b/packages/gui/src-tauri/tauri.conf.json index 3fd334d..9b417d5 100644 --- a/packages/gui/src-tauri/tauri.conf.json +++ b/packages/gui/src-tauri/tauri.conf.json @@ -18,10 +18,26 @@ "scope": ["https://api.tea.xyz/v1/*", "https://github.com/*"] }, "shell": { - "all": false, - "execute": false, + "all": true, + "execute": true, "open": true, - "scope": [], + "scope": [ + { + "name": "tea-install", + "cmd": "tea", + "args": [{ "validator": "\\S+" }, "true"] + }, + { + "name": "node", + "cmd": "node", + "args": ["--version"] + }, + { + "name": "list-packages", + "cmd": "ls", + "args": ["-R ~/.tea/tea.xyz/var/www | grep 'xz\\|gz'"] + } + ], "sidecar": false }, "window": { @@ -55,6 +71,13 @@ "startDragging": true, "unmaximize": true, "unminimize": true + }, + "fs": { + "readDir": true, + "scope": [ + "$HOME/.tea/*", + "$APPDATA/*" + ] } }, "bundle": { diff --git a/packages/gui/src/components/BigBlackSpace/BigBlackSpace.svelte b/packages/gui/src/components/BigBlackSpace/BigBlackSpace.svelte index c6701a4..5aa397a 100644 --- a/packages/gui/src/components/BigBlackSpace/BigBlackSpace.svelte +++ b/packages/gui/src/components/BigBlackSpace/BigBlackSpace.svelte @@ -1,6 +1,5 @@ - +
diff --git a/packages/gui/src/components/CliBanner/CliBanner.svelte b/packages/gui/src/components/CliBanner/CliBanner.svelte index 0415675..d268cb7 100644 --- a/packages/gui/src/components/CliBanner/CliBanner.svelte +++ b/packages/gui/src/components/CliBanner/CliBanner.svelte @@ -1,6 +1,27 @@ - +
+
+
+ tea +
+

tea.cli ver. 0.6.0

+
+
+ + + +
+
diff --git a/packages/gui/src/components/FeaturedCourses/FeaturedCourses.svelte b/packages/gui/src/components/FeaturedCourses/FeaturedCourses.svelte index c662ae7..4febfe4 100644 --- a/packages/gui/src/components/FeaturedCourses/FeaturedCourses.svelte +++ b/packages/gui/src/components/FeaturedCourses/FeaturedCourses.svelte @@ -1,7 +1,26 @@ - -

test

+ ({ + title: course.title, + subTitle: course.sub_title, + imageUrl: course.banner_image_url, + link: course.link + }))} +/> diff --git a/packages/gui/src/components/FeaturedPackages/FeaturedPackages.svelte b/packages/gui/src/components/FeaturedPackages/FeaturedPackages.svelte index 75d8d20..83ac856 100644 --- a/packages/gui/src/components/FeaturedPackages/FeaturedPackages.svelte +++ b/packages/gui/src/components/FeaturedPackages/FeaturedPackages.svelte @@ -1,9 +1,9 @@ -
- -
-

FEATURED PACKAGES

-
    - {#each featuredPackages as pkg, i} -
-
-
-
- {#each featuredPackages as pkg} -
- - - -
- {/each} -
-
-
+ ({ + title: pkg.full_name, + subTitle: pkg.maintainer || '', + imageUrl: pkg.thumb_image_url, + link: `/packages/${pkg.slug}` + }))} +/> diff --git a/packages/gui/src/components/GettingStarted/GettingStarted.svelte b/packages/gui/src/components/GettingStarted/GettingStarted.svelte index ffd55b5..80c7ce6 100644 --- a/packages/gui/src/components/GettingStarted/GettingStarted.svelte +++ b/packages/gui/src/components/GettingStarted/GettingStarted.svelte @@ -7,8 +7,8 @@ }; -
GETTING STARTED WITH TEA
-
+
GETTING STARTED WITH TEA
+
- + {#each routes as route}
  • - +
    • {/each}
  • - +
    • -