diff --git a/bonus1/README.md b/bonus1/README.md new file mode 100644 index 0000000..fde333e --- /dev/null +++ b/bonus1/README.md @@ -0,0 +1,13 @@ +# Bonus 1 + +## Authors +Claudio Maggioni and Joey Bevilacqua + +## Running the program +This program is built with rust. In order to run it, a rust toolchain needs to be installed. +Run the program with `cargo run`, providing as first argument the directory with the jekyll +output. For example, in order to run the program from this directory, run: + +``` +cargo run ../site/_site/ +``` diff --git a/docs/report/report.tex b/docs/report/report.tex index a994eed..d9aa2d0 100644 --- a/docs/report/report.tex +++ b/docs/report/report.tex @@ -36,26 +36,26 @@ \centering \begin{tabular}{lllll} \textbf{Author} & \textbf{Lines} & \textbf{Commits} & \textbf{File stats} & \textbf{Distribution} \\ \hline -bevilj & 387 & 61 & 149 & 58.3 / 23.6 / 50.2 \\ -maggicl & 97 & 35 & 53 & 14.6 / 13.5 / 17.8 \\ -britea & 72 & 31 & 25 & 10.8 / 12.0 / 8.4 \\ -terehm & 20 & 25 & 9 & 3.0 / 9.7 / 3.0 \\ -omenem & 15 & 11 & 6 & 2.3 / 4.2 / 2.0 \\ -devitg & 14 & 7 & 10 & 2.1 / 2.7 / 3.4 \\ -annoum & 8 & 24 & 5 & 1.2 / 9.3 / 1.7 \\ -rasicd & 8 & 10 & 4 & 1.2 / 3.9 / 1.3 \\ -faracm & 7 & 8 & 5 & 1.1 / 3.1 / 1.7 \\ -alberj & 6 & 3 & 4 & 0.9 / 1.2 / 1.3 \\ -ponzim & 6 & 10 & 3 & 0.9 / 3.9 / 1.0 \\ -luinia & 6 & 6 & 6 & 0.9 / 2.3 / 2.0 \\ -vottad & 5 & 5 & 5 & 0.8 / 1.9 / 1.7 \\ -brunnn & 4 & 6 & 4 & 0.6 / 2.3 / 1.3 \\ -feninf & 3 & 2 & 3 & 0.5 / 0.8 / 1.0 \\ -hijmam & 2 & 2 & 2 & 0.3 / 0.8 / 0.7 \\ -lunghm & 2 & 5 & 2 & 0.3 / 1.9 / 0.7 \\ -montiag & 1 & 1 & 1 & 0.2 / 0.4 / 0.3 \\ -marina & 1 & 2 & 1 & 0.2 / 0.8 / 0.3 \\ -vivanr & 0 & 5 & 0 & 0.0 / 1.9 / 0.0 \\ +bevilj & 415 & 70 & 155 & 56.6 / 24.1 / 46.5 \\ +maggicl & 108 & 37 & 64 & 14.7 / 12.8 / 19.2 \\ +britea & 75 & 35 & 26 & 10.2 / 12.1 / 7.8 \\ +terehm & 37 & 28 & 24 & 5.0 / 9.7 / 7.2 \\ +omenem & 15 & 11 & 6 & 2.0 / 3.8 / 1.8 \\ +devitg & 14 & 7 & 10 & 1.9 / 2.4 / 3.0 \\ +annoum & 8 & 24 & 5 & 1.1 / 8.3 / 1.5 \\ +feninf & 8 & 8 & 3 & 1.1 / 2.8 / 0.9 \\ +rasicd & 8 & 10 & 4 & 1.1 / 3.4 / 1.2 \\ +alberj & 7 & 4 & 5 & 1.0 / 1.4 / 1.5 \\ +faracm & 7 & 8 & 5 & 1.0 / 2.8 / 1.5 \\ +hijmam & 6 & 8 & 4 & 0.8 / 2.8 / 1.2 \\ +ponzim & 6 & 10 & 3 & 0.8 / 3.4 / 0.9 \\ +luinia & 6 & 6 & 6 & 0.8 / 2.1 / 1.8 \\ +vottad & 5 & 5 & 5 & 0.7 / 1.7 / 1.5 \\ +brunnn & 4 & 6 & 4 & 0.5 / 2.1 / 1.2 \\ +lunghm & 2 & 5 & 2 & 0.3 / 1.7 / 0.6 \\ +montiag & 1 & 1 & 1 & 0.1 / 0.3 / 0.3 \\ +marina & 1 & 2 & 1 & 0.1 / 0.7 / 0.3 \\ +vivanr & 0 & 5 & 0 & 0.0 / 1.7 / 0.0 \\ \end{tabular} \end{table} @@ -73,6 +73,9 @@ Some of the pages were coauthored with \texttt{team-cmd-basic} members since the assignment of topics. In this team there were some difficulties with \textit{Jekyll}, but nonetheless they were able to deliver content. +\textit{Marwan Announ} volunteered to build a multiple-choice quiz feature, eventually not included in the final product +due to lack of time. The code was uploaded just for grading purposes in a separate directory named \texttt{quiz/}. + \subsection{Basic commands team} This team performed very well. All team members were active and good content creators. They delivered their pages on time and they offered their help for doing extra pages. @@ -91,13 +94,28 @@ Both \textit{Marco Conterno}, the team leader, and \textit{Alexander Todorovic} the project. \textit{Marco Tereh} became the \emph{ad interim} team leader. \textit{Matteo Omenetti} was assigned to this team too. +\textit{Alexander Todorovic} tried to submit some content regarding selection and iteration in \texttt{bash} scripting, +but this content was emailed to \textit{Marco Conterno}. He did not upload it in the SVN repository, nor sent it to the +leading team in any form. The content, recovered mere hours before the deadline, overlaps with some of the work done by +other ``volunteer'' team members, and therefore is was uploaded on a separate directory named \texttt{todorovic/} + \subsection{CSS team} The team delivered good content for the entire duration of the project. Other than helping other teams when needed, they were able to grasp the \textit{Jekyll} syntax and work flow very quickly. \subsection{Leading, bonus and documentation team} This meta team was composed by \textit{Claudio Maggioni} and \textit{Joey Bevilacqua}. This team did \textit{bonus-1} and -\textit{bonus-2}, wrote all the documentation and reviewed the code and content. +\textit{bonus-2}, wrote all the documentation and reviewed the code and content. Special thanks go to \textit{Joey +Bevilacqua} for doing much of the code reviewing process and being a good vice team leader \footnote{pro-actively self-imposed, in the most positive meaning of the term}. +\section{Use the final product} + +\subsection{Building the website} +The final website works with \textit{Jekyll} as planned. In order to build it locally, use the script \texttt{./build.sh}: +a browser window pointing to \url{http://localhost:4000} should open. If the website does not load immediately, reload +the page. + +\subsection{Online version} +A live-updating working copy of the website can be found at \url{https://theshell.ch}. \end{document} diff --git a/site/index.html b/site/index.html index b52676b..de6a867 100644 --- a/site/index.html +++ b/site/index.html @@ -67,3 +67,10 @@ title: Home page "My scripts work."
- Joey Bevilacqua

+
+ Solve +

+ "Finally I can quit vi." +

- Claudio Maggioni
+

+
diff --git a/site/pages/info/navigation.html b/site/pages/info/navigation.html index 659dd87..7286e51 100644 --- a/site/pages/info/navigation.html +++ b/site/pages/info/navigation.html @@ -53,7 +53,7 @@ You can navigate in our website with your keyboard using some tricks:
- s + j Brings you to the topic page of the page you're currently reading. This is the same as vi down command.