Skip to content

Commit

Permalink
bugfix + css
Browse files Browse the repository at this point in the history
  • Loading branch information
AlixH committed Feb 25, 2020
1 parent fb2b69f commit 0b43e8f
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 6 deletions.
9 changes: 7 additions & 2 deletions front-end/src/Components/Plugin/Plugin.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// eslint-disable-file no-unused-vars
import React, {useRef, useState} from 'react';
import React, {useRef, useState, useEffect} from 'react';
import Rating from '@material-ui/lab/Rating';
import Popper from '@material-ui/core/Popper';
import "./Plugin.css";
Expand All @@ -23,6 +23,7 @@ import {OPEN_PLUGIN_DETAILS} from "../../store/actions/OpenPluginDetails";
function Plugin(properties) {
const plugin = properties.plugin;
let tags = plugin.tags.slice(0, 5);
const [interupteur, setInterupteur] = useState(properties.interupteur);
const dispatch = useDispatch();
const open_source = plugin.opensource;
const [anchorEl, setAnchorEl] = useState(null);
Expand All @@ -39,8 +40,10 @@ function Plugin(properties) {

};

useEffect(() => { setInterupteur(!interupteur) }, []);

const comments = plugin.comments.filter(c => c!=="" && c !== null).map(comment => {
return <p>{comment}</p>
return <p style={{backgroundColor:"whitesmoke", width:"100%", textAlign:"center", borderRadius:"10px"}}>{comment}</p>
})
const comments_count = comments.length;
const comments_icon_tooltip = "Voir les commentaires";
Expand Down Expand Up @@ -164,6 +167,7 @@ function Plugin(properties) {
<Box component="fieldset" mb={3} borderColor="transparent">
<Rating size={"large"} name="read-only" value={score} readOnly precision={0.5}/>
</Box>
{modalOpened === null &&
<Tooltip title={<span id={"tooltip"}>{comments_icon_tooltip}</span>}>
<div onClick={comments_section}
className={comments_count > 0 ? "button_hover comments_logo_wrapper" : "button_hover comments_logo_wrapper_hidden"}>
Expand All @@ -172,6 +176,7 @@ function Plugin(properties) {
</Badge>
</div>
</Tooltip>
}
</div>
</div>
</div>
Expand Down
14 changes: 13 additions & 1 deletion front-end/src/Components/PluginModal/PluginModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function PluginModal() {
const plugin = pluginsList[openPlugin];
const [rating, setRating] = useState(null);
const rating_ref = useRef(null);
const[interupteur,setInterupteur] = useState(false);


function closeModal() {
Expand All @@ -52,6 +53,7 @@ function PluginModal() {
})
});
setOpenRatingSet(true);
setInterupteur(!interupteur);
}
}

Expand Down Expand Up @@ -102,7 +104,7 @@ function PluginModal() {
open={openPlugin != null}
>
<div id={"modal"}>
<Plugin plugin={plugin}/>
<Plugin key={interupteur} refresh={interupteur} plugin={plugin}/>
<div className={"card"}>
<Card raised={true}>
<CardContent>
Expand Down Expand Up @@ -171,6 +173,16 @@ function PluginModal() {
</div>
</CardContent>
</Card>
<Card>
<CardContent>
<div id={"test_zone"}>
<div id={"test"}>
<h1 className={"card_title"}>Tester l'effet audio du plugin</h1>
</div>
</div>

</CardContent>
</Card>
</div>
: null
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,6 @@ function PluginUploadForm() {
</div>
<div id={"tags_input"}>
<TextField className={"textField"} margin={"normal"}
required
id="outlined-required"
name="tags"
label="Tags"
Expand Down Expand Up @@ -352,7 +351,7 @@ function PluginUploadForm() {
}
{activeStep === steps.length - 1 &&
<div id={"validation"}>
<p id={"congrats"}>Félicitations : votre plugin a été ajouté au magasin!</p>
<p id={"congrats"}>Félicitations : votre plugin a été ajouté!</p>
<CheckCircleIcon id="check_icon"/>
</div>
}
Expand Down
2 changes: 1 addition & 1 deletion front-end/src/store/reducers/OpenPluginDetails.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {OPEN_PLUGIN_DETAILS} from "../actions/OpenPluginDetails";

const defaultState = {};
const defaultState = {plugin:null};

const openPluginReducer = (state = defaultState, action) => {
if (action.type === OPEN_PLUGIN_DETAILS) {
Expand Down

0 comments on commit 0b43e8f

Please sign in to comment.