React / Redux -> simple fixes & upgrade movements statement

feature/2_forms
TBS093A 2021-02-17 19:27:57 +01:00
parent e9e3e04060
commit f951ead34b
2 changed files with 75 additions and 121 deletions

View File

@ -7,6 +7,65 @@ import { userCrudSelector } from '../../redux/slices/userCrudSlice'
import userCrudAsyncThunk from '../../redux/asyncThunks/userCrudAsyncThunk' 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 ) => { const __styleChanger = ( bool ) => {
let display = { let display = {
@ -57,29 +116,17 @@ const NavigationBar = ({ movements }) => {
User info User info
<div> <div>
<div> <div>
{ user_get.username } Username: { user_get.username }
</div> </div>
<div> <div>
{ user_get.email } E-mail: { user_get.email }
</div> </div>
</div> </div>
</div> </div>
<div onClick={ () => movements.user_view.setUserCrudView( <div onClick={ () => __setShowGeneral( 'user_view', 'update_user', movements ) }>
{
update_user: true,
delete_user: false
}
)
}>
Update User Update User
</div> </div>
<div onClick={ () => movements.user_view.setUserCrudView( <div onClick={ () => __setShowGeneral( 'user_view', 'delete_user', movements ) }>
{
update_user: false,
delete_user: true
}
)
}>
Delete User Delete User
</div> </div>
</div> </div>
@ -89,34 +136,13 @@ const NavigationBar = ({ movements }) => {
Models Models
</div> </div>
<div style={ __styleChanger( showModels ) }> <div style={ __styleChanger( showModels ) }>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'model_view', 'get_all_models', movements ) }>
{
get_all_models: true,
get_one_model_and_download: false,
upload_model: false
}
)
}>
Get All Models Get All Models
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'model_view', 'get_one_model_and_download', movements )}>
{
get_all_models: false,
get_one_model_and_download: true,
upload_model: false
}
)
}>
Get One Model & Download Get One Model & Download
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'model_view', 'upload_model', movements ) }>
{
get_all_models: false,
get_one_model_and_download: false,
upload_model: true
}
)
}>
Upload Model Upload Model
</div> </div>
</div> </div>
@ -126,19 +152,7 @@ const NavigationBar = ({ movements }) => {
Render Render
</div> </div>
<div style={ __styleChanger( showRender ) }> <div style={ __styleChanger( showRender ) }>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'show_ready_renders_and_download', movements ) }>
{
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
}
}
)
}>
Show Ready Renders & Download Show Ready Renders & Download
</div> </div>
<div> <div>
@ -146,79 +160,19 @@ const NavigationBar = ({ movements }) => {
Render Functionality Render Functionality
</div> </div>
<div style={ __styleChanger( showRenderFunc ) }> <div style={ __styleChanger( showRenderFunc ) }>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'render_single_image', movements ) }>
{
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
}
}
)
}>
Render Single Image Render Single Image
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'render_single_set', movements ) }>
{
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
}
}
)
}>
Render Single Set Render Single Set
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'render_all', movements ) }>
{
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
}
}
)
}>
Render All Sets Render All Sets
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'render_image_by_vector', movements ) }>
{
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
}
}
)
}>
Render Image By Vector Render Image By Vector
</div> </div>
<div onClick={ () => movements.model_view.setModelCrudView( <div onClick={ () => __setShowGeneral( 'render_view', 'render_set_by_vector', movements ) }>
{
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
}
}
)
}>
Render Set By Vector Render Set By Vector
</div> </div>
</div> </div>

View File

@ -73,13 +73,13 @@ const responseAbstract = async (endpoint, method, token, body) => {
} }
const headerBuilder = (url, method, token, body) => { const headerBuilder = (url, method, token, body) => {
headers = { let headers_r = {
'Authorization': token, 'Authorization': token,
'accept': 'application/json', 'accept': 'application/json',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
} }
if ('file' in body) { if ('file' in body) {
headers = { headers_r = {
'Authorization': token, 'Authorization': token,
'accept': 'multipart/form-data', 'accept': 'multipart/form-data',
'Content-Type': 'multipart/form-data', 'Content-Type': 'multipart/form-data',
@ -88,7 +88,7 @@ const headerBuilder = (url, method, token, body) => {
let headers = { let headers = {
url: url, url: url,
method: method, method: method,
headers: headers headers: headers_r
} }
if (method === 'PUT' || method === 'POST' || method === 'PATCH') { if (method === 'PUT' || method === 'POST' || method === 'PATCH') {
headers = Object.assign({}, headers, { headers = Object.assign({}, headers, {