Skip to content

Commit

Permalink
Merge pull request #38 from ICEI-PUC-Minas-PPLCC-TI/develop
Browse files Browse the repository at this point in the history
Adicionando projetos
  • Loading branch information
andreeluis authored Dec 1, 2023
2 parents 2eda4a2 + 4b58523 commit 5379544
Show file tree
Hide file tree
Showing 30 changed files with 577 additions and 992 deletions.
48 changes: 0 additions & 48 deletions src/assets/css/imgMap.css
Original file line number Diff line number Diff line change
Expand Up @@ -28,54 +28,6 @@


/* Modal */
.modal-overlay {
display: none;
position: fixed;
z-index: 1;
padding-top: 100px;
left: 0;
top: 0;
width: 100%;
height: 100%;
overflow: auto;
background: rgba(0, 0, 0, 0.7);
}

.modal-content {
position: relative;
width: 500px;
max-width: 90%;
background-color: #fefefe;
margin: auto;
padding: 1.5em;
border: 1px solid #888;
border-radius: .5vmax;
}

.modal-overlay #close-modal {
position: absolute;
right: -10px;
top: -20px;
z-index: 1;
font-size: 2.5em;
}

.modal-overlay #close-modal i {
border-radius: 50%;
color: var(--light-red);
background-color: var(--light-grey);
}

.modal-overlay #close-modal i:hover {
background-color: var(--white);
cursor: pointer;
}

.modal-content h3 {
margin-top: 1.5em;
text-align: center;
}

.modal-content div {
display: flex;
flex-direction: column;
Expand Down
File renamed without changes.
82 changes: 81 additions & 1 deletion src/assets/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,85 @@ main {
padding: 0 1em;
}

button.add-item {
float: right;
padding: 1em;
border: none;
border-radius: .5vmax;
margin-top: 1.5em;
background-color: var(--principal-blue);
color: var(--white);
font-weight: bold;
}

button.add-item:hover {
cursor: pointer;
}

/* ARTICLE LISTS */
.itens-list {
width: 100%;
display: inline-block;
}

.itens-list article {
background-color: var(--light-grey);
margin: 2em auto;
padding: 1.5em 2.5em;
width: 90%;
border-radius: 1.5vmax;
}

.itens-list article.autor {
border: 2px solid var(--principal-blue);
}

.itens-list article h3 {
color: var(--principal-blue);
display: inline;
margin: 0 1em 0 0;
vertical-align: middle;
}

.itens-list article .handle-item {
float: right;
vertical-align: middle;
font-size: 1.2em;
}

.itens-list article .handle-item button {
padding: 0;
border: none;
background: none;
font-size: 1em;
}

.itens-list article .handle-item button:hover {
cursor: pointer;
}

.itens-list article .handle-item button i {
margin-left: .5em;
}

.itens-list article .handle-item button.edit {
color: var(--blue);
}

.itens-list article .handle-item button.delete {
color: var(--red);
}

.itens-list article p.categoria {
display: inline-block;
padding: .3em .6em;
background-color: var(--grey);
color: var(--white);
font-weight: bold;
border-radius: .5vmax;
}


/* FOOTER */
footer {
display: grid;
Expand Down Expand Up @@ -269,7 +348,8 @@ form .input-field label {
}

form .input-field input,
form .input-field textarea {
form .input-field textarea,
form .input-field select {
max-width: 100%;
min-width: 100%;
margin-top: 0.5em;
Expand Down
3 changes: 1 addition & 2 deletions src/assets/js/imgMap.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const apiURL = 'https://jsonserver--andreeluis.repl.co/arduino';
let arduinoParts = [];

window.addEventListener('load', showParts, false);
Expand All @@ -8,7 +7,7 @@ document.querySelector('#close-modal').addEventListener('click', closeModal, fal
window.addEventListener('click', event => { event.target == modal ? closeModal() : null; }, false);

async function loadParts() {
try { arduinoParts = await (await fetch(`${apiURL}`)).json() }
try { arduinoParts = await (await fetch(`${apiURL}/arduino`)).json() }
catch (error) { console.error('Falha ao carregar componentes:', error)}
}

Expand Down
2 changes: 2 additions & 0 deletions src/assets/js/index.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const apiURL = 'https://arduinohub--andreeluis.repl.co';

const loginButton = document.querySelector('header nav .login');
const myAccountButton = document.querySelector('header nav .my-account');

Expand Down
1 change: 0 additions & 1 deletion src/assets/js/login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
const apiURL = 'https://jsonserver--andreeluis.repl.co';
let usersList = [];

window.addEventListener('load', loadUsers, false);
Expand Down
2 changes: 1 addition & 1 deletion src/calculadora-resistor/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<!-- Menu -->
<nav>
<ul class="menu">
<li><a href="#">Projetos</a></li>
<li><a href="../projetos/">Projetos</a></li>
<li><a href="">Ferramentas</a></li>
<li><a href="../gerenciar-estoque/">Componetes</a></li>
<li><a href="../forum/">Fórum</a></li>
Expand Down
82 changes: 2 additions & 80 deletions src/forum/assets/css/forum.css
Original file line number Diff line number Diff line change
@@ -1,84 +1,6 @@
main article {
background-color: var(--light-grey);
margin: 2em auto;
padding: 1.5em 2.5em;
width: 90%;
border-radius: 1.5vmax;
}

main article.autor {
border: 2px solid var(--principal-blue);
}

button#add-post {
float: right;
padding: 1em;
border: none;
border-radius: .5vmax;
margin-top: 1.5em;
background-color: var(--principal-blue);
color: var(--white);
font-weight: bold;
}

button#add-post:hover {
cursor: pointer;
}

#posts {
display: inline-block;
}

#posts a {
color: inherit;
}

#posts article h3 {
color: var(--principal-blue);
display: inline;
margin: 0 1em 0 0;
vertical-align: middle;
}

#posts article p.categoria {
display: inline-block;
padding: .3em .6em;
background-color: var(--grey);
color: var(--white);
font-weight: bold;
border-radius: .5vmax;
}

#posts article .engajamento {
display: inline;
#posts article .reactions {
float: right;
vertical-align: middle;
font-size: 1.2em;
float: right;
}

#posts article .engajamento span {
margin-right: 1em;
}

#posts article .engajamento button {
padding: 0;
border: none;
background: none;
font-size: 1em;
}

#posts article .engajamento button:hover {
cursor: pointer;
}

#posts article .engajamento .edit {
color: var(--blue);
}

#posts article .engajamento .delete {
color: var(--red);
}

#posts article .engajamento button i {
margin-left: .5em;
}
100 changes: 0 additions & 100 deletions src/forum/assets/js/app.js

This file was deleted.

Loading

0 comments on commit 5379544

Please sign in to comment.