Skip to content

Commit 390fdf6

Browse files
hexlet-clihexlet-cli
committed
submit java-web-ru/template
1 parent aaa53b7 commit 390fdf6

File tree

5 files changed

+133
-133
lines changed

5 files changed

+133
-133
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/dynamic-routes"}
1+
{"assignment":"java-web-ru/template"}

‎java-web-ru/template/gradlew‎

100644100755
File mode changed.

‎java-web-ru/template/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

‎java-web-ru/template/src/main/jte/users/index.jte‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
@import exercise.dto.users.UsersPage
2-
@param UsersPage page
3-
4-
<h1>Users</h1>
5-
<table class="table">
6-
<thead>
7-
<tr>
8-
<th>ID</th>
9-
<th>Full Name</th>
10-
<th>Email</th>
11-
<th>Actions</th>
12-
</tr>
13-
</thead>
14-
<tbody>
15-
@for(var user : page.getUsers())
16-
<tr>
17-
<td>${user.getId()}</td>
18-
<td>${user.getFirstName()} ${user.getLastName()}</td>
19-
<td>${user.getEmail()}</td>
20-
<td>
21-
<a href="/users/${user.getId()}" class="btn btn-primary">View</a>
22-
</td>
23-
</tr>
24-
@endfor
25-
</tbody>
1+
@import exercise.dto.users.UsersPage
2+
@param UsersPage page
3+
4+
<h1>Users</h1>
5+
<table class="table">
6+
<thead>
7+
<tr>
8+
<th>ID</th>
9+
<th>Full Name</th>
10+
<th>Email</th>
11+
<th>Actions</th>
12+
</tr>
13+
</thead>
14+
<tbody>
15+
@for(var user : page.getUsers())
16+
<tr>
17+
<td>${user.getId()}</td>
18+
<td>${user.getFirstName()} ${user.getLastName()}</td>
19+
<td>${user.getEmail()}</td>
20+
<td>
21+
<a href="/users/${user.getId()}" class="btn btn-primary">View</a>
22+
</td>
23+
</tr>
24+
@endfor
25+
</tbody>
2626
</table>

‎java-web-ru/template/src/main/jte/users/show.jte‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
@import exercise.dto.users.UserPage
2-
@param UserPage page
3-
4-
<h1>User Details</h1>
5-
<div class="card">
6-
<div class="card-body">
7-
<h5 class="card-title">${page.getUser().getFirstName()} ${page.getUser().getLastName()}</h5>
8-
<p class="card-text">
9-
<strong>ID:</strong> ${page.getUser().getId()}<br>
10-
<strong>First Name:</strong> ${page.getUser().getFirstName()}<br>
11-
<strong>Last Name:</strong> ${page.getUser().getLastName()}<br>
12-
<strong>Email:</strong> ${page.getUser().getEmail()}
13-
</p>
14-
<a href="/users" class="btn btn-primary">Back to users list</a>
15-
</div>
1+
@import exercise.dto.users.UserPage
2+
@param UserPage page
3+
4+
<h1>User Details</h1>
5+
<div class="card">
6+
<div class="card-body">
7+
<h5 class="card-title">${page.getUser().getFirstName()} ${page.getUser().getLastName()}</h5>
8+
<p class="card-text">
9+
<strong>ID:</strong> ${page.getUser().getId()}<br>
10+
<strong>First Name:</strong> ${page.getUser().getFirstName()}<br>
11+
<strong>Last Name:</strong> ${page.getUser().getLastName()}<br>
12+
<strong>Email:</strong> ${page.getUser().getEmail()}
13+
</p>
14+
<a href="/users" class="btn btn-primary">Back to users list</a>
15+
</div>
1616
</div>

0 commit comments

Comments
 (0)