diff --git a/css/cv.css b/css/cv.css index 7021bc5..194a19f 100644 --- a/css/cv.css +++ b/css/cv.css @@ -114,7 +114,8 @@ ul { .mu { height: 5em; width: auto; - float: inline-end; + padding: 0.5em; + max-width: 100%; } .imgLi { @@ -122,6 +123,7 @@ ul { list-style-position: inside; width: fit-content; clear: left; + list-style-type: none; } .imgLi::marker { @@ -174,6 +176,18 @@ ul { margin-bottom: 0.5em!important; border-left: 2px solid white!important; padding: 0.5em!important; + display: flex; + flex-direction: column; +} + +.my-header-texts { + align-self: center; +} + +.my-header-logos { + align-self: center; + margin-left: auto; + background-color: rgba(0, 0, 0, 0)!important; } .my-section { @@ -232,6 +246,13 @@ ul { box-shadow: 0px 0px 5px 1px var(--streamYellow); } +/* Show the skills in two columns */ +.my-skills { + display: grid; + grid-template-columns: repeat(2, 1fr); + grid-gap: 0.5em; +} + .my-color-black { color: black; } @@ -245,10 +266,28 @@ ul { grid-template-rows: min-content 1fr; } + .mu { + float: inline-end; + } + + /* Show the skills in tree columns */ + .my-skills { + grid-template-columns: repeat(3, 1fr); + } + + .my-header { + flex-direction: row; + } + .my-nav { grid-area: top; flex-direction: row; } + + .imgLi { + list-style-type: disc; + } + .langOption { display: flex; diff --git a/html/cv.html b/html/cv.html index 2429d5c..1f8184f 100644 --- a/html/cv.html +++ b/html/cv.html @@ -39,9 +39,15 @@
- MU logo -

-

+
+

+

+

+
+
+ MU logo + MU logo +
@@ -142,61 +148,61 @@
Application Developer
-
-
    -
  • -
    - -

    C

    -
    -
    • -
  • -
    - -

    Java

    -
    -
    • -
  • -
    - -

    SQL

    -
    -
    • -
-
    -
  • -
    - -

    JavaScript

    -
    -
    • -
  • -
    - -

    HTML5

    -
    -
    • -
  • -
    - -

    CSS

    -
    -
    • -
-
    -
  • -
    - -

    Android

    -
    -
    • -
  • -
    - -

    Assembly

    -
    -
    • -
+
+
  • +
    + +

    C

    +
    +
    • +
  • +
    + +

    C#

    +
    +
    • +
  • +
    + +

    Java

    +
    +
    • +
  • +
    + +

    VB.NET

    +
    +
    • +
  • +
    + +

    SQL

    +
    +
    • +
  • +
    + +

    Typescript

    +
    +
    • +
  • +
    + +

    JavaScript

    +
    +
    • +
  • +
    + +

    HTML5

    +
    +
    • +
  • +
    + +

    CSS

    +
    +
    • @@ -214,6 +220,7 @@

    +

    diff --git a/html/skills.html b/html/skills.html index 8ca2a0b..6d6be34 100644 --- a/html/skills.html +++ b/html/skills.html @@ -43,10 +43,16 @@
    - MU logo -

    -

    -
    +
    +

    +

    +

    +
    +
    + MU logo + MU logo +
    +

    Programming Languages

    diff --git a/img/Logo CAS_Horizontzala_Txuria.png b/img/Logo CAS_Horizontzala_Txuria.png index b29dc11..a19e099 100644 Binary files a/img/Logo CAS_Horizontzala_Txuria.png and b/img/Logo CAS_Horizontzala_Txuria.png differ diff --git a/img/Logo CAS_Horizontzala_Txuria.png-autosave.kra b/img/Logo CAS_Horizontzala_Txuria.png-autosave.kra new file mode 100644 index 0000000..8938a1d Binary files /dev/null and b/img/Logo CAS_Horizontzala_Txuria.png-autosave.kra differ diff --git a/img/Logo CAS_Horizontzala_Txuria.png~ b/img/Logo CAS_Horizontzala_Txuria.png~ new file mode 100644 index 0000000..b29dc11 Binary files /dev/null and b/img/Logo CAS_Horizontzala_Txuria.png~ differ diff --git a/img/Logo ENG_Horizontala_Txuria.png b/img/Logo ENG_Horizontala_Txuria.png index 572067e..4ad5554 100644 Binary files a/img/Logo ENG_Horizontala_Txuria.png and b/img/Logo ENG_Horizontala_Txuria.png differ diff --git a/img/Logo ENG_Horizontala_Txuria.png-autosave.kra b/img/Logo ENG_Horizontala_Txuria.png-autosave.kra new file mode 100644 index 0000000..22c2f91 Binary files /dev/null and b/img/Logo ENG_Horizontala_Txuria.png-autosave.kra differ diff --git a/img/Logo ENG_Horizontala_Txuria.png~ b/img/Logo ENG_Horizontala_Txuria.png~ new file mode 100644 index 0000000..572067e Binary files /dev/null and b/img/Logo ENG_Horizontala_Txuria.png~ differ diff --git a/img/Logo EUS_Horizontzala_Txuria.png b/img/Logo EUS_Horizontzala_Txuria.png index b348e88..592d611 100644 Binary files a/img/Logo EUS_Horizontzala_Txuria.png and b/img/Logo EUS_Horizontzala_Txuria.png differ diff --git a/img/Logo EUS_Horizontzala_Txuria.png-autosave.kra b/img/Logo EUS_Horizontzala_Txuria.png-autosave.kra new file mode 100644 index 0000000..fc161de Binary files /dev/null and b/img/Logo EUS_Horizontzala_Txuria.png-autosave.kra differ diff --git a/img/Logo EUS_Horizontzala_Txuria.png~ b/img/Logo EUS_Horizontzala_Txuria.png~ new file mode 100644 index 0000000..b348e88 Binary files /dev/null and b/img/Logo EUS_Horizontzala_Txuria.png~ differ diff --git a/img/Logo-uoc-white.png b/img/Logo-uoc-white.png new file mode 100644 index 0000000..70811fd Binary files /dev/null and b/img/Logo-uoc-white.png differ diff --git a/img/Logo-uoc-white.png-autosave.kra b/img/Logo-uoc-white.png-autosave.kra new file mode 100644 index 0000000..80a5027 Binary files /dev/null and b/img/Logo-uoc-white.png-autosave.kra differ diff --git a/img/Logo-uoc-white.png~ b/img/Logo-uoc-white.png~ new file mode 100644 index 0000000..fcc70b3 Binary files /dev/null and b/img/Logo-uoc-white.png~ differ diff --git a/img/Logo-uoc.png b/img/Logo-uoc.png new file mode 100644 index 0000000..d048656 Binary files /dev/null and b/img/Logo-uoc.png differ diff --git a/img/logoRust.svg b/img/logoRust.svg new file mode 100644 index 0000000..2e9dd01 --- /dev/null +++ b/img/logoRust.svg @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/js/lang.js b/js/lang.js index 8f6a384..a6abe8f 100644 --- a/js/lang.js +++ b/js/lang.js @@ -2,7 +2,7 @@ function updateText(language) { // Update the selected language in localStorage localStorage.setItem('language', language); - var url = 'https://aitorastorga.github.io/cv/lang/' + language + '.json'; + var url = '../lang/' + language + '.json'; // Load the text for the selected language fetch(url) @@ -25,7 +25,9 @@ function updateText(language) { // Call the updateText function when the page loads $(document).ready(function () { - updateText('en'); + // Get the language from localStorage, or fall back to English + var language = localStorage.getItem('language') || 'en'; + updateText(language); }); function updateSelectedLanguageButton(language) { diff --git a/js/misc.js b/js/misc.js index aa61d57..610ff23 100644 --- a/js/misc.js +++ b/js/misc.js @@ -1,7 +1,7 @@ -function openMain() { - window.location.href = 'https://aitorastorga.github.io/cv/html/cv.html'; +function openMain(language) { + window.location.href = '../html/cv.html'; } -function openSkills() { - window.location.href = 'https://aitorastorga.github.io/cv/html/skills.html'; +function openSkills(language) { + window.location.href = '../html/skills.html'; } \ No newline at end of file diff --git a/js/skills.js b/js/skills.js index f881f41..b95e1d7 100644 --- a/js/skills.js +++ b/js/skills.js @@ -25,7 +25,7 @@ window.addEventListener("load", () => { const containers = document.querySelectorAll(".component-container"); // Load the text for the selected language - fetch("https://aitorastorga.github.io/cv/skills-data.json") + fetch("../skills-data.json") .then((response) => response.json()) .then((data) => { // Loop over all the sections diff --git a/lang/en.json b/lang/en.json index 28be7a7..08fad03 100644 --- a/lang/en.json +++ b/lang/en.json @@ -7,15 +7,16 @@ "name": "Aitor Astorga Saez de Vicuña", "degree": "Graduate in Computer Engineering", + "master": "Master's Student in Cybersecurity and Privacy", "goals_t": "Goals", - "goals_b": "Work in a IT oriented environment to further improve my knowledge and grow personally. Find an enthusiastic development team ready to work in a joint project. I wish to position myself in a place that helps me keep track of the ever-changing technologies of this world.", + "goals_b": "Seeking a role in an IT-oriented environment where I can apply and expand my software development skills. I am looking to collaborate in a team that values innovation, contributing to challenging projects that require continuous adaptation and learning. My goal is to develop efficient technological solutions, staying abreast of emerging trends and evolving professionally. I have a special appreciation for open-source development and value the collaboration and knowledge sharing that characterizes this community.", "languages_t": "Languages", "contact_t": "Contact Information", - "address_t": "Address", - "address_b": "Reyes Católicos 10, 5ºD, Vitoria-Gasteiz 01002", + "address_t": "Location", + "address_b": "Vitoria-Gasteiz / Bilbao", "number_t": "Number", "mail_t": "Mail", @@ -29,6 +30,7 @@ "additional_t": "Additional Information", "additional_b1": "I practise fencing since 2010, and from 2017 to 2019 was a coach in the club CEGA. I currently hold a position as Secretary.", "additional_b2": "Since october 2020 I have the responsibility of presiding over the Alava Fencing Federation.", + "additional_b3": "My current OS is Garuda Linux, and I have used FreeBSD, Manjaro, Ubuntu, Debian and Windows XP to Windows 10.", "c_b": "Extensive knowledge", "csharp_b": "Extensive knowledge", @@ -38,6 +40,7 @@ "assembly_b": "Basic Knowledge", "javascript_b": "Intermediate Knowledge", "typescript_b": "Intermediate Knowledge", + "rust_b": "Basic Knowledge", "angular_b": "", "bootstrap_b": "", diff --git a/lang/es.json b/lang/es.json index 26b8ccd..b9a5f5d 100644 --- a/lang/es.json +++ b/lang/es.json @@ -1,23 +1,24 @@ { "basque": "Euskera (Euskara)", "spanish": "Español", - "english": "Ingles (English)", + "english": "Inglés (English)", "inspiration": "Paleta de colores inspirada por: @WilburSoot", "name": "Aitor Astorga Saez de Vicuña", "degree": "Grado en Ingenieria Informática", + "master": "Estudiante de Máster en Ciberseguridad y Privacidad", "goals_t": "Objetivos", - "goals_b": "Trabajar en un entorno orientado a TI para mejorar aún más mis conocimientos y crecer personalmente. Encontrar un equipo de desarrollo entusiasta listo para trabajar en un proyecto conjunto. Deseo posicionarme en un lugar que me ayude a realizar un seguimiento de las tecnologías en constante cambio de este mundo.", + "goals_b": "Trabajar en un entorno orientado a TI donde pueda aplicar y expandir mis habilidades en desarrollo de software. Busco colaborar en un equipo que valore la innovación, contribuyendo a proyectos desafiantes que requieran adaptación y aprendizaje continuo. Mi meta es desarrollar soluciones tecnológicas eficientes, manteniéndome al día con las tendencias emergentes y evolucionando profesionalmente. Tengo un especial aprecio por el desarrollo open source y valoro la colaboración y el intercambio de conocimientos que caracteriza a esta comunidad.", "languages_t": "Idiomas", "contact_t": "Información de Contacto", - "address_t": "Dirección", - "address_b": "Reyes Católicos 10, 5ºD, Vitoria-Gasteiz 01002", + "address_t": "Ubicación", + "address_b": "Vitoria-Gasteiz / Bilbao", "number_t": "Número", - "mail_t": "Correo Electrónico", + "mail_t": "Email", "experience_t": "Experiencia", "experience_1_title": "Desarrollador de aplicaciones", @@ -29,6 +30,7 @@ "additional_t": "Información Adicional", "additional_b1": "Practico esgrima desde 2010, y de 2017 a 2019 fui entrenador en el club CEGA. Actualmente ocupo el cargo de Secretario.", "additional_b2": "Desde octubre de 2020 tengo la responsabilidad de presidir la Federación Alavesa de Esgrima.", + "additional_b3": "Mi SO actual es Garuda Linux, y he utilizado FreeBSD, Manjaro, Ubuntu, Debian y Windows XP hasta Windows 10.", "c_b": "Amplio conocimiento", "csharp_b": "Amplio conocimiento", @@ -38,6 +40,7 @@ "assembly_b": "Conocimiento básico", "javascript_b": "Conocimiento intermedio", "typescript_b": "Conocimiento intermedio", + "rust_b": "Conocimiento básico", "angular_b": "", "bootstrap_b": "", diff --git a/lang/eu.json b/lang/eu.json index 5c7643e..86accbe 100644 --- a/lang/eu.json +++ b/lang/eu.json @@ -7,17 +7,18 @@ "name": "Aitor Astorga Saez de Vicuña", "degree": "Informatikako Ingeriaritzako Gradua", + "master": "Cibersegurtasun eta Pribatutasuneko Masterra ikaslea", "goals_t": "Helburuak", - "goals_b": "Informatikari zuzendutako ingurune batean lan egin nire ezagutzak hobetzeko eta pertsonalki hazteko. Aurkitu garapen talde gogotsu bat proiektu bateratu batean lan egiteko prest. Nire burua etengabe aldatzen diren mundu honetako teknologien inguruan jarraipena egiten laguntzen didan leku batean kokatu nahi dut.", + "goals_b": "Nire software garapeneko trebetasunak aplikatu eta hedatu ahal izango dudan TI bideratutako ingurune batean lan egin. Berrikuntza baloratzen duen talde batean lankidetzan aritzeko asmoa dut, etengabeko egokitzapena eta ikaskuntza eskatzen dituzten erronka handiko proiektuetan lagunduz. Teknologia-irtenbide efizienteak garatu nahi ditut, joera berriekin eguneratuta mantenduz eta profesional gisa hobetuz. Open source garapena eta komunitate honetan ezaugarritzen den lankidetza eta ezagutzen trukea bereziki baloratzen ditut.", "languages_t": "Hizkuntzak", "contact_t": "Harremanetarako informazioa", - "address_t": "Helbidea", - "address_b": "Errege Katolikoak 10, 5ºD, Vitoria-Gasteiz 01002", + "address_t": "Kokapena", + "address_b": "Vitoria-Gasteiz / Bilbo", "number_t": "Zenbakia", - "mail_t": "Helbide Elektronikoa", + "mail_t": "E-posta", "experience_t": "Esperientzia", "experience_1_title": "Aplikazio Garatzailea", @@ -29,6 +30,7 @@ "additional_t": "Informazio Gehigarria", "additional_b1": "Eskrima praktikatzen dut 2010etik, eta 2017tik 2019ra entrenatzaile izan nintzen CEGA klubean. Gaur egun, idazkari kargua daukat.", "additional_b2": "2020ko urritik Arabako Eskrima Federazioaren buru naiz.", + "additional_b3": "Nire SE Garuda Linux da, eta FreeBSD, Manjaro, Ubuntu, Debian eta Windows XP-tik Windows 10-ra erabili ditut.", "c_b": "Ezagutza zabala", "csharp_b": "Ezagutza zabala", @@ -38,6 +40,7 @@ "assembly_b": "Oinarrizko Ezagutza", "javascript_b": "Bitarteko Ezagutza", "typescript_b": "Bitarteko Knowledge", + "rust_b": "Oinarrizko Ezagutza", "angular_b": "", "bootstrap_b": "", diff --git a/skills-data.json b/skills-data.json index c4dbd02..ac46cf7 100644 --- a/skills-data.json +++ b/skills-data.json @@ -41,8 +41,14 @@ "image": "../img/logoPython.svg", "title": "Python", "data_text_base": "python" + }, + { + "image": "../img/logoRust.svg", + "title": "Rust", + "data_text_base": "rust" } + ] }, {