Skip to content

Commit

Permalink
change structure
Browse files Browse the repository at this point in the history
  • Loading branch information
acvetochka committed Jul 22, 2024
1 parent 24f7e67 commit ffa58ed
Show file tree
Hide file tree
Showing 16 changed files with 285 additions and 119 deletions.
38 changes: 26 additions & 12 deletions src/data/addition.json
Original file line number Diff line number Diff line change
@@ -1,36 +1,50 @@
[
{
"name": "DevOps and Kubernetes",
"location": "Prometheus",
"date": "03/2024 - 05/2024"
"name": "DevOps and Kubernetes",
"location": "Prometheus",
"period": "03/2024 - 05/2024",
"degree": "Basics of DevOps und Kubernetes",
"href": "https://certs.prometheus.org.ua/downloads/ca1a768be03f488fabceb66fa91e2c5c/Certificate.pdf",
"date": "05/2024"
},
{
"name": "German course for work - B2",
"location": "Inlingua Memmingen, Memmingen (Germany)",
"date": "12/2023 - today",
"degree": "Telc DTB B2 (planned)"
"period": "12/2023 - 07/2024",
"degree": "Telc DTB B2 (planned)",
"href": "#",
"date": ""
},
{
"name": "Google Digital Marketing and e-Commerce",
"location": "Coursera",
"date": "01/2024 - 03/2024",
"degree": "Digital Marketing and e-Commerce (planned)"
"period": "01/2024 - 03/2024",
"degree": "Digital Marketing and e-Commerce",
"href": "https://www.coursera.org/account/accomplishments/professional-cert/VUH3LRL3AADW",
"date": "03/2024"
},
{
"name": "Google IT-Support",
"location": "Coursera",
"date": "12/2023 - 01/2024",
"degree": "Professional Certificate IT Support"
"period": "12/2023 - 01/2024",
"degree": "Professional Certificate IT Support",
"href": "https://www.coursera.org/account/accomplishments/specialization/Z8AUC5ZXETPF",
"date": "01/2024"
},
{
"name": "German integration course",
"location": "Inlingua Memmingen, Memmingen (Germany)",
"date": "04/2023 - 08/2023",
"degree": "Telc DTZ B1, LiD"
"period": "04/2023 - 08/2023",
"degree": "Telc DTZ B1, LiD",
"href": "https://www.linkedin.com/in/alona-kuznietsova/details/certifications/1635544727939/single-media-viewer/?profileId=ACoAADspLvsB65Njn3v9EgSCL9OWgtOLiUx09FU",
"date": "10/2023"
},
{
"name": "FullStack Developer Course",
"location": "IT School GoIT, Kyiv (Ukraine)",
"date": "11/2022 - 10/2023"
"period": "11/2022 - 10/2023",
"degree": "FullStack Developer",
"href": "https://www.linkedin.com/in/alona-kuznietsova/details/certifications/1635544730567/single-media-viewer/?profileId=ACoAADspLvsB65Njn3v9EgSCL9OWgtOLiUx09FU",
"date": "08/2023"
}
]
32 changes: 24 additions & 8 deletions src/data/de/addition.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,33 +2,49 @@
{
"name": "DevOps und Kubernetes",
"location": "Prometheus",
"date": "03/2024 - heute"
"period": "03/2024 - 05/2024",
"degree": "Basics of DevOps und Kubernetes",
"href": "https://certs.prometheus.org.ua/downloads/ca1a768be03f488fabceb66fa91e2c5c/Certificate.pdf",
"date": "05/2024"
},
{
"name": "Berufssprachkurs - B2",
"location": "Inlingua Memmingen, Memmingen",
"date": "12/2023 - heute",
"degree": "Telc DTB B2 (geplanter)"
"period": "12/2023 - 07/2024",
"degree": "Telc DTB B2 (geplanter)",
"href": "#",
"date": ""
},
{
"name": "Google Digital Marketing and e-Commerce",
"location": "Coursera",
"date": "01/2024 - 03/2024"
"period": "01/2024 - 03/2024",
"degree": "Google Digital Marketing and e-Commerce",
"href": "https://www.coursera.org/account/accomplishments/professional-cert/VUH3LRL3AADW",
"date": "03/2024"
},
{
"name": "Google IT-Support",
"location": "Coursera",
"date": "12/2023 - 01/2024"
"period": "12/2023 - 01/2024",
"degree": "Google IT-Support",
"href": "https://www.coursera.org/account/accomplishments/specialization/Z8AUC5ZXETPF",
"date": "01/2024"
},
{
"name": "Integrationskurs",
"location": "Inlingua Memmingen, Memmingen",
"date": "04/2023 - 08/2023",
"degree": "Telc DTZ B1, LiD"
"period": "04/2023 - 08/2023",
"degree": "Telc DTZ B1, LiD",
"href": "https://www.linkedin.com/in/alona-kuznietsova/details/certifications/1635544727939/single-media-viewer/?profileId=ACoAADspLvsB65Njn3v9EgSCL9OWgtOLiUx09FU",
"date": "10/2023"
},
{
"name": "FullStack Developer Kurs",
"location": "IT Schule GoIT, Kiew (Ukraine)",
"date": "11/2022 - 10/2023"
"period": "11/2022 - 10/2023",
"degree": "FullStack Developer",
"href": "https://www.linkedin.com/in/alona-kuznietsova/details/certifications/1635544730567/single-media-viewer/?profileId=ACoAADspLvsB65Njn3v9EgSCL9OWgtOLiUx09FU",
"date": "08/2023"
}
]
9 changes: 6 additions & 3 deletions src/data/techSkills.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[
"HTML5/CSS3/SASS",
"Responsive/Adaptive design",
"HTML5",
"CSS3/SASS",
"Adaptive design",
"A11y",
"GIT/Github",
"JavaScript",
Expand All @@ -10,7 +11,9 @@
"Axios",
"WebPack",
"Parcel",
"React/Redux/Redux Toolkit",
"React",
"Redux",
"Redux Toolkit",
"Next.js",
"Node.js",
"MongoDB",
Expand Down
4 changes: 1 addition & 3 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@

<body>
<main class="main">
<section class="section about">

</section>
<section class="section about"></section>
<div class="main-container">
<include src="./partials/sidebar.html"></include>
<include src="./partials/main.html"></include>
Expand Down
4 changes: 3 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ import './js/renderEducation';
import './js/renderSkills';
import './js/renderLanguages';
import './js/renderContacts';
import './js/renderAdditions';
import './js/renderAdditions';
import './js/renderAdditionsSidebar';
import './js/renderEducationSidebar';
21 changes: 12 additions & 9 deletions src/js/renderAbout.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,21 @@ function renderAbout() {
const markup = aboutData
.map(
({ name, position, description, link, lang }) => `
<div class="lang">
<div class="about-container">
<div class="lang">
<a href=${link} class="lang-link">${lang}</a>
</div>
<div class="photo-wrapper">
</div>
<div class="photo-wrapper">
<img src=${photo} alt="photo" class="photo" width="250" height="250">
</div>
<div>
<h1 class="about-name">${name}</h1>
</div>
<div>
<h1 class="about-name">${name}</h1>
<h2 class="about-position">${position}</h2>
<p class="about-description">${description}
</p>
</div>`
<p class="about-description">${description}</p>
</div>
</div>
<hr/>
`
)
.join('');
aboutSection.innerHTML = markup;
Expand Down
4 changes: 2 additions & 2 deletions src/js/renderAdditions.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function renderAddition() {
}

const markup = add
.map(({ name, location, date, degree }) => {
.map(({ name, location, period, degree }) => {
const deg = degree => {
if (degree) {
return 'Abschluss: ' + degree;
Expand All @@ -24,7 +24,7 @@ function renderAddition() {

return `<li class="education-item">
<h4 class="education-course">${name}</h4>
<p class="period">${date}<span class="line"> | </span>${location}</p>
<p class="period">${period}<span class="line"> | </span>${location}</p>
<p class="education-add-spec">
${deg(degree)}</p>
</li>`;
Expand Down
35 changes: 35 additions & 0 deletions src/js/renderAdditionsSidebar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import addDe from '../data/de/addition.json';
import addEn from '../data/addition.json';

const additionList = document.querySelector('.addition-list-sidebar');
const currentURL = window.location.href;
let add = addEn;

function renderAdditionSidebar() {
if (currentURL.includes('de.html')) {
add = addDe;
} else {
add = addEn;
}

const markup = add
.map(({ name, location, href, date, period, degree }) => {
const deg = degree => {
if (degree) {
return 'Abschluss: ' + degree;
} else {
return '';
}
};

return `<li class="education-item">
<span>
<a href=${href} class="education-course">${degree}</a> - ${date}</span>
</li>`;
})
.join('');

additionList.innerHTML = markup;
}

renderAdditionSidebar();
4 changes: 2 additions & 2 deletions src/js/renderEducation.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ function renderEducation() {
};

return `<li class="education-item">
<p class="education-spec">${degree}
<h4 class="education-uni">${uni}</h4>
<h4 class="education-spec">${degree}</h4>
<p class="education-uni">${uni}</p>
<p class="period">${date}<span class="line"> | </span>${location}</p>
</li>`;
})
Expand Down
37 changes: 37 additions & 0 deletions src/js/renderEducationSidebar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import eduEn from '../data/education.json';
import eduDe from '../data/de/education.json';

const eduList = document.querySelector('.education-list-sidebar');
const currentURL = window.location.href;
let edu = eduEn;

function renderEducation() {
if (currentURL.includes('de.html')) {
edu = eduDe;
} else {
edu = eduEn;
}

const markup = edu
.map(({ uni, date, location, spec, degree }) => {
const deg = degree => {
if (degree) {
return ' | ' + degree;
} else {
return '';
}
};

return `<li class="education-item">
<h4 class="education-spec">${degree}</h4>
<p class="education-uni">${uni}</p>
<p class="period">${date}<span class="line"> | </span>${location}</p>
</li>`;
})
.join('');

// ${deg(degree)}</p>
eduList.innerHTML = markup;
}

renderEducation();
8 changes: 8 additions & 0 deletions src/partials-de/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@
<h3 class="sidebar-title">Kontaktinformationen</h3>
<ul class="contacts-list"></ul>
</div>
<div class="education">
<h3 class="sidebar-title">Studium</h3>
<ul class="education-list-sidebar"></ul>
</div>
<div class="education">
<h3 class="sidebar-title">Zertifikate</h3>
<ul class="addition-list-sidebar"></ul>
</div>
<!--Tech Skills-->
<div class="tech-skills">
<h3 class="sidebar-title">Technische Fähigkeiten</h3>
Expand Down
12 changes: 8 additions & 4 deletions src/partials/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,19 @@
<h3 class="sidebar-title">Contacts</h3>
<ul class="contacts-list"></ul>
</div>
<div class="education">
<h3 class="sidebar-title">Education</h3>
<ul class="education-list-sidebar"></ul>
</div>
<div class="education">
<h3 class="sidebar-title">Certificates</h3>
<ul class="addition-list-sidebar"></ul>
</div>
<!--Tech Skills-->
<div class="tech-skills">
<h3 class="sidebar-title">Tech Skills</h3>
<ul class="tech-skills-list"></ul>
</div>
<!-- <div class="education">
<h3 class="title">Certificates</h3>
<ul class="addition-list"></ul>
</div> -->
<!-- Languages -->
<div class="languages">
<h3 class="sidebar-title">Languages</h3>
Expand Down
10 changes: 7 additions & 3 deletions src/sass/components/_about.scss
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
.about {
position: relative;
display: flex;
gap: 50px;
padding-top: 40px;
padding-bottom: 40px;
margin-bottom: 0;
background: linear-gradient(90deg, rgb(137 151 204) 0%, rgba(89, 125, 164, 1) 35%, rgb(48 88 131) 100%);
}

.about-container {
position: relative;
display: flex;
gap: 50px;

}

@media screen and (max-width: 768px) {
.about {
flex-direction: column;
Expand Down
Loading

0 comments on commit ffa58ed

Please sign in to comment.