Skip to content

Commit 69614c8

Browse files
Merge pull request #3 from Ukis/Develop
Web + poprawki
2 parents fbfb235 + e3a85c7 commit 69614c8

File tree

12 files changed

+324
-182
lines changed

12 files changed

+324
-182
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.settings/
44
target/
55

6+
.idea
67
.project
78
.classpath
89
.springBeans

.idea/uiDesigner.xml

Lines changed: 124 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Grown-mainContext.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
<bean id="mainController" class="com.Polodz.controller.MainController">
3131
<property name="membersDAO" ref="MembersDAOF" />
32-
<property name="telentController" ref="IController" />
32+
<property name="telnetController" ref="IController" />
3333
</bean>
3434

3535

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.Polodz.WebController;
2+
3+
import org.springframework.stereotype.Controller;
4+
import org.springframework.web.bind.annotation.GetMapping;
5+
import org.springframework.web.servlet.ModelAndView;
6+
7+
/**
8+
* Created by Łukasz on 07.09.2016.
9+
*/
10+
11+
@Controller
12+
public class MainPageController {
13+
14+
@GetMapping("/")
15+
public ModelAndView getMainPage() {
16+
return new ModelAndView("mainPage");
17+
}
18+
}
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.Polodz.WebController;
2+
3+
import com.Polodz.service.WebService;
4+
import org.springframework.beans.factory.annotation.Autowired;
5+
import org.springframework.stereotype.Controller;
6+
import org.springframework.ui.Model;
7+
import org.springframework.web.bind.annotation.GetMapping;
8+
import org.springframework.web.servlet.ModelAndView;
9+
10+
/**
11+
* Created by lpolatowski on 2016-09-07.
12+
*/
13+
14+
@Controller
15+
public class MovieListController {
16+
17+
@Autowired
18+
private WebService service;
19+
20+
@GetMapping("/movieList")
21+
public ModelAndView getMovieList() {
22+
return new ModelAndView("movieList").addObject("string", service.getMovieListString());
23+
}
24+
25+
}

0 commit comments

Comments
 (0)