17
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c2849f2..3bf71e7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,7 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="ab19ce1b-f89c-47e9-85b3-501caccc0201" name="Default" comment="">
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/eventsHandler.js" afterPath="$PROJECT_DIR$/public/eventsHandler.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/views/mapp.ejs" afterPath="$PROJECT_DIR$/views/mapp.ejs" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/style/styles.css" afterPath="$PROJECT_DIR$/public/style/styles.css" />
</list>
<ignored path="intelIoTHackathon.iws" />
<ignored path=".idea/workspace.xml" />
@@ -47,7 +49,7 @@
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="68" column="42" selection-start-line="68" selection-start-column="42" selection-end-line="68" selection-end-column="42" />
+ <caret line="50" column="18" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="18" />
<folding />
</state>
</provider>
@@ -56,23 +58,13 @@
<file leaf-file-name="config.json" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/config/config.json">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state vertical-scroll-proportion="-9.375">
<caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="index.ejs" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/views/index.ejs">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.875">
- <caret line="3" column="28" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="lkLayout.ejs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/layout/lkLayout.ejs">
<provider selected="true" editor-type-id="text-editor">
@@ -83,47 +75,39 @@
</provider>
</entry>
</file>
- <file leaf-file-name="eventsHandler.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="mapp.ejs" pinned="false" current-in-tab="true">
+ <file leaf-file-name="mapp.ejs" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/views/mapp.ejs">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.39473686">
- <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+ <state vertical-scroll-proportion="-15.625">
+ <caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#1;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#2;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#div#3;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#1;n#div#3;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="styles.css" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/style/styles.css">
+ <file leaf-file-name="eventsHandler.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
+ <caret line="13" column="34" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="normalize.css" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/public/style/normalize.css">
+ <file leaf-file-name="styles.css" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/public/style/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+ <state vertical-scroll-proportion="0.78125">
+ <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
<folding />
</state>
</provider>
@@ -153,10 +137,11 @@
<option value="$PROJECT_DIR$/config/config.json" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/views/index.ejs" />
- <option value="$PROJECT_DIR$/public/eventsHandler.js" />
<option value="$PROJECT_DIR$/routes/index.js" />
<option value="$PROJECT_DIR$/public/styles.css" />
+ <option value="$PROJECT_DIR$/public/eventsHandler.js" />
<option value="$PROJECT_DIR$/views/mapp.ejs" />
+ <option value="$PROJECT_DIR$/public/style/styles.css" />
</list>
</option>
</component>
@@ -906,14 +891,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/config/config.json">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
@@ -937,9 +914,17 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/public/style/normalize.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/views/index.ejs">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.875">
+ <state vertical-scroll-proportion="0.098684214">
<caret line="3" column="28" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
<folding />
</state>
@@ -953,51 +938,53 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/routes/index.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="68" column="42" selection-start-line="68" selection-start-column="42" selection-end-line="68" selection-end-column="42" />
+ <caret line="50" column="18" selection-start-line="50" selection-start-column="17" selection-end-line="50" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/style/styles.css">
+ <entry file="file://$PROJECT_DIR$/config/config.json">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="16" column="1" selection-start-line="16" selection-start-column="1" selection-end-line="16" selection-end-column="1" />
+ <state vertical-scroll-proportion="-9.375">
+ <caret line="15" column="29" selection-start-line="15" selection-start-column="29" selection-end-line="15" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/public/style/normalize.css">
+ <entry file="file://$PROJECT_DIR$/public/eventsHandler.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="8" column="6" selection-start-line="8" selection-start-column="6" selection-end-line="8" selection-end-column="6" />
+ <caret line="13" column="34" selection-start-line="13" selection-start-column="33" selection-end-line="13" selection-end-column="34" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/views/mapp.ejs">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.39473686">
- <caret line="12" column="39" selection-start-line="12" selection-start-column="39" selection-end-line="12" selection-end-column="39" />
+ <state vertical-scroll-proportion="-15.625">
+ <caret line="25" column="29" selection-start-line="25" selection-start-column="29" selection-end-line="25" selection-end-column="29" />
<folding>
<element signature="n#style#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#0;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#img#1;n#div#3;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#0;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#2;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#0;n#div#3;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#img#1;n#div#3;n#section#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/public/style/styles.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.78125">
+ <caret line="25" column="18" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="18" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/public/eventsHandler.js b/public/eventsHandler.js
index e2f5ee8..c5020e9 100644
--- a/public/eventsHandler.js
+++ b/public/eventsHandler.js
@@ -1,5 +1,31 @@
$(document).ready(function(){
+ window.reserve = false;
+ $.ajax({
+ url:"/parkingContext",
+ success:function(result){
+ $('#spaceCounter').html(result.freeSpaces);
+ $('section').fadeIn(500);
+ }
+ });
-
+ $('#reserve').click(function(){
+ if(reserve) {
+ $('#alert').html("Нельзя бронировать больше одного места");
+ setTimeout(function(){
+ $('#alert').html("Для Вас забронировано 1 место");
+ }, 2000);
+ return false;
+ }
+ $.ajax({
+ url:"/bookPlace",
+ method:"POST",
+ success:function(){
+ $('#alert').html("Мы забронировали Вам место!").fadeIn(300);
+ setTimeout(function(){
+ $('#alert').html("Для Вас забронировано 1 место");
+ }, 2000);
+ }
+ });
+ })
})
\ No newline at end of file
diff --git a/public/style/styles.css b/public/style/styles.css
index 23b075d..a3c8e55 100644
--- a/public/style/styles.css
+++ b/public/style/styles.css
@@ -1,17 +1,27 @@
body{
min-width: 100%;
min-height: 100%;
+ color:#0068C4;
+ text-align:center;
+ font-family: 'sans-serif';
+ font-weight: 700;
}
+
div{
width: 300px;
height: 100px;
margin: 0px auto;
text-align:center;
- color:#0068C4;
font-family: 'sans-serif';
font-weight: 700;
}
#buttons{
margin-top:30px;
+}
+#buttons img{
+ cursor: pointer;
+}
+.alert{
+ display: none;
}
\ No newline at end of file
diff --git a/views/mapp.ejs b/views/mapp.ejs
index b5a3bc5..6b0ef0c 100644
--- a/views/mapp.ejs
+++ b/views/mapp.ejs
@@ -4,28 +4,32 @@
<title></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"></script>
- <script src="http://"></script>
+ <script src="/eventsHandler.js"></script>
<link rel="stylesheet" href="/style/styles.css"/>
</head>
-<body style="height: 600px">
+ <body style="height: 600px">
+ <section style="display:none">
+ <div style="height: 100px; margin-top:50px">
+ <img src="/images/SMART - PARKING.png">
+ </div>
+ <div style="height: 40px;">
+ <img src="/images/Nev.png">
+ </div>
+ <div style="height: 30px; ">
+ Количество мест: <span id='spaceCounter'></span>
+ </div>
+ <div id='buttons' >
+ <img src="/images/P.png" style="margin: 10px">
+ <img src="/images/Reserve.png" id = 'reserve'style="margin: 10px">
+ </div>
+ <p class="alert" >
+ </p>
-<div style="height: 100px; margin-top:50px">
- <img src="/images/SMART - PARKING.png">
-</div>
-<div style="height: 40px;">
- <img src="/images/Nev.png">
-</div>
-<div style="height: 30px; ">
- Количество мест: <span id='spaceCounter'></span>
-</div>
-<div id='buttons' >
- <img src="/images/P.png" style="margin: 10px">
- <img src="/images/Reserve.png" style="margin: 10px">
-</div>
+ </section>
-<script>
+ <script>
-</script>
-</body>
+ </script>
+ </body>
</html>
\ No newline at end of file