Skip to content

Commit

Permalink
Hotfix#314 (#315)
Browse files Browse the repository at this point in the history 
* chore: fmt

* fix: Compilation error after creating the app  #314

* chore: clippy
  • Loading branch information
@AnthonyMichaelTDM
AnthonyMichaelTDM authored Aug 27, 2023
1 parent 7be0062 commit 6d07b20
Show file tree
Hide file tree
Showing 6 changed files with 71 additions and 67 deletions.
4 changes: 2 additions & 2 deletions create-rust-app/src/dev/dev_server.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@ pub async fn start(
let app = Router::new()
.route("/", get(|| async {
// Let user know the server is running
Html(r###"
Html(r#"
<html style="background-color: #171717; height: 100%; width: 100%;">
<head><title>Create Rust App: Development Server</title></head>
<body style="text-align: center; color: white; fony-family: sans-serif; padding: 50px;">
<img style="margin-right: 12px" height="50px" src="data:image/png;base64,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" alt="" />
<h3>Create Rust App: Development Server</h3>
</body>
</html>
"###)
"#)
}))
.route("/vitejs-down", get(vitejs_down_handler))
.route("/vitejs-up", get(vitejs_up_handler))
Expand Down
4 changes: 2 additions & 2 deletions create-rust-app_cli/src/content/project.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ fn add_bins_to_cargo_toml(
.cra_enabled_features
.contains(&"plugin_tasks".to_string())
{
r##"
r#"
[[bin]]
name = "queue"
path = "backend/queue.rs"
"##
"#
} else {
""
};
Expand Down
17 changes: 8 additions & 9 deletions create-rust-app_cli/src/plugins/dev.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,14 @@ impl Plugin for Dev {

fs::append(
"frontend/src/dev.tsx",
indoc! {r##"
// Sets up the development environment.
//
// Note: When running `cargo frontend` and `cargo backend` individually, "DEV_SERVER_PORT" is not set.
// Use `cargo fullstack` for the full development experience.
if (import.meta.env.DEV_SERVER_PORT) {
import('./setupDevelopment')
}
"##},
indoc! {r#"// Sets up the development environment.
//
// Note: When running `cargo frontend` and `cargo backend` individually, "DEV_SERVER_PORT" is not set.
// Use `cargo fullstack` for the full development experience.
if (import.meta.env.DEV_SERVER_PORT) {
import('./setupDevelopment')
}
"#},
)?;

match install_config.backend_framework {
Expand Down
14 changes: 7 additions & 7 deletions create-rust-app_cli/src/plugins/graphql.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ import { GraphQLPage } from './containers/GraphQLPage'"#,
fs::replace(
"frontend/bundles/index.tsx",
"ReactDOM.createRoot",
r##"import {ApolloProvider} from "@apollo/client";
r#"import {ApolloProvider} from "@apollo/client";
import {useAuthenticatedApolloClient} from "../src/hooks/useAuthenticatedApolloClient";
const AuthenticatedApolloProvider = (props: { children: React.ReactNode }) => {
Expand All @@ -96,7 +96,7 @@ const AuthenticatedApolloProvider = (props: { children: React.ReactNode }) => {
</ApolloProvider>
}
ReactDOM.createRoot"##,
ReactDOM.createRoot"#,
)?;

fs::replace(
Expand All @@ -108,18 +108,18 @@ ReactDOM.createRoot"##,

fs::replace(
"frontend/package.json",
r##""dependencies": {"##,
r##""dependencies": {
r#""dependencies": {"#,
r#""dependencies": {
"@apollo/client": "^3.5.10",
"graphql-ws": "^5.6.4",
"graphql": "^16.3.0","##,
"graphql": "^16.3.0","#,
)?;

fs::replace("backend/main.rs", "mod mail;", "mod mail;\nmod graphql;")?;

// update auth plugin's logout button
let old_logout_link = r##"{ auth.isAuthenticated && <a className="NavButton" onClick={() => auth.logout()}>Logout</a> }"##;
let new_logout_link = r##"{ auth.isAuthenticated && <a className="NavButton" onClick={() => { auth.logout(); apollo.resetStore(); }}>Logout</a> }"##;
let old_logout_link = r#"{ auth.isAuthenticated && <a className="NavButton" onClick={() => auth.logout()}>Logout</a> }"#;
let new_logout_link = r#"{ auth.isAuthenticated && <a className="NavButton" onClick={() => { auth.logout(); apollo.resetStore(); }}>Logout</a> }"#;
fs::replace("frontend/src/App.tsx", old_logout_link, new_logout_link)?;

// make sure auth plugin is wrapped on top
Expand Down
45 changes: 22 additions & 23 deletions create-rust-app_cli/src/plugins/tasks.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,28 @@ impl Plugin for Tasks {

crate::content::migration::create(
"plugin_tasks",
indoc! {r##"
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
CREATE TYPE fang_task_state AS ENUM ('new', 'in_progress', 'failed', 'finished', 'retried');
CREATE TABLE fang_tasks (
id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
metadata jsonb NOT NULL,
error_message TEXT,
state fang_task_state DEFAULT 'new' NOT NULL,
task_type VARCHAR DEFAULT 'common' NOT NULL,
uniq_hash CHAR(64),
retries INTEGER DEFAULT 0 NOT NULL,
scheduled_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
CREATE INDEX fang_tasks_state_index ON fang_tasks(state);
CREATE INDEX fang_tasks_type_index ON fang_tasks(task_type);
CREATE INDEX fang_tasks_scheduled_at_index ON fang_tasks(scheduled_at);
CREATE INDEX fang_tasks_uniq_hash ON fang_tasks(uniq_hash);
"##},
indoc! {r#"CREATE EXTENSION IF NOT EXISTS "uuid-ossp";
CREATE TYPE fang_task_state AS ENUM ('new', 'in_progress', 'failed', 'finished', 'retried');
CREATE TABLE fang_tasks (
id uuid PRIMARY KEY DEFAULT uuid_generate_v4(),
metadata jsonb NOT NULL,
error_message TEXT,
state fang_task_state DEFAULT 'new' NOT NULL,
task_type VARCHAR DEFAULT 'common' NOT NULL,
uniq_hash CHAR(64),
retries INTEGER DEFAULT 0 NOT NULL,
scheduled_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
updated_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
);
CREATE INDEX fang_tasks_state_index ON fang_tasks(state);
CREATE INDEX fang_tasks_type_index ON fang_tasks(task_type);
CREATE INDEX fang_tasks_scheduled_at_index ON fang_tasks(scheduled_at);
CREATE INDEX fang_tasks_uniq_hash ON fang_tasks(uniq_hash);
"#},
r#"DROP TABLE fang_tasks;"#,
)?;

Expand Down
54 changes: 30 additions & 24 deletions create-rust-app_cli/template/.cargo/bin/dsync.rs
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::collections::HashMap;
use std::path::PathBuf;
use dsync;
use dsync::{GenerationConfig, TableOptions};
use std::collections::HashMap;
use std::path::PathBuf;

pub fn main() {
let dir = env!("CARGO_MANIFEST_DIR");
Expand All @@ -13,32 +13,38 @@ pub fn main() {

ensure_schema_is_generated(&schema_file);

dsync::generate_files(schema_file, models_dir, GenerationConfig {
connection_type: "create_rust_app::Connection".to_string(),
default_table_options: TableOptions::default()
.tsync()
.autogenerated_columns(vec!["id", "created_at", "updated_at"]),
table_options: HashMap::from([
// plugin_storage
("attachment_blobs", TableOptions::default().ignore()),
("attachments", TableOptions::default().ignore()),

// plugin_auth
("role_permissions", TableOptions::default().ignore()),
("user_permissions", TableOptions::default().ignore()),
("user_roles", TableOptions::default().ignore()),
("user_sessions", TableOptions::default().ignore()),
("users", TableOptions::default().ignore()),

// plugin_tasks
("fang_tasks", TableOptions::default().ignore()),
]),
});
dsync::generate_files(
schema_file,
models_dir,
GenerationConfig {
connection_type: "create_rust_app::Connection".to_string(),
default_table_options: TableOptions::default().tsync().autogenerated_columns(vec![
"id",
"created_at",
"updated_at",
]),
table_options: HashMap::from([
// plugin_storage
("attachment_blobs", TableOptions::default().ignore()),
("attachments", TableOptions::default().ignore()),
// plugin_auth
("role_permissions", TableOptions::default().ignore()),
("user_permissions", TableOptions::default().ignore()),
("user_roles", TableOptions::default().ignore()),
("user_sessions", TableOptions::default().ignore()),
("users", TableOptions::default().ignore()),
// plugin_tasks
("fang_tasks", TableOptions::default().ignore()),
]),
model_path: "crate::models::".to_string(),
schema_path: "crate::schema::".to_string(),
},
);
}

pub fn ensure_schema_is_generated(schema_file: &PathBuf) {
// check that the diesel schema file is not empty
let content = std::fs::read_to_string(schema_file).unwrap_or_default();
let content = std::fs::read_to_string(schema_file).unwrap_or_default();

if content.trim().is_empty() {
println!("=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=");
Expand Down

0 comments on commit 6d07b20

Please sign in to comment.