From 6dd50dc44f9f220f4c32ce1dca3d620f3e5de06e Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Tue, 8 Sep 2015 22:48:29 +0200 Subject: [PATCH] =?utf8?q?Continued:=20-=20first=20pages=20are=20working?= =?utf8?q?=20again!=20-=20migrated=20from=20JSP=20to=20JSF=20(more=20needs?= =?utf8?q?=20to=20be=20done)=20-=20added=20navigation=20rules=20-=20update?= =?utf8?q?d=20jcore.jar,=20jcoreee.jar,=20jshop-core.jar,=20jshop-ee-lib.j?= =?utf8?q?ar=20+=20jswingcore.jar=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcore.jar | Bin 28933 -> 28193 bytes lib/jcoreee.jar | Bin 20298 -> 16413 bytes lib/jshop-core.jar | Bin 27473 -> 26718 bytes lib/jshop-ee-lib.jar | Bin 6200 -> 6975 bytes nbproject/build-impl.xml | 4 +- nbproject/genfiles.properties | 6 +- nbproject/project.properties | 4 +- nbproject/project.xml | 8 +- .../beans/basket/PizzaBasketWebBean.java | 8 + .../basket/PizzaServiceBasketWebBean.java | 13 +- .../controller/AdminProductWebController.java | 54 +++++ .../beans/controller/PizzaServiceWebBean.java | 74 ++++--- .../beans/controller/PizzaWebBean.java | 24 --- .../customer/PizzaServiceCustomerWebBean.java | 2 +- .../GenderWebBean.java} | 4 +- .../PizzaServiceGenderController.java} | 20 +- web/WEB-INF/faces-config.xml | 50 +++++ .../admin/admin_category_selection_box.jsp | 16 -- web/WEB-INF/static/admin/admin_footer.jsp | 16 -- web/WEB-INF/static/admin/admin_menu.jsp | 21 -- .../admin_parent_category_selection_box.jsp | 17 -- web/WEB-INF/templates.dist/admin_page.xhtml | 27 +++ web/WEB-INF/templates.dist/guest_page.xhtml | 2 +- web/WEB-INF/templates/admin/admin_base.tpl | 11 + .../admin/admin_category_selection_box.tpl | 10 + web/WEB-INF/templates/admin/admin_footer.tpl | 13 ++ web/WEB-INF/templates/admin/admin_menu.tpl | 19 ++ .../admin_parent_category_selection_box.tpl | 10 + web/WEB-INF/templates/base.tpl | 10 +- web/WEB-INF/templates/guest/guest_base.tpl | 2 + web/WEB-INF/templates/guest/guest_menu.tpl | 2 +- web/WEB-INF/web.xml | 18 -- web/admin/category.jsp | 141 ------------- web/admin/category.xhtml | 117 +++++++++++ web/admin/index.jsp | 48 ----- web/admin/index.xhtml | 27 +++ web/admin/product.jsp | 188 ------------------ web/admin/product.xhtml | 162 +++++++++++++++ web/customer/login.xhtml | 2 +- web/index.xhtml | 10 +- web/resources/css/cssLayout.css | 6 +- web/terms.xhtml | 6 +- 42 files changed, 604 insertions(+), 568 deletions(-) create mode 100644 src/java/org/mxchange/pizzaapplication/beans/controller/AdminProductWebController.java rename src/java/org/mxchange/pizzaapplication/beans/{data/DataWebBean.java => gender/GenderWebBean.java} (91%) rename src/java/org/mxchange/pizzaapplication/beans/{data/PizzaServiceDataWebBean.java => gender/PizzaServiceGenderController.java} (75%) delete mode 100644 web/WEB-INF/static/admin/admin_category_selection_box.jsp delete mode 100644 web/WEB-INF/static/admin/admin_footer.jsp delete mode 100644 web/WEB-INF/static/admin/admin_menu.jsp delete mode 100644 web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp create mode 100644 web/WEB-INF/templates.dist/admin_page.xhtml create mode 100644 web/WEB-INF/templates/admin/admin_base.tpl create mode 100644 web/WEB-INF/templates/admin/admin_category_selection_box.tpl create mode 100644 web/WEB-INF/templates/admin/admin_footer.tpl create mode 100644 web/WEB-INF/templates/admin/admin_menu.tpl create mode 100644 web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl delete mode 100644 web/admin/category.jsp create mode 100644 web/admin/category.xhtml delete mode 100644 web/admin/index.jsp create mode 100644 web/admin/index.xhtml delete mode 100644 web/admin/product.jsp create mode 100644 web/admin/product.xhtml diff --git a/lib/jcore.jar b/lib/jcore.jar index 7318d475bd60750789a5af0d8c58471ad7d4f1d8..217c364fc77db0e54d31c837de5517fdce382fb0 100644 GIT binary patch delta 5729 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 diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar index f479cd85f681296c81d035819d67d492850194ec..9f0039fef5c5783f9feefb340c1781b104232d23 100644 GIT binary patch delta 2896 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 Jp7rzIe*w^+*DwG8 diff --git a/lib/jshop-ee-lib.jar b/lib/jshop-ee-lib.jar index 54ab89b53838c3734cca1275258252fce03841f1..7b5364022b09a7af86a6f90ceecc825c6c3a74dd 100644 GIT binary patch literal 6975 zcmcIpPiz!b82@HlI&@*n_76x!NKwIUOuIn+2Sv@cv{-1Np|uA*nCZ@QnKC=G&def} z6Y;ExH{-b{f?t1tKrs1xb?3Qw$s4vw8n6STUTn=mKGP* z)~8n%R}@2gkJ--D2D5Cojy}4){KrfwU$!9#U}6_{&;@+rBZR;Vv57mskv?1 z|LXLacVBsVYIEk?MCH1r)O9v7Z(1$WQXJ$sSt^!_kz%|J{iv8}HLB@5O8$=K-TE!X zXfVOnQGV-I-Lymmn zQI^rqXOV6y_H8Dz`*aqEI-;s!TH6Avvw5^_$7~8ccPdMdmSw8##1WpD*?Hj?34qo@ zf`#jN&xZj5{3E>Vp5z*{DZu8KV%%U&(_zzfU9s(lkH7l?dCkDE3_~&;lA$a?QPFje z%9dcJGWpIjg-93x9;yYhW+fQ5na=8tvZ=F>(@14jDHWnLHr!RUod0E)7kjv<|pTn3#}S%iklFIt#_h+ z7|prSlu(~T&2bsVWq4YKV-m=UsxCRKDZzybcWm87)Kr!1^du4G?BoWX-oo8FYfoNe?yLrR>0C9|-TH>Q3?Ra~PirGBM zrpU}65fU7A1I21;en5s;i3N-72MdJ?Mhu1oz1ff96Mr*^p%Z^YK@@*ef*}m9kPjSk zgRPAGhGB%;JL>j11vu>PIRaE7DIkyX0eR*7pZov7G*0UZZW4MgtV%VtsTuQrjmnD5 z5gAHeO2U z!n{=tT(+(`SW|RtSJmyeZKigIs}zIl0K!d1uu^WPyk5l2?!gH2dpxf{`gQ%@1B4K* zWJeGx=2z;Vxe1iZfuOJ>D0}(QC)F5cmC;xxyu{vbGfZKz?2X{)Ebj|R3ckK)={%dL z?a?BiO10|-_b z24yI6so+F9hyUkfGBwYCGBNj46w*DhfCYpK0i|@AkHzsXXOG-20ML31H>D&AFBXFa z-%XaQUbmm+=OdVGWx%vP>XmqGSA5ER!8jHV#`#?bW1zGz)eXhrsIvI4B{-W=Sa?2@ z8!{Z`u=A|gGd<#G?#T}&KZFF$iUetzbkq>vpZQ8ia6RafA+Wem3GuobuecmUDAQP@ zfV~a%GX&@|59m+lzWD7&%ow!h^8(seIt$B);;^)gQE9oOXgb{meENKd=E}?7AUbw= zJf3P#j|hA{7Xs6y?g{u}sjY{~A{EB^(&vE)6nx6?PmMmqk)Jmmj7Yo92Z?~5o%=81 z-;lIpTDW>O;?Ql7=aRd^AK+JVwTOZuzlyU&CpT(21>Z3>i0_A4CRRckbUyuosup*J);7m+tg@1l2!w0XK<;C&$ z^GMtxUdn{x!o$tD2)ol)UM_#3i{yTcm%w~-)9*uFMe>(}NaWX;AjKjB%%wN_T}AS( xawKvbyAh$t0FvVNu&Y$QpNXXYJ)Bc&T3rr6w2y8FIQ=;c$MAkIME~gp{{b6ifPw%3 literal 6200 zcmeHL&2HRO6h5B(IGJ?POcI(j1Qe-VObUq;6%l9xVvI1Lfd>~W^BK&quXKiB7e=iKvq z@7dq!>(2rV0gQf8xD74OF!V#YbXZ*2-rJI%JptJFNpnd0+hpzg8j{nP#Nm^ci+kH! zrOM%Ad8;fN+9%9*7LJ%@Yo>8)Zh3Jjmn|ACGsT9i9J4u`!P+eM{E8MYUMQ3vxrqwVl*+InlTsD^t1dHyW9|be5niNlw^C;@4%CT(J zSOV#lDCvoPY&O_QHDS$c?3yZ*4Lf1wwJs|yRyUm_ac`spsLJ-I%t;XB^>jE&({{`{ zvl5UB>5x>}k)I!hZ1emm4tj3{<=gvfUoG_k(4c@J|MI=ZcL~?Lo{>BquX9ybm`$;; zj`ly`He6J6*|wiN`}r3{y9uv|a8-mE5ndKRlvQ=xVRZrCD(tp1QcR0UbyH=!q#>15 zR8_gEGnWsoTb(}=AX_?BSc9U)7GYL^5d=LnT_R+m*`<2JITN6-F#jR{k1$N_oh5<{ z)|gY&bpi5)`P~!wo-8#TO_$1YV^x6RidHjZr)e<(K8U_wbIEm#MQPVGYO6hM`(0!s zq71vT?Fg`fOnOnC0HYqpUbB8+-nY4qwo#)MvuP=8OVe=+vvFpneG72)plLW-ogHbm zhPEjhhUxIsg=ph^v!@c}5Z4z_?qa*B^!@@4CBPWhIalJH>IqX&36p$EGo=c%G+Ea^ zCr=SznonDG%@e@)l|can$lyRX2eDtkYA}HR2Jv4%e$&iQ+srUzBQzs$DKe9TQN;Ce z;4&g+U<~o{Fdm_u;H4!4FL9bHFooZPNHg79jVS5A|INh1Apz?cjvXXQp+i4mZFrfh zTVRfeFeJjT2-%1Syc&O#GKGJw7>FjE@6Uj=OZ3Jr<&VDPST_8xgu4YW|3yI`RRU zC%pj6UBIFmASgU*ghF7ZvqgK1f_G9x0qt1o$TfW+B-BU&@G25L{c*Qo{*lW!)S>2J z`PcDsqn_Qhnd&>B0PEdRJVV5SgfjSm7p|>k)(cpClf}H=`OQejHYcp58_(P z&p0=R1-o@_9N$dvWH8AKHq{NhGli4E-v^`L{eX#pMloG7;Aimi*^5-rHGV1W{6A8` zbSHcEm$Vn-|;8;Q_>3R8MzOM`zQVkd0^5~>LIxgEzRTM zIkePoA0%N=Pbt7C#bUTO#w4U`=RkbxUv@$Ani)xe)N^tl+TO3}0ITO6sCXMu4=TVN z%EYNHbV>Fvcu5jdPbxq@NQdlosN&@fqdrWB$`32)W&I-^s@K5^%Np%ro$KJygX>tA zJG*2^x1P=7S|7Zl72Qhojvg?5jMvN*OnrmK-?uw5j^0%R#y9X(l!9^0Wy)>bMYkEf u?gZTKV)jeHE&kBjnPK!u6)>!hreYXZ9M9PeP!|9XdwF;~0HBT2zkdKbDtY7p diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index cd59461d..4f43a2bd 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -1030,11 +1030,11 @@ exists or setup the property manually. For example like this: - + @@ -1044,11 +1044,11 @@ exists or setup the property manually. For example like this: - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index 2ae24f4c..c0c289dc 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -1,8 +1,8 @@ -build.xml.data.CRC32=1edfee4e +build.xml.data.CRC32=ae8d1d07 build.xml.script.CRC32=82213886 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=1edfee4e -nbproject/build-impl.xml.script.CRC32=055d9dec +nbproject/build-impl.xml.data.CRC32=ae8d1d07 +nbproject/build-impl.xml.script.CRC32=6b50b9cf nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/nbproject/project.properties b/nbproject/project.properties index a21586fd..f0ff76fd 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -50,7 +50,7 @@ j2ee.compile.on.save=true j2ee.copy.static.files.on.save=true j2ee.deploy.on.save=true j2ee.platform=1.7 -j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.persistence.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar +j2ee.platform.classpath=${j2ee.server.middleware}/mq/lib/jaxm-api.jar:${j2ee.server.home}/modules/endorsed/javax.annotation-api.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar:${j2ee.server.home}/modules/javax.batch-api.jar:${j2ee.server.home}/modules/javax.security.auth.message-api.jar:${j2ee.server.home}/modules/javax.faces.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl-api.jar:${j2ee.server.home}/modules/javax.transaction-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jar:${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/javax.mail.jar:${j2ee.server.home}/modules/javax.interceptor-api.jar:${j2ee.server.home}/modules/javax.inject.jar:${j2ee.server.home}/modules/javax.resource-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent-api.jar:${j2ee.server.home}/modules/javax.el.jar:${j2ee.server.home}/modules/javax.ejb-api.jar:${j2ee.server.home}/modules/javax.xml.rpc-api.jar:${j2ee.server.home}/modules/javax.security.jacc-api.jar:${j2ee.server.home}/modules/javax.json.jar:${j2ee.server.home}/modules/javax.xml.registry-api.jar:${j2ee.server.home}/modules/javax.websocket-api.jar:${j2ee.server.home}/modules/javax.management.j2ee-api.jar:${j2ee.server.home}/modules/javax.servlet-api.jar:${j2ee.server.home}/modules/javax.jms-api.jar:${j2ee.server.home}/modules/javax.enterprise.concurrent.jar:${j2ee.server.home}/modules/javax.servlet.jsp.jstl.jar:${j2ee.server.home}/modules/javax.enterprise.deploy-api.jar:${j2ee.server.home}/modules/bean-validator.jar:${j2ee.server.home}/modules/javax.ws.rs-api.jar:${j2ee.server.home}/modules/javax.servlet.jsp-api.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/weld-osgi-bundle.jar:${j2ee.server.home}/modules/javax.persistence.jar j2ee.platform.embeddableejb.classpath=${j2ee.server.home}/lib/embedded/glassfish-embedded-static-shell.jar j2ee.platform.wscompile.classpath=${j2ee.server.home}/modules/webservices-osgi.jar j2ee.platform.wsgen.classpath=${j2ee.server.home}/modules/webservices-osgi.jar:${j2ee.server.home}/modules/endorsed/webservices-api-osgi.jar:${j2ee.server.home}/modules/jaxb-osgi.jar:${j2ee.server.home}/modules/endorsed/jaxb-api.jar @@ -59,11 +59,11 @@ j2ee.platform.wsit.classpath= j2ee.server.type=gfv3ee6 jar.compress=false javac.classpath=\ - ${reference.PizzaService-lib.jar}:\ ${file.reference.jcore.jar}:\ ${file.reference.jcoreee.jar}:\ ${file.reference.jshop-core.jar}:\ ${file.reference.jshop-ee-lib.jar}:\ + ${reference.PizzaService-lib.jar}:\ ${file.reference.cdi-api.jar}:\ ${file.reference.gf-client.jar}:\ ${file.reference.log4j-api-2.3.jar}:\ diff --git a/nbproject/project.xml b/nbproject/project.xml index dee8330a..a412ce80 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -6,10 +6,6 @@ PizzaService-war 1.6.5 - - ${reference.PizzaService-lib.jar} - WEB-INF/lib - ${file.reference.jcore.jar} WEB-INF/lib @@ -26,6 +22,10 @@ ${file.reference.jshop-ee-lib.jar} WEB-INF/lib + + ${reference.PizzaService-lib.jar} + WEB-INF/lib + ${file.reference.cdi-api.jar} WEB-INF/lib diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebBean.java index 68ffc3bc..12b55bc1 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaBasketWebBean.java @@ -17,6 +17,7 @@ package org.mxchange.pizzaapplication.beans.basket; import java.io.Serializable; +import org.mxchange.jshopcore.model.product.Product; /** * An interface for a basket @@ -37,4 +38,11 @@ public interface PizzaBasketWebBean extends Serializable { * @return Whether the basket is empty */ public boolean hasItems (); + + /** + * Setter for current product instance + * + * @param product Product instance + */ + public void setCurrentProduct (final Product product); } diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java index 05586ed7..eca1f9eb 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/PizzaServiceBasketWebBean.java @@ -24,7 +24,8 @@ import javax.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.beans.BaseFrameworkBean; -import org.mxchange.jshopeelib.beans.remote.basket.BasketSessionBeanRemote; +import org.mxchange.jshopcore.model.basket.BasketSessionBeanRemote; +import org.mxchange.jshopcore.model.product.Product; /** * A bean for the basket @@ -45,6 +46,11 @@ public class PizzaServiceBasketWebBean extends BaseFrameworkBean implements Pizz */ private final BasketSessionBeanRemote basket; + /** + * Current product instance + */ + private Product currentProduct; + /** * Default constructor * @@ -80,4 +86,9 @@ public class PizzaServiceBasketWebBean extends BaseFrameworkBean implements Pizz // Call super init first super.genericInit(); } + + @Override + public void setCurrentProduct (final Product product) { + this.currentProduct = product; + } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/controller/AdminProductWebController.java new file mode 100644 index 00000000..6000979c --- /dev/null +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/AdminProductWebController.java @@ -0,0 +1,54 @@ +/* + * Copyright (C) 2015 Roland Haeder + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.mxchange.pizzaapplication.beans.controller; + +import java.util.Deque; +import javax.faces.view.facelets.FaceletException; +import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jshopcore.model.product.Product; + +/** + * An interface for product controllers for "ADMIN" role + * + * @author Roland Haeder + */ +public interface AdminProductWebController { + + /** + * Adds given category data from request to database + * + * @param category Category instance + * @throws javax.faces.view.facelets.FaceletException If something unexpected happened + */ + public void doAdminAddCategory (final Category category) throws FaceletException; + + /** + * Adds given product data from request to database + * + * @param product Product instance + * @throws javax.faces.view.facelets.FaceletException If something unexpected happened + */ + public void doAdminAddProduct (final Product product) throws FaceletException; + + /** + * Some "getter" for a linked list of all products + * + * @return All products + * @throws javax.faces.view.facelets.FaceletException If anything went wrong + */ + public Deque getAllProducts () throws FaceletException; +} diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java index 8755c9f7..cbaf01b3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaServiceWebBean.java @@ -16,7 +16,6 @@ */ package org.mxchange.pizzaapplication.beans.controller; -import java.io.IOException; import java.rmi.RemoteException; import java.util.Deque; import javax.annotation.PostConstruct; @@ -26,11 +25,11 @@ import javax.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.beans.BaseFrameworkBean; -import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; -import org.mxchange.jshopcore.exceptions.ProductTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.Category; +import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; +import org.mxchange.jshopcore.model.category.ProductCategory; import org.mxchange.jshopcore.model.product.Product; -import org.mxchange.jshopeelib.beans.remote.shop.ShopSessionBeanRemote; +import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; /** * Main application class @@ -46,9 +45,14 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe private static final long serialVersionUID = 58_137_539_530_279L; /** - * Remote bean + * Remote bean for categories */ - private final ShopSessionBeanRemote shop; + private final CategorySessionBeanRemote category; + + /** + * Remote bean for products + */ + private final ProductSessionBeanRemote product; /** * Default constructor @@ -60,7 +64,10 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe InitialContext context = new InitialContext(); // Try to lookup the bean - this.shop = (ShopSessionBeanRemote) context.lookup("ejb/stateless-shop"); //NOI18N + this.category = (CategorySessionBeanRemote) context.lookup("ejb/stateless-category"); //NOI18N + + // Try to lookup the bean + this.product = (ProductSessionBeanRemote) context.lookup("ejb/stateless-product"); //NOI18N } @PostConstruct @@ -72,17 +79,7 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe @Override public Deque getAvailableProducts () throws FacesException { try { - return this.getShop().getAvailableProducts(); - } catch (final RemoteException ex) { - // Continue to throw - throw new FacesException(ex); - } - } - - @Override - public Deque getAllProducts () throws FacesException { - try { - return this.getShop().getAllProducts(); + return this.getProduct().getAvailableProducts(); } catch (final RemoteException ex) { // Continue to throw throw new FacesException(ex); @@ -92,31 +89,30 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe @Override public Deque getAllCategories () throws FacesException { try { - return this.getShop().getAllCategories(); - } catch (final RemoteException ex) { - // Continue to throw - throw new FacesException(ex); - } - } + // Fake zero category + Category c = new ProductCategory(0L, "Ist oberste Kategorie", 0L); - @Override - public void doAdminAddCategory (final Category category) throws FacesException { - try { - this.getShop().doAdminAddCategory(category); - } catch (final IOException | CategoryTitleAlreadyUsedException ex) { + // Get List back + Deque deque = this.getCategory().getAllCategories(); + + // Add fake category + deque.addFirst(c); + + // Return it + return deque; + } catch (final RemoteException ex) { // Continue to throw throw new FacesException(ex); } } - @Override - public void doAdminAddProduct (final Product product) throws FacesException { - try { - this.getShop().doAdminAddProduct(product); - } catch (final IOException | ProductTitleAlreadyUsedException ex) { - // Continue to throw - throw new FacesException(ex); - } + /** + * Getter for shop remote bean + * + * @return Remote shop bean + */ + private CategorySessionBeanRemote getCategory () { + return this.category; } /** @@ -124,7 +120,7 @@ public class PizzaServiceWebBean extends BaseFrameworkBean implements PizzaWebBe * * @return Remote shop bean */ - private ShopSessionBeanRemote getShop () { - return this.shop; + private ProductSessionBeanRemote getProduct () { + return this.product; } } diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java index 8c248e50..d58d0449 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/PizzaWebBean.java @@ -37,14 +37,6 @@ public interface PizzaWebBean extends Serializable { */ public Deque getAvailableProducts () throws FaceletException; - /** - * Some "getter" for a linked list of all products - * - * @return All products - * @throws javax.faces.view.facelets.FaceletException If anything went wrong - */ - public Deque getAllProducts () throws FaceletException; - /** * Some "getter" for a linked list of all categories * @@ -52,20 +44,4 @@ public interface PizzaWebBean extends Serializable { * @throws javax.faces.view.facelets.FaceletException If anything went wrong */ public Deque getAllCategories () throws FaceletException; - - /** - * Adds given category data from request to database - * - * @param category Category instance - * @throws javax.faces.view.facelets.FaceletException If something unexpected happened - */ - public void doAdminAddCategory (final Category category) throws FaceletException; - - /** - * Adds given product data from request to database - * - * @param product Product instance - * @throws javax.faces.view.facelets.FaceletException If something unexpected happened - */ - public void doAdminAddProduct (final Product product) throws FaceletException; } diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java index 8b9af4d6..089590f0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/PizzaServiceCustomerWebBean.java @@ -22,7 +22,7 @@ import javax.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreee.beans.BaseFrameworkBean; -import org.mxchange.jshopeelib.beans.remote.customer.CustomerSessionBeanRemote; +import org.mxchange.jshopcore.model.customer.CustomerSessionBeanRemote; /** * A customer bean which hides the customer instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/data/DataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java similarity index 91% rename from src/java/org/mxchange/pizzaapplication/beans/data/DataWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java index c75c80a9..e6c44081 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/data/DataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.pizzaapplication.beans.data; +package org.mxchange.pizzaapplication.beans.gender; import java.io.Serializable; import java.util.List; @@ -25,7 +25,7 @@ import org.mxchange.jcore.model.contact.gender.Gender; * * @author Roland Haeder */ -public interface DataWebBean extends Serializable { +public interface GenderWebBean extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaServiceGenderController.java similarity index 75% rename from src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/gender/PizzaServiceGenderController.java index aa977901..fc39c971 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/data/PizzaServiceDataWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/PizzaServiceGenderController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.pizzaapplication.beans.data; +package org.mxchange.pizzaapplication.beans.gender; import java.util.List; import javax.annotation.PostConstruct; @@ -23,8 +23,8 @@ import javax.inject.Named; import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcore.model.contact.gender.Gender; +import org.mxchange.jcore.model.contact.gender.GenderSessionBeanRemote; import org.mxchange.jcoreee.beans.BaseFrameworkBean; -import org.mxchange.jshopeelib.beans.remote.data.ShopDataBeanRemote; /** * A customer bean which hides the customer instance @@ -33,7 +33,7 @@ import org.mxchange.jshopeelib.beans.remote.data.ShopDataBeanRemote; */ @Named ("data") @ApplicationScoped -public class PizzaServiceDataWebBean extends BaseFrameworkBean implements DataWebBean { +public class PizzaServiceGenderController extends BaseFrameworkBean implements GenderWebBean { /** * Serial number @@ -43,32 +43,32 @@ public class PizzaServiceDataWebBean extends BaseFrameworkBean implements DataWe /** * Remote bean */ - private final ShopDataBeanRemote data; + private final GenderSessionBeanRemote gender; /** * Default constructor * * @throws javax.naming.NamingException If something happens? */ - public PizzaServiceDataWebBean () throws NamingException { + public PizzaServiceGenderController () throws NamingException { // Get initial context InitialContext context = new InitialContext(); // Try to lookup bean - this.data = (ShopDataBeanRemote) context.lookup("ejb/stateless-data"); //NOI18N + this.gender = (GenderSessionBeanRemote) context.lookup("ejb/stateless-data"); //NOI18N } @Override public Gender[] allGenders () { // Return it - return this.getData().allGenders(); + return this.getGender().allGenders(); } @Override public List selectableGenders () { // Init array // TODO Call EJB here? - List genders = this.getData().selectableGenders(); + List genders = this.getGender().selectableGenders(); // Return it return genders; @@ -79,8 +79,8 @@ public class PizzaServiceDataWebBean extends BaseFrameworkBean implements DataWe * * @return data remote bean */ - private ShopDataBeanRemote getData () { - return this.data; + private GenderSessionBeanRemote getGender () { + return this.gender; } @PostConstruct diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index 1010e3f5..4f60a769 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -11,4 +11,54 @@ NameValidator org.mxchange.jcoreee.validator.string.names.NameValidator + + * + + customer_register + /customer/register.xhtml + + + index + /index.xhtml + + + customer_lost_passwd + /customer/lost_passwd.xhtml + + + customer_login + /customer/login.xhtml + + + terms + /terms.xhtml + + + privacy + /privacy.xhtml + + + imprint + /imprint.xhtml + + + logout + /bye.xhtml + + + admin_product + /admin/product.xhtml + + + admin_category + /admin/category.xhtml + + + + * + + admin_index + /admin/index.xhtml + + diff --git a/web/WEB-INF/static/admin/admin_category_selection_box.jsp b/web/WEB-INF/static/admin/admin_category_selection_box.jsp deleted file mode 100644 index e1d2bece..00000000 --- a/web/WEB-INF/static/admin/admin_category_selection_box.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Document : admin_category_selection_box - Created on : 14.08.2015, 12:51:05 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> - - - diff --git a/web/WEB-INF/static/admin/admin_footer.jsp b/web/WEB-INF/static/admin/admin_footer.jsp deleted file mode 100644 index aa6b21b9..00000000 --- a/web/WEB-INF/static/admin/admin_footer.jsp +++ /dev/null @@ -1,16 +0,0 @@ -<%-- - Document : admin_footer - Created on : 11.08.2015, 12:28:03 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - -
- -
- -
diff --git a/web/WEB-INF/static/admin/admin_menu.jsp b/web/WEB-INF/static/admin/admin_menu.jsp deleted file mode 100644 index 92504285..00000000 --- a/web/WEB-INF/static/admin/admin_menu.jsp +++ /dev/null @@ -1,21 +0,0 @@ -<%-- - Document : admin_menu - Created on : 06.08.2015, 12:41:44 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - diff --git a/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp b/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp deleted file mode 100644 index c00a925e..00000000 --- a/web/WEB-INF/static/admin/admin_parent_category_selection_box.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%-- - Document : admin_parent_category_selection_box - Created on : 14.08.2015, 12:51:05 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> - - - diff --git a/web/WEB-INF/templates.dist/admin_page.xhtml b/web/WEB-INF/templates.dist/admin_page.xhtml new file mode 100644 index 00000000..c83abe25 --- /dev/null +++ b/web/WEB-INF/templates.dist/admin_page.xhtml @@ -0,0 +1,27 @@ + + + + + Your page's title here + + + + + + + Your header above content here + + + + Here goes your content. + + + + + + + diff --git a/web/WEB-INF/templates.dist/guest_page.xhtml b/web/WEB-INF/templates.dist/guest_page.xhtml index 7439d638..0622bd44 100644 --- a/web/WEB-INF/templates.dist/guest_page.xhtml +++ b/web/WEB-INF/templates.dist/guest_page.xhtml @@ -6,7 +6,7 @@ > - Your page's title here + Your page's title here diff --git a/web/WEB-INF/templates/admin/admin_base.tpl b/web/WEB-INF/templates/admin/admin_base.tpl new file mode 100644 index 00000000..0305ff96 --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_base.tpl @@ -0,0 +1,11 @@ + + + Administration - + + + diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl new file mode 100644 index 00000000..8783f813 --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl @@ -0,0 +1,10 @@ + + + + + + diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl new file mode 100644 index 00000000..ecdae42a --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_footer.tpl @@ -0,0 +1,13 @@ + +
+
    +
    • +
+
+ +
+ diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl new file mode 100644 index 00000000..9e984152 --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_menu.tpl @@ -0,0 +1,19 @@ + + + + diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl new file mode 100644 index 00000000..5c3bb91d --- /dev/null +++ b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl @@ -0,0 +1,10 @@ + + + + + + diff --git a/web/WEB-INF/templates/base.tpl b/web/WEB-INF/templates/base.tpl index d191bf64..a70734cd 100644 --- a/web/WEB-INF/templates/base.tpl +++ b/web/WEB-INF/templates/base.tpl @@ -30,9 +30,13 @@ Default menu -
- Default content header - Default content +
+
+ Default content header +
+
+ Default content +
diff --git a/web/WEB-INF/templates/guest/guest_base.tpl b/web/WEB-INF/templates/guest/guest_base.tpl index 58f5a1e2..ee4ced7e 100644 --- a/web/WEB-INF/templates/guest/guest_base.tpl +++ b/web/WEB-INF/templates/guest/guest_base.tpl @@ -3,6 +3,8 @@ xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets"> + + diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 0e4d7180..76a0a275 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -11,7 +11,7 @@
    • -
    • +
diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index 2e94dad3..83bfa265 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -4,16 +4,6 @@ javax.faces.PROJECT_STAGE Development - - A servlet filter for setting character encoding to UTF-8 - Utf8ServletFilter - org.mxchange.jcoreee.filter.servlet.utf8.Utf8ServletFilter - - - A servlet filter for logging - Log4jServletFilter - org.apache.logging.log4j.web.Log4jServletFilter - - - Log4jServletFilter - /* - - - Utf8ServletFilter - /* - Faces Servlet javax.faces.webapp.FacesServlet diff --git a/web/admin/category.jsp b/web/admin/category.jsp deleted file mode 100644 index 23cca2b4..00000000 --- a/web/admin/category.jsp +++ /dev/null @@ -1,141 +0,0 @@ -<%-- - Document : category - Created on : 05.08.2015, 10:51:14 - Author : Roland Haeder ---%> - -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page import="org.mxchange.jshopejb.category.Category"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - -<% - // TODO: Can be removed later - controller.init(); -%> - - - - - - - - - Pizza-Service - Kategorien - - - - - - - -
-
-

Kategorien administrieren:

-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - -
- Auswählen: - - Bezeichnung: - - Elternkategorie: -
- ${category.categoryId}: - - - ${category.decodedTitle} - - ${controller.generateLinkForParent(category)} -
- - - -
-
-
- -
-
-
-
- Neue Kategorie hinzufügen: -
- -
- Bitte alle Felder ausfüllen: - -
-
- Bezeichnung: -
(z.B. Pizzen)
-
- -
- -
- -
-
- -
-
- Elternkategorie: -
- -
- -
- -
-
-
- -
- - -
-
-
-
-
-
- - - - diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml new file mode 100644 index 00000000..2cd077e3 --- /dev/null +++ b/web/admin/category.xhtml @@ -0,0 +1,117 @@ + + + + + Kategorien + + + + + + + Kategorien administrieren + + + +
+ + + + + + + + + + + + + + + + + + + + +
+ Auswählen: + + Bezeichnung: + + Elternkategorie: +
+ + + +
+ +
+ +
+ +
+
+ Neue Kategorie hinzufügen: +
+ +
+ Bitte alle Felder ausfüllen: + +
+
+ Bezeichnung: +
(z.B. Pizzen)
+
+ +
+ +
+ +
+
+ +
+
+ Elternkategorie: +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ +
+ + + + + + + diff --git a/web/admin/index.jsp b/web/admin/index.jsp deleted file mode 100644 index cd88ed7d..00000000 --- a/web/admin/index.jsp +++ /dev/null @@ -1,48 +0,0 @@ -<%-- - Document : index - Created on : 04.08.2015, 10:33:10 - Author : Roland Haeder ---%> - -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page import="java.util.Map"%> -<%@page import="java.util.Iterator"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> -<%@page import="org.mxchange.jshopejb.product.Product"%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> - - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - - Pizza-Service - Administration - - - - - - - -
-
-

Willkommen zur Administration:

-
- -
- Einiges kann hier eingestellt werden. -
-
- - - - diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml new file mode 100644 index 00000000..8dc2e51b --- /dev/null +++ b/web/admin/index.xhtml @@ -0,0 +1,27 @@ + + + + + Willkommen + + + + + + + Willkommen zur Administration + + + + Einiges kann hier eingestellt werden. + + + + + + + diff --git a/web/admin/product.jsp b/web/admin/product.jsp deleted file mode 100644 index aeb5747f..00000000 --- a/web/admin/product.jsp +++ /dev/null @@ -1,188 +0,0 @@ -<%-- - Document : product - Created on : 04.08.2015, 10:55:10 - Author : Roland Haeder ---%> - -<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%--<%@page errorPage="errorHandler.jsp" %>--%> -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaBean"%> -<%@page import="org.mxchange.pizzaapplication.beans.controller.PizzaServiceBean"%> - - - - - -<% - // TODO: Can be removed later - controller.init(); -%> - - - - - - - - - Pizza-Service - Produkte - - - - - - - -
-
-

Diese Produkte wurden eingestellt:

-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - -
- Produktnummer: - - Produktbezeichnung: - - Einzelpreis: - - Kategorie: - - Verfügbar: -
- ${product.itemId}: - - - ${product.title} - - ${product.price} - - ${controller.getPrintableProduktCategory(product)} - - ${controller.getPrintableProductAvailability(product)} -
- - - -
-
-
- -
-
-
-
- Neues Produkt hinzufügen: -
- -
- Bitte alle Felder ausfüllen: - -
-
- Produktbezeichnung: -
(z.B. Pizza Italia)
-
- -
- -
- -
-
- -
-
- Einzelpreis: -
(z.B. 50.0)
-
- -
- -
- -
-
- -
-
- Kategorie: -
- -
- -
- -
-
- -
-
- Verfügbar: -
- -
- -
- -
-
-
- -
- - -
-
-
-
- -
- Hinweise zum Hinzufügen von Produkten: -
    -
  • Beim Preis keine Währungszeichen (wie € usw.) eingeben.
    • -
  • Kommastellen mit Punkt, nicht mit Komma abtrennen.
    • -
  • Keine Tausendertrenner verwenden, auch keine Leerschritte.
    • -
-
-
-
- - - - diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml new file mode 100644 index 00000000..cfb743a5 --- /dev/null +++ b/web/admin/product.xhtml @@ -0,0 +1,162 @@ + + + + + Produkte + + + + + + + Diese Produkte wurden eingestellt + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Produktnummer: + + Produktbezeichnung: + + Einzelpreis: + + Kategorie: + + Verfügbar: +
+ #{product.itemId}: + + + #{product.title} + + #{product.price} + + ${controller.getPrintableProduktCategory(product)} + + ${controller.getPrintableProductAvailability(product)} +
+ + + +
+ +
+ +
+ +
+
+ Neues Produkt hinzufügen: +
+ +
+ Bitte alle Felder ausfüllen: + +
+
+ Produktbezeichnung: +
(z.B. Pizza Italia)
+
+ +
+ +
+ +
+
+ +
+
+ Einzelpreis: +
(z.B. 50.0)
+
+ +
+ +
+ +
+
+ +
+
+ Kategorie: +
+ +
+ +
+ +
+
+ +
+
+ Verfügbar: +
+ +
+ +
+ +
+
+
+ +
+ + +
+
+ +
+ +
+ Hinweise zum Hinzufügen von Produkten: +
    +
  • Beim Preis keine Währungszeichen (wie EUR usw.) eingeben.
    • +
  • Kommastellen mit Punkt, nicht mit Komma abtrennen.
    • +
  • Keine Tausendertrenner verwenden, auch keine Leerschritte.
    • +
+
+ + + + + + + diff --git a/web/customer/login.xhtml b/web/customer/login.xhtml index 198e37cb..bc320508 100644 --- a/web/customer/login.xhtml +++ b/web/customer/login.xhtml @@ -27,7 +27,7 @@
- +
diff --git a/web/index.xhtml b/web/index.xhtml index 74acebc0..c8885c1e 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -18,7 +18,7 @@ - Eingangsseite (dummy) + Willkommen zum Pizza-Service @@ -65,10 +65,10 @@ - - - + + + @@ -96,7 +96,7 @@ - + diff --git a/web/resources/css/cssLayout.css b/web/resources/css/cssLayout.css index 57b5048d..27d10449 100644 --- a/web/resources/css/cssLayout.css +++ b/web/resources/css/cssLayout.css @@ -133,7 +133,11 @@ ul.footer_nav li { .table_header { text-align: center; font-weight: bold; - font-size: 20px; +} + +#content_header { + font-weight: bold; + font-size: 18px; } .table_header_column { diff --git a/web/terms.xhtml b/web/terms.xhtml index e84f73f1..46708d58 100644 --- a/web/terms.xhtml +++ b/web/terms.xhtml @@ -6,18 +6,18 @@ > - Allgemeine Geschäftsbedingungen + Allgemeine Geschäftsbedingungen - Allgemeine Geschäftsbedingungen + Allgemeine Geschäftsbedingungen - Hier kommen die allgemeinen Geschäftsbedingungen hin. + Hier kommen die allgemeinen Geschäftsbedingungen hin. -- 2.39.5