School/WasteInformationServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved website folder

Browse Source
This commit is contained in:
Lukas-Heiligenbrunner 2019-10-11 11:17:06 +02:00
parent 26fa5aacbb
commit dfd3cff5a2
41 changed files with 237 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
.idea/$PRODUCT_WORKSPACE_FILE$ Normal file
View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="masterDetails">
<states>
<state key="GlobalLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="JdkListConfigurable.UI">
<settings>
<last-edited>1.8</last-edited>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
<state key="ProjectLibrariesConfigurable.UI">
<settings>
<splitter-proportions>
<option name="proportions">
<list>
<option value="0.2" />
</list>
</option>
</splitter-proportions>
</settings>
</state>
</states>
</component>
</project>

4
.idea/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Default ignored files
/workspace.xml
# Default ignored files
/workspace.xml

11
.idea/artifacts/WasteinformationServer.xml Normal file
View File

@ -0,0 +1,11 @@
<component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="WasteinformationServer">
<output-path>$PROJECT_DIR$/out/artifacts/WasteinformationServer</output-path>
<root id="archive" name="WasteinformationServer.jar">
<element id="module-output" name="WasteInformationServer" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/mysql-connector-java-5.1.44-bin.jar" path-in-jar="/" />
<element id="extracted-dir" path="$PROJECT_DIR$/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar" path-in-jar="/" />
<element id="dir-copy" path="$PROJECT_DIR$/resources" />
</root>
</artifact>
</component>

9
.idea/libraries/mysql_connector_java_5_1_44_bin.xml Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="mysql-connector-java-5.1.44-bin">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/mysql-connector-java-5.1.44-bin.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

9
.idea/libraries/org_eclipse_paho_client_mqttv3_1_2_1.xml Normal file
View File

@ -0,0 +1,9 @@
<component name="libraryTable">
<library name="org.eclipse.paho.client.mqttv3-1.2.1">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lib/org.eclipse.paho.client.mqttv3-1.2.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>

6
.idea/misc.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

8
.idea/modules.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/WasteInformationServer.iml" filepath="$PROJECT_DIR$/WasteInformationServer.iml" />
</modules>
</component>
</project>

124
.idea/uiDesigner.xml Normal file
View File

@ -0,0 +1,124 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
</item>
<item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
</item>
<item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
<default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
</item>
<item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
<initial-values>
<property name="text" value="Button" />
</initial-values>
</item>
<item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="RadioButton" />
</initial-values>
</item>
<item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
<initial-values>
<property name="text" value="CheckBox" />
</initial-values>
</item>
<item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
<initial-values>
<property name="text" value="Label" />
</initial-values>
</item>
<item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
<preferred-size width="150" height="-1" />
</default-constraints>
</item>
<item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
</item>
<item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
<preferred-size width="150" height="50" />
</default-constraints>
</item>
<item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
<preferred-size width="200" height="200" />
</default-constraints>
</item>
<item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
</item>
<item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
</item>
<item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
</item>
<item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
<preferred-size width="-1" height="20" />
</default-constraints>
</item>
<item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
<default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
</item>
<item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
<default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
</item>
</group>
</component>
</project>

6
.idea/vcs.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

0
UniquedeviceID-tcp19216864151883/.lck
View File

0
UniquedeviceID-tcp19216865151883/.lck
View File

1
WasteInformationServer.iml
View File

@ -4,6 +4,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />

BIN
lib/mysql-connector-java-5.1.44-bin.jar Executable file → Normal file
View File

Binary file not shown.

BIN
lib/org.eclipse.paho.client.mqttv3-1.2.1.jar
View File

Binary file not shown.

0
wwwroot/css/general.css → resources/wwwroot/css/general.css
View File

0
wwwroot/css/index.css → resources/wwwroot/css/index.css
View File

0
wwwroot/css/profile.css → resources/wwwroot/css/profile.css
View File

0
wwwroot/css/register.css → resources/wwwroot/css/register.css
View File

0
wwwroot/css/settings.css → resources/wwwroot/css/settings.css
View File

0
wwwroot/index.html → resources/wwwroot/index.html
View File

0
wwwroot/js/index.js → resources/wwwroot/js/index.js
View File

0
wwwroot/js/profile.js → resources/wwwroot/js/profile.js
View File

0
wwwroot/js/register.js → resources/wwwroot/js/register.js
View File

0
wwwroot/js/settings.js → resources/wwwroot/js/settings.js
View File

0
wwwroot/lib/bootstrap.min.css → resources/wwwroot/lib/bootstrap.min.css vendored
View File

0
wwwroot/lib/bootstrap.min.js → resources/wwwroot/lib/bootstrap.min.js vendored
View File

0
wwwroot/lib/jquery.min.js → resources/wwwroot/lib/jquery.min.js vendored
View File

0
wwwroot/lib/popper.min.js → resources/wwwroot/lib/popper.min.js vendored
View File

0
wwwroot/profile.html → resources/wwwroot/profile.html
View File

0
wwwroot/register.html → resources/wwwroot/register.html
View File

0
wwwroot/rsc/login.jpg → resources/wwwroot/rsc/login.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 536 KiB

After

Width:  |  Height:  |  Size: 536 KiB

0
wwwroot/rsc/login2.jpg → resources/wwwroot/rsc/login2.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 MiB

After

Width:  |  Height:  |  Size: 1.2 MiB

0
wwwroot/settings.html → resources/wwwroot/settings.html
View File

2
src/com/wasteinformationserver/db/jdcb.java
View File

@ -1,8 +1,6 @@
package com.wasteinformationserver.db;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.Database;
import com.wasteinformationserver.db.MySQLConnector;
import java.sql.Connection;
import java.sql.PreparedStatement;

12
src/com/wasteinformationserver/main.java
View File

@ -1,6 +1,8 @@
package com.wasteinformationserver;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.mqtt.*;
import com.wasteinformationserver.website.Webserver;
public class main {
public static void main(String[] args) {
@ -10,7 +12,7 @@ public class main {
D.printList();
*/
/* Runtime.getRuntime().addShutdownHook(new Thread(() -> {
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
try {
Thread.sleep(200);
Log.warning("Shutting down ...");
@ -24,11 +26,11 @@ public class main {
Thread mythread = new Thread(() -> new Webserver().startserver());
mythread.start();
Log.message("thread started");*/
Log.message("thread started");
mqtt m = new mqtt();
m.notifymessage();
m.getDatabasedata();
// mqtt m = new mqtt();
// m.notifymessage();
// m.getDatabasedata();
}
}

1
src/com/wasteinformationserver/website/CheckLoginState.java
View File

@ -1,7 +1,6 @@
package com.wasteinformationserver.website;
import com.wasteinformationserver.basicutils.Log;
import com.wasteinformationserver.db.PostRequest;
import java.util.HashMap;

1
src/com/wasteinformationserver/website/LoginRequest.java
View File

@ -1,6 +1,5 @@
package com.wasteinformationserver.website;
import com.wasteinformationserver.db.PostRequest;
import com.wasteinformationserver.db.jdcb;
import java.sql.ResultSet;

17
src/com/wasteinformationserver/website/MainPage.java
View File

@ -5,11 +5,10 @@ import com.sun.net.httpserver.HttpExchange;
import com.sun.net.httpserver.HttpHandler;
import com.wasteinformationserver.basicutils.Log;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.awt.*;
import java.io.*;
import java.net.URI;
import java.net.URL;
public class MainPage implements HttpHandler {
@Override
@ -25,9 +24,13 @@ public class MainPage implements HttpHandler {
}
Log.message("looking for: " + root + path);
File file = new File(root + path).getCanonicalFile();
if (!file.isFile()) {
// File file = new File(getClass().getResource("/wwwroot"+path).getFile()).getCanonicalFile();
InputStream fs = getClass().getResourceAsStream("/wwwroot"+path);
// File file = new File(root + path).getCanonicalFile();
if (fs.available() < 1) {
// Object does not exist or is not a file: reject with 404 error.
String response = "404 (Not Found)\n";
t.sendResponseHeaders(404, response.length());
@ -45,7 +48,7 @@ public class MainPage implements HttpHandler {
t.sendResponseHeaders(200, 0);
OutputStream os = t.getResponseBody();
FileInputStream fs = new FileInputStream(file);
// FileInputStream fs = new FileInputStream(file);
final byte[] buffer = new byte[0x10000];
int count;
while ((count = fs.read(buffer)) >= 0) {

2
src/com/wasteinformationserver/db/PostRequest.java → src/com/wasteinformationserver/website/PostRequest.java
View File

@ -1,4 +1,4 @@
package com.wasteinformationserver.db;
package com.wasteinformationserver.website;
import com.sun.net.httpserver.Headers;
import com.sun.net.httpserver.HttpExchange;

1
src/com/wasteinformationserver/website/RegisterRequest.java
View File

@ -1,6 +1,5 @@
package com.wasteinformationserver.website;
import com.wasteinformationserver.db.PostRequest;
import com.wasteinformationserver.db.jdcb;
import java.util.HashMap;

3
src/com/wasteinformationserver/website/Webserver.java
View File

@ -4,7 +4,6 @@ import com.sun.net.httpserver.HttpServer;
import com.wasteinformationserver.basicutils.Log;
import java.io.IOException;
import java.net.InetSocketAddress;
@ -28,6 +27,4 @@ public class Webserver {
Log.info("Server available at http://127.0.0.1:8000 now");
}
}