Skip to content

Commit

Permalink
Rename application to "Spaceman"
Browse files Browse the repository at this point in the history
  • Loading branch information
eliaperantoni committed Mar 26, 2023
1 parent 63bf4f6 commit 7aebf81
Show file tree
Hide file tree
Showing 178 changed files with 118 additions and 118 deletions.
2 changes: 1 addition & 1 deletion .taurignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Ignore everything but the backend crate
*
!/blossom_gui_back/*
!/spaceman_gui_back/*
# The trailing asterisk is necessary. I don't know why but it doesn't work without it.
136 changes: 68 additions & 68 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[workspace]
members = [
"blossom_types",
"blossom_core",
"blossom_cli",
"blossom_gui_front",
"blossom_gui_back",
"spaceman_types",
"spaceman_core",
"spaceman_cli",
"spaceman_gui_front",
"spaceman_gui_back",
"playground",
]
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Blossom
# Spaceman

<img align="left" width="300" height="300" src="img/logo.png">

Q: I am on Linux and sometimes the application comes up with weird errors!
A: Tauri uses webkit2gtk for the webview on Linux. Unfortunately, WASM is badly supported there and so Blossom might encounter various issues. There is no known solution for this and nothing I can do about it.
A: Tauri uses webkit2gtk for the webview on Linux. Unfortunately, WASM is badly supported there and so Spaceman might encounter various issues. There is no known solution for this and nothing I can do about it.
2 changes: 1 addition & 1 deletion playground/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
authors = ["Elia Perantoni"]
description = "A server for testing and demostrating Blossom"
description = "A server for testing and demostrating Spaceman"

name = "playground"
version = "0.1.0"
Expand Down
10 changes: 5 additions & 5 deletions blossom_cli/Cargo.toml → spaceman_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
authors = ["Elia Perantoni"]
description = "A client for testing gRPC services"

name = "blossom_cli"
name = "spaceman_cli"
version = "0.1.0"
edition = "2021"

Expand All @@ -14,11 +14,11 @@ clap = { version = "3.2.16", features = ["default", "derive"] }
colored = "2.0.0"
base64 = "0.13.0"

[dependencies.blossom_types]
path = "../blossom_types"
[dependencies.spaceman_types]
path = "../spaceman_types"

[dependencies.blossom_core]
path = "../blossom_core"
[dependencies.spaceman_core]
path = "../spaceman_core"

# Serde
[dependencies.serde]
Expand Down
6 changes: 3 additions & 3 deletions blossom_cli/src/main.rs → spaceman_cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ use tokio::sync::mpsc;
use tokio::sync::oneshot;
use tokio_stream::wrappers::ReceiverStream;

use blossom_core::{
use spaceman_core::{
Conn, DynamicMessage, IntoRequest, Metadata, MethodDescriptor, Repo, SerializeOptions,
};
use blossom_types::{endpoint::Endpoint, repo::RepoView};
use spaceman_types::{endpoint::Endpoint, repo::RepoView};

#[derive(Parser)]
#[clap(author, version, about)]
Expand Down Expand Up @@ -81,7 +81,7 @@ struct TlsOptions {
ca_cert: Option<String>,
}

impl From<TlsOptions> for blossom_types::endpoint::TlsOptions {
impl From<TlsOptions> for spaceman_types::endpoint::TlsOptions {
fn from(from: TlsOptions) -> Self {
Self {
no_check: from.no_check,
Expand Down
6 changes: 3 additions & 3 deletions blossom_core/Cargo.toml → spaceman_core/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "blossom_core"
name = "spaceman_core"
version = "0.1.0"
edition = "2021"

Expand All @@ -9,8 +9,8 @@ edition = "2021"
anyhow = "1.0.58"
serde = { version = "1.0.145", features = ["derive"] }

[dependencies.blossom_types]
path = "../blossom_types"
[dependencies.spaceman_types]
path = "../spaceman_types"

# gRPC
[dependencies.prost-reflect]
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions blossom_core/src/lib.rs → spaceman_core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use tonic::codec::Streaming;
pub use tonic::{IntoRequest, IntoStreamingRequest};
use tonic::{Request, Response};

pub use blossom_types as types;
use blossom_types::endpoint::{Endpoint, TlsOptions};
pub use spaceman_types as types;
use spaceman_types::endpoint::{Endpoint, TlsOptions};
pub use metadata::Metadata;
pub use repo::Repo;

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion blossom_core/src/repo.rs → spaceman_core/src/repo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use prost_reflect::{
prost::Message, prost_types::FileDescriptorSet, DescriptorPool, MethodDescriptor,
};

use blossom_types::repo::{MethodView, RepoView, ServiceView};
use spaceman_types::repo::{MethodView, RepoView, ServiceView};

/// Stores protobuf descriptors.
#[derive(Default, Clone)]
Expand Down
2 changes: 1 addition & 1 deletion blossom_core/src/tls.rs → spaceman_core/src/tls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use hyper_rustls::ConfigBuilderExt;
use rustls::client::{ServerCertVerified, ServerCertVerifier};
use rustls::{Certificate, ClientConfig, Error, RootCertStore, ServerName};

use blossom_types::endpoint::TlsOptions;
use spaceman_types::endpoint::TlsOptions;

pub fn make_rustls_config(tls_options: &TlsOptions) -> Result<ClientConfig> {
let tls = ClientConfig::builder().with_safe_defaults();
Expand Down
8 changes: 4 additions & 4 deletions blossom_gui_back/Cargo.toml → spaceman_gui_back/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ tokio-stream = "0.1.10"
tokio = "1.21.2"
either = "1.8.0"

[dependencies.blossom_types]
path = "../blossom_types"
[dependencies.spaceman_types]
path = "../spaceman_types"

[dependencies.blossom_core]
path = "../blossom_core"
[dependencies.spaceman_core]
path = "../spaceman_core"

[features]
# by default Tauri runs in production mode
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{collections::HashMap, path::Path, sync::{RwLock, Mutex}, time::Duratio

use tauri::{Manager, State, LogicalSize};
use tokio_stream::StreamExt;
use blossom_core::{Conn, DynamicMessage, IntoRequest, IntoStreamingRequest, Metadata, Repo, SerializeOptions, zero_message};
use spaceman_core::{Conn, DynamicMessage, IntoRequest, IntoStreamingRequest, Metadata, Repo, SerializeOptions, zero_message};
use anyhow::Result;

fn main() {
Expand Down Expand Up @@ -69,7 +69,7 @@ enum CallOpIn {
Cancel,
}

use blossom_types::callopout::CallOpOut;
use spaceman_types::callopout::CallOpOut;

static SERIALIZE_OPTIONS: &'static SerializeOptions =
&SerializeOptions::new().skip_default_fields(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"build": {
"beforeBuildCommand": "cd blossom_gui_front/ && trunk build --release",
"beforeDevCommand": "cd blossom_gui_front/ && trunk serve --port 1420",
"beforeBuildCommand": "cd spaceman_gui_front/ && trunk build --release",
"beforeDevCommand": "cd spaceman_gui_front/ && trunk serve --port 1420",
"devPath": "http://localhost:1420/",
"distDir": "../blossom_gui_front/dist/",
"distDir": "../spaceman_gui_front/dist/",
"withGlobalTauri": true
},
"package": {
"productName": "blossom_gui_back",
"productName": "spaceman_gui_back",
"version": "0.1.0"
},
"tauri": {
Expand All @@ -29,7 +29,7 @@
"icons/icon.icns",
"icons/icon.ico"
],
"identifier": "blossom",
"identifier": "spaceman",
"longDescription": "",
"macOS": {
"entitlements": null,
Expand Down Expand Up @@ -58,7 +58,7 @@
"fullscreen": false,
"height": 600,
"resizable": true,
"title": "Blossom",
"title": "Spaceman",
"width": 800
}
]
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[package]
name = "blossom_gui_front"
name = "spaceman_gui_front"
version = "0.1.0"
edition = "2021"

Expand All @@ -22,5 +22,5 @@ gloo-timers = "0.2.6"
slab = "0.4.8"
uuid = { version = "1.3.0", features = ["v4", "js", "serde"] }

[dependencies.blossom_types]
path = "../blossom_types"
[dependencies.spaceman_types]
path = "../spaceman_types"
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Blossom</title>
<title>Spaceman</title>
<link data-trunk rel="scss" href="src/style.scss"/>
<link data-trunk rel="copy-dir" href="src/font"/>
<link data-trunk rel="copy-dir" href="src/img"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ use wasm_bindgen::{closure::Closure, JsCast, JsValue};
use crate::glue;
use crate::MetadataRow;

use blossom_types::endpoint::Endpoint;
use blossom_types::callopout::CallOpOut;
use spaceman_types::endpoint::Endpoint;
use spaceman_types::callopout::CallOpOut;

pub(crate) async fn start_call(
call_id: i32,
Expand Down
Loading

0 comments on commit 7aebf81

Please sign in to comment.