Skip to content
Snippets Groups Projects
Commit f15fd17f authored by Explorerose's avatar Explorerose
Browse files

M2

parent 6c1cd7c3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 33
− 28
View file @ f15fd17f
...@@ -2,13 +2,8 @@ ...@@ -2,13 +2,8 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="1d6634ec-b7ad-4ab3-b01a-3030dcab967e" name="Default Changelist" comment=""> <list default="true" id="1d6634ec-b7ad-4ab3-b01a-3030dcab967e" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/Java codes/src/Database.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/Java codes/src/Process.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Interface/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/Interface/style.css" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Interface/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/Interface/style.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Java codes/src/Community.java" beforeDir="false" afterPath="$PROJECT_DIR$/Java codes/src/Community.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Interface/welcome page.html" beforeDir="false" afterPath="$PROJECT_DIR$/Interface/welcome page.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Java codes/src/Fridge.java" beforeDir="false" afterPath="$PROJECT_DIR$/Java codes/src/Fridge.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Java codes/src/Main.java" beforeDir="false" afterPath="$PROJECT_DIR$/Java codes/src/Main.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Java codes/src/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/Java codes/src/User.java" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -29,25 +24,27 @@ ...@@ -29,25 +24,27 @@
<entry key="css" value="2" /> <entry key="css" value="2" />
<entry key="html" value="3" /> <entry key="html" value="3" />
<entry key="java" value="2" /> <entry key="java" value="2" />
<entry key="jpg" value="1" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.open"> <usages-collector id="statistics.file.types.open">
<counts> <counts>
<entry key="CSS" value="2" /> <entry key="CSS" value="2" />
<entry key="HTML" value="3" /> <entry key="HTML" value="3" />
<entry key="Image" value="1" />
<entry key="JAVA" value="2" /> <entry key="JAVA" value="2" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.extensions.edit"> <usages-collector id="statistics.file.extensions.edit">
<counts> <counts>
<entry key="css" value="197" /> <entry key="css" value="265" />
<entry key="html" value="50" /> <entry key="html" value="63" />
</counts> </counts>
</usages-collector> </usages-collector>
<usages-collector id="statistics.file.types.edit"> <usages-collector id="statistics.file.types.edit">
<counts> <counts>
<entry key="CSS" value="197" /> <entry key="CSS" value="265" />
<entry key="HTML" value="50" /> <entry key="HTML" value="63" />
</counts> </counts>
</usages-collector> </usages-collector>
</session> </session>
...@@ -63,11 +60,11 @@ ...@@ -63,11 +60,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Interface/welcome page.html"> <entry file="file://$PROJECT_DIR$/Interface/welcome page.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state relative-caret-position="289">
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -81,15 +78,20 @@ ...@@ -81,15 +78,20 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Interface/style.css"> <entry file="file://$PROJECT_DIR$/Interface/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state>
<caret line="1" column="25" lean-forward="true" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" /> <caret selection-end-line="2" selection-end-column="1" />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Interface/food.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FileTemplateManagerImpl"> <component name="FileTemplateManagerImpl">
...@@ -106,8 +108,8 @@ ...@@ -106,8 +108,8 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/Login_v13/welcome page.html" /> <option value="$PROJECT_DIR$/Login_v13/welcome page.html" />
<option value="$PROJECT_DIR$/Interface/welcome page.html" />
<option value="$PROJECT_DIR$/Interface/style.css" /> <option value="$PROJECT_DIR$/Interface/style.css" />
<option value="$PROJECT_DIR$/Interface/welcome page.html" />
</list> </list>
</option> </option>
</component> </component>
...@@ -161,7 +163,7 @@ ...@@ -161,7 +163,7 @@
<property name="DefaultHtmlFileTemplate" value="HTML File" /> <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="aspect.path.notification.shown" value="true" /> <property name="aspect.path.notification.shown" value="true" />
<property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548522646464" /> <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1548523098825" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" /> <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" /> <property name="nodejs_npm_path_reset_for_default_project" value="true" />
...@@ -188,12 +190,12 @@ ...@@ -188,12 +190,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1548511002627</updated> <updated>1548511002627</updated>
<workItem from="1548511007288" duration="4219000" /> <workItem from="1548511007288" duration="4606000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="4219000" /> <option name="totallyTimeSpent" value="4606000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="16" y="23" width="1264" height="777" extended-state="0" /> <frame x="16" y="23" width="1264" height="777" extended-state="0" />
...@@ -204,11 +206,11 @@ ...@@ -204,11 +206,11 @@
<window_info id="UI Designer" /> <window_info id="UI Designer" />
<window_info id="Capture Tool" /> <window_info id="Capture Tool" />
<window_info id="Favorites" side_tool="true" /> <window_info id="Favorites" side_tool="true" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24959083" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24959083" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Database Changes" show_stripe_button="false" /> <window_info anchor="bottom" id="Database Changes" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" /> <window_info anchor="bottom" id="Version Control" />
<window_info active="true" anchor="bottom" id="Terminal" visible="true" weight="0.329927" /> <window_info anchor="bottom" id="Terminal" visible="true" weight="0.329927" />
<window_info anchor="bottom" id="Event Log" side_tool="true" /> <window_info anchor="bottom" id="Event Log" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" /> <window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" /> <window_info anchor="bottom" id="Find" order="1" />
...@@ -268,17 +270,20 @@ ...@@ -268,17 +270,20 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Interface/welcome page.html"> <entry file="file://$PROJECT_DIR$/Interface/food.jpg">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/Interface/style.css">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="274"> <state>
<caret line="32" column="32" selection-start-line="32" selection-start-column="32" selection-end-line="32" selection-end-column="32" /> <caret selection-end-line="2" selection-end-column="1" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Interface/style.css"> <entry file="file://$PROJECT_DIR$/Interface/welcome page.html">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17"> <state relative-caret-position="289">
<caret line="1" column="25" lean-forward="true" selection-start-line="1" selection-start-column="25" selection-end-line="1" selection-end-column="25" /> <caret line="17" column="16" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
Interface/style.css
+ 1
− 6
View file @ f15fd17f
body { body {
background-image: url ("food.jpg" background-image: url("./food.jpg");
background-repeat: repeat-x;);
background-repeat: no-repeat;
background-attachment: fixed;
background-size: cover;
opacity: 0.3;
} }
h1 { h1 {
......
Interface/welcome page.html
+ 4
− 1
View file @ f15fd17f
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel="stylesheet" type="text/css" href="style.css">
<style> <style>
body { body {
<link rel="stylesheet" type="text/css" href="style.css">
} }
h1 { h1 {
...@@ -31,8 +32,10 @@ ...@@ -31,8 +32,10 @@
<br> <br>
<div class="center inside_inline"> <div class="center inside_inline">
<center>
<button id= "button1">Register</button> <button id= "button1">Register</button>
<button>Login</button> <button>Login</button>
</center>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment