Unecessary lib.rs -> commands.rs

Cargo.toml

@@ -11,5 +11,4 @@ leptos-use = "0.9.0"
 reqwest = { version = "0.11.23", features = ["json"] }
 serde = "1.0.195"
 serde_json = "1.0.111"
-stylers = "0.3.2"
 tokio = { version = "1.35.1", features = ["macros", "sync"] }

src/base/banner.rs

@@ -1,8 +1,9 @@
+use crate::commands::banner;
 use leptos::{component, view, IntoView};
 
 #[component]
 pub fn Banner() -> impl IntoView {
-    let banner = termfolio::banner();
+    let banner = banner();
 
     view! {
         <p class="inline">"user@termfolio:~$ "</p>

src/base/prompt/general.rs

@@ -1,3 +1,4 @@
+use crate::commands::Command;
 use leptos::{ReadSignal, Signal, SignalGetUntracked, SignalUpdate, WriteSignal};
 use leptos_use::ColorMode;
 use std::collections::VecDeque;
@@ -39,7 +40,7 @@ pub async fn general_commands<F>(
                 r#"Theme changed to: <b class="grn">{new_theme}</b>"#
             ));
         }
-        _ => set_out(termfolio::Command::process(val.0, val.1).await),
+        _ => set_out(Command::process(val.0, val.1).await),
     }
 
     updater.update(|hist| {

src/base/prompt/keyboard.rs

@@ -1,3 +1,4 @@
+use crate::commands::autocomplete;
 use leptos::ev::{keydown, KeyboardEvent};
 use leptos::html::Input;
 use leptos::{NodeRef, ReadSignal, SignalGetUntracked, SignalUpdate, WriteSignal};
@@ -38,7 +39,7 @@ pub fn keyboard_commands(
             //Autocomplete
             "Tab" => {
                 ev.prevent_default();
-                inp.set_value(termfolio::autocomplete(&inp.value()));
+                inp.set_value(autocomplete(&inp.value()));
             }
             _ => {}
         }

src/fetch.rs → src/commands/fetch.rs

@@ -4,15 +4,15 @@ use tokio::try_join;
 
 // Formnatting functions and error messages
 mod formats;
-use crate::texts::{FETCH_GITHUB_ERROR, READ_JSON_ERROR};
+use crate::commands::texts::{FETCH_GITHUB_ERROR, READ_JSON_ERROR};
 use formats::*;
 
 // Structs for JSON Parsing
 mod structs;
 use structs::*;
 
 // Config JSON
-const JSON: &str = include_str!("../configs/config.json");
+const JSON: &str = include_str!("../../configs/config.json");
 
 // Once statics
 

src/fetch/formats.rs → src/commands/fetch/formats.rs

@@ -1,14 +1,14 @@
-use crate::fetch::{About, Links, Repository, UserInfo, UserStats};
+use crate::commands::fetch::{About, Links, Repository, UserInfo, UserStats};
 use std::collections::HashMap;
 
 // Ascii art used for Github
-const NEOFETCH: &str = include_str!("../../configs/neofetch.txt");
+const NEOFETCH: &str = include_str!("../../../configs/neofetch.txt");
 
 // Language icons for repos
-const RUST: &str = include_str!("../../configs/lang_icons/ferris.txt");
-const PYTHON: &str = include_str!("../../configs/lang_icons/pythons.txt");
-const JAVASCRIPT: &str = include_str!("../../configs/lang_icons/javascript.txt");
-const PLACEHOLDER: &str = include_str!("../../configs/lang_icons/octocat.txt");
+const RUST: &str = include_str!("../../../configs/lang_icons/ferris.txt");
+const PYTHON: &str = include_str!("../../../configs/lang_icons/pythons.txt");
+const JAVASCRIPT: &str = include_str!("../../../configs/lang_icons/javascript.txt");
+const PLACEHOLDER: &str = include_str!("../../../configs/lang_icons/octocat.txt");
 
 pub fn format_about(about: About) -> String {
     let exp_string: String = about

src/main.rs

@@ -1,6 +1,7 @@
 use leptos::view;
 
 mod base;
+mod commands;
 use base::Base;
 
 fn main() {