lanlab-org · vicky-ZhuWenqi · Dec 9, 2020 · Dec 9, 2020 · Dec 9, 2020 · Dec 9, 2020
diff --git a/.gitignore b/.gitignore
diff --git a/201836900114_maintenance_story.txt b/201836900114_maintenance_story.txt
@@ -0,0 +1,11 @@
+GitHub link: 
+https://github.com/lanlab-org/OAPS-Jifry/tree/201836900114-zwq
+
+Group information:
+201836900106    洪  仪
+201836900113    许璐怡
+201836900114    朱文琦
+201836900115    诸斯涔
+
+concise maintenance story:
+添加了在主页自动推送popular article的功能，由于最初版本的jifry项目没有管理员界面，所以我们直接为项目在主页顶端添加了自动显示点赞最高的两篇文章以实现文章推荐功能，用户就可以根据推荐去浏览想看的文章。
diff --git a/The things I have done.txt b/The things I have done.txt
diff --git a/WZF_OAPS.iml b/WZF_OAPS.iml
diff --git a/src/main/webapp/Contact.jsp → WebContent/Aboutus.jsp b/src/main/webapp/Contact.jsp → WebContent/Aboutus.jsp
@@ -1,10 +1,10 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8">
-<title>Contact</title>
+<meta charset="ISO-8859-1">
+<title>About us</title>
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 <link rel="stylesheet" type="text/css" href="style.css">
 <style type="text/css">
@@ -33,7 +33,7 @@ header a
 	margin-left:25px;
 	text-decoration:none;
 	color:white;
-	cursor:default;
+	cursor:
 }
 
 header a:hover
@@ -77,43 +77,37 @@ footer
 	font-size:20px;
 	margin-top:50px;
 }
-    .email {
-        text-align: center;
-        margin: 10px auto;
-    }
 
 </style>
 </head>
 <body>
 
 <header>
 <nav>
-
 <a href="Controller?page=home">Home</a>
 <a href="Controller?page=aboutus">About us</a>
 <a href="Controller?page=contact">Contact</a>
-<a href="Controller?page=administrator">Admin</a>
+<a href="Controller?page=admin">Admin</a>
 
-<form action="Controller" method="post">
+<form action="/OAPS/Controller" method="post">
 <input type="hidden" name="page" value="select">
 <select name="option">
 <option value="Articles">Articles</option>
 </select>
 <button>go</button>
 </form>
 
-<form action="Controller" method="post">
+<form action="/OAPS/Controller" method="post">
 <input type="hidden" name="page" value="search">
 <input type="text" name="search2" required>
 <button>search</button>
 </form>
 </nav>
 </header>
 
-<h2 class="email">开发者邮箱：<a href="mailto:1614518467@qq.com">1614518467@qq.com</a></h2>
 <footer>
-2020 copyright&copy;Wu Zhongfu
+2019 copyright&copy;mjh.mohamed
 </footer>
 
 </body>
-</html>
+</html>
diff --git a/target/WZF_OAPS/Author.jsp → WebContent/Admin.jsp b/target/WZF_OAPS/Author.jsp → WebContent/Admin.jsp
@@ -1,12 +1,11 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-
 
 <!DOCTYPE html>
 <html>
 <head>
-<meta charset="UTF-8">
+<meta charset="ISO-8859-1">
 <title>Admin</title>
 <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
 <link rel="stylesheet" type="text/css" href="style.css">
@@ -36,7 +35,7 @@ header a
 	margin-left:25px;
 	text-decoration:none;
 	color:white;
-	cursor:default;
+	cursor:
 }
 
 header a:hover
@@ -127,21 +126,20 @@ footer
 
 <header>
 <nav>
-
 <a href="Controller?page=home">Home</a>
 <a href="Controller?page=aboutus">About us</a>
 <a href="Controller?page=contact">Contact</a>
-<a href="Controller?page=administrator">Admin</a>
+<a href="Controller?page=admin">Admin</a>
 
-<form action="Controller" method="post">
+<form action="/OAPS/Controller" method="post">
 <input type="hidden" name="page" value="select">
 <select name="option">
 <option value="Articles">Articles</option>
 </select>
 <button>go</button>
 </form>
 
-<form action="Controller" method="post">
+<form action="/OAPS/Controller" method="post">
 <input type="hidden" name="page" value="search">
 <input type="text" name="search2" required>
 <button>search</button>
@@ -150,22 +148,21 @@ footer
 </header>
 
 
-<form action="AdministratorController" method="post" class="form1">
+<form action="/OAPS/AdminController" method="post" class="form1">
 <table>
 <tr><td><h1>Admin Login</h1></td></tr>
-<tr><td><input type="hidden" name="page" value="administrator"></td></tr>
+<tr><td><input type="hidden" name="page" value="admin"></td></tr>
 <tr><td><input type="email" name="email" required></td></tr>
 <tr><td><input type="password" name="password" required></td></tr>
-<tr><td><button>Admin Login</button></td></tr>
-<tr><td> <a href="AuthorController?page=register">register</a> </td></tr>
+<tr><td><button>login</button></td></tr>
+<tr><td> <a href="AdminController?page=register">register</a> </td></tr>
 <tr><td style="color:red"> <c:out value="${ msg}"></c:out> </td></tr>
 </table>
 </form>
-<h3 style="text-align: center;">${advice}</h3>
 
 
 <footer>
-2020 copyright&copy;Wu Zhongfu
+2019 copyright&copy;mjh.mohamed
 </footer>
 
 </body>

diff --git a/WebContent/AdminEdit.jsp b/WebContent/AdminEdit.jsp
@@ -0,0 +1,134 @@
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>  
+<%@ taglib uri="http://java.sun.com/jsp/jstl/sql" prefix="sql" %>     
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="ISO-8859-1">
+<title>Insert title here</title>
+<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+<link rel="stylesheet" type="text/css" href="style.css">
+<style type="text/css">
+
+header h1
+{
+	float:left;
+	color:white;
+	margin-left:20px;
+}
+
+header nav
+{
+	float:right;
+	margin-right:20px;
+}
+
+.form1
+{
+	width:60%;
+	margin: 0px auto;
+	font-size:20px;
+}
+
+table
+{
+	margin:20px;
+}
+
+.form1 input
+{
+	width:200%;
+	margin-bottom:15px;
+	border-radius:3px;
+	padding-left:5px;
+}
+
+footer
+{
+	background:black;
+	height:40px;
+	color:white;
+	text-align:center;
+	padding:5px;
+	font-size:20px;
+	margin-top:50px;
+}
+
+</style>
+
+</head>
+<body>
+
+<header>
+<h1>Welcome Admin</h1>
+<nav>
+<a href="AdminController?page=home">Home</a>
+<a href="AdminController?page=articles"></a>
+<a href="AdminController?page=logout">logout</a>
+</nav>
+</header>
+
+
+<sql:setDataSource user="root" password="1234" url="jdbc:mysql://localhost:3306/ooad?serverTimezone=UTC&&autoReconnect=true&&useSSL=false" driver="com.mysql.cj.jdbc.Driver" var="db" />
+
+<sql:query var="result" dataSource="${ db}">
+	select * from article where title='<%= request.getAttribute("title")%>'
+</sql:query>
+
+<c:forEach items="${ result.rows}" var="row">
+
+
+<form class="form1" action="/OAPS/AdminController" method="post">
+<input type="hidden" name="page" value="edit-form">
+<input type="hidden" name="old-title" value="<%= request.getAttribute("title")%>">
+<table>
+
+<tr>
+<td>Current Subject</td>
+</tr>
+
+<tr>
+<td><input type="text" name="subject" value="<c:out value="${ row.subject}"></c:out>" readonly style="background:lightgray"></td>
+</tr>
+
+<tr>
+<td>Title</td>
+</tr>
+
+<tr>
+<td><input type="text" name="title" value="<c:out value="${ row.title}"></c:out>" placeholder="Enter title" required></td>
+</tr>
+
+<tr>
+<td>Highlights</td>
+</tr>
+
+<tr>
+<td><input type="text" name="highlights" value="<c:out value="${ row.highlight}"></c:out>" placeholder="Enter highlights" required></td>
+</tr>
+
+<tr>
+<td>Abstract</td>
+</tr>
+
+<tr>
+<td><input type="text" name="abstracts" value="<c:out value="${ row.abstracts}"></c:out>" placeholder="Enter abstract" required></td>
+</tr>
+
+
+<tr>
+<td><button>update</button></td>
+</tr>
+
+</table>
+</form>
+
+</c:forEach>
+
+<footer>
+2019 copyright&copy;mjh.mohamed
+</footer>
+
+</body>
+</html>