diff --git a/frontend/src/lib/css/education.css b/frontend/src/lib/css/education.css
deleted file mode 100644
index eb0aead..0000000
--- a/frontend/src/lib/css/education.css
+++ /dev/null
@@ -1,103 +0,0 @@
-.education-container {
- display: flex;
- flex-direction: column;
- transition: all .3s ease 0s;
-}
-
-.education-main {
- display: flex;
- border-radius: 0.4rem;
- box-shadow: 0px 20px 50px -10px rgba(0, 0, 0, 0.2);
- background-color: var(--color-background);
- height: 20rem;
- margin-left: 2.5rem;
- margin-right: 2.5rem;
- z-index: 1;
- transition: all .3s ease 0s;
-}
-
-.education-img-container{
- display: flex;
- margin: 1.5rem;
- justify-content: center;
- align-items: center;
-}
-
-.education-img {
- max-height: 15rem;
- min-width: 20rem;
- max-width: 25rem;
-}
-
-.education-text-container {
- margin: 1.5rem;
- width: 25rem;
-}
-
-.education-title {
- color: var(--color-text);
- font-family: 'Gabarito', sans-serif;
- font-weight: 600;
- font-size: 2rem;
-}
-
-.education-subtitle-container {
- display: flex;
- flex-direction: row;
- align-items: center;
-}
-
-.education-aftericon {
- margin-left: 0.5rem;
-}
-
-.education-subtitle {
- color: var(--color-text);
- font-family: 'Gabarito', sans-serif;
- font-weight: 500;
- font-size: 1.5rem;
- margin-top: 0.75rem;
- margin-bottom: 0.75rem;
-}
-
-.education-unactive {
- scale: 0.9;
- margin-left: 2.25rem !important;
- margin-right: 2.25rem !important;
- box-shadow: 0 7px 30px -10px rgba(150,170,180,0.5) !important;
-}
-
-.education-time {
- margin-top: 3rem;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
-.education-bubble {
- z-index: 2;
- width: 5rem;
- height: 5rem;
- background-color: var(--color-special);
- box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.2);
- border-radius: 50%;
- transition: all .3s ease 0s;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.education-date {
- color: var(--color-special);
- font-weight: 700;
-}
-
-.education-string {
- z-index: -1;
- position: absolute;
- height: 3rem;
- background-color: var(--color-special);
- opacity: 0.5;
- transition: all .3s ease 0s;
-}
\ No newline at end of file
diff --git a/frontend/src/lib/css/experience.css b/frontend/src/lib/css/experience.css
deleted file mode 100644
index 163e9e5..0000000
--- a/frontend/src/lib/css/experience.css
+++ /dev/null
@@ -1,105 +0,0 @@
-.experience-container {
- display: flex;
- flex-direction: column;
- transition: all .3s ease 0s;
-}
-
-.experience-main {
- display: flex;
- border-radius: 0.4rem;
- box-shadow: 0px 20px 50px -10px rgba(0, 0, 0, 0.2);
- background-color: var(--color-background);
- height: 22rem;
- margin-left: 2.5rem;
- margin-right: 2.5rem;
- z-index: 1;
- transition: all .3s ease 0s;
-}
-
-.experience-img-container{
- display: flex;
- margin: 1.5rem;
- justify-content: center;
- align-items: center;
-}
-
-.experience-img {
- max-height: 15rem;
- min-width: 20rem;
- max-width: 25rem;
-}
-
-.experience-text-container {
- margin: 1.5rem;
- width: 25rem;
-}
-
-.experience-title {
- color: var(--color-text);
- font-family: 'Gabarito', sans-serif;
- font-weight: 600;
- font-size: 2rem;
-}
-
-.experience-subtitle-container {
- display: flex;
- flex-direction: row;
- align-items: center;
-}
-
-.experience-aftericon {
- margin-left: 0.5rem;
-}
-
-.experience-subtitle {
- color: var(--color-text);
- font-family: 'Gabarito', sans-serif;
- font-weight: 500;
- font-size: 1.5rem;
- margin-top: 0.75rem;
- margin-bottom: 0.75rem;
- text-align:justify;
- text-justify: auto;
-}
-
-.experience-unactive {
- scale: 0.9;
- margin-left: 2.25rem !important;
- margin-right: 2.25rem !important;
- box-shadow: 0 7px 30px -10px rgba(150,170,180,0.5) !important;
-}
-
-.experience-time {
- margin-top: 3rem;
- display: flex;
- flex-direction: column;
- justify-content: center;
- align-items: center;
-}
-
-.experience-bubble {
- z-index: 2;
- width: 5rem;
- height: 5rem;
- background-color: var(--color-special);
- box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.2);
- border-radius: 50%;
- transition: all .3s ease 0s;
- display: flex;
- justify-content: center;
- align-items: center;
-}
-
-.experience-date {
- color: var(--color-special);
- font-weight: 700;
-}
-
-.experience-string {
- z-index: -1;
- position: absolute;
- height: 3rem;
- background-color: var(--color-special);
- opacity: 0.5;
- transition: all .3s ease 0s;
-}
\ No newline at end of file
diff --git a/frontend/src/lib/css/projects.css b/frontend/src/lib/css/slide.css
similarity index 61%
rename from frontend/src/lib/css/projects.css
rename to frontend/src/lib/css/slide.css
index cd549b3..04938a2 100644
--- a/frontend/src/lib/css/projects.css
+++ b/frontend/src/lib/css/slide.css
@@ -1,10 +1,10 @@
-.projects-container {
+.slide-container {
display: flex;
flex-direction: column;
transition: all .3s ease 0s;
}
-.projects-main {
+.slide-main {
display: flex;
border-radius: 0.4rem;
box-shadow: 0px 20px 50px -10px rgba(0, 0, 0, 0.2);
@@ -16,42 +16,51 @@
transition: all .3s ease 0s;
}
-.projects-img-container {
+.slide-unactive {
+ scale: 0.9;
+ margin-left: 2.25rem !important;
+ margin-right: 2.25rem !important;
+ box-shadow: 0 7px 30px -10px rgba(150,170,180,0.5) !important;
+}
+
+.slide-img-container{
display: flex;
margin: 1.5rem;
justify-content: center;
align-items: center;
}
-.projects-img {
+.slide-img {
max-height: 15rem;
min-width: 20rem;
max-width: 25rem;
}
-.projects-text-container {
+.slide-text-container {
margin: 1.5rem;
width: 25rem;
}
-.projects-title {
+.slide-title {
color: var(--color-text);
font-family: 'Gabarito', sans-serif;
font-weight: 600;
font-size: 2rem;
}
-.projects-subtitle-container {
+.slide-subtitle-container {
display: flex;
flex-direction: row;
align-items: center;
}
-.projects-aftericon {
+/* When an icon is put after a subtitle*/
+.slide-aftericon {
margin-left: 0.5rem;
}
-.projects-subtitle {
+/* Any Subtitle */
+.slide-subtitle {
color: var(--color-text);
font-family: 'Gabarito', sans-serif;
font-weight: 500;
@@ -63,7 +72,8 @@
text-justify: auto;
}
-.projects-text {
+/* Add it to any text that may overflow. (long texts)*/
+.slide-text {
font-size: 1.25rem !important;
overflow: hidden;
display: -webkit-box;
@@ -72,19 +82,14 @@
text-overflow: ellipsis;
}
-.projects-unactive {
- scale: 0.9;
- margin-left: 2.25rem !important;
- margin-right: 2.25rem !important;
- box-shadow: 0 7px 30px -10px rgba(150, 170, 180, 0.5) !important;
-}
-
-.projects-button-container {
+/* For button at the end of the container*/
+.slide-button-container {
display: flex;
justify-content: flex-end;
}
-.projects-more-button {
+/* Every button are centered to the right side of the component */
+.slide-button {
padding-right: 1rem;
padding-left: 1rem;
padding-top: 0.5rem;
@@ -103,7 +108,7 @@
transition: all .3s ease 0s;
}
-.projects-more-button:hover {
+.slide-button:hover {
color: var(--color-special);
background-color: var(--color-background);
box-shadow: 0 0.7px 3px -1px rgba(150,170,180,0.5);
@@ -111,7 +116,44 @@
border-color: var(--color-special);
}
-.projects-more-button:active {
+.slide-button:active {
transform: translateY(0.25rem);
background-color: var(--color-subtitle);
+}
+
+/* Timeline stuff */
+.slide-time {
+ margin-top: 3rem;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.slide-bubble {
+ z-index: 2;
+ width: 5rem;
+ height: 5rem;
+ background-color: var(--color-special);
+ box-shadow: 0px 2px 5px -1px rgba(0, 0, 0, 0.2);
+ border-radius: 50%;
+ transition: all .3s ease 0s;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+
+/* Date text */
+.slide-date {
+ color: var(--color-special);
+ font-weight: 700;
+}
+
+.slide-string {
+ z-index: -1;
+ position: absolute;
+ height: 3rem;
+ background-color: var(--color-special);
+ opacity: 0.5;
+ transition: all .3s ease 0s;
}
\ No newline at end of file
diff --git a/frontend/src/lib/js/timeline.js b/frontend/src/lib/js/slideshow.js
similarity index 63%
rename from frontend/src/lib/js/timeline.js
rename to frontend/src/lib/js/slideshow.js
index 469e5ef..786ed2e 100644
--- a/frontend/src/lib/js/timeline.js
+++ b/frontend/src/lib/js/slideshow.js
@@ -1,8 +1,10 @@
-export function createTimeLine(positionsArray, typename) {
+import { writable } from 'svelte/store';
+
+export function createTimeLine(positionsArray) {
let divArray = [];
for (let i = 0; i < positionsArray.length - 1; i++) {
var newDiv = document.createElement('div');
- newDiv.className = `${typename}-string`;
+ newDiv.className = "slide-string";
const left = positionsArray[i].left + (2.5 * 16);
newDiv.style.left = `${left}px`;
const top = positionsArray[i].top + 16;
@@ -12,4 +14,8 @@ export function createTimeLine(positionsArray, typename) {
divArray.push(newDiv);
}
return divArray;
-}
\ No newline at end of file
+}
+
+export let slideContainerCount = writable(0);
+export let slideTimelineCount = writable(0);
+export let slideStringCount = writable(0);
\ No newline at end of file
diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte
index 5bff2a7..a64f025 100644
--- a/frontend/src/routes/+page.svelte
+++ b/frontend/src/routes/+page.svelte
@@ -34,10 +34,8 @@
let sidebar_height = 0;
$: scrollY = 0;
$: innerHeight = 0;
- $: outerHeight = 0;
onMount(() => {
sidebar_height = sidebar.offsetHeight;
- console.log(sidebar_height);
sidebarScrollingHandler();
});
@@ -53,7 +51,7 @@
}
-
+
{#if data.status == 0}
@@ -95,22 +93,18 @@