From e469c42b80267a3ecefb54ddd2722c01411c0d87 Mon Sep 17 00:00:00 2001 From: Otavio Augusto Date: Thu, 10 Dec 2020 17:59:52 -0300 Subject: [PATCH 01/11] =?UTF-8?q?index:=20rodap=C3=A9=20atualizado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --> mudança das classes do rodapé, regras dos pixie points atualizadas e logo atualizada --- index.html | 34 +++++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 9 deletions(-) diff --git a/index.html b/index.html index b19d629..9b25733 100644 --- a/index.html +++ b/index.html @@ -130,14 +130,30 @@

Pixie Poi
-
-
-

Os Pixie Points são a principal métrica de desempenho dos Duendes Pixie. Todas as - atividades realizadas resultam em pontos, que acumulados podem ser trocados em prêmios.

+
+
+

Os Pixie Points são as principais métricas de desempenho dos Duendes Pixie. + Todas as atividades realizadas resultam em Pixie Points, que acumulados podem ser trocados em prêmios. + As regras para ganhar Pixie Points são as seguintes:

+

Sábado

+

Entrada pontual (8h40) e saída pontual (11h20): +15 PPs.

+

Atraso ou saída antecipada: +10 PPs.

+

Ausência justificada + formulário respondido: +10 PPs.

+

Ausência não justificada + formulário respondido: +5 PPs.

+

Anotar pontuação e presenças durante a aula: +5 PPs.

-
-

As regras para ganhar Pixie Points são as seguintes. (Inserir Regras AQUI). Abaixo - você pode conferir como está a pontuação atual do time.

+
+

Domingo

+

Entrada pontual (8h40) e saída pontual (11h20): +15 PPs.

+

Atraso ou saída antecipada: +10 PPs.

+

Ausência justificada + formulário respondido: +10 PPs.

+

Ausência não justificada + formulário respondido: +5 PPs.

+

Ausência não justificada: -30 PPs.

+

Participação nos exercícios da aula: +5 PPs.

+

Participação em projetos: +15 PPs semanais. + Participação em eventos: +20 PPs por dia de evento. +

+

Confira abaixo a pontuação atual do time.

@@ -216,7 +232,7 @@

-
+

Localização

Av. General Carlos Cavalcanti, 4748 - Uvaranas @@ -225,7 +241,7 @@

Localização

-
+

Redes Sociais

From 394a57a7f2d141b71cfa172842f89c21c5e1e756 Mon Sep 17 00:00:00 2001 From: Otavio Augusto Date: Thu, 10 Dec 2020 18:12:45 -0300 Subject: [PATCH 02/11] assets: logo pixie alterado por svg --- assets/img/logo_pixie.svg | 103 ++++++++++---------------------------- 1 file changed, 26 insertions(+), 77 deletions(-) diff --git a/assets/img/logo_pixie.svg b/assets/img/logo_pixie.svg index 1e3a81c..ee3f751 100644 --- a/assets/img/logo_pixie.svg +++ b/assets/img/logo_pixie.svg @@ -1,78 +1,27 @@ - - - - + + + background + + + + Layer 1 + + + + + + + + + + + + + + + + \ No newline at end of file From 870009cbad4ba0658fc67e98795aa0b83530c1bd Mon Sep 17 00:00:00 2001 From: Otavio Augusto Date: Thu, 10 Dec 2020 18:14:04 -0300 Subject: [PATCH 03/11] styles: css modificado MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --> durante o reposicionamento do footer, foi alterado para justificar o conteúdo no centro mas não foi utilizado a classe modificada --- css/styles.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 30347b0..6b63549 100644 --- a/css/styles.css +++ b/css/styles.css @@ -5495,6 +5495,8 @@ a.close.disabled { .modal-body { position: relative; + flex-direction: column; + flex-grow: 2; flex: 1 1 auto; padding: 4rem 1rem; } @@ -5503,8 +5505,7 @@ a.close.disabled { display: flex; flex-wrap: wrap; align-items: center; - justify-content: flex-end; - padding: 4rem 1rem-0.25rem; + padding: 4rem 1rem -0.25rem; border-top: 0 solid #dee2e6; border-bottom-right-radius: 0.75rem; border-bottom-left-radius: 0.75rem; @@ -10237,4 +10238,8 @@ form .row:first-child .floating-label-form-group { .copyright { background-color: #1a252f; +} +.footer .text-center .container{ + display: flex; + align-items: center; } \ No newline at end of file From 5330134be3b6a65f941d3302bd7c9178be0ff12f Mon Sep 17 00:00:00 2001 From: Eduardo Naoto Saito Date: Thu, 10 Dec 2020 21:49:48 -0300 Subject: [PATCH 04/11] link da tabela alterado --- index.html | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index 9b25733..38704ec 100644 --- a/index.html +++ b/index.html @@ -158,7 +158,10 @@

Pixie Poi

- + Tabela de PPs @@ -184,7 +187,7 @@

- +

@@ -192,7 +195,7 @@

- + @@ -201,7 +204,7 @@

- + @@ -210,7 +213,7 @@

- + @@ -220,7 +223,7 @@


+ type="submit">Enviar

From db82698c0bbf2fc2c5d0a75c6e8e684a2fa3bb7a Mon Sep 17 00:00:00 2001 From: edupovaz Date: Thu, 10 Dec 2020 23:40:34 -0300 Subject: [PATCH 05/11] =?UTF-8?q?Task:=20adicionando=20informa=C3=A7=C3=B5?= =?UTF-8?q?es=20na=20agenda?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/styles.css | 8 ++++++++ index.html | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6b63549..9c2657f 100644 --- a/css/styles.css +++ b/css/styles.css @@ -10239,7 +10239,15 @@ form .row:first-child .floating-label-form-group { .copyright { background-color: #1a252f; } + .footer .text-center .container{ display: flex; align-items: center; + +#agenda-iten{ + border-radius: 0.5rem; + background-color: #6eaa6fa8; + margin-bottom: 1rem !important; + + font-size: large; } \ No newline at end of file diff --git a/index.html b/index.html index 38704ec..1d30c4a 100644 --- a/index.html +++ b/index.html @@ -282,7 +282,11 @@

Redes Sociais

-

12/12: JavaScript - Avançando na Linguagem +

12/12: JavaScript - Avançando na Linguagem +

+

19/12: JavaScript - Avançando na Linguagem +

+

26/12: JavaScript - Avançando na Linguagem

- +
@@ -169,6 +171,30 @@

Pixie Poi

+ +
+

Duendes

+
+
+
+
+
+
+ + + + + + + + + + + +
NomeE-mailContatoPontuação
+
+
+
diff --git a/js/scripts.js b/js/scripts.js index d7b3979..a157b8f 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -65,5 +65,27 @@ }); }); + // Inserir tabela duendes + $(document).ready(()=>{ + $('#table-person').show(); + + var nomes = ["Eduardo Saito", "Luan Halaiko", "Thiago Teixeira", "João Victor"]; + var email = ["eduardo@gmail.com", "luan@gmail.com", "thiago@gmail.com", "jv@gmail.com"]; + var contatos = ["(42)98432-6218", "(42)96473-2738", "(42)92738-2873", "(42)99742-2833"]; + var points = ["1200", "1700", "1550", "1670"]; + + var table = ''; + var pessoas = nomes.length; + var x = 0; + while (x < pessoas) { + table += '' + nomes[x] + ''; + table += '' + email[x] + ''; + table += '' + contatos[x] + ''; + table += '' + points[x] + ''; + x++; + } + $('#table-person tbody').html(table); + }) + })(jQuery); // End of use strict \ No newline at end of file From cd5825ada982b2679c5cca6f7ce64025dd195a37 Mon Sep 17 00:00:00 2001 From: Julio Buda Date: Thu, 17 Dec 2020 13:31:43 -0300 Subject: [PATCH 09/11] pau no cu do carlos --- js/scripts.js | 184 ++++++++++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 80 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index a157b8f..2b723b9 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -3,89 +3,113 @@ * Copyright 2013-2020 Start Bootstrap * Licensed under MIT (https://github.com/StartBootstrap/startbootstrap-freelancer/blob/master/LICENSE) */ - (function($) { - "use strict"; // Start of use strict - - // Smooth scrolling using jQuery easing - $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function() { - if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { - var target = $(this.hash); - target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); - if (target.length) { - $('html, body').animate({ - scrollTop: (target.offset().top - 71) - }, 1000, "easeInOutExpo"); - return false; - } - } - }); - - // Scroll to top button appear - $(document).scroll(function() { - var scrollDistance = $(this).scrollTop(); - if (scrollDistance > 100) { - $('.scroll-to-top').fadeIn(); - } else { - $('.scroll-to-top').fadeOut(); - } - }); - - // Closes responsive menu when a scroll trigger link is clicked - $('.js-scroll-trigger').click(function() { - $('.navbar-collapse').collapse('hide'); - }); - - // Activate scrollspy to add active class to navbar items on scroll - $('body').scrollspy({ - target: '#mainNav', - offset: 80 - }); - - // Collapse Navbar - var navbarCollapse = function() { - if ($("#mainNav").offset().top > 100) { - $("#mainNav").addClass("navbar-shrink"); - } else { - $("#mainNav").removeClass("navbar-shrink"); +(function ($) { + "use strict"; // Start of use strict + + // Smooth scrolling using jQuery easing + $('a.js-scroll-trigger[href*="#"]:not([href="#"])').click(function () { + if (location.pathname.replace(/^\//, '') == this.pathname.replace(/^\//, '') && location.hostname == this.hostname) { + var target = $(this.hash); + target = target.length ? target : $('[name=' + this.hash.slice(1) + ']'); + if (target.length) { + $('html, body').animate({ + scrollTop: (target.offset().top - 71) + }, 1000, "easeInOutExpo"); + return false; } - }; - // Collapse now if page is not at top - navbarCollapse(); - // Collapse the navbar when page is scrolled - $(window).scroll(navbarCollapse); - - // Floating label headings for the contact form - $(function() { - $("body").on("input propertychange", ".floating-label-form-group", function(e) { - $(this).toggleClass("floating-label-form-group-with-value", !!$(e.target).val()); - }).on("focus", ".floating-label-form-group", function() { - $(this).addClass("floating-label-form-group-with-focus"); - }).on("blur", ".floating-label-form-group", function() { - $(this).removeClass("floating-label-form-group-with-focus"); - }); + } + }); + + // Scroll to top button appear + $(document).scroll(function () { + var scrollDistance = $(this).scrollTop(); + if (scrollDistance > 100) { + $('.scroll-to-top').fadeIn(); + } else { + $('.scroll-to-top').fadeOut(); + } + }); + + // Closes responsive menu when a scroll trigger link is clicked + $('.js-scroll-trigger').click(function () { + $('.navbar-collapse').collapse('hide'); + }); + + // Activate scrollspy to add active class to navbar items on scroll + $('body').scrollspy({ + target: '#mainNav', + offset: 80 + }); + + // Collapse Navbar + var navbarCollapse = function () { + if ($("#mainNav").offset().top > 100) { + $("#mainNav").addClass("navbar-shrink"); + } else { + $("#mainNav").removeClass("navbar-shrink"); + } + }; + // Collapse now if page is not at top + navbarCollapse(); + // Collapse the navbar when page is scrolled + $(window).scroll(navbarCollapse); + + // Floating label headings for the contact form + $(function () { + $("body").on("input propertychange", ".floating-label-form-group", function (e) { + $(this).toggleClass("floating-label-form-group-with-value", !!$(e.target).val()); + }).on("focus", ".floating-label-form-group", function () { + $(this).addClass("floating-label-form-group-with-focus"); + }).on("blur", ".floating-label-form-group", function () { + $(this).removeClass("floating-label-form-group-with-focus"); }); - - // Inserir tabela duendes - $(document).ready(()=>{ - $('#table-person').show(); + }); - var nomes = ["Eduardo Saito", "Luan Halaiko", "Thiago Teixeira", "João Victor"]; - var email = ["eduardo@gmail.com", "luan@gmail.com", "thiago@gmail.com", "jv@gmail.com"]; - var contatos = ["(42)98432-6218", "(42)96473-2738", "(42)92738-2873", "(42)99742-2833"]; - var points = ["1200", "1700", "1550", "1670"]; + //adicionar ação no botão + var form = document.querySelector("#contactForm"); + $('#sendMessageButton').click(function (form) { - var table = ''; - var pessoas = nomes.length; - var x = 0; - while (x < pessoas) { - table += '' + nomes[x] + ''; - table += '' + email[x] + ''; - table += '' + contatos[x] + ''; - table += '' + points[x] + ''; - x++; - } - $('#table-person tbody').html(table); + var duende = { + name: form.name.value, + email: form.email.value, + phone: form.phone.value, + message: form.message.value + }; + $(document).ready(() => { + var table = ''; + var pessoas = duende.length; + var x = 0; + while (x < pessoas) { + table += '' + duende.name + ''; + table += '' + duende.email + ''; + table += '' + duende.phone + ''; + table += '' + duende.message+ ''; + x++; + } }) + + }) + + // Inserir tabela duendes + $(document).ready(() => { + $('#table-person').show(); + + var nomes = ["Eduardo Saito", "Luan Halaiko", "Thiago Teixeira", "João Victor"]; + var email = ["eduardo@gmail.com", "luan@gmail.com", "thiago@gmail.com", "jv@gmail.com"]; + var contatos = ["(42)98432-6218", "(42)96473-2738", "(42)92738-2873", "(42)99742-2833"]; + var points = ["1200", "1700", "1550", "1670"]; + + var table = ''; + var pessoas = nomes.length; + var x = 0; + while (x < pessoas) { + table += '' + nomes[x] + ''; + table += '' + email[x] + ''; + table += '' + contatos[x] + ''; + table += '' + points[x] + ''; + x++; + } + $('#table-person tbody').html(table); + }) - })(jQuery); // End of use strict - \ No newline at end of file +})(jQuery); // End of use strict From 9cfebcfef66f49a781282bbad3bfb1e8dc5b7b40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Eli=C3=A9zer=20dos=20Santos=20Dias?= Date: Thu, 17 Dec 2020 19:51:49 -0300 Subject: [PATCH 10/11] Ta aqui o push nessa porra --- js/scripts.js | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index 2b723b9..1e140e9 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -65,30 +65,36 @@ }); }); - //adicionar ação no botão + //Add New Duende var form = document.querySelector("#contactForm"); - $('#sendMessageButton').click(function (form) { - + $('#sendMessageButton').click(function (event) { + event.preventDefault(); + var duende = { name: form.name.value, email: form.email.value, phone: form.phone.value, message: form.message.value }; - $(document).ready(() => { - var table = ''; - var pessoas = duende.length; - var x = 0; - while (x < pessoas) { - table += '' + duende.name + ''; - table += '' + duende.email + ''; - table += '' + duende.phone + ''; - table += '' + duende.message+ ''; - x++; - } - }) - + + let duendeTr = document.createElement("tr"); + let table = document.querySelector('#table-person'); + + duendeTr.appendChild(createTh(duende.name)); + duendeTr.appendChild(createTh(duende.email)); + duendeTr.appendChild(createTh(duende.phone)); + duendeTr.appendChild(createTh(duende.message)); + + table.appendChild(duendeTr); }) + + function createTh(data) { + var td = document.createElement("th"); + + td.textContent = data; + + return td; + } // Inserir tabela duendes $(document).ready(() => { From 2cb45e8b43f18efc157a30a5c87d83dea7fe63ba Mon Sep 17 00:00:00 2001 From: Otavio Augusto Date: Thu, 17 Dec 2020 21:43:34 -0300 Subject: [PATCH 11/11] =?UTF-8?q?refatora=C3=A7=C3=A3o=20total=20do=20c?= =?UTF-8?q?=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --> mudança nos nomes das classe e id's. alteração nos comentários --- assets/img/{portfolio => schedule}/cabin.png | Bin assets/img/{portfolio => schedule}/cake.png | Bin assets/img/{portfolio => schedule}/circus.png | Bin .../img/{portfolio => schedule}/domingo.png | Bin assets/img/{portfolio => schedule}/game.png | Bin assets/img/{portfolio => schedule}/sabado.png | Bin assets/img/{portfolio => schedule}/safe.png | Bin .../img/{portfolio => schedule}/submarine.png | Bin assets/mail/contact_me.js | 4 +- css/styles.css | 32 ++-- debug.log | 1 + index.html | 150 +++++++++--------- 12 files changed, 95 insertions(+), 92 deletions(-) rename assets/img/{portfolio => schedule}/cabin.png (100%) rename assets/img/{portfolio => schedule}/cake.png (100%) rename assets/img/{portfolio => schedule}/circus.png (100%) rename assets/img/{portfolio => schedule}/domingo.png (100%) rename assets/img/{portfolio => schedule}/game.png (100%) rename assets/img/{portfolio => schedule}/sabado.png (100%) rename assets/img/{portfolio => schedule}/safe.png (100%) rename assets/img/{portfolio => schedule}/submarine.png (100%) create mode 100644 debug.log diff --git a/assets/img/portfolio/cabin.png b/assets/img/schedule/cabin.png similarity index 100% rename from assets/img/portfolio/cabin.png rename to assets/img/schedule/cabin.png diff --git a/assets/img/portfolio/cake.png b/assets/img/schedule/cake.png similarity index 100% rename from assets/img/portfolio/cake.png rename to assets/img/schedule/cake.png diff --git a/assets/img/portfolio/circus.png b/assets/img/schedule/circus.png similarity index 100% rename from assets/img/portfolio/circus.png rename to assets/img/schedule/circus.png diff --git a/assets/img/portfolio/domingo.png b/assets/img/schedule/domingo.png similarity index 100% rename from assets/img/portfolio/domingo.png rename to assets/img/schedule/domingo.png diff --git a/assets/img/portfolio/game.png b/assets/img/schedule/game.png similarity index 100% rename from assets/img/portfolio/game.png rename to assets/img/schedule/game.png diff --git a/assets/img/portfolio/sabado.png b/assets/img/schedule/sabado.png similarity index 100% rename from assets/img/portfolio/sabado.png rename to assets/img/schedule/sabado.png diff --git a/assets/img/portfolio/safe.png b/assets/img/schedule/safe.png similarity index 100% rename from assets/img/portfolio/safe.png rename to assets/img/schedule/safe.png diff --git a/assets/img/portfolio/submarine.png b/assets/img/schedule/submarine.png similarity index 100% rename from assets/img/portfolio/submarine.png rename to assets/img/schedule/submarine.png diff --git a/assets/mail/contact_me.js b/assets/mail/contact_me.js index 2a13ab7..91b8508 100644 --- a/assets/mail/contact_me.js +++ b/assets/mail/contact_me.js @@ -55,9 +55,9 @@ $(function () { .append(""); $("#success > .alert-danger").append( $("").text( - "Sorry " + + "Desculpe " + firstName + - ", it seems that my mail server is not responding. Please try again later!" + ", parece que o servidor do e-mail não está respondendo. Por Favor, tente mais tarde!" ) ); $("#success > .alert-danger").append("
"); diff --git a/css/styles.css b/css/styles.css index 9c2657f..803c6d2 100644 --- a/css/styles.css +++ b/css/styles.css @@ -10111,35 +10111,35 @@ h3 { font-size: 1.5em; } } -.masthead { +.home { padding-top: calc(6rem + 74px); padding-bottom: 6rem; } -.masthead .masthead-heading { +.home .home-title { font-size: 2.75rem; line-height: 2.75rem; } -.masthead .masthead-subheading { +.home .home-subtitle { font-size: 1.25rem; } -.masthead .masthead-avatar { +.home .home-image { width: 15rem; } @media (min-width: 992px) { - .masthead { + .home { padding-top: calc(6rem + 104px); padding-bottom: 6rem; } - .masthead .masthead-heading { + .home .home-heading { font-size: 4rem; line-height: 3.5rem; } - .masthead .masthead-subheading { + .home .home-subheading { font-size: 1.5rem; } } -.portfolio .portfolio-item { +.schedule .schedule-item { cursor: pointer; position: relative; display: block; @@ -10147,7 +10147,7 @@ h3 { border-radius: 0.5rem; overflow: hidden; } -.portfolio .portfolio-item .portfolio-item-caption { +.schedule .schedule-item .schedule-item-caption { position: absolute; top: 0; left: 0; @@ -10155,24 +10155,24 @@ h3 { opacity: 0; background-color: rgba(26, 188, 156, 0.9); } -.portfolio .portfolio-item .portfolio-item-caption:hover { +.schedule .schedule-item .schedule-item-caption:hover { opacity: 1; } -.portfolio .portfolio-item .portfolio-item-caption .portfolio-item-caption-content { +.schedule .schedule-item .schedule-item-caption .schedule-item-caption-content { font-size: 1.5rem; } -.portfolio-modal .portfolio-modal-title { +.schedule-modal .schedule-modal-title { font-size: 2.25rem; line-height: 2rem; } @media (min-width: 992px) { - .portfolio-modal .portfolio-modal-title { + .schedule-modal .schedule-modal-title { font-size: 3rem; line-height: 2.5rem; } } -.portfolio-modal .close { +.schedule-modal .close { position: absolute; z-index: 1; right: 1.5rem; @@ -10243,10 +10243,10 @@ form .row:first-child .floating-label-form-group { .footer .text-center .container{ display: flex; align-items: center; - +} #agenda-iten{ border-radius: 0.5rem; - background-color: #6eaa6fa8; + margin-bottom: 1rem !important; font-size: large; diff --git a/debug.log b/debug.log new file mode 100644 index 0000000..f56e4da --- /dev/null +++ b/debug.log @@ -0,0 +1 @@ +[1217/195603.918:ERROR:directory_reader_win.cc(43)] FindFirstFile: O sistema não pode encontrar o caminho especificado. (0x3) diff --git a/index.html b/index.html index 948e323..8dbb6d1 100644 --- a/index.html +++ b/index.html @@ -25,21 +25,23 @@ - + - + - + - - + + - -
+ +
- - - -

Bem-vindo!

- + + + +

Bem-vindo!

+
- -

Pixie - Empresa Júnior de Engenharia de Software UEPG + +

Pixie - Empresa Júnior de Engenharia de Software UEPG

- -
+ +
- +

Agenda

- +
- +
- +
-
+
-
+
- +
- +
-
+
-
+
- +
- -
+ +
- +

Pixie Points

- +
- +

Os Pixie Points são as principais métricas de desempenho dos Duendes Pixie. @@ -158,7 +161,7 @@

Pixie Poi

Confira abaixo a pontuação atual do time.

- +
Pixie Poi
- +

Duendes

@@ -195,18 +198,18 @@

- +
- +

Contato

- +
- +
@@ -214,35 +217,35 @@

- +

- - E-mail + + data-validation-required-message="Insira o e-mail." />

- - Contato + + data-validation-required-message="Informe seu telefone." />

- - + data-validation-required-message="Insira a pontuação.">

@@ -256,11 +259,11 @@

- + - +
Feito com 💚 por Pixie
- +
- - -