Skip to content
Snippets Groups Projects
Commit 78d974f1 authored by Maximilian Komp's avatar Maximilian Komp
Browse files

some Project changes

parent e676a1a5
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 292 additions and 121 deletions
.gitignore
+ 2
− 1
View file @ 78d974f1
/target/
\ No newline at end of file
/target/
.idea/
.idea/artifacts/shopInShop_war_exploded.xml
+ 2
− 0
View file @ 78d974f1
......@@ -7,6 +7,7 @@
<element id="module-output" name="shopInShop" />
</element>
<element id="directory" name="lib">
<element id="library" level="project" name="Maven: org.postgresql:postgresql:42.0.0" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-server:7.7.8" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.13" />
<element id="library" level="project" name="Maven: org.w3c.css:sac:1.3" />
......@@ -18,6 +19,7 @@
<element id="library" level="project" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-client-compiled:7.7.8" />
<element id="library" level="project" name="Maven: com.vaadin:vaadin-themes:7.7.8" />
<element id="library" level="project" name="Maven: org.apache.commons:commons-lang3:3.4" />
</element>
</element>
<element id="directory" name="META-INF">
......
.idea/workspace.xml
+ 235
− 89
View file @ 78d974f1
This diff is collapsed.
pom.xml
+ 5
− 0
View file @ 78d974f1
......@@ -44,6 +44,11 @@
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>LATEST</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
......
shopInShop.iml
+ 15
− 0
View file @ 78d974f1
......@@ -8,9 +8,17 @@
</facet>
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="context.xml" url="file://$MODULE_DIR$/src/main/webapp/META-INF/context.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
<root url="file://$MODULE_DIR$/target/generated-resources/gwt" />
</sourceRoots>
</configuration>
</facet>
</component>
......@@ -21,10 +29,12 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/target/generated-resources/gwt" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: org.postgresql:postgresql:42.0.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: javax.servlet:javax.servlet-api:3.0.1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-server:7.7.8" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-sass-compiler:0.9.13" level="project" />
......@@ -37,5 +47,10 @@
<orderEntry type="library" name="Maven: com.vaadin.external.slf4j:vaadin-slf4j-jdk14:1.6.1" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-client-compiled:7.7.8" level="project" />
<orderEntry type="library" name="Maven: com.vaadin:vaadin-themes:7.7.8" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.projectlombok:lombok:1.16.16" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.4" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.11" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
</component>
</module>
\ No newline at end of file
src/main/java/org/s4s/gui/views/LoginView.java
+ 6
− 6
View file @ 78d974f1
......@@ -9,18 +9,15 @@ import com.vaadin.navigator.View;
import com.vaadin.navigator.ViewChangeListener;
import com.vaadin.server.FontAwesome;
import com.vaadin.shared.ui.label.ContentMode;
import com.vaadin.ui.Button;
import com.vaadin.ui.Label;
import com.vaadin.ui.Notification;
import com.vaadin.ui.PasswordField;
import com.vaadin.ui.TextField;
import com.vaadin.ui.VerticalLayout;
import com.vaadin.ui.*;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.s4s.dao.DAOException;
import org.s4s.dao.KundenDAO;
import org.s4s.dao.NoSuchUserOrPassword;
import org.s4s.dao.impl.LoginControl;
import org.s4s.services.util.Views;
/**
*
......@@ -73,6 +70,9 @@ public class LoginView extends VerticalLayout implements View {
Notification.show("Fehler", "interner Fehler", Notification.Type.ERROR_MESSAGE);
Logger.getLogger(LoginView.class.getName()).log(Level.SEVERE, null, ex);
}
// bei Erfolg wird der Navigator angesprochen und man wird in wieder zur Landingpage geführt
UI.getCurrent().getNavigator().navigateTo(Views.WELCOME);
}
});
}
......
src/main/java/org/s4s/gui/views/WelcomeView.java
+ 2
− 0
View file @ 78d974f1
......@@ -65,6 +65,8 @@ public class WelcomeView extends VerticalLayout implements View{
Label label = new Label("Willkommen in unserem Shop in Shop System!");
horizontalLayout.addComponent(label);
horizontalLayout.setComponentAlignment(label, Alignment.MIDDLE_CENTER);
addComponent(horizontalLayout);
setComponentAlignment(horizontalLayout, Alignment.TOP_CENTER);
}
......
target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
+ 25
− 25
View file @ 78d974f1
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\WelcomeView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\ProductDAO.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\PasswortView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ArtikeldetailsView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\BenutzerkontoView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\CheckoutView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\WarenkorbView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\KundenDAO.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\MyUI.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\LoginView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Warenkorb.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ShopView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\AbstractDatabaseClass.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\KaufbestaetigungView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\ProductSearch.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\DAOException.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\db\JDBCConnection.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\FaqView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\impl\LoginControl.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\Product.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\ImpressumView.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\modell\objects\dto\User.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\services\util\Views.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\dao\NoSuchUserOrPassword.java
C:\Users\Holger\Documents\NetBeansProjects\s4s_MeineTests\src\main\java\org\s4s\gui\views\VerkaeuferbewertungView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\PasswortView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\impl\LoginControl.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\NoSuchUserOrPassword.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\CheckoutView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\VerkaeuferbewertungView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\modell\objects\dto\Warenkorb.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\LoginView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\ShopView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\modell\objects\dto\Product.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\ImpressumView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\modell\objects\dto\User.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\DAOException.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\View\InitView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\ArtikeldetailsView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\KaufbestaetigungView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\services\db\JDBCConnection.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\ProductDAO.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\impl\AbstractDatabaseClass.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\BenutzerkontoView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\impl\ProductSearch.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\dao\KundenDAO.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\FaqView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\services\util\Views.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\WarenkorbView.java
C:\Users\Max-Desktop\Documents\Uni\Semester 4\SE2\s4s\src\main\java\org\s4s\gui\views\WelcomeView.java
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment