Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
849384b
Se elimina linea final: Si no has completado todo lo anterior, no con…
Joseline0609 Jan 4, 2024
e48af0d
Merge pull request #1 from Joseline0609/developJoseline
Etelbina Jan 4, 2024
60a2ed0
se elimino en punto 10
Etelbina Jan 4, 2024
c0e1035
Merge pull request #2 from Joseline0609/developJoseline
Etelbina Jan 5, 2024
764f7f7
se agrega comentario
Joseline0609 Jan 5, 2024
838fcbc
adding resources folder
Etelbina Jan 8, 2024
c485555
dataset added
Joseline0609 Jan 9, 2024
98684fc
head information
Etelbina Jan 9, 2024
2f580a1
HTMl basic structure
Joseline0609 Jan 9, 2024
37c4555
adding circles to icoons
Etelbina Jan 10, 2024
ec84860
ornamentales
Etelbina Jan 10, 2024
349e175
adding card section
Etelbina Jan 10, 2024
be62e29
names to images added
Joseline0609 Jan 10, 2024
2ab43c4
nueva estructura de tarjetas
Etelbina Jan 10, 2024
e834156
category styles added and data corrections
Joseline0609 Jan 12, 2024
faf94de
Accept incomming changes and fix problems
Joseline0609 Jan 12, 2024
1ee30b2
Header and card styles
Etelbina Jan 12, 2024
1007425
Merge pull request #3 from Joseline0609/developJoseline
Etelbina Jan 12, 2024
22efb43
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into main…
Etelbina Jan 13, 2024
6934c2f
fixed merge conflicts
Etelbina Jan 13, 2024
7878bfe
html w3c maukup validation service corrections
Etelbina Jan 13, 2024
bff04f6
Merge pull request #4 from Etelbina/developEthel
Joseline0609 Jan 15, 2024
4cf44df
ul element changed by select element in the aside
Joseline0609 Jan 15, 2024
a17b365
html microdata structure
Etelbina Jan 15, 2024
bacc608
Merge pull request #5 from Etelbina/developEthel
Joseline0609 Jan 15, 2024
68d381b
adding resources folder
Etelbina Jan 8, 2024
d2b8f6e
dataset added
Joseline0609 Jan 9, 2024
babfb39
head information
Etelbina Jan 9, 2024
d04bc46
HTMl basic structure
Joseline0609 Jan 9, 2024
9cd2a76
adding circles to icoons
Etelbina Jan 10, 2024
62a5b04
ornamentales
Etelbina Jan 10, 2024
874e428
adding card section
Etelbina Jan 10, 2024
ad5b2bb
nueva estructura de tarjetas
Etelbina Jan 10, 2024
7313cc4
Header and card styles
Etelbina Jan 12, 2024
ad32cf6
names to images added
Joseline0609 Jan 10, 2024
5de4480
category styles added and data corrections
Joseline0609 Jan 12, 2024
13a61ea
fixed merge conflicts
Etelbina Jan 13, 2024
c601032
html w3c maukup validation service corrections
Etelbina Jan 13, 2024
975ba87
ul element changed by select element in the aside
Joseline0609 Jan 15, 2024
b000674
html microdata structure
Etelbina Jan 15, 2024
029ce35
added function to create cards dynamically
Joseline0609 Jan 15, 2024
ee67a7d
test
Joseline0609 Jan 15, 2024
08b3daf
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Joseline0609 Jan 15, 2024
faa9013
Merge pull request #6 from Joseline0609/developJoseline
Etelbina Jan 16, 2024
81a457a
css cards styles and ordered
Etelbina Jan 16, 2024
8b9a1ef
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Etelbina Jan 16, 2024
227f0a4
Merge pull request #7 from Etelbina/developEthel
Joseline0609 Jan 16, 2024
2a6b087
Added functionality to bottons to spin cards
Joseline0609 Jan 16, 2024
fff59e5
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Joseline0609 Jan 16, 2024
0932983
linking CSS with viewJS
Etelbina Jan 16, 2024
6e41cc7
Merge pull request #8 from Etelbina/developEthel
Joseline0609 Jan 16, 2024
03e9410
Merge pull request #9 from Joseline0609/developJoseline
Etelbina Jan 16, 2024
288e960
Rotate card function applied to all cards
Joseline0609 Jan 18, 2024
7d97e61
Merge pull request #10 from Joseline0609/developJoseline
Etelbina Jan 18, 2024
f27122b
adding plant images
Etelbina Jan 18, 2024
5276a0e
name changes
Joseline0609 Jan 18, 2024
53ae785
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Joseline0609 Jan 18, 2024
2202629
last details to CSS
Etelbina Jan 18, 2024
249a680
Merge pull request #11 from Etelbina/developEthel
Etelbina Jan 18, 2024
f477795
data corrections
Joseline0609 Jan 18, 2024
7c24006
Merge pull request #12 from Joseline0609/developJoseline
Joseline0609 Jan 19, 2024
905e70b
new betails styles
Etelbina Jan 19, 2024
d9e82bf
hito 1 finished
Etelbina Jan 19, 2024
8daba98
Merge pull request #13 from Etelbina/developEthel
Etelbina Jan 19, 2024
ca34dbe
Merge pull request #14 from Etelbina/mainDevelop
Etelbina Jan 19, 2024
4799d18
Adding images
Etelbina Jan 19, 2024
7a97860
changing urls fail
Etelbina Jan 19, 2024
021a789
changes
Joseline0609 Jan 19, 2024
5cf44d3
changes
Joseline0609 Jan 19, 2024
a59867e
correction
Joseline0609 Jan 19, 2024
721ce72
adding image urls
Etelbina Jan 19, 2024
78854f3
Merge pull request #15 from Joseline0609/developJoseline
Etelbina Jan 19, 2024
04c7175
few changes just tu pull
Etelbina Jan 19, 2024
4e42e46
Merge branch 'main' of github.com:Etelbina/dataverse
Etelbina Jan 19, 2024
40fb0e4
filterData function added
Joseline0609 Jan 22, 2024
2b0644d
filterData function added
Joseline0609 Jan 23, 2024
4cb69b3
triying to do the sorting function
Etelbina Jan 23, 2024
a4d79cb
Merge pull request #16 from Joseline0609/developJoseline
Etelbina Jan 23, 2024
0aa5f49
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Etelbina Jan 24, 2024
744e0ef
my latest changes and joseline actualization
Etelbina Jan 24, 2024
282fe68
function what is selected
Etelbina Jan 24, 2024
d0159a2
function selected
Etelbina Jan 24, 2024
9315d7a
css applied to categories
Etelbina Jan 24, 2024
2fc9ad7
Merge pull request #17 from Etelbina/developEthel
Joseline0609 Jan 24, 2024
933fce6
Rotate cards feature added but this time using event delegation
Joseline0609 Jan 24, 2024
e24bfea
Merge branch 'Etelbina:main' into developJoseline
Joseline0609 Jan 24, 2024
c455d25
added filter by name function and modal window for description
Joseline0609 Jan 25, 2024
c7621c8
added filter by name function and modal window for description
Joseline0609 Jan 25, 2024
1b5b143
drop down function dor option 3 and 4
Etelbina Jan 25, 2024
99d6d0a
adding sorting with filters
Etelbina Jan 25, 2024
c23f870
Merge pull request #18 from Joseline0609/developJoseline
Etelbina Jan 26, 2024
f537d51
changed some care dificulties
Etelbina Jan 26, 2024
fa1abfd
solving conflicts after pull
Etelbina Jan 26, 2024
35e2518
Order, filter and search by name fusion (#19)
Etelbina Jan 26, 2024
a70bd99
hide back files images in a folder
Etelbina Jan 26, 2024
fa95fd0
search by name styles
Etelbina Jan 29, 2024
a3a5607
function to render facts dinamically added, computeStats function add…
Joseline0609 Jan 29, 2024
3f2342c
popup stats content
Etelbina Jan 29, 2024
a03188d
last changes
Joseline0609 Jan 30, 2024
b360fff
stats event listener
Etelbina Jan 30, 2024
23b68f9
Merge pull request #21 from Etelbina/developEthel
Etelbina Jan 30, 2024
15452b2
Create CNAME
Etelbina Jan 30, 2024
401ee37
Delete CNAME
Etelbina Jan 30, 2024
f695291
Merge pull request #20 from Joseline0609/developJoseline
Etelbina Jan 30, 2024
3ef6c2c
solving conflicts
Etelbina Jan 30, 2024
d7f6a29
repeticion borrada
Etelbina Jan 30, 2024
edac193
Merge pull request #22 from Etelbina/developEthel
Etelbina Jan 30, 2024
5b02436
Last cahnges (#1)
Joseline0609 Jan 30, 2024
3e3fb22
solving filter and data
Etelbina Jan 31, 2024
4555f4f
Modification of the structure of the template in view.js, rendering s…
Joseline0609 Feb 1, 2024
1600fe0
Incoming changes accepted
Joseline0609 Feb 1, 2024
705658a
.
Joseline0609 Feb 1, 2024
9cb715f
.
Joseline0609 Feb 1, 2024
f41ac7b
<p> tags deleted
Joseline0609 Feb 1, 2024
2dcf185
Merge pull request #23 from Joseline0609/developJoseline
Etelbina Feb 1, 2024
7996d85
adding 3 docs to clean code
Etelbina Feb 1, 2024
f81bc08
solving conflicts of html structure of modals from story6 stats funct…
Etelbina Feb 1, 2024
8d280f2
changing names to attribute values everywhere
Etelbina Feb 2, 2024
776213b
Merge pull request #24 from Etelbina/developEthel
Etelbina Feb 2, 2024
4864d4b
cleaning 1/n
Etelbina Feb 4, 2024
ddd7fd6
cleaning 2/n
Etelbina Feb 4, 2024
c4358fc
cleaning 3/n - Added comments
Etelbina Feb 4, 2024
91b0a42
cleaning 4/n - Water Statistics
Etelbina Feb 4, 2024
2bb966d
cleaning 5/n adding all stats
Etelbina Feb 4, 2024
047abaa
cleaning 6/n fixing reset button
Etelbina Feb 4, 2024
6d5a705
cleaning 7/n fix CSS color by category
Etelbina Feb 4, 2024
2bcca63
8/n - move to main stats
Etelbina Feb 4, 2024
e74d7ba
9/n move event listeners to main
Etelbina Feb 4, 2024
72f4b18
10/n meve rest of the listeners to main
Etelbina Feb 4, 2024
3e53eca
11/n fixing category listeners
Etelbina Feb 4, 2024
b9fcd9e
adding all comments
Etelbina Feb 5, 2024
b213c2a
media queries responsive styles
Etelbina Feb 5, 2024
bee1564
organizing files in folders
Etelbina Feb 5, 2024
d03458b
first template of readme
Joseline0609 Feb 5, 2024
9b99514
Merge pull request #25 from Etelbina/developEthel
Joseline0609 Feb 5, 2024
b2688cb
Merge branch 'mainDevelop' of github.com:Etelbina/dataverse into deve…
Joseline0609 Feb 5, 2024
58967ee
Gif para el Readme
Joseline0609 Feb 5, 2024
da4ef90
.
Joseline0609 Feb 5, 2024
5c91cbe
Merge branch 'developJoseline' of github.com:Joseline0609/dataverse i…
Joseline0609 Feb 5, 2024
5ee8283
Update README.md
Joseline0609 Feb 5, 2024
896e02d
Readme and filterData test added
Joseline0609 Feb 5, 2024
6b5b6d0
.
Joseline0609 Feb 5, 2024
b536779
test example modified on readme
Joseline0609 Feb 5, 2024
eb05e18
Merge pull request #27 from Joseline0609/developJoseline
Etelbina Feb 6, 2024
8d5c0c5
little changes
Etelbina Feb 6, 2024
846447b
concluding local merge
Etelbina Feb 6, 2024
2e3e871
statistics function fixed
Etelbina Feb 7, 2024
b58e9d1
full test
Etelbina Feb 7, 2024
b74e40d
Merge pull request #28 from Etelbina/developEthel
Etelbina Feb 7, 2024
cf48bbf
last updated readme
Joseline0609 Feb 7, 2024
c46fdab
Merge pull request #29 from Joseline0609/developJoseline
Etelbina Feb 7, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,078 changes: 186 additions & 892 deletions README.md

Large diffs are not rendered by default.

688 changes: 688 additions & 0 deletions src/cleaning/Ccleaning.css

Large diffs are not rendered by default.

84 changes: 84 additions & 0 deletions src/cleaning/cleaning.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="authors" content="Joseline García & Etelbina Cañedo">
<title>Dataverse</title>
<meta name="description" content="This is the second proyect of Laboratoria bootcamp, first time working as a team">
<link rel="icon" href="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/Logo.png?raw=true">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Lato:wght@300;400;700;900&family=Marcellus&family=Marcellus+SC&display=swap" rel="stylesheet">
<link rel="stylesheet" href="style.css">
</head>
<body>
<!-- Header -->
<header>
<section class="brand" id="brand">
<img class="logo" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/Logo.png?raw=true" alt="Logo" onclick="refreshPage()">
<h1 onclick="refreshPage()">My Beauty Plants</h1>
</section>
</header>
<!-- Menu section -->
<!-- Search by name -->
<aside class="search-by-name container">
<form class="search-container" action="data/dataset.js">
<input type="text" id="input-name" placeholder="Buscar..." name="search">
</form>
</aside>
<!-- Category menu -->
<aside class="category-menu container">
<nav class="category-nav">
<div class="item-aside">
<input type="image" data-category="ornamental" id="ornamental" name="ornamental" alt="Ornamentales" class="category" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/Ornamentales.png?raw=true">
<label for="ornamental">Ornamentales</label>
</div>
<div class="item-aside">
<input type="image" data-category="medicinal" id="medicinal" name="medicinal" alt="Medicinales" class="category" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/Medicinales.png?raw=true">
<label for="medicinal">Medicinales</label>
</div>
<div class="item-aside">
<input type="image" data-category="desert" id="desert" name="desert" alt="Desérticas" class="category" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/deserticas.png?raw=true">
<label for="desert">Desérticas</label>
</div>
<div class="item-aside">
<input type="image" data-category="trees" id="trees" name="trees" alt="Árboles" class="category" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/arboles.png?raw=true">
<label for="trees">Árboles</label>
</div>
<div class="item-aside">
<input type="image" data-category="aromatic" id="aromatic" name="aromatic" alt="Aromáticas" class="category" src="https://github.com/Etelbina/dataverse/blob/main/src/resources/Icons/aromaticas.png?raw=true">
<label for="aromatic">Aromáticas</label>
</div>
</nav>
</aside>
<!-- Order by dropdown button -->
<aside class="order-by container">
<label for="item-order" id="order" class="dropdown-button">Orden</label>
<select name="order" id="item-order">
<option value="order">Orden</option>
<option value="a-z">A - Z</option>
<option value="z-a">Z - A</option>
<option value="reset">Resetear</option>
</select>
</aside>
<button data-testid="button-clear" type="reset" class="unnecessary">Reset</button>
<!-- Mmain -->
<main>
<h2 class="unnecessary">Plantas</h2>
<!-- Container -->
<div id="root">
<!-- Ul cards -->
<ul class="cards" id="ul-cards">
<li class="unnecessary" itemscope itemtype="https://schema.org">Plant</li>
</ul>
</div>
</main>
<!-- Footer limpio -->
<footer>
<h3 class="footer">My Beauty Plants</h3>
<p class="footer">Etelbina Cañedo &amp; Joseline García</p>
<p class="footer">Bootcamp Laboratoria</p>
</footer>
<script src="main.js" type="module"></script>
</body>
</html>
145 changes: 145 additions & 0 deletions src/cleaning/data-functions-Cleaning.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
//----------------------
/**
* This function gets the category from the object
* and compares it with the value of the atribute in HTML element
* is call by categoryButtons function when a button is cliked
*
* @param { every plant } data - From dataset
* @param { property } filterBy - Category of every element of the array object
* @param { atribute } value - Category of plant
*
* @returns data filtered
*/
export const filterData = (data, filterBy, value) => {
return data.filter(objeto => objeto[filterBy] === value);
};

//----------------------
/**
* This function decides with a condition
* wich order needs to me used
* a-z / z-a
* is call by dropdown function when an option is clicked
*
* @param { data } data - currentData
* @param { property } sortBy - id of every element of the array object
* @param { option } sortOrder - selectedIndex from dropdown
*
*
*/
export const sortData = (data, sortBy, sortOrder) => {
data.sort(function(a,b){
if (sortOrder === 1) {
return a[sortBy] > b[sortBy] ? 1 : -1;
} else if (sortOrder === 2) {
return a[sortBy] < b[sortBy] ? 1 : -1;
}
});
};

//----------------------
/**
* This function creates the structure
* stores the numbers into an array
* calculate the sum of every type of fact
* calculates the average of every type of fact
* and stores them into the structure
* in call by statiscis variable to be use in ststisticsButton
*
* @param { every plant } data - From clonedData
*
* @returns the new populated object
*/
export const createStatistics = (data) => {
//1 - Create empty structure to host categories in arrays
const statsByCategory = {
"ornamental":{
sum: {
waterSum:0,
lightSum:0,
careSum:0
},
average:{
waterAverage:0,
lightAverage:0,
careAverage:0
},
factsByPlants:[]
},
"medicinal":{
sum: {
waterSum:0,
lightSum:0,
careSum:0
},
average:{
waterAverage:0,
lightAverage:0,
careAverage:0
},
factsByPlants:[]
},
"aromatic":{
sum: {
waterSum:0,
lightSum:0,
careSum:0
},
average:{
waterAverage:0,
lightAverage:0,
careAverage:0
},
factsByPlants:[]
},
"desert":{
sum: {
waterSum:0,
lightSum:0,
careSum:0
},
average:{
waterAverage:0,
lightAverage:0,
careAverage:0
},
factsByPlants:[]
},
"trees":{
sum: {
waterSum:0,
lightSum:0,
careSum:0
},
average:{
waterAverage:0,
lightAverage:0,
careAverage:0
},
factsByPlants:[]
},
};
//2 - Iterate in data
data.forEach(plant => {
//3 - Identify category
const category = plant.categoryPlant;
//4 - Extracts facts
//5 - Store facts in array corresponding category
statsByCategory[category].factsByPlants.push(plant.facts);

//6 - Calculate average by category
statsByCategory[category].sum.waterSum+=plant.facts.waterAmount;
//6.1 - Save total facts by category in dedicated structure
statsByCategory[category].average.waterAverage=Math.round(statsByCategory[category].sum.waterSum/statsByCategory[category].factsByPlants.length);

//repeat for light
statsByCategory[category].sum.lightSum+=plant.facts.sunLight;
statsByCategory[category].average.lightAverage=Math.round(statsByCategory[category].sum.lightSum/statsByCategory[category].factsByPlants.length);

//repeat for care
statsByCategory[category].sum.careSum+=plant.facts.careDifficulty;
statsByCategory[category].average.careAverage=Math.round(statsByCategory[category].sum.careSum/statsByCategory[category].factsByPlants.length);
});

return statsByCategory;
}
Loading