Skip to content

Commit

Permalink
Merge pull request #64 from GabrielSirtoriCorrea/AdicionandoDoações
Browse files Browse the repository at this point in the history
AdicionandoDoações
  • Loading branch information
GabrielSirtoriCorrea authored Apr 30, 2021
2 parents 2dff323 + 2a692b4 commit d9c0776
Show file tree
Hide file tree
Showing 30 changed files with 4,055 additions and 15 deletions.
11 changes: 11 additions & 0 deletions App/.project
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,15 @@
<natures>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
<filteredResources>
<filter>
<id>1606087840088</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>
4 changes: 2 additions & 2 deletions Configurations.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"FridayConfigs": {
"ID": "Sexta-Feira",
"ServerHost": "192.168.0.4",
"ServerHost": "192.168.0.5",
"Port": 5000
},
"ServerConfigs": {
"ID": "Server",
"Host": "192.168.0.4",
"Host": "192.168.0.5",
"Port": 5000
}
}
Binary file added Planejamento/Projeto finalizado/donate.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -642,4 +642,13 @@ para a construção dos layouts.
Após 3 meses trabalhando nesse projeto, finalmente cheguei em uma versão que me agrada. Porém considero longe
da versão final. Ainda existem implementações que devem ser feitas, como por exemplo, o Acesso da localização
do telefone através do app, além de adicionar mais interações, comandos e devices.


# Me faça uma doação!
Gostou do projeto? Me faça uma doação! Assim você me incentiva a aprender mais e criar novos projetos :D

Você pode utilizar o App do seu banco para ler o QR Code abaixo, ou se preferir, utilizar minha chave pix:
:point_down::point_down:
0caf9f55-45dd-43a3-865c-70d005770ef7

![Exemplo tabela](https://github.com/GabrielSirtoriCorrea/Sexta-Feira-Mark_6/blob/master/Planejamento/Projeto%20finalizado/donate.JPG)

1 change: 1 addition & 0 deletions Server/DataBase.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import mysql.connector as mysqlConnector
from datetime import datetime
import sqlite3

class DataBaseConnection:
def __init__(self):
Expand Down
Binary file added Server/DataBase/DataBase.db
Binary file not shown.
Binary file modified Server/__pycache__/DataBase.cpython-36.pyc
Binary file not shown.
Binary file modified Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc
Binary file not shown.
2 changes: 1 addition & 1 deletion Sexta-FeiraInterface/build/built-jar.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#Mon, 03 Aug 2020 21:17:22 -0300
#Fri, 05 Mar 2021 22:05:32 -0300


E\:\\Sexta-Feira-Mark_6\\Sexta-FeiraInterface=
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"action": 5,
"action": 0,
"content": null,
"url": "E:\\Sexta-Feira-Mark_6\\/Images/TabelaPeriodica.jpg"
"url": ".com"
}
Binary file not shown.
4 changes: 2 additions & 2 deletions Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
function launchApplication(jnlpfile) {
dtjava.launch( {
url : 'Sexta-FeiraInterface.jnlp',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA3MTEzIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA2OTY3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
Expand All @@ -24,7 +24,7 @@
placeholder : 'javafx-app-placeholder',
width : '800',
height : '600',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA3MTEzIiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA2OTY3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
Expand Down
Binary file modified Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</information>
<resources>
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="Sexta-FeiraInterface.jar" size="107113" download="eager" />
<jar href="Sexta-FeiraInterface.jar" size="106967" download="eager" />
<jar href="lib\json-simple-1.1.jar" size="16046" download="eager" />
</resources>
<applet-desc width="800" height="600" main-class="com.javafx.main.NoJavaFXFallback" name="Sexta-FeiraInterface" >
Expand Down
45 changes: 45 additions & 0 deletions Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<html><head>
<SCRIPT src="./web-files/dtjava.js"></SCRIPT>
<script>
function launchApplication(jnlpfile) {
dtjava.launch( {
url : 'Sexta-FeiraInterface.jnlp',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA2OTY3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
},
{}
);
return false;
}
</script>

<script>
function javafxEmbedcom.friday() {
dtjava.embed(
{
id : 'com.friday',
url : 'Sexta-FeiraInterface.jnlp',
placeholder : 'javafx-app-placeholder',
width : '800',
height : '600',
jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iU2V4dGEtRmVpcmFJbnRlcmZhY2Uuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+U2V4dGEtRmVpcmFJbnRlcmZhY2U8L3RpdGxlPg0KICAgIDx2ZW5kb3I+R2F6ZWJvPC92ZW5kb3I+DQogICAgPGRlc2NyaXB0aW9uPm51bGw8L2Rlc2NyaXB0aW9uPg0KICAgIDxvZmZsaW5lLWFsbG93ZWQvPg0KICA8L2luZm9ybWF0aW9uPg0KICA8cmVzb3VyY2VzPg0KICAgIDxqMnNlIHZlcnNpb249IjEuNisiIGhyZWY9Imh0dHA6Ly9qYXZhLnN1bi5jb20vcHJvZHVjdHMvYXV0b2RsL2oyc2UiLz4NCiAgICA8amFyIGhyZWY9IlNleHRhLUZlaXJhSW50ZXJmYWNlLmphciIgc2l6ZT0iMTA2OTY3IiBkb3dubG9hZD0iZWFnZXIiIC8+DQogICAgPGphciBocmVmPSJsaWJcanNvbi1zaW1wbGUtMS4xLmphciIgc2l6ZT0iMTYwNDYiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxhcHBsZXQtZGVzYyAgd2lkdGg9IjgwMCIgaGVpZ2h0PSI2MDAiIG1haW4tY2xhc3M9ImNvbS5qYXZhZngubWFpbi5Ob0phdmFGWEZhbGxiYWNrIiAgbmFtZT0iU2V4dGEtRmVpcmFJbnRlcmZhY2UiID4NCiAgICA8cGFyYW0gbmFtZT0icmVxdWlyZWRGWFZlcnNpb24iIHZhbHVlPSI4LjArIi8+DQogIDwvYXBwbGV0LWRlc2M+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJjb20uZnJpZGF5LlNleHRhRmVpcmFJbnRlcmZhY2UiICBuYW1lPSJTZXh0YS1GZWlyYUludGVyZmFjZSIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
},
{}
);
}
<!-- Embed FX application into web page once page is loaded -->
dtjava.addOnloadCallback(javafxEmbedcom.friday);
</script>

</head><body>
<h2>Test page for <b>Sexta-FeiraInterface</b></h2>
<b>Webstart:</b> <a href='Sexta-FeiraInterface.jnlp' onclick="return launchApplication('Sexta-FeiraInterface.jnlp');">click to launch this app as webstart</a><br><hr><br>

<!-- Applet will be inserted here -->
<div id='javafx-app-placeholder'></div>
</body></html>
Binary file not shown.
19 changes: 19 additions & 0 deletions Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jnlp
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<jnlp spec="1.0" xmlns:jfx="http://javafx.com" href="Sexta-FeiraInterface.jnlp">
<information>
<title>Sexta-FeiraInterface</title>
<vendor>Gazebo</vendor>
<description>null</description>
<offline-allowed/>
</information>
<resources>
<j2se version="1.6+" href="http://java.sun.com/products/autodl/j2se"/>
<jar href="Sexta-FeiraInterface.jar" size="106967" download="eager" />
<jar href="lib\json-simple-1.1.jar" size="16046" download="eager" />
</resources>
<applet-desc width="800" height="600" main-class="com.javafx.main.NoJavaFXFallback" name="Sexta-FeiraInterface" >
<param name="requiredFXVersion" value="8.0+"/>
</applet-desc>
<jfx:javafx-desc width="800" height="600" main-class="com.friday.SextaFeiraInterface" name="Sexta-FeiraInterface" />
<update check="always"/>
</jnlp>
Binary file not shown.
Loading

0 comments on commit d9c0776

Please sign in to comment.