diff --git a/App/.project b/App/.project index f5b29f6..fe5a761 100644 --- a/App/.project +++ b/App/.project @@ -14,4 +14,15 @@ org.eclipse.buildship.core.gradleprojectnature + + + 1606087840088 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + diff --git a/Configurations.json b/Configurations.json index c5d52f8..e140e37 100644 --- a/Configurations.json +++ b/Configurations.json @@ -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 } } \ No newline at end of file diff --git a/Planejamento/Projeto finalizado/donate.jpeg b/Planejamento/Projeto finalizado/donate.jpeg new file mode 100644 index 0000000..7028df1 Binary files /dev/null and b/Planejamento/Projeto finalizado/donate.jpeg differ diff --git a/README.md b/README.md index 39660a3..ffe019b 100644 --- a/README.md +++ b/README.md @@ -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) + diff --git a/Server/DataBase.py b/Server/DataBase.py index a19070c..9f373ae 100644 --- a/Server/DataBase.py +++ b/Server/DataBase.py @@ -1,5 +1,6 @@ import mysql.connector as mysqlConnector from datetime import datetime +import sqlite3 class DataBaseConnection: def __init__(self): diff --git a/Server/DataBase/DataBase.db b/Server/DataBase/DataBase.db new file mode 100644 index 0000000..fe65bb7 Binary files /dev/null and b/Server/DataBase/DataBase.db differ diff --git a/Server/__pycache__/DataBase.cpython-36.pyc b/Server/__pycache__/DataBase.cpython-36.pyc index 2ef6e3f..075ed6f 100644 Binary files a/Server/__pycache__/DataBase.cpython-36.pyc and b/Server/__pycache__/DataBase.cpython-36.pyc differ diff --git a/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc b/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc index 587b9c0..a58848d 100644 Binary files a/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc and b/Sexta-Feira(A.I.)/__pycache__/Functions.cpython-36.pyc differ diff --git a/Sexta-FeiraInterface/build/built-jar.properties b/Sexta-FeiraInterface/build/built-jar.properties index affd6b9..e5fe851 100644 --- a/Sexta-FeiraInterface/build/built-jar.properties +++ b/Sexta-FeiraInterface/build/built-jar.properties @@ -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= diff --git a/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json index 18266d2..407630c 100644 --- a/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json +++ b/Sexta-FeiraInterface/build/classes/com/friday/FridayComunication.json @@ -1,5 +1,5 @@ { - "action": 5, + "action": 0, "content": null, - "url": "E:\\Sexta-Feira-Mark_6\\/Images/TabelaPeriodica.jpg" + "url": ".com" } \ No newline at end of file diff --git a/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class b/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class index 6983041..74c6aad 100644 Binary files a/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class and b/Sexta-FeiraInterface/build/classes/com/friday/SextaFeiraInterface.class differ diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html index 8223c5b..2c338d1 100644 --- a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html +++ b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.html @@ -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+' @@ -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+' diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar index 007dceb..53af35d 100644 Binary files a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar and b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jar differ diff --git a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp index cf1983f..00604d6 100644 --- a/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp +++ b/Sexta-FeiraInterface/dist/Sexta-FeiraInterface.jnlp @@ -8,7 +8,7 @@ - + diff --git a/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.html b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.html new file mode 100644 index 0000000..2c338d1 --- /dev/null +++ b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.html @@ -0,0 +1,45 @@ + + + + + + + +

Test page for Sexta-FeiraInterface

+ Webstart: click to launch this app as webstart


+ + +
+ diff --git a/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jar b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jar new file mode 100644 index 0000000..53af35d Binary files /dev/null and b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jar differ diff --git a/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jnlp b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jnlp new file mode 100644 index 0000000..00604d6 --- /dev/null +++ b/Sexta-FeiraInterface/dist/run971186289/Sexta-FeiraInterface.jnlp @@ -0,0 +1,19 @@ + + + + Sexta-FeiraInterface + Gazebo + null + + + + + + + + + + + + + diff --git a/Sexta-FeiraInterface/dist/run971186289/lib/json-simple-1.1.jar b/Sexta-FeiraInterface/dist/run971186289/lib/json-simple-1.1.jar new file mode 100644 index 0000000..f395f41 Binary files /dev/null and b/Sexta-FeiraInterface/dist/run971186289/lib/json-simple-1.1.jar differ diff --git a/Sexta-FeiraInterface/dist/run971186289/web-files/dtjava.js b/Sexta-FeiraInterface/dist/run971186289/web-files/dtjava.js new file mode 100644 index 0000000..b77ecd7 --- /dev/null +++ b/Sexta-FeiraInterface/dist/run971186289/web-files/dtjava.js @@ -0,0 +1,3958 @@ +/* + * Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved. + * ORACLE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms. + */ + +/** + The Java Deployment Toolkit is a utility to deploy Java content in + the browser as applets or applications using the right version of Java. + If needed it can initiate an upgrade of user's system to install required + components of Java platform. +

+ Note that some of the Deployment Toolkit methods may not be fully operational if + used before web page body is loaded (because DT native plugins could not be instantiated). + If you intend to use it before web page DOM tree is ready then dtjava.js + needs to be loaded inside the body element of the page and before use of other DT APIs. + + @module java/deployment_toolkit +*/ +var dtjava = function() { + function notNull(o) { + return (o != undefined && o != null); + } + + function isDef(fn) { + return (fn != null && typeof fn != "undefined"); + } + + //return true if any of patterns from query list is found in the given string + function containsAny(lst, str) { + for (var q = 0; q < lst.length; q++) { + if (str.indexOf(lst[q]) != -1) { + return true; + } + } + return false; + } + + /* Location of static web content - images, javascript files. */ + var jscodebase = (function () { + //