mirror of
https://github.com/Astatin3/unshell.git
synced 2026-06-08 22:38:01 -06:00
Work on tree
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
use std::collections::HashMap;
|
||||
|
||||
use unshell_lib::config::config_struct::ConfigStructField;
|
||||
use unshell_lib::config::ConfigStructField;
|
||||
|
||||
// use crate::config::ConfigStructField;
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ mod blob;
|
||||
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
error::Error,
|
||||
fs,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
@@ -5,10 +5,7 @@ use std::{
|
||||
|
||||
use unshell_lib::{
|
||||
ModuleError, Result,
|
||||
config::{
|
||||
Tree, TreeMessage,
|
||||
config_struct::{Config, ConfigStructField},
|
||||
},
|
||||
config::{ConfigStructField, Tree, TreeMessage, config_struct::Config},
|
||||
};
|
||||
use unshell_manager::Manager;
|
||||
|
||||
@@ -28,7 +25,7 @@ pub struct Server {
|
||||
|
||||
impl Server {
|
||||
pub fn new(_config_paths: Vec<PathBuf>, database: String) -> Result<Self> {
|
||||
// let mut component_configs: Vec<crate::config::ComponentState> = Vec::new();
|
||||
// let mut component_configs: Vec<crate::config::ComponentState> = Vec::new(1);
|
||||
|
||||
// for config in &config_paths {
|
||||
// component_configs.extend(crate::config::load_config(config)?);
|
||||
@@ -45,12 +42,12 @@ impl Server {
|
||||
ConfigStructField::String {
|
||||
default: "Test Texttttttttttttttt".into(),
|
||||
max_length: None,
|
||||
protected: None,
|
||||
protected: true,
|
||||
},
|
||||
ConfigStructField::String {
|
||||
default: "Test ".into(),
|
||||
max_length: None,
|
||||
protected: None,
|
||||
max_length: Some(15),
|
||||
protected: false,
|
||||
},
|
||||
]))),
|
||||
// tree: Tree2::default(),
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
use axum::{
|
||||
Extension, Json,
|
||||
Json,
|
||||
extract::{Path, State},
|
||||
};
|
||||
|
||||
@@ -10,7 +10,7 @@ use unshell_lib::{
|
||||
debug,
|
||||
};
|
||||
|
||||
use crate::{Server, auth::structs::CurrentUser};
|
||||
use crate::Server;
|
||||
|
||||
impl Server {
|
||||
pub async fn get_tree2_root(
|
||||
|
||||
Reference in New Issue
Block a user