Skip to content

Commit b470ae1

Browse files
committed
submit java-web-ru/layout
1 parent 881a24f commit b470ae1

File tree

7 files changed

+176
-176
lines changed

7 files changed

+176
-176
lines changed

.current.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"assignment":"java-web-ru/template"}
1+
{"assignment":"java-web-ru/layout"}

java-web-ru/layout/gradlew

100644100755
File mode changed.

java-web-ru/layout/gradlew.bat

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
1-
@rem
2-
@rem Copyright 2015 the original author or authors.
3-
@rem
4-
@rem Licensed under the Apache License, Version 2.0 (the "License");
5-
@rem you may not use this file except in compliance with the License.
6-
@rem You may obtain a copy of the License at
7-
@rem
8-
@rem https://www.apache.org/licenses/LICENSE-2.0
9-
@rem
10-
@rem Unless required by applicable law or agreed to in writing, software
11-
@rem distributed under the License is distributed on an "AS IS" BASIS,
12-
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
@rem See the License for the specific language governing permissions and
14-
@rem limitations under the License.
15-
@rem
16-
17-
@if "%DEBUG%"=="" @echo off
18-
@rem ##########################################################################
19-
@rem
20-
@rem Gradle startup script for Windows
21-
@rem
22-
@rem ##########################################################################
23-
24-
@rem Set local scope for the variables with windows NT shell
25-
if "%OS%"=="Windows_NT" setlocal
26-
27-
set DIRNAME=%~dp0
28-
if "%DIRNAME%"=="" set DIRNAME=.
29-
@rem This is normally unused
30-
set APP_BASE_NAME=%~n0
31-
set APP_HOME=%DIRNAME%
32-
33-
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
34-
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
35-
36-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
37-
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
38-
39-
@rem Find java.exe
40-
if defined JAVA_HOME goto findJavaFromJavaHome
41-
42-
set JAVA_EXE=java.exe
43-
%JAVA_EXE% -version >NUL 2>&1
44-
if %ERRORLEVEL% equ 0 goto execute
45-
46-
echo.
47-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48-
echo.
49-
echo Please set the JAVA_HOME variable in your environment to match the
50-
echo location of your Java installation.
51-
52-
goto fail
53-
54-
:findJavaFromJavaHome
55-
set JAVA_HOME=%JAVA_HOME:"=%
56-
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
57-
58-
if exist "%JAVA_EXE%" goto execute
59-
60-
echo.
61-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62-
echo.
63-
echo Please set the JAVA_HOME variable in your environment to match the
64-
echo location of your Java installation.
65-
66-
goto fail
67-
68-
:execute
69-
@rem Setup the command line
70-
71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
72-
73-
74-
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76-
77-
:end
78-
@rem End local scope for the variables with windows NT shell
79-
if %ERRORLEVEL% equ 0 goto mainEnd
80-
81-
:fail
82-
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83-
rem the _cmd.exe /c_ return code!
84-
set EXIT_CODE=%ERRORLEVEL%
85-
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86-
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87-
exit /b %EXIT_CODE%
88-
89-
:mainEnd
90-
if "%OS%"=="Windows_NT" endlocal
91-
92-
:omega
1+
@rem
2+
@rem Copyright 2015 the original author or authors.
3+
@rem
4+
@rem Licensed under the Apache License, Version 2.0 (the "License");
5+
@rem you may not use this file except in compliance with the License.
6+
@rem You may obtain a copy of the License at
7+
@rem
8+
@rem https://www.apache.org/licenses/LICENSE-2.0
9+
@rem
10+
@rem Unless required by applicable law or agreed to in writing, software
11+
@rem distributed under the License is distributed on an "AS IS" BASIS,
12+
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
@rem See the License for the specific language governing permissions and
14+
@rem limitations under the License.
15+
@rem
16+
17+
@if "%DEBUG%"=="" @echo off
18+
@rem ##########################################################################
19+
@rem
20+
@rem Gradle startup script for Windows
21+
@rem
22+
@rem ##########################################################################
23+
24+
@rem Set local scope for the variables with windows NT shell
25+
if "%OS%"=="Windows_NT" setlocal
26+
27+
set DIRNAME=%~dp0
28+
if "%DIRNAME%"=="" set DIRNAME=.
29+
@rem This is normally unused
30+
set APP_BASE_NAME=%~n0
31+
set APP_HOME=%DIRNAME%
32+
33+
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
34+
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
35+
36+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
37+
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
38+
39+
@rem Find java.exe
40+
if defined JAVA_HOME goto findJavaFromJavaHome
41+
42+
set JAVA_EXE=java.exe
43+
%JAVA_EXE% -version >NUL 2>&1
44+
if %ERRORLEVEL% equ 0 goto execute
45+
46+
echo.
47+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
48+
echo.
49+
echo Please set the JAVA_HOME variable in your environment to match the
50+
echo location of your Java installation.
51+
52+
goto fail
53+
54+
:findJavaFromJavaHome
55+
set JAVA_HOME=%JAVA_HOME:"=%
56+
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
57+
58+
if exist "%JAVA_EXE%" goto execute
59+
60+
echo.
61+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
62+
echo.
63+
echo Please set the JAVA_HOME variable in your environment to match the
64+
echo location of your Java installation.
65+
66+
goto fail
67+
68+
:execute
69+
@rem Setup the command line
70+
71+
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
72+
73+
74+
@rem Execute Gradle
75+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
76+
77+
:end
78+
@rem End local scope for the variables with windows NT shell
79+
if %ERRORLEVEL% equ 0 goto mainEnd
80+
81+
:fail
82+
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
83+
rem the _cmd.exe /c_ return code!
84+
set EXIT_CODE=%ERRORLEVEL%
85+
if %EXIT_CODE% equ 0 set EXIT_CODE=1
86+
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
87+
exit /b %EXIT_CODE%
88+
89+
:mainEnd
90+
if "%OS%"=="Windows_NT" endlocal
91+
92+
:omega
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@template.layout.page(
2-
content = @`
3-
<h2>Welcome to Hexlet</h2>
4-
`,
5-
footer = @`
6-
<p>Thanks for visiting, come again soon!</p>
7-
`
1+
@template.layout.page(
2+
content = @`
3+
<h2>Welcome to Hexlet</h2>
4+
`,
5+
footer = @`
6+
<p>Thanks for visiting, come again soon!</p>
7+
`
88
)
Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
1-
@import gg.jte.Content
2-
@param Content content
3-
@param Content footer = null
4-
5-
<!doctype html>
6-
<html lang="en">
7-
<head>
8-
<meta charset="utf-8" />
9-
<meta name="viewport" content="width=device-width, initial-scale=1" />
10-
<title>Hexlet Javalin Example</title>
11-
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
12-
rel="stylesheet"
13-
integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We"
14-
crossorigin="anonymous">
15-
</head>
16-
<body>
17-
<nav class="navbar navbar-expand-lg navbar-light bg-light">
18-
<div class="collapse navbar-collapse" id="navbarNavDropdown">
19-
<ul class="navbar-nav">
20-
<li class="nav-item active">
21-
<a class="nav-link" href="/">Home</a>
22-
</li>
23-
<li class="nav-item">
24-
<a class="nav-link" href="/users">Users</a>
25-
</li>
26-
</ul>
27-
</div>
28-
</nav>
29-
30-
<div class="mx-auto p-4 py-md-5">
31-
${content}
32-
</div>
33-
34-
@if (footer != null)
35-
<footer class="text-center text-lg-start bg-light text-muted">
36-
<div class="text-center p-4" style="background-color: rgba(0, 0, 0, 0.05);">
37-
${footer}
38-
</div>
39-
</footer>
40-
@endif
41-
42-
</body>
1+
@import gg.jte.Content
2+
@param Content content
3+
@param Content footer = null
4+
5+
<!doctype html>
6+
<html lang="en">
7+
<head>
8+
<meta charset="utf-8" />
9+
<meta name="viewport" content="width=device-width, initial-scale=1" />
10+
<title>Hexlet Javalin Example</title>
11+
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css"
12+
rel="stylesheet"
13+
integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We"
14+
crossorigin="anonymous">
15+
</head>
16+
<body>
17+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
18+
<div class="collapse navbar-collapse" id="navbarNavDropdown">
19+
<ul class="navbar-nav">
20+
<li class="nav-item active">
21+
<a class="nav-link" href="/">Home</a>
22+
</li>
23+
<li class="nav-item">
24+
<a class="nav-link" href="/users">Users</a>
25+
</li>
26+
</ul>
27+
</div>
28+
</nav>
29+
30+
<div class="mx-auto p-4 py-md-5">
31+
${content}
32+
</div>
33+
34+
@if (footer != null)
35+
<footer class="text-center text-lg-start bg-light text-muted">
36+
<div class="text-center p-4" style="background-color: rgba(0, 0, 0, 0.05);">
37+
${footer}
38+
</div>
39+
</footer>
40+
@endif
41+
42+
</body>
4343
</html>
Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
@import exercise.dto.users.UsersPage
2-
@param UsersPage page
3-
4-
@template.layout.page(
5-
content = @`
6-
<h1>Пользователи</h1>
7-
<table class="table table-striped">
8-
@for(var user : page.getUsers())
9-
<tr>
10-
<td>
11-
${user.getId()}
12-
</td>
13-
<td>
14-
<a href="/users/${user.getId()}">${user.getFirstName()} ${user.getLastName()}</a>
15-
</td>
16-
</tr>
17-
@endfor
18-
</table>
19-
`,
20-
footer = @`
21-
<p>Thanks for visiting, come again soon!</p>
22-
`
1+
@import exercise.dto.users.UsersPage
2+
@param UsersPage page
3+
4+
@template.layout.page(
5+
content = @`
6+
<h1>Пользователи</h1>
7+
<table class="table table-striped">
8+
@for(var user : page.getUsers())
9+
<tr>
10+
<td>
11+
${user.getId()}
12+
</td>
13+
<td>
14+
<a href="/users/${user.getId()}">${user.getFirstName()} ${user.getLastName()}</a>
15+
</td>
16+
</tr>
17+
@endfor
18+
</table>
19+
`,
20+
footer = @`
21+
<p>Thanks for visiting, come again soon!</p>
22+
`
2323
)
Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@import exercise.dto.users.UserPage
2-
@param UserPage page
3-
4-
@template.layout.page(
5-
6-
content = @`
7-
<h2>${page.getUser().getFirstName()} ${page.getUser().getLastName()}</h2>
8-
<div>${page.getUser().getEmail()}</div>
9-
`,
10-
footer = @`
11-
<p>Thanks for visiting, come again soon!</p>
12-
`
1+
@import exercise.dto.users.UserPage
2+
@param UserPage page
3+
4+
@template.layout.page(
5+
6+
content = @`
7+
<h2>${page.getUser().getFirstName()} ${page.getUser().getLastName()}</h2>
8+
<div>${page.getUser().getEmail()}</div>
9+
`,
10+
footer = @`
11+
<p>Thanks for visiting, come again soon!</p>
12+
`
1313
)

0 commit comments

Comments
 (0)