Commit 67a847bb authored by jkerr's avatar jkerr
Browse files

Finished css, made massive progress

parent c3efbcf8
......@@ -3,4 +3,7 @@
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="ProjectPlainTextFileTypeManager">
<file url="file://$PROJECT_DIR$/scripts/data/tentInfo.html" />
</component>
</project>
\ No newline at end of file
......@@ -2,14 +2,18 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cccfd40b-d5c2-4431-bcfd-f34d25764049" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/scripts/data/cabinInfo.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/data/tentInfo.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/data/vanInfo.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/jquery-3.3.1.min.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/switchbooking.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/style/siteInfoStyle.css" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/leaflet/leafletAjax.js" afterDir="false" />
<change afterPath="$PROJECT_DIR$/scripts/map.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/images/._camperVan.jpg" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/images/camperVan.jpg" beforeDir="false" afterPath="$PROJECT_DIR$/images/van.jpg" afterDir="false" />
<change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/data/cabinInfo.html" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/data/cabinInfo.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/data/tentInfo.html" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/data/tentInfo.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/data/vanInfo.html" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/data/vanInfo.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/scripts/switchbooking.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/switchbooking.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/style/siteInfoStyle.css" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/style/style.css" beforeDir="false" afterPath="$PROJECT_DIR$/style/style.css" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -28,44 +32,57 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="51" lean-forward="true" selection-start-line="16" selection-start-column="51" selection-end-line="16" selection-end-column="51" />
<state>
<caret column="14" selection-start-column="14" selection-end-column="14" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/style/style.css">
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/scripts/leaflet/leafletAjax.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
<caret column="9338" selection-start-column="9338" selection-end-column="9338" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/switchbooking.js">
<entry file="file://$PROJECT_DIR$/style/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="89" selection-start-line="17" selection-start-column="89" selection-end-line="17" selection-end-column="89" />
<state relative-caret-position="781">
<caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/style/siteInfoStyle.css">
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
<state relative-caret-position="180">
<caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/data/campsites.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/data/POI.geojson">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/data/bookings.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
<state relative-caret-position="75">
<caret line="5" selection-start-line="5" selection-end-line="6" />
</state>
</provider>
</entry>
......@@ -75,10 +92,10 @@
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="JavaScript File" />
<option value="AMD JavaScript File" />
<option value="HTML File" />
<option value="CSS File" />
<option value="JavaScript File" />
</list>
</option>
</component>
......@@ -94,19 +111,22 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/scripts/jquery-3.3.1.min.js" />
<option value="$PROJECT_DIR$/style/siteInfoStyle.css" />
<option value="$PROJECT_DIR$/scripts/data/tentInfo.xml" />
<option value="$PROJECT_DIR$/scripts/data/cabinInfo.html" />
<option value="$PROJECT_DIR$/scripts/data/tentInfo.html" />
<option value="$PROJECT_DIR$/scripts/data/vanInfo.html" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/style/style.css" />
<option value="$PROJECT_DIR$/style/siteInfoStyle.css" />
<option value="$PROJECT_DIR$/scripts/switchbooking.js" />
<option value="$PROJECT_DIR$/scripts/data/tentInfo.html" />
<option value="$PROJECT_DIR$/scripts/map.js" />
<option value="$PROJECT_DIR$/style/style.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/scripts/leaflet/leafletAjax.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="y" value="23" />
<option name="width" value="1059" />
<option name="width" value="1189" />
<option name="height" value="1347" />
</component>
<component name="ProjectLevelVcsManager">
......@@ -133,7 +153,7 @@
<item name="assignment-1" type="b2602c69:ProjectViewProjectNode" />
<item name="assignment-1" type="462c0819:PsiDirectoryNode" />
<item name="scripts" type="462c0819:PsiDirectoryNode" />
<item name="data" type="462c0819:PsiDirectoryNode" />
<item name="leaflet" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="assignment-1" type="b2602c69:ProjectViewProjectNode" />
......@@ -191,6 +211,8 @@
<workItem from="1565755309208" duration="4420000" />
<workItem from="1565927840184" duration="2912000" />
<workItem from="1566271563452" duration="7254000" />
<workItem from="1566278943384" duration="34000" />
<workItem from="1566340107468" duration="6143000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1565679239864</created>
......@@ -206,21 +228,28 @@
<option name="project" value="LOCAL" />
<updated>1565759992852</updated>
</task>
<option name="localTasksCounter" value="3" />
<task id="LOCAL-00003" summary="Finished css, made massive progress">
<created>1566278967193</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1566278967193</updated>
</task>
<option name="localTasksCounter" value="4" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="14763000" />
<option name="totallyTimeSpent" value="20940000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1059" height="1347" extended-state="0" />
<frame x="0" y="23" width="1189" height="1347" extended-state="0" />
<editor active="true" />
<layout>
<window_info content_ui="combo" id="Project" order="0" weight="0.24680433" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21883173" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32988048" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
......@@ -236,27 +265,6 @@
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
</layout>
<layout-to-restore>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24680433" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Database Changes" order="8" />
<window_info anchor="bottom" id="Version Control" order="9" weight="0.32988048" />
<window_info anchor="bottom" id="Terminal" order="10" />
<window_info anchor="bottom" id="Event Log" order="11" side_tool="true" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="right" id="Database" order="3" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
......@@ -264,16 +272,10 @@
<component name="VcsManagerConfiguration">
<MESSAGE value="First Commit" />
<MESSAGE value="Added form, image and some text" />
<option name="LAST_COMMIT_MESSAGE" value="Added form, image and some text" />
<MESSAGE value="Finished css, made massive progress" />
<option name="LAST_COMMIT_MESSAGE" value="Finished css, made massive progress" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/scripts/data/bookings.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-570">
<caret line="5" selection-start-line="5" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/jquery-3.3.1.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
......@@ -284,44 +286,96 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="6" selection-end-line="4" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#h2#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/cabinInfo.html">
<provider selected="true" editor-type-id="text-editor" />
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="4" column="6" lean-forward="true" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="53" lean-forward="true" selection-start-line="3" selection-start-column="53" selection-end-line="3" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/vanInfo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="45">
<caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/POI.geojson">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/scripts/data/bookings.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="5" selection-start-line="5" selection-end-line="6" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/switchbooking.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="51" lean-forward="true" selection-start-line="16" selection-start-column="51" selection-end-line="16" selection-end-column="51" />
<state relative-caret-position="390">
<caret line="26" column="34" selection-start-line="26" selection-start-column="34" selection-end-line="26" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/style/siteInfoStyle.css">
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="2" selection-start-column="2" selection-end-column="2" />
<state relative-caret-position="180">
<caret line="12" column="56" selection-start-line="12" selection-start-column="56" selection-end-line="12" selection-end-column="56" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/style/siteInfoStyle.css">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/style/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="781">
<caret line="176" column="34" selection-start-line="176" selection-start-column="34" selection-end-line="176" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/campsites.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/scripts/leaflet/._leaflet.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="26" selection-start-column="26" selection-end-column="26" />
<caret column="32" lean-forward="true" selection-start-column="32" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/switchbooking.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="89" selection-start-line="17" selection-start-column="89" selection-end-line="17" selection-end-column="89" />
<state>
<caret column="14" selection-start-column="14" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<entry file="file://$PROJECT_DIR$/scripts/leaflet/leafletAjax.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="43" selection-start-line="2" selection-start-column="43" selection-end-line="2" selection-end-column="43" />
<state>
<caret column="9338" selection-start-column="9338" selection-end-column="9338" />
</state>
</provider>
</entry>
......
......@@ -6,6 +6,10 @@
<link rel="stylesheet" href="style/style.css">
<script src="scripts/jquery-3.3.1.min.js"></script>
<script src="scripts/switchbooking.js"></script>
<link rel="stylesheet" href="scripts/leaflet/leaflet.css"/>
<script src="scripts/leaflet/leaflet.js"></script>
<script src="scripts/map.js"></script>
</head>
<body>
<header>
......@@ -21,10 +25,12 @@
<main>
<section id="info">
<section id="infoContainer">
<div id="placedInfo">
<h2>Our Cabins:</h2>
<p>All of our cabins include great views, comfortable beds, and best of all hot showers.
If you are looking for a more comfortable camping experience, our luxury cabins are for you.</p>
</div>
</section>
<section id="book">
<h2>Book a Cabin:</h2>
......@@ -33,12 +39,13 @@
<input id="name" name="name" type="text"><label id="first" for="name">Full Name</label>
<input id="checkIn" name="checkIn" type="date"><label for="checkIn">Check In</label>
<input id="checkOut" name="checkIn" type="date"><label for="checkOut">Check Out</label>
<input id="siteType" name="siteType' type='text">
<input id="siteType" name="siteType' type='text" value="cabin" hidden>
</form>
</section>
<figure id="map"></figure>
<figure id="photo"></figure>
<div id="mapContainer">
<div id="map"></div>
</div>
<figure id="photo"><img src="images/cabin.jpg"></figure>
</main>
......
<div id="placedInfo">
<h2>Our Cabins:</h2>
<p>All of our cabins include great views, comfortable beds, and best of all hot showers.
If you are looking for a more comfortable camping experience, our luxury cabins are for you.</p>
</div>
\ No newline at end of file
<link rel="stylesheet" href="../../style/style.css">
<h2>Our Tent Sites</h2>
<p>And some well-writen info about them</p>
\ No newline at end of file
<div id="placedInfo">
<h2>Our Tent Sites</h2>
<p>Out tent sites are positioned to ensure maximum sunlight, and are in an elevated part
of the camping ground to ensure you stay dry.</p>
</div>
\ No newline at end of file
<div id="placedInfo">
<h2>Our Van Sites</h2>
<p>Our van sites are big enough to house even the biggest of camper vans.
Each one is fitted with a power outlet.</p>
</div>
\ No newline at end of file
var Map = (function () {
pub = {};
pub.setup = function() {
var map = L.map('map').setView([-45.875, 170.500], 13);
L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png",
{
maxZoom: 18,
attribution: "Map data &copy; " +
'<a href="http://www.openstreetmap.org/copyright">' +
"OpenStreetMap contributors</a> CC-BY-SA"
}).addTo(map);
centralMarker = L.marker([-45.875, 170.500]).addTo(map);
}
function onMapClick(e) {
alert("You clicked the map at " + e.latlng);
}
return pub;
})();
$(document).ready(Map.setup);
\ No newline at end of file
......@@ -9,15 +9,17 @@ var changeType = (function () {
}
}
function changeSiteType(a) {
var siteType;
if (this.innerHTML.toLowerCase().includes("cabin")) {
console.log("Cabin");
siteType = "cabin";
} else if (this.innerHTML.toLowerCase().includes("van")) {
console.log("Van");
siteType = "van";
} else if (this.innerHTML.toLowerCase().includes("tent")) {
console.log("Tent");
document.getElementById("info").innerHTML ='<object type="text/html" data="scripts/data/tentInfo.html"></object>';
siteType = "tent";
}
$("#infoContainer").load("scripts/data/"+ siteType +"Info.html");
$("#siteType")[0].value = siteType;
$("#photo").find("img").attr("src", "images/"+ siteType +".jpg");
}
return pub;
......
h2
\ No newline at end of file
@import "siteInfoStyle.css";
/* ======== FONTS ======== */
@font-face {
font-family: "Lato";
......@@ -115,15 +114,21 @@ main section {
background-color: var(--white);
}
/* Campsite info*/
#info {
#infoContainer {
margin: 0 0 var(--defaultSeperation) 0;
padding: 10px;
}
#info h2 {
#placedInfo {
width: calc(100% - 20px);
}
#placedInfo {
padding: 10px;
}
#placedInfo h2 {
font-family: Quicksand, serif;
margin: 0;
}
#info p {
#placedinfo p {
font-family: Opensans, serif;
}
/* Booking form*/
......@@ -163,22 +168,32 @@ main section {
display: block;
}
/* Map */
#map {
#mapContainer {
border: solid 1px orange;
margin: 0;
float: right;
width: calc(60% - 30px);
height: 0;
padding: 0 0 calc(56.4%) 0;
height: 800px;
padding: 0 /*0 calc(56.4%) 0*/;
overflow: hidden;
}
#map {
border: solid 1px;
height: 100%;
}
#photo {
border: solid 1px;
margin: 0;
overflow: hidden;
width: 40%;
padding-top: 30%;
padding: 0;
clear: left;
}
#photo img {
padding: -50px;
width: 100%;
margin: 0;
}
/* ======== Styling ======== */
......
Markdown is supported
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