diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 3da3c92daba41d7eed78e7b0e0ebf9afc469bb1d..94a25f7f4cb416c083d265558da75d457237d671 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/ext ironing/myteam" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 67300cd73f07efc3bbcd4ab1c3c77a6982a677f5..94be569ab3924b03b3bcb5bc58e6f864fb93bbe5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,7 +5,16 @@
</component>
<component name="ChangeListManager">
<list default="true" id="5d66d739-0810-4bfa-9039-29f5df43a961" name="更改" comment="111">
+ <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/.idea/.gitignore" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/.idea/modules.xml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/.idea/webcodegit.iml" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/main.css" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/taobao.css" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/exercise/taobao.html" beforeDir="false" />
+ <change beforePath="$PROJECT_DIR$/ext ironing/myteam" beforeDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -24,32 +33,32 @@
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
<option name="ROOT_SYNC" value="DONT_SYNC" />
</component>
- <component name="GitLabMergeRequestFiltersHistory"><![CDATA[{
- "history": [
+ <component name="GitLabMergeRequestFiltersHistory">{
+ "history": [
{
- "state": "MERGED",
- "assignee": {
- "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
- "username": "c24058946",
- "fullname": "Zhicheng Xu"
+ "state": "MERGED",
+ "assignee": {
+ "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
+ "username": "c24058946",
+ "fullname": "Zhicheng Xu"
}
}
],
- "lastFilter": {
- "state": "MERGED",
- "assignee": {
- "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
- "username": "c24058946",
- "fullname": "Zhicheng Xu"
+ "lastFilter": {
+ "state": "MERGED",
+ "assignee": {
+ "type": "org.jetbrains.plugins.gitlab.mergerequest.ui.filters.GitLabMergeRequestsFiltersValue.MergeRequestsMemberFilterValue.MergeRequestsAssigneeFilterValue",
+ "username": "c24058946",
+ "fullname": "Zhicheng Xu"
}
}
-}]]></component>
- <component name="GitLabMergeRequestsSettings"><![CDATA[{
- "selectedUrlAndAccountId": {
- "first": "https://git.cardiff.ac.uk/c23096663/myteam.git",
- "second": "e7ab46ee-4d9f-4595-99aa-40fd7f0f73ea"
+}</component>
+ <component name="GitLabMergeRequestsSettings">{
+ "selectedUrlAndAccountId": {
+ "first": "https://git.cardiff.ac.uk/c23096663/myteam.git",
+ "second": "e7ab46ee-4d9f-4595-99aa-40fd7f0f73ea"
}
-}]]></component>
+}</component>
<component name="HighlightingSettingsPerFile">
<setting file="file://$PROJECT_DIR$/taobao.css" root0="SKIP_INSPECTION" />
</component>
@@ -66,24 +75,24 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent"><![CDATA[{
- "keyToString": {
- "DefaultHtmlFileTemplate": "HTML File",
- "JavaScript 调试.member home page.html.executor": "Run",
- "JavaScript 调试.taobao.html.executor": "Run",
- "RunOnceActivity.ShowReadmeOnStart": "true",
- "git-widget-placeholder": "master",
- "last_opened_file_path": "D:/webcodegit",
- "list.type.of.created.stylesheet": "CSS",
- "node.js.detected.package.eslint": "true",
- "node.js.detected.package.tslint": "true",
- "node.js.selected.package.eslint": "(autodetect)",
- "node.js.selected.package.tslint": "(autodetect)",
- "nodejs_package_manager_path": "npm",
- "settings.editor.selected.configurable": "vcs.Git",
- "vue.rearranger.settings.migration": "true"
+ <component name="PropertiesComponent">{
+ "keyToString": {
+ "DefaultHtmlFileTemplate": "HTML File",
+ "JavaScript 调试.member home page.html.executor": "Run",
+ "JavaScript 调试.taobao.html.executor": "Run",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "git-widget-placeholder": "c24058946-main-patch-98829",
+ "last_opened_file_path": "D:/webcodegit",
+ "list.type.of.created.stylesheet": "CSS",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "settings.editor.selected.configurable": "vcs.Git",
+ "vue.rearranger.settings.migration": "true"
}
-}]]></component>
+}</component>
<component name="SharedIndexes">
<attachedChunks>
<set>
@@ -100,7 +109,11 @@
<option name="presentableId" value="Default" />
<updated>1728398002254</updated>
<workItem from="1728398003914" duration="4894000" />
- <workItem from="1728550406289" duration="9937000" />
+ <workItem from="1728550406289" duration="10133000" />
+ <workItem from="1728561190426" duration="17000" />
+ <workItem from="1728561255150" duration="1706000" />
+ <workItem from="1728562981639" duration="300000" />
+ <workItem from="1728563291174" duration="382000" />
</task>
<task id="LOCAL-00001" summary="111">
<option name="closed" value="true" />
@@ -110,7 +123,15 @@
<option name="project" value="LOCAL" />
<updated>1728559850168</updated>
</task>
- <option name="localTasksCounter" value="2" />
+ <task id="LOCAL-00002" summary="111">
+ <option name="closed" value="true" />
+ <created>1728560534167</created>
+ <option name="number" value="00002" />
+ <option name="presentableId" value="LOCAL-00002" />
+ <option name="project" value="LOCAL" />
+ <updated>1728560534167</updated>
+ </task>
+ <option name="localTasksCounter" value="3" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
diff --git a/exercise/.idea/.gitignore b/exercise/.idea/.gitignore
deleted file mode 100644
index 10b731c518c79596ed8690544cfbc87a98cf7e36..0000000000000000000000000000000000000000
--- a/exercise/.idea/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-# 默认忽略的文件
-/shelf/
-/workspace.xml
-# 基于编辑器的 HTTP 客户端请求
-/httpRequests/
diff --git a/exercise/.idea/modules.xml b/exercise/.idea/modules.xml
deleted file mode 100644
index e7d09053d5012775efbadfafe0697ad6dea34496..0000000000000000000000000000000000000000
--- a/exercise/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ProjectModuleManager">
- <modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/webcodegit.iml" filepath="$PROJECT_DIR$/.idea/webcodegit.iml" />
- </modules>
- </component>
-</project>
\ No newline at end of file
diff --git a/exercise/.idea/webcodegit.iml b/exercise/.idea/webcodegit.iml
deleted file mode 100644
index 24643cc37449b4bde54411a80b8ed61258225e34..0000000000000000000000000000000000000000
--- a/exercise/.idea/webcodegit.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
- <component name="NewModuleRootManager">
- <content url="file://$MODULE_DIR$">
- <excludeFolder url="file://$MODULE_DIR$/.tmp" />
- <excludeFolder url="file://$MODULE_DIR$/temp" />
- <excludeFolder url="file://$MODULE_DIR$/tmp" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
\ No newline at end of file
diff --git a/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp b/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp
deleted file mode 100644
index ca1ac62e901097c44615d0588fbbfc822e71b97d..0000000000000000000000000000000000000000
Binary files a/exercise/689d1554-9651-4cfe-9f2b-49c815ed30e1.webp and /dev/null differ
diff --git a/exercise/main.css b/exercise/main.css
deleted file mode 100644
index 337a8223380cd045275cb0c2021f09bc16d273c9..0000000000000000000000000000000000000000
--- a/exercise/main.css
+++ /dev/null
@@ -1,23 +0,0 @@
-.header{
- /*设置容器的大å°ï¼Œç„¶åŽè®©å®¹å™¨å†…的图片ä¸ä¼šè¶…出去*/
- border-color: black;/*å¯è§†åŒ–边框范围用*/
- border-style: solid;
- width: 100%;
- height: 120px;
- overflow: hidden;
- /*图片超出容器的部分éšè—掉 */
- position: relative;
- /*这个postionæ˜¯ç”¨äºŽè§„èŒƒï¼Œå› ä¸ºimgçš„headerçš„å类，å类的position写的absolute是相对于父类的absolute，规范写法需è¦åŠ 上*/
-
-
-}
-/*将图片按照容器的大å°è¿›è¡Œé€‚é…，统一高度并居ä¸*/
-.header img{
- height: 120px;
- position: absolute;
- /*设置图片是ç»å¯¹ä½ç½®ï¼Œå¹¶ä¸”是ç»å¯¹æ˜¯ä»Žå®¹å™¨çš„左一åŠçš„ä½ç½®å¼€å§‹æ˜¾ç¤º*/
- left: 50%;
- transform: translateX(-50%);
- transform是移动属性，X轴移动-50% 也就是å‘左移动一åŠçš„è·ç¦»ï¼Œè¿™æ ·å°±ä¸€å®šæ˜¯å±…ä¸æ˜¾ç¤ºçš„图片
-
-}
\ No newline at end of file
diff --git a/exercise/taobao.css b/exercise/taobao.css
deleted file mode 100644
index e04eaae0bc4a8fd38cf915c2b70c491fdf6f6665..0000000000000000000000000000000000000000
--- a/exercise/taobao.css
+++ /dev/null
@@ -1,6 +0,0 @@
-body,divdl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0;}
-body{text-align:center;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
-li{ list-style:none}
-a{ text-decoration:none}
-img{border:none;}
-
diff --git a/exercise/taobao.html b/exercise/taobao.html
deleted file mode 100644
index 0fae286eec922218ce249d5c76d504cec4f43822..0000000000000000000000000000000000000000
--- a/exercise/taobao.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>å°ç±³</title>
- <link rel="stylesheet" href="taobao.css">
- <link rel="stylesheet" href="main.css">
-</head>
-
-<body>
-<!--顶部æ -->
-<div class="header">
- <a href="https://www.dota2.com/home">
- <img src="689d1554-9651-4cfe-9f2b-49c815ed30e1.webp" alt="dota2">
- </a>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ext ironing/myteam b/ext ironing/myteam
deleted file mode 160000
index 25f88379848002816ca7fa57c9e6021de6ed74bf..0000000000000000000000000000000000000000
--- a/ext ironing/myteam
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25f88379848002816ca7fa57c9e6021de6ed74bf