Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
afcirillo96 committed Aug 10, 2023
2 parents dade541 + 9ae0a17 commit 0fe2062
Show file tree
Hide file tree
Showing 20 changed files with 1,451 additions and 462 deletions.
25 changes: 15 additions & 10 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,11 @@
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="https://getbootstrap.com/docs/3.3/assets/js/ie10-viewport-bug-workaround.js" integrity="sha384-hbdPIKvN8VYiuuYBaMb70rDCVFrg4vzTn4XSlM+8ctmf8g5Ci4iU4FQY8PDbyCvj" crossorigin="anonymous"></script>

<!--TooltipTourMaker-->
<link href="src/js/components/help/helpTour.css" rel="stylesheet">
<link href="src/js/components/help/tooltipTourMaker.css" rel="stylesheet">
<script src="src/js/components/help/tooltipTourMaker.js"></script>

<!-- Argenmap basic libraries -->
<script src="src/js/utils/analytics/analytics.js"></script>
<script src="src/js/utils/constants/constants.js"></script>
Expand All @@ -72,7 +77,11 @@
<script src="src/js/components/styles/styles.js"></script>
<script src="src/js/components/login/login.js"></script>
<script src="src/js/components/sidebar/sidebar.js"></script>

<script src="src/js/components/UI/UserInterface.js"></script>
<script src="src/js/components/about/about.js"></script>

<script src="https://cdnjs.cloudflare.com/ajax/libs/marked/2.0.0/marked.min.js"></script>

<!--tabulator-->
<link rel="stylesheet" href="src/js/plugins/tabulator/tabulator.min.css">
<script type="text/javascript" src="src/js/plugins/tabulator/tabulator.min.js"></script>
Expand Down Expand Up @@ -110,20 +119,16 @@
<link href="src/js/components/user-message/user-message.css" rel="stylesheet">
<link href="src/js/components/pdfPrinter/pdfPrinter.css" rel="stylesheet">
<link href="src/js/components/consultData/consultData.css" rel="stylesheet">
<link href="src/js/components/about/about.css" rel="stylesheet">

<!--TooltipTourMaker-->
<link href="src/js/components/help/helpTour.css" rel="stylesheet">
<link href="src/js/components/help/tooltipTourMaker.css" rel="stylesheet">
<script src="src/js/components/help/tooltipTourMaker.js"></script>

</head>
<body>
</head>
<body>
<div class="loader-line hidden"></div>
<nav class="navbar _navbar-inverse navbar-fixed-top">
<div class="navbar-new">
<button type="button" class="hidden-lg hidden-md navbar-toggle collapsed pull-left navbar-test-content navbar-button" data-toggle="collapse"
<button type="button" class="hidden-lg hidden-md navbar-toggle x collapsed pull-left navbar-test-content navbar-button" data-toggle="collapse"
data-target="#sidebar-container" aria-expanded="false" aria-controls="sidebar">
<span class="sr-only">Toggle navigation</span>
<!-- <span class="sr-only">Toggle navigation</span> -->
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
Expand Down
84 changes: 84 additions & 0 deletions src/docs/contributors.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<style>
img {
border-radius: 100%;
display: block;
margin: 0;
width: 60px;
}

h2 {
margin: 0;
}
</style>

![profile_img](https://avatars.githubusercontent.com/u/3695043?v=4)

## [Zalitoar](https://github.com/Zalitoar)

---

![profile_img](https://avatars.githubusercontent.com/u/87725395?v=4)

## [afcirillo96](https://github.com/afcirillo96)

---

![profile_img](https://avatars.githubusercontent.com/u/3924657?v=4)

## [daf111](https://github.com/daf111)

---

![profile_img](https://avatars.githubusercontent.com/u/49733149?v=4)

## [damianlopez95](https://github.com/damianlopez95)

---

![profile_img](https://avatars.githubusercontent.com/u/61470409?v=4)

## [andreazomoza](https://github.com/andreazomoza)

---

![profile_img](https://avatars.githubusercontent.com/u/95931791?v=4)

## [GSC996](https://github.com/GSC996)

---

![profile_img](https://avatars.githubusercontent.com/u/9384999?v=4)

## [gvarela1981](https://github.com/gvarela1981)

---

![profile_img](https://avatars.githubusercontent.com/u/16062027?v=4)

## [yamilvernet](https://github.com/yamilvernet)

---

![profile_img](https://avatars.githubusercontent.com/u/47434650?v=4)

## [lucasvallejo](https://github.com/lucasvallejo)

---

![profile_img](https://avatars.githubusercontent.com/u/32717?v=4)

## [kant](https://github.com/kant)

---

![profile_img](https://avatars.githubusercontent.com/u/39769968?v=4)

## [hcastellaro](https://github.com/hcastellaro)

---

![profile_img](https://avatars.githubusercontent.com/u/69722315?v=4)

## [InMunken](https://github.com/InMunken)

---
4 changes: 2 additions & 2 deletions src/docs/diagrams/Data.drawio
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<mxfile host="65bd71144e">
<diagram id="CWb_n4CAjd2z9gFYFfTj" name="Class Diagram">
<mxGraphModel dx="1284" dy="470" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<mxGraphModel dx="844" dy="359" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<root>
<mxCell id="0"/>
<mxCell id="1" parent="0"/>
Expand Down Expand Up @@ -205,7 +205,7 @@
</mxGraphModel>
</diagram>
<diagram id="zKj1nWsVdqE3z-n9kn48" name="Layer Class">
<mxGraphModel dx="1352" dy="495" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<mxGraphModel dx="844" dy="359" grid="0" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">
<root>
<mxCell id="8P5OABlq8EOVzUHR2hVs-0"/>
<mxCell id="8P5OABlq8EOVzUHR2hVs-1" parent="8P5OABlq8EOVzUHR2hVs-0"/>
Expand Down
2 changes: 1 addition & 1 deletion src/docs/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
- Agregar capas desde archivos GeoJSON
- Medir área y distancia
- Mostrar grilla
- Filtrar el panel de capas por meido de un cuadro de búsuqeda
- Filtrar el panel de capas por medio de un cuadro de búsqueda
- Consultar la ubicación de usuario/a
- Capturar imagen del mapa
- Vista de pantalla completa
Expand Down
167 changes: 167 additions & 0 deletions src/js/components/UI/UserInterface.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
class UserInterface {
constructor() {

}

createElement() {

}

remove() {

}

}

/**
* Represents the About Us modal in the user interface.
* @extends UserInterface
*/
class AboutUsModal extends UserInterface {
constructor() {
super();
}

/**
* Creates the About Us modal element and appends it to the document body.
* @param {Array} tabs - The array of tab objects.
*/
createElement(tabs) {
const principalContainer = document.createElement("div");
principalContainer.id = "whole-about";

const aboutHeader = document.createElement("div");
aboutHeader.className = "about-header";

const aboutLogo = document.createElement("img");
aboutLogo.src = "src/styles/images/argenmap-banner.webp";
aboutLogo.className = "about-logo";

const aboutExitBtn = document.createElement("a");
aboutExitBtn.id = "aboutExitBtn";
aboutExitBtn.classList = "about-exit";
aboutExitBtn.innerHTML = '<i class="fa fa-times"></i>';
aboutExitBtn.onclick = () => {
const notiDots = document.querySelectorAll(".notification-dot");
notiDots.forEach((dot) => { dot.remove() });
principalContainer.remove();
this.isVisible = false;
};

const aboutMainSection = document.createElement("div");
aboutMainSection.className = "about-main-section";

const aboutTabsContainer = document.createElement("div");
aboutTabsContainer.className = "about-tabs-bar";

aboutHeader.appendChild(aboutLogo);
aboutHeader.appendChild(aboutExitBtn);

principalContainer.appendChild(aboutHeader);
aboutMainSection.appendChild(aboutTabsContainer);
principalContainer.appendChild(aboutMainSection);

document.body.appendChild(principalContainer);

tabs.forEach((tab, i) => {
const tabItem = new AboutUsTab();
tabItem.createElement(tab, i);
});

const tabContent = new AboutUsTab();

const readmeContainer = tabContent.createReadmeContainer();
const functionContainer = tabContent.createFunctionsContainer();
const contributorContainer = tabContent.createContributorsContainer();

aboutMainSection.appendChild(readmeContainer);
aboutMainSection.appendChild(functionContainer);
aboutMainSection.appendChild(contributorContainer);
}
}

/**
* Represents the About Us tab in the user interface.
* @extends UserInterface
*/
class AboutUsTab extends UserInterface {
constructor() {
super();
}

/**
* Creates and appends a tab element to the about-tabs-bar container.
* @param {Object} tab - The tab object containing name and id properties.
* @param {number} i - The index of the tab.
*/
createElement(tab, i) {
const tabElement = document.createElement('div');
tabElement.classList.add('tab');

if (tab.name) {
tabElement.innerHTML = tab.name;
tabElement.id = tab.id;
} else {
tabElement.innerHTML = "TODPN"; // Te Olvidaste De Ponerle Nombre
}

tabElement.addEventListener('click', () => {
modalAboutUs.showTab(i);
});

document.querySelector(".about-tabs-bar").appendChild(tabElement);
}

/**
* Creates the readme container element.
* @returns {HTMLElement} - The created readme container element.
*/
createReadmeContainer() {
const readmeContainer = document.createElement('div');
readmeContainer.classList.add('content-about-tab', 'content-about-deactivate', 'readme-container');
readmeContainer.id = "readme-container";

const repoIndication = document.createElement("p");
repoIndication.textContent = "Repositorio en GitHub";
repoIndication.style.margin = "0";

const gitHubMark = document.createElement("img");
gitHubMark.src = "src/styles/images/github-mark-white.png";
gitHubMark.alt = "GitHub Logo";
gitHubMark.style.width = "24px";
gitHubMark.style.margin = "0 5px";

const repoDiv = document.createElement("div");
repoDiv.appendChild(gitHubMark);
repoDiv.appendChild(repoIndication);
repoDiv.style.textAlign = "center";
repoDiv.id = "link-to-repo";

readmeContainer.appendChild(repoDiv);
return readmeContainer;
}

/**
* Creates the functions container element.
* @returns {HTMLElement} - The created functions container element.
*/
createFunctionsContainer() {
const functionsContainer = document.createElement('div');
functionsContainer.classList.add('content-about-tab', 'content-about-deactivate');
functionsContainer.style.overflow = "auto";
functionsContainer.id = "functions-container";
return functionsContainer;
}

/**
* Creates the contributors container element.
* @returns {HTMLElement} - The created contributors container element.
*/
createContributorsContainer() {
const contributorContainer = document.createElement('div');
contributorContainer.classList.add('content-about-tab', 'contributor-container', 'content-about-deactivate');
contributorContainer.id = "contributors-container";

return contributorContainer;
}
}
Loading

0 comments on commit 0fe2062

Please sign in to comment.