Skip to content

Commit 962dc45

Browse files
authored
Merge pull request #1 from dancixx/refactor/project-handling
refactor: multi project handling
2 parents e09d391 + 0eb2135 commit 962dc45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+992
-843
lines changed

.github/workflows/rust.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
# add rust nightly
1717
container:
18-
image: rust:latest
18+
image: rustlang/rust:nightly
1919

2020
steps:
2121
- uses: actions/checkout@v3

Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust-sql-gui-ui"
3-
version = "1.0.0-alpha.2"
3+
version = "1.0.0-alpha.3"
44
edition = "2021"
55

66
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
@@ -16,8 +16,9 @@ leptos_icons = { version = "0.1.0", features = ["HiBars4OutlineLg", "HiCircleSta
1616
serde_json = "1.0.108"
1717
wasm-bindgen-futures = "0.4.39"
1818
monaco = "0.4.0"
19-
# tauri = { version = "1.5.3", features = ["dialog"] }
2019
thaw = "0.1.3"
20+
common = { path = "common" }
21+
2122

2223
[workspace]
23-
members = ["src-tauri"]
24+
members = ["src-tauri", "common"]

common/Cargo.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[package]
2+
name = "common"
3+
version = "1.0.0-alpha.3"
4+
edition = "2021"
5+
6+
[dependencies]
7+
serde = "1.0.193"

common/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pub mod project;

common/src/project.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
use serde::{Deserialize, Serialize};
2+
3+
#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord, Debug)]
4+
pub struct ProjectDetails {
5+
pub name: String,
6+
pub user: String,
7+
pub password: String,
8+
pub host: String,
9+
pub port: String,
10+
}

public/leptos.svg

Lines changed: 0 additions & 64 deletions
This file was deleted.

public/tauri.svg

Lines changed: 0 additions & 6 deletions
This file was deleted.

src-tauri/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rust-sql-gui"
3-
version = "1.0.0-alpha.2"
3+
version = "1.0.0-alpha.3"
44
description = "PostgreSQL GUI written in Rust"
55
authors = ["you"]
66
license = ""
@@ -20,6 +20,7 @@ tokio = "1.34.0"
2020
tokio-postgres = "0.7.10"
2121
chrono = "0.4.31"
2222
sled = "0.34.7"
23+
common = { path = "../common" }
2324

2425

2526

src-tauri/icons/128x128.png

-5.08 KB
Loading

src-tauri/icons/128x128@2x.png

-17.3 KB
Loading

0 commit comments

Comments
 (0)