Skip to content
Snippets Groups Projects
Commit 8687eda8 authored by Yibo Zhu's avatar Yibo Zhu
Browse files

change login.html and register.html style.css grouplist.html 

grouplist.css
parent a1967a0a
No related branches found
No related tags found
1 merge request!22change login.html and register.html style.css grouplist.html
Show whitespace changes
Inline Side-by-side
Showing
with 230 additions and 95 deletions
.idea/modules.xml
+ 1
− 0
View file @ 8687eda8
......@@ -2,6 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/demo.main.iml" filepath="$PROJECT_DIR$/.idea/modules/demo.main.iml" />
<module fileurl="file://$PROJECT_DIR$/.idea/secondhand disposal.iml" filepath="$PROJECT_DIR$/.idea/secondhand disposal.iml" />
</modules>
</component>
......
.idea/modules/demo.main.iml 0 → 100644
+ 8
− 0
View file @ 8687eda8
<?xml version="1.0" encoding="UTF-8"?>
<module version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$/../../second-hand-disposal-dev/build/generated/sources/annotationProcessor/java/main">
<sourceFolder url="file://$MODULE_DIR$/../../second-hand-disposal-dev/build/generated/sources/annotationProcessor/java/main" isTestSource="false" generated="true" />
</content>
</component>
</module>
\ No newline at end of file
.idea/workspace.xml
+ 29
− 68
View file @ 8687eda8
......@@ -4,68 +4,16 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="3dcf2182-6fdd-4b94-b51f-5c03ef064a21" name="变更" comment="">
<change afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/.vscode/settings.json" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/.gitattributes" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/build.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/gradlew" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/gradlew.bat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/second-hand-disposal/README.md" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/settings.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/application.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/static/css/bootstrap - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/static/css/bootstrap.min - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/static/lib/bootstrap.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/static/lib/jquery.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/bootstrap - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/bootstrap.min - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/grouplist.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/index.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/reset.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/css/style.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/lib/bootstrap.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/lib/grouplist.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/lib/jquery.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/page" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/.gitattributes" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/.gitignore" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/build.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/gradlew" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/gradlew.bat" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/settings.gradle" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/java/uk/ac/cf/spring/demo/DemoApplication.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeItem.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/java/uk/ac/cf/spring/demo/takeaway/index/ExchangeService.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/java/uk/ac/cf/spring/demo/takeaway/index/IndexController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/application.properties" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/static/css/bootstrap - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/static/css/bootstrap.min - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/static/lib/bootstrap.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/static/lib/jquery.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/bootstrap - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/bootstrap.min - Copy.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/index.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/reset.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/style.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/lib/bootstrap.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/lib/jquery.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/groupList.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/itemDetail.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/itemForm.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/itemList.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/login.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/logo.jpg" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/personalInformation.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/register.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/test/java/uk/ac/cf/spring/demo/DemoApplicationTests.java" afterDir="false" />
<list default="true" id="3dcf2182-6fdd-4b94-b51f-5c03ef064a21" name="变更" comment="change">
<change afterPath="$PROJECT_DIR$/.idea/modules/demo.main.iml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/grouplist.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/page" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/exercise/second-hand-disposal/src/main/resources/templates/page" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/css/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/groupList.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/groupList.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/login.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/login.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/register.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/second-hand-disposal/src/main/resources/templates/page/register.html" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -90,13 +38,14 @@
<option name="showLibraryContents" value="true" />
<option name="showScratchesAndConsoles" value="false" />
</component>
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;preferences.pluginManager&quot;
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"SHARE_PROJECT_CONFIGURATION_FILES": "true",
"settings.editor.selected.configurable": "preferences.pluginManager"
}
}</component>
}]]></component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="C:\Users\朱毅博\Desktop\exercise\src\second-hand-disposal\src\main\resources\templates\css" />
......@@ -127,6 +76,18 @@
<option name="presentableId" value="Default" />
<updated>1730196990991</updated>
</task>
<task id="LOCAL-00001" summary="change">
<created>1730374628686</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1730374628686</updated>
</task>
<option name="localTasksCounter" value="2" />
<servers />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="change" />
<option name="LAST_COMMIT_MESSAGE" value="change" />
</component>
</project>
\ No newline at end of file
src/second-hand-disposal/src/main/resources/templates/css/grouplist.css 0 → 100644
+ 110
− 0
View file @ 8687eda8
/* 全局样式 */
body {
font-family: Arial, sans-serif;
background-color: #f5f5f5;
color: #333;
margin: 0;
padding: 0;
animation: fadeIn 1s ease-in-out;
}
h2{
text-align: center;
}
/* 淡入效果 */
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
/* 页眉样式 */
header {
background-color: #4CAF50;
padding: 15px;
text-align: center;
}
header img {
width: 50px;
vertical-align: middle;
}
header ul {
list-style-type: none;
padding: 0;
margin: 10px 0 0;
text-align: center;
}
header ul li {
display: inline;
margin: 0 10px;
}
header ul li a {
color: white;
text-decoration: none;
font-weight: bold;
transition: transform 0.3s, color 0.3s;
}
header ul li a:hover {
transform: scale(1.1);
color: #FFD700;
}
/* 表格样式 */
table {
width: 80%;
margin: 20px auto;
border-collapse: collapse;
background-color: #fff;
box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
transition: transform 0.3s ease;
}
table:hover {
transform: scale(1.02);
}
table,
th,
td {
border: 1px solid #ddd;
}
th,
td {
padding: 12px;
text-align: center;
}
th {
background-color: #4CAF50;
color: white;
}
/* 表格行的悬停效果 */
tr {
transition: background-color 0.3s ease;
}
tr:hover {
background-color: #f1f1f1;
}
a {
color: #4CAF50;
text-decoration: none;
transition: color 0.3s, transform 0.2s;
}
a:hover {
color: #FF6347;
transform: scale(1.1);
}
\ No newline at end of file
src/second-hand-disposal/src/main/resources/templates/css/style.css
+ 1
− 1
View file @ 8687eda8
......@@ -30,7 +30,7 @@ h2{
}
.input-box{
position: relative;
width: 220px;
width: 165px;
margin: 30px 0;
border-bottom: 2px solid #fff;
}
......
src/second-hand-disposal/src/main/resources/templates/page/groupList.html
+ 39
− 1
View file @ 8687eda8
......@@ -3,8 +3,46 @@
<head>
<meta charset="UTF-8">
<title>Title</title>
<link rel="stylesheet" href="../css/grouplist.css">
</head>
<body>
<div>groupList</div>
<header class="safe">
<div>
<img src="logo.jpg" alt="Logo">
</div>
<div class="l">
<ul>
<li><a href="index.html">Index</a></li>
<li><a href="groupList.html">GroupList</a></li>
<li><a href="itemForm.html">ShelfItem</a></li>
<li><a href="personalInformation.html">PersonalInformation</a></li>
</ul>
</div>
</header>
<h2>GroupList</h2>
<table>
<thead>
<tr>
<th>ID</th>
<th>Name</th>
<th>Description</th>
<th>Join</th>
</tr>
<tr>
<th>0</th>
<th>British</th>
<th>xx</th>
<th><a href="itemList.html">enter</a></th>
</tr>
<tr>
<th>1</th>
<th>America</th>
<th>xx</th>
<th><a href="itemList.html">enter</a></th>
</tr>
</thead>
</table>
</body>
<script src="../lib/grouplist.js"></script>
</html>
\ No newline at end of file
src/second-hand-disposal/src/main/resources/templates/page/login.html
+ 17
− 6
View file @ 8687eda8
......@@ -3,27 +3,38 @@
<head>
<meta charset="UTF-8">
<title>Title</title>
<link rel="stylesheet" href="../static/css/style.css">
<link rel="stylesheet" href="../css/style.css">
</head>
<body>
<div class="blob"></div>
<div class="wrapper">
<form action="">
<form action="groupList.html" onsubmit="return validateForm">
<h2>Homepage</h2>
<div class="input-box">
<input type="email" required>
<input type="email" id="email" required>
<label >Email</label>
</div>
<div class="input-box">
<input type="password" required>
<input type="password" id="password" required>
<label >Password</label>
</div>
<button type="submit">log in</button>
<button type="submit">Log in</button>
<div class="register-link">
<p>Don't have account?<a href="register.html">Resgiter</a></p>
</div>
</form>
</div>
<script>
function validateForm() {
const email = document.getElementById('email').value;
const password = document.getElementById('password').value;
if (!email || !password) {
alert('Please enter both email and password.');
return false;
}
return true;
}
</script>
</body>
</html>
\ No newline at end of file
src/second-hand-disposal/src/main/resources/templates/page/register.html
+ 25
− 19
View file @ 8687eda8
......@@ -3,26 +3,32 @@
<head>
<meta charset="UTF-8">
<title>Title</title>
<link rel="stylesheet" href="../static/css/style.css">
<link rel="stylesheet" href="../css/style.css">
</head>
<body>
<div class="blob"></div>
<div class="wrapper">
<form action="">
<form action="groupList.html" onsubmit="return validateForm()">
<h2>Register</h2>
<div class="input-box">
<input type="email" required>
<label for="">登录邮箱</label>
<label >Email</label>
</div>
<div class="input-box">
<input type="password" required>
<label for="">输入密码</label>
<label >Password</label>
</div>
<div class="input-box">
<input type="password" required>
<label for="">确认密码</label>
<label >Again</label>
</div>
<button type="submit">success</button>
</form>
<script>
function validateForm(){
}
</script>
</div>
</body>
</html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment