diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 021b1f2..9fe0c62 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,9 @@ image: build_and_deploy: script: - - cd docs + - cd docs/presentation_17_03_23 + - pdflatex main.tex + - cd ../rapportFinal - pdflatex main.tex only: refs: @@ -18,4 +20,5 @@ build_and_deploy: - cat ./docs/main.log artifacts: paths: - - ./docs/main.pdf + - ./docs/presentation_17_03_23/main.pdf + - ./docs/rapportFinal/main.pdf diff --git a/docs/centralisation/index.tex b/docs/centralisation/index.tex deleted file mode 100644 index a85effb..0000000 --- a/docs/centralisation/index.tex +++ /dev/null @@ -1,5 +0,0 @@ -\section{Systèmes Existants} -\input{centralisation/sys_existants.tex} - -\section{Exemples de Failles} -\input{centralisation/failles.tex} \ No newline at end of file diff --git a/docs/decentralisation/index.tex b/docs/decentralisation/index.tex deleted file mode 100644 index 851f37a..0000000 --- a/docs/decentralisation/index.tex +++ /dev/null @@ -1,2 +0,0 @@ -\section{Etat de l'art} -\input{decentralisation/etat_art.tex} \ No newline at end of file diff --git a/docs/main.tex b/docs/main.tex deleted file mode 100644 index 048c9ca..0000000 --- a/docs/main.tex +++ /dev/null @@ -1,43 +0,0 @@ -\documentclass{article} - -\usepackage[T1]{fontenc} -\usepackage[utf8]{inputenc} -\usepackage[french]{babel} -\usepackage[affil-it]{authblk} - - -\newenvironment*{remerciements}{% - \renewcommand*{\abstractname}{Remerciements} - \begin{abstract} -}{ - \end{abstract} -} - - -\begin{document} -\title{Etats de l'art des protocoles inter-blockchains} -\author{VOLPE Dorian, ROTONDO Eloïse, TESTUD Romain,\\DE CAMPOU Louis, JOLY Amaury} -\affil{M2 Informatique Option FSI,\\ Université Aix-Marseille} - - -\begin{titlepage} - \maketitle - \begin{remerciements} - Merci à M. TRAVERS Corentin et M. LABOUREL Aranaud pour la proposition de ce sujet et son encadrement. - \end{remerciements} - \begin{abstract} - abstract - \end{abstract} -\end{titlepage} - - -\tableofcontents - -\part{Introduction} -\input{introduction/index.tex} -\part{Systèmes Centralisés} -\input{centralisation/index.tex} -\part{Systèmes Décentralisés} -\input{decentralisation/index.tex} - -\end{document} \ No newline at end of file diff --git a/docs/presentation_17_03_23/centralisation/failles.tex b/docs/presentation_17_03_23/centralisation/failles.tex new file mode 100644 index 0000000..a97a7a1 --- /dev/null +++ b/docs/presentation_17_03_23/centralisation/failles.tex @@ -0,0 +1,3 @@ +\begin{frame} + \frametitle{Failles} +\end{frame} \ No newline at end of file diff --git a/docs/presentation_17_03_23/centralisation/index.tex b/docs/presentation_17_03_23/centralisation/index.tex new file mode 100644 index 0000000..e1a2901 --- /dev/null +++ b/docs/presentation_17_03_23/centralisation/index.tex @@ -0,0 +1,5 @@ +\subsection{Systèmes Existants} +\input{centralisation/sys_existants.tex} + +\subsection{Exemples de Failles} +\input{centralisation/failles.tex} \ No newline at end of file diff --git a/docs/presentation_17_03_23/centralisation/sys_existants.tex b/docs/presentation_17_03_23/centralisation/sys_existants.tex new file mode 100644 index 0000000..c0faa1b --- /dev/null +++ b/docs/presentation_17_03_23/centralisation/sys_existants.tex @@ -0,0 +1,3 @@ +\begin{frame} + \frametitle{Systèmes existants} +\end{frame} \ No newline at end of file diff --git a/docs/presentation_17_03_23/decentralisation/etat_art.tex b/docs/presentation_17_03_23/decentralisation/etat_art.tex new file mode 100644 index 0000000..c4526d7 --- /dev/null +++ b/docs/presentation_17_03_23/decentralisation/etat_art.tex @@ -0,0 +1,3 @@ +\begin{frame} + \frametitle{Etat de l'art} +\end{frame} \ No newline at end of file diff --git a/docs/presentation_17_03_23/decentralisation/index.tex b/docs/presentation_17_03_23/decentralisation/index.tex new file mode 100644 index 0000000..eb54b8c --- /dev/null +++ b/docs/presentation_17_03_23/decentralisation/index.tex @@ -0,0 +1,2 @@ +\subsection{Etat de l'art} +\input{decentralisation/etat_art.tex} \ No newline at end of file diff --git a/docs/presentation_17_03_23/img/amu.png b/docs/presentation_17_03_23/img/amu.png new file mode 100644 index 0000000..e27d5d6 Binary files /dev/null and b/docs/presentation_17_03_23/img/amu.png differ diff --git a/docs/presentation_17_03_23/introduction/index.tex b/docs/presentation_17_03_23/introduction/index.tex new file mode 100644 index 0000000..ffbf35f --- /dev/null +++ b/docs/presentation_17_03_23/introduction/index.tex @@ -0,0 +1,3 @@ +\begin{frame} + \frametitle{Introduction} +\end{frame} \ No newline at end of file diff --git a/docs/presentation_17_03_23/main.tex b/docs/presentation_17_03_23/main.tex new file mode 100644 index 0000000..250c642 --- /dev/null +++ b/docs/presentation_17_03_23/main.tex @@ -0,0 +1,62 @@ +\documentclass{beamer} +\usetheme{Boadilla} +\usecolortheme{orchid} + +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[french]{babel} + + +\addtobeamertemplate{navigation symbols}{}{% + \usebeamerfont{footline}% + \usebeamercolor[fg]{footline}% + \hspace{1em}% + \insertframenumber/\inserttotalframenumber +} +\usepackage{ulem} +\usepackage{tkz-tab} +\setbeamertemplate{blocks}[rounded]% +[shadow=true] +\AtBeginSection{% + \begin{frame} + \tableofcontents[sections=\value{section}] + \end{frame} +} + +\newenvironment*{remerciements}{% + \renewcommand*{\abstractname}{Remerciements} + \begin{abstract} +}{ + \end{abstract} +} + + +\title[Swap Cross-Blockchain]{Echange de jetons inter-blockchains} +\subtitle{Projet de fin d'études: Master 2 Informatique Option Fiabilité et sécurité informatique 2022-2023} +\author[M2 FSI]{VOLPE Dorian, ROTONDO Eloïse, TESTUD Romain,\\DE CAMPOU Louis, JOLY Amaury \\ \textbf{Encadrants :} TRAVERS Corentin, LABOUREL Arnaud \\[2ex] \includegraphics[scale=0.1]{./img/amu.png}} +\institute[Aix-Marseille Université]{M2 Fiabilité et sécurité informatique} +\date{17 Mars 2023} + +\begin{document} + +\maketitle + +\begin{frame} + \begin{remerciements} + Merci à M. TRAVERS Corentin et M. LABOUREL Arnaud pour la proposition de ce sujet et son encadrement. + \end{remerciements} + \begin{abstract} + abstract + \end{abstract} +\end{frame} + +\tableofcontents + +\section{Introduction} +\input{introduction/index.tex} +\section{Centralisation} +\input{centralisation/index.tex} +\section{Décentralisation} +\input{decentralisation/index.tex} + +\end{document} diff --git a/docs/centralisation/failles.tex b/docs/rapportFinal/centralisation/failles.tex similarity index 100% rename from docs/centralisation/failles.tex rename to docs/rapportFinal/centralisation/failles.tex diff --git a/docs/rapportFinal/centralisation/index.tex b/docs/rapportFinal/centralisation/index.tex new file mode 100644 index 0000000..e1a2901 --- /dev/null +++ b/docs/rapportFinal/centralisation/index.tex @@ -0,0 +1,5 @@ +\subsection{Systèmes Existants} +\input{centralisation/sys_existants.tex} + +\subsection{Exemples de Failles} +\input{centralisation/failles.tex} \ No newline at end of file diff --git a/docs/centralisation/sys_existants.tex b/docs/rapportFinal/centralisation/sys_existants.tex similarity index 100% rename from docs/centralisation/sys_existants.tex rename to docs/rapportFinal/centralisation/sys_existants.tex diff --git a/docs/decentralisation/etat_art.tex b/docs/rapportFinal/decentralisation/etat_art.tex similarity index 100% rename from docs/decentralisation/etat_art.tex rename to docs/rapportFinal/decentralisation/etat_art.tex diff --git a/docs/rapportFinal/decentralisation/index.tex b/docs/rapportFinal/decentralisation/index.tex new file mode 100644 index 0000000..eb54b8c --- /dev/null +++ b/docs/rapportFinal/decentralisation/index.tex @@ -0,0 +1,2 @@ +\subsection{Etat de l'art} +\input{decentralisation/etat_art.tex} \ No newline at end of file diff --git a/docs/rapportFinal/img/amu.png b/docs/rapportFinal/img/amu.png new file mode 100644 index 0000000..e27d5d6 Binary files /dev/null and b/docs/rapportFinal/img/amu.png differ diff --git a/docs/introduction/index.tex b/docs/rapportFinal/introduction/index.tex similarity index 100% rename from docs/introduction/index.tex rename to docs/rapportFinal/introduction/index.tex diff --git a/docs/rapportFinal/main.tex b/docs/rapportFinal/main.tex new file mode 100644 index 0000000..edcbcc9 --- /dev/null +++ b/docs/rapportFinal/main.tex @@ -0,0 +1,49 @@ +\documentclass{article} + +\usepackage[T1]{fontenc} +\usepackage[utf8]{inputenc} +\usepackage[french]{babel} +\usepackage[affil-it]{authblk} + +\usepackage{graphicx} + +\newenvironment*{remerciements}{% + \renewcommand*{\abstractname}{Remerciements} + \begin{abstract} +}{ + \end{abstract} +} + + +\begin{document} + +\title{Echange de jetons inter-blockchains} +\author{VOLPE Dorian, ROTONDO Eloïse, TESTUD Romain,\\DE CAMPOU Louis, JOLY Amaury \\ \textbf{Encadrants :} TRAVERS Corentin, LABOUREL Arnaud \\ \includegraphics[scale=0.1]{./img/amu.png}} +\affil{Aix-Marseille Université, M2 Fiabilité et sécurité informatique} +\date{17 Mars 2023} + +\begin{titlepage} + \maketitle +\end{titlepage} + +\begin{remerciements} + Merci à M. TRAVERS Corentin et M. LABOUREL Aranaud pour la proposition de ce sujet et son encadrement. +\end{remerciements} +\begin{abstract} + abstract +\end{abstract} + +\newpage + +\tableofcontents + +\newpage + +\section{Introduction} +\input{introduction/index.tex} +\section{Systèmes Centralisés} +\input{centralisation/index.tex} +\section{Systèmes Décentralisés} +\input{decentralisation/index.tex} + +\end{document} \ No newline at end of file