Skip to content

Commit

Permalink
tutorial progress
Browse files Browse the repository at this point in the history
  • Loading branch information
@mayalb
mayalb committed Jan 6, 2024
1 parent 3961ad7 commit 3012763
Show file tree
Hide file tree
Showing 13 changed files with 94 additions and 21 deletions.
12 changes: 6 additions & 6 deletions packages/client/src/components/ProjectSummary.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ const ProjectSummary: React.FC<Props> = ({ project, classes }: Props) => {
))}
</div>
)}
<Typography align="justify" gutterBottom={true} variant="subtitle1">
{/* <Typography align="justify" gutterBottom={true} variant="subtitle1">
<b>{project.description}</b>
</Typography>
<Typography
</Typography> */}
{/* <Typography
align="left"
gutterBottom={true}
variant="h4"
Expand All @@ -66,7 +66,7 @@ const ProjectSummary: React.FC<Props> = ({ project, classes }: Props) => {
</Typography>
<Typography align="justify" gutterBottom={true} variant="subtitle1">
{project.objective}
</Typography>
</Typography> */}
{project.assignments.length > 0 && (
<>
<Typography
Expand All @@ -87,15 +87,15 @@ const ProjectSummary: React.FC<Props> = ({ project, classes }: Props) => {
</Typography>
</>
)}
<Typography
{/* <Typography
align="left"
gutterBottom={true}
variant="h4"
color="primary"
className={classes.section}
>
<Trans i18nKey={"project.URL_title"} />
</Typography>
</Typography> */}

<Typography align="left" gutterBottom={true} variant="subtitle1">
<a
Expand Down
44 changes: 39 additions & 5 deletions packages/client/src/components/Tutorial/Tutorial.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ const join3 = require("./images/join3.png");
const create = require("./images/create.png");
const projectcreate = require("./images/projectcreate.png");
const create2 = require("./images/create2.png");
const logo = require("./images/logo.png");
const happy= require("./images/sourire.png");
const use1= require("./images/use1.png");
const use2= require("./images/use2.png");
const use3= require("./images/use3.png");
const use4= require("./images/use4.png");
// const logoFsm = require("./images/logo-fsm.jpg");
// const logoLp = require("./images/logo-lp.png");
// const logoBlog = require("./images/logo_espectateur.png");
Expand All @@ -27,13 +33,21 @@ export const Tutorial: React.FC = () => {
fontStyle: 'revert-layer',
}}
>
<Typography align='center' variant="h2" gutterBottom={true} style={{
margin: '40px',
<Typography align='center' variant="h2" gutterBottom={true} style={{
margin: '5px',
color:'#0B9A8D',

}}>
Comment utiliser l'outil E-spectateur?
Comment utiliser l'outil E-spectateur?
</Typography>

<Typography align='center' variant="h6" gutterBottom={true} style={{
margin: '20px',
color:'#666666',

}}>
Vous pouvez télécharger le tutorial en cliquant sur <a href="./images/cmd.txt" download={"cmd.txt"}>Tutorial</a>
</Typography>

<Typography align='center' variant="h4" gutterBottom={true}>
Avec E-spect@teur, vous pouvez être créateur de projet ou simplement participer à un projet existant.

Expand Down Expand Up @@ -73,7 +87,27 @@ export const Tutorial: React.FC = () => {

</div>

<div className="vertical-box">Box 3</div>

<div className="vertical-box">
<p className="box-text"> Utiliser E-spectateur

</p>
<div className="box-column">
<img src={use1} alt="Erasmus"/>
</div>
<div className="box-column">
<img src={use2} alt="Erasmus"/>
</div>
<div className="clear-line"></div>

<div className="box-column">
< img src={use3} alt="Erasmus"/>
</div>
<div className="box-column">
< img src={use4} alt="Erasmus"/>
</div>

</div>

</div>

Expand Down
32 changes: 32 additions & 0 deletions packages/client/src/components/Tutorial/images/cmd.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
sudo docker build . -t especateur -f Dockerfile.webapp
docker tag espectateur:latest ghcr.io/celluloid-camp/espectateur:latest

452 sudo docker push ghcr.io/celluloid-camp/espectateur
453 sudo docker login gchr.io/ -u mayalb


459 sudo docker login gchr.io/ -u mayalb -p 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
460 sudo docker push ghcr.io/celluloid-camp/espectateur
461 echo "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" | docker login ghcr.io -u mayalb --password-stdi
sudo echo "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" | docker login ghcr.io -u mayalb --password-stdin
463 echo "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" | sudo docker login ghcr.io -u mayalb --password-stdin
464 sudo docker push ghcr.io/celluloid-camp/espectateur
465 docker build . -t especateur -f Dockerfile.webapp
466 yarn start
467 yarn build
468 yarn start
469 ./pycharm.sh
470 yarn start
471 ffmpeg -version
472 yarn start
473 yarn build
474 yarn start
475 docker build . -t especateur -f Dockerfile.webapp
476 sudo docker tag especateur:latest ghcr.io/celluloid-camp/espectateur:latest
477 sudo docker push ghcr.io/celluloid-camp/espectateur
478 ssh celluloid@cchum-kvm-celluloid.in2p3.fr



Git:
delete git repo from project: rm -rf .git and then inside the subfolder run git rm --cached . -rf
Binary file added packages/client/src/components/Tutorial/images/happy.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/logo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/sourire.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/use1.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/use2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/use3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added packages/client/src/components/Tutorial/images/use4.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 10 additions & 3 deletions packages/client/src/components/Tutorial/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,24 +14,26 @@ body {
width: calc(100% - 20px); /* Take up 100% width with 20px margin on each side */
padding:10px;
flex-wrap: wrap;
height: 100vh;
height: 105vh;
box-sizing: border-box;
justify-content: center;
background-color: #fff;
color: #fff;
text-align: center;
border-radius: 10px; /* Add border-radius */
margin: 20px; /* Adjust margin as needed */
margin: 30px; /* Adjust margin as needed */
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
overflow: hidden;
position: relative;
}
.box-column {
flex: 1;
padding: 10px;
margin-top: 40px;
margin-top: 60px;
float: left;
box-sizing: border-box;
}

.box-row {
display: flex;
flex-direction: column; /* Set direction to column to stack items vertically */
Expand Down Expand Up @@ -60,6 +62,7 @@ body {
}
.box-text {
position: absolute;
display: flex;
top: 10px; /* Adjust top position as needed */
left: 50%;
color:#0B9A8D;
Expand All @@ -68,8 +71,12 @@ body {
font-weight: bold;
font-style: italic;
font-family: Arial, sans-serif;
text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.2);
align-items: center;


}

.clear-line {
width: 100%;
height: 0;
Expand Down
4 changes: 2 additions & 2 deletions packages/client/src/scenes/Home/HomeContainer.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,13 @@ const HomeContainer: React.FC<Props> = ({
<Typography variant="h3" color="primary" gutterBottom={true}>
{t("home.title")}
</Typography>
<Typography
{/* <Typography
variant="subtitle1"
className={classes.description}
gutterBottom={true}
>
{t("home.description")}
</Typography>
</Typography> */}
{/* <Typography
variant="subtitle1"
className={classes.tutoriel}
Expand Down
10 changes: 5 additions & 5 deletions packages/client/src/scenes/Project/components/SideBar/SideBarComponent.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const SideBarComponenent: React.FC<Props> = ({
const { t } = useTranslation();
const onClickStatic = () => {
// navigate(`/projects/${project.id}`);
console.log('test ........................................');

window.location.assign(`/projectstat/${project.id}`);
};
return (
Expand Down Expand Up @@ -186,22 +186,22 @@ const SideBarComponenent: React.FC<Props> = ({
)}
{user ? (
<>
<LabeledProgressSwitch
{/* <LabeledProgressSwitch
label={t('project.public')}
checked={project.public}
loading={setPublicLoading}
error={setPublicError}
onChange={() => onClickSetPublic(project.id, !project.public)}
/>
<LabeledProgressSwitch
/> */}
{/* <LabeledProgressSwitch
label={t('project.collaborative')}
checked={project.collaborative}
loading={setCollaborativeLoading}
error={setCollaborativeError}
onChange={() =>
onClickSetCollaborative(project.id, !project.collaborative)
}
/>
/> */}
{/* {user && (
<LabeledProgressSwitch
label={t('project.sequencing')}
Expand Down

0 comments on commit 3012763

Please sign in to comment.