Skip to content

made the summary display in a table #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 14, 2023
Merged

made the summary display in a table #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/ru/javawebinar/basejava/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class Config {
public static Config get() {
if (INSTANCE == null) {
Properties properties = new Properties();
File fileWithProperties = new File("config/resumes.properties");
File fileWithProperties = new File(getHomeDir(), "config/resumes.properties");

try (InputStream is = new FileInputStream(fileWithProperties)) {
properties.load(is);
Expand All @@ -44,4 +44,13 @@ public File getStorageDir() {
public Storage getStorage() {
return storage;
}

private static File getHomeDir() {
String prop = System.getProperty("homeDir");
File homeDir = new File(prop != null ? prop : ".");
if (!homeDir.isDirectory()) {
throw new IllegalStateException(homeDir + " isn't directory!");
}
return homeDir;
}
}
5 changes: 5 additions & 0 deletions src/ru/javawebinar/basejava/storage/SqlStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ public class SqlStorage implements Storage {
private final SqlHelper sqlHelper;

public SqlStorage(String dbUrl, String dbUser, String dbPassword) {
try {
Class.forName("org.postgresql.Driver");
} catch (ClassNotFoundException e) {
throw new IllegalStateException(e);
}
sqlHelper = new SqlHelper(() -> DriverManager.getConnection(dbUrl, dbUser, dbPassword));
}

Expand Down
37 changes: 35 additions & 2 deletions src/ru/javawebinar/basejava/web/ResumeServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,52 @@
package ru.javawebinar.basejava.web;

import java.io.Writer;
import javax.servlet.*;
import javax.servlet.http.*;
import java.io.IOException;
import ru.javawebinar.basejava.Config;
import ru.javawebinar.basejava.model.ContactType;
import ru.javawebinar.basejava.model.Resume;
import ru.javawebinar.basejava.storage.Storage;

public class ResumeServlet extends HttpServlet {

private final Storage storage = Config.get().getStorage();


@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
request.setCharacterEncoding("UTF-8");
response.setCharacterEncoding("UTF-8");
response.setContentType("text/html; charset=UTF-8");
String name = request.getParameter("name");
response.getWriter().write(name == null ? "Hello Resumes!" : "Hello " + name + '!');
Writer writer = response.getWriter();
writer.write(
"<html>\n" +
"<head>\n" +
" <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n" +
" <link rel=\"stylesheet\" href=\"css/style.css\">\n" +
" <title>Список всех резюме</title>\n" +
"</head>\n" +
"<body>\n" +
"<section>\n" +
"<table border=\"1\" cellpadding=\"8\" cellspacing=\"0\">\n" +
" <tr>\n" +
" <th>Имя</th>\n" +
" <th>Email</th>\n" +
" </tr>\n");
for (Resume resume : storage.getAllSorted()) {
writer.write(
"<tr>\n" +
" <td><a href=\"resume?uuid=" + resume.getUuid() + "\">" + resume.getFullName()
+ "</a></td>\n" +
" <td>" + resume.getContact(ContactType.EMAIL) + "</td>\n" +
"</tr>\n");
}
writer.write("</table>\n" +
"</section>\n" +
"</body>\n" +
"</html>\n");
}

@Override
Expand Down