diff --git a/src/pages/func_group/navigationBar.js b/src/pages/func_group/navigationBar.js index a6b55d4..b280230 100644 --- a/src/pages/func_group/navigationBar.js +++ b/src/pages/func_group/navigationBar.js @@ -7,6 +7,65 @@ import { userCrudSelector } from '../../redux/slices/userCrudSlice' import userCrudAsyncThunk from '../../redux/asyncThunks/userCrudAsyncThunk' +const __setShowGeneral = ( view, key, movements ) => { + + movements.user_view.setUserCrudView( + { + update_user: false, + delete_user: false + } + ) + + movements.model_view.setModelCrudView( + { + get_all_models: true, + get_one_model_and_download: false, + upload_model: false + } + ) + + movements.render_view.setRenderView( + { + show_ready_renders_and_download: false, + render_functionality: { + render_single_image: false, + render_single_set: false, + render_all: false, + render_image_by_vector: false, + render_set_by_vector: false + } + } + ) + + if (view === 'user_view') { + let new_move = movements.user_view.userCrudView + new_move[key] = true + movements.user_view.setUserCrudView( + new_move + ) + } else if (view === 'model_view') { + let new_move = movements.user_view.modelCrudView + new_move[key] = true + movements.model_view.setModelCrudView( + new_move + ) + } else if (view === 'render_view') { + let new_move = movements.render_view.renderView + if ( key in new_move ) { + new_move[key] = true + movements.model_view.setModelCrudView( + new_move + ) + } else { + new_move['render_functionality'][key] = true + movements.model_view.setModelCrudView( + new_move + ) + } + } + +} + const __styleChanger = ( bool ) => { let display = { @@ -57,29 +116,17 @@ const NavigationBar = ({ movements }) => { │ ├── User info
- │ │ ├── { user_get.username } + │ │ ├── Username: { user_get.username }
- │ │ └── { user_get.email } + │ │ └── E-mail: { user_get.email }
-
movements.user_view.setUserCrudView( - { - update_user: true, - delete_user: false - } - ) - }> +
__setShowGeneral( 'user_view', 'update_user', movements ) }> │ ├── Update User
-
movements.user_view.setUserCrudView( - { - update_user: false, - delete_user: true - } - ) - }> +
__setShowGeneral( 'user_view', 'delete_user', movements ) }> │ └── Delete User
@@ -89,34 +136,13 @@ const NavigationBar = ({ movements }) => { ├── Models
-
movements.model_view.setModelCrudView( - { - get_all_models: true, - get_one_model_and_download: false, - upload_model: false - } - ) - }> +
__setShowGeneral( 'model_view', 'get_all_models', movements ) }> │ ├── Get All Models
-
movements.model_view.setModelCrudView( - { - get_all_models: false, - get_one_model_and_download: true, - upload_model: false - } - ) - }> +
__setShowGeneral( 'model_view', 'get_one_model_and_download', movements )}> │ ├── Get One Model & Download
-
movements.model_view.setModelCrudView( - { - get_all_models: false, - get_one_model_and_download: false, - upload_model: true - } - ) - }> +
__setShowGeneral( 'model_view', 'upload_model', movements ) }> │ └── Upload Model
@@ -126,19 +152,7 @@ const NavigationBar = ({ movements }) => { ├── Render
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: true, - render_functionality: { - render_single_image: false, - render_single_set: false, - render_all: false, - render_image_by_vector: false, - render_set_by_vector: false - } - } - ) - }> +
__setShowGeneral( 'render_view', 'show_ready_renders_and_download', movements ) }> │ ├── Show Ready Renders & Download
@@ -146,79 +160,19 @@ const NavigationBar = ({ movements }) => { │ ├── Render Functionality
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: false, - render_functionality: { - render_single_image: true, - render_single_set: false, - render_all: false, - render_image_by_vector: false, - render_set_by_vector: false - } - } - ) - }> +
__setShowGeneral( 'render_view', 'render_single_image', movements ) }> │ │ ├── Render Single Image
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: false, - render_functionality: { - render_single_image: false, - render_single_set: true, - render_all: false, - render_image_by_vector: false, - render_set_by_vector: false - } - } - ) - }> +
__setShowGeneral( 'render_view', 'render_single_set', movements ) }> │ │ ├── Render Single Set
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: false, - render_functionality: { - render_single_image: false, - render_single_set: false, - render_all: true, - render_image_by_vector: false, - render_set_by_vector: false - } - } - ) - }> +
__setShowGeneral( 'render_view', 'render_all', movements ) }> │ │ ├── Render All Sets
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: false, - render_functionality: { - render_single_image: false, - render_single_set: false, - render_all: false, - render_image_by_vector: true, - render_set_by_vector: false - } - } - ) - }> +
__setShowGeneral( 'render_view', 'render_image_by_vector', movements ) }> │ │ ├── Render Image By Vector
-
movements.model_view.setModelCrudView( - { - show_ready_renders_and_download: false, - render_functionality: { - render_single_image: false, - render_single_set: false, - render_all: false, - render_image_by_vector: false, - render_set_by_vector: true - } - } - ) - }> +
__setShowGeneral( 'render_view', 'render_set_by_vector', movements ) }> │ │ └── Render Set By Vector
diff --git a/src/redux/asyncThunks/abstracts/abstractService.js b/src/redux/asyncThunks/abstracts/abstractService.js index d6a74e1..3866e1f 100644 --- a/src/redux/asyncThunks/abstracts/abstractService.js +++ b/src/redux/asyncThunks/abstracts/abstractService.js @@ -73,13 +73,13 @@ const responseAbstract = async (endpoint, method, token, body) => { } const headerBuilder = (url, method, token, body) => { - headers = { + let headers_r = { 'Authorization': token, 'accept': 'application/json', 'Content-Type': 'application/json', } if ('file' in body) { - headers = { + headers_r = { 'Authorization': token, 'accept': 'multipart/form-data', 'Content-Type': 'multipart/form-data', @@ -88,7 +88,7 @@ const headerBuilder = (url, method, token, body) => { let headers = { url: url, method: method, - headers: headers + headers: headers_r } if (method === 'PUT' || method === 'POST' || method === 'PATCH') { headers = Object.assign({}, headers, {