Skip to content

Commit

Permalink
#13:[WIP] Slider/Carousel
Browse files Browse the repository at this point in the history
  • Loading branch information
msaroshali committed Apr 11, 2023
1 parent 6d1ffcc commit a37806c
Show file tree
Hide file tree
Showing 49 changed files with 174 additions and 14 deletions.
20 changes: 18 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,29 @@
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .idea/aws.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions .project
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,15 @@
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
<filteredResources>
<filter>
<id>1680755969575</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>
7 changes: 4 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -21,8 +21,9 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_additive_operator=18
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=18
Expand Down
Binary file added src/main/java/assets/images_fw/about.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/blog-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/blog-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/blog-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/brand-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/brand-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/brand-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/brand-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/brand-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/cover-img-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/img_bg_1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/img_bg_2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/img_bg_3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-10.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-11.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-12.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-13.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-14.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-15.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-16.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-5.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/main/java/assets/images_fw/item-6.jpg
Binary file added src/main/java/assets/images_fw/item-7.jpg
Binary file added src/main/java/assets/images_fw/item-8.jpg
Binary file added src/main/java/assets/images_fw/item-9.jpg
Binary file added src/main/java/assets/images_fw/loader.gif
Binary file added src/main/java/assets/images_fw/loc.png
Binary file added src/main/java/assets/images_fw/men.jpg
Binary file added src/main/java/assets/images_fw/person1.jpg
Binary file added src/main/java/assets/images_fw/person2.jpg
Binary file added src/main/java/assets/images_fw/person3.jpg
Binary file added src/main/java/assets/images_fw/women.jpg
43 changes: 40 additions & 3 deletions src/main/java/views/WebShopController/index.ftl.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
<#import "../layout/defaultLayoutWebShop.ftl.html" as layout>
<@layout.myLayout "The ultimate webshop">
<aside id="colorlib-hero">
<div class="flexslider">
<ul class="slides">
<#list carousel as caro> <#if (caro_index == 0)>
<li class="active" style="background-image: url('${contextPath}${caro.imageURL}');" >
<#else>
<li class="" style="background-image: url('${contextPath}${caro.imageURL}');" >
</#if>
<div class="overlay"></div>
<div class="container-fluid">
<div class="row">
<div class="col-sm-6 offset-sm-3 text-center slider-text">
<div class="slider-text-inner">
<div class="desc">
<h1 class="head-1">${caro.name}</h1>
<p><a href="${contextPath}/productDetail/${caro.name?url('UTF-8')}?productId=${caro.id}" class="btn btn-primary">Buy</a></p>
</div>
</div>
</div>
</div>
</div>
</li>
</#list>
</ul>
</div>
</aside>
<!--
<div class="row">
<div class="col-xs-12">
<div class="header-container">
Expand All @@ -8,18 +35,22 @@
</div>
<div class="col-xs-12">
<div id="pShopCarousel" class="carousel slide" data-ride="carousel">

-->
<!-- Indicators -->
<!--
<ol class="carousel-indicators">
<#list carousel as caro> <#if (caro_index == 0)>
<li data-target="#pShopCarousel" data-slide-to="0" class="active"></li>
<#else>
<li data-target="#pShopCarousel" data-slide-to="${caro_index}"></li>
</#if> </#list>
</ol>
-->

<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
<!--
<div class="carousel-inner" role="listbox">
<#list carousel as caro> <#if (caro_index == 0)>
<div id="pShopCarouselItem${caro_index}" class="item active">
<#else>
Expand All @@ -36,8 +67,10 @@
</#list>
</div>
</div>
-->

<!-- Left and right controls; Carousel nav -->
<!--
<a id="btnCarouselPrev" class="left carousel-control"
href="#pShopCarousel" role="button" data-slide="prev"> <span
class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
Expand All @@ -48,9 +81,13 @@
<span class="sr-only">Next</span>
</a>
</div>
</div>
</div>
-->


<!--Homepage Product Samples-->
<div class="margin_top20 row">
<div class="col-xs-12">
<div class="header-container">
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/views/layout/defaultLayoutWebShop.ftl.html
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
</header>

<!-- main/content -->
<div class="body-wrapper">
<main> <!-- message: no java script -->
<noscript>
<div class="section">
Expand Down Expand Up @@ -96,9 +95,9 @@
</div>

<!-- body -->
<div class="container-fluid" id="main"><#nested/></div>
<div class="" id="main"><#nested/></div>
</main>
</div>

<!-- footer -->
<#include "footer.ftl.html"/>

Expand Down
31 changes: 28 additions & 3 deletions src/main/java/views/layout/header.ftl.html
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,34 @@ <h3><a href="#">Our biggest sale yet 50% off all Posters</a></h3>
</div>
</div>
</nav>
<br><br><br><br><br><br><br><br><br><br><br><br>
<aside id="colorlib-hero">
<div class="flexslider">
<ul class="slides">
<#list carousel as caro> <#if (caro_index == 0)>
<li class="active" style="background-image: url('${contextPath}${caro.imageURL}');" >
<#else>
<li class="" style="background-image: url('${contextPath}${caro.imageURL}');" >
</#if>
<div class="overlay"></div>
<div class="container-fluid">
<div class="row">
<div class="col-sm-6 offset-sm-3 text-center slider-text">
<div class="slider-text-inner">
<div class="desc">
<h1 class="head-1" style="color: black;">${caro.name}</h1>
<p><a href="${contextPath}/productDetail/${caro.name?url('UTF-8')}?productId=${caro.id}" class="btn btn-primary">Buy</a></p>
</div>
</div>
</div>
</div>
</div>
</li>
</#list>
</ul>
</div>
</aside>

<nav id="globalNavigation"
<nav id="globalNavigation"
class="navbar navbar-default navbar-static-top">
<div class="container-fluid">
<div class="row">
Expand Down Expand Up @@ -315,4 +340,4 @@ <h3><a href="#">Our biggest sale yet 50% off all Posters</a></h3>
</ul>
</div>
</div>
</nav>
</nav>

0 comments on commit a37806c

Please sign in to comment.