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

Commit with all files

parent afc42351
Pipeline #2515 passed with stage
in 3 seconds
File added
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="cccfd40b-d5c2-4431-bcfd-f34d25764049" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.gitlab-ci.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.gitlab-ci.yml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list>
<list default="true" id="cccfd40b-d5c2-4431-bcfd-f34d25764049" name="Default Changelist" comment="" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
......@@ -17,53 +14,7 @@
</execution>
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/reviews.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="76" lean-forward="true" selection-start-line="17" selection-start-column="76" selection-end-line="17" selection-end-column="76" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/scripts/data/reviews.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="38" lean-forward="true" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/style/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="212" column="13" selection-start-line="212" selection-start-column="13" selection-end-line="212" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<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="728">
<caret line="64" column="21" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="21" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="12" lean-forward="true" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
......@@ -90,6 +41,8 @@
<find>map.js:51 You clicked the map at LatLng</find>
<find>table</find>
<find>20px</find>
<find>alert</find>
<find>ale</find>
</findStrings>
<replaceStrings>
<replace>console</replace>
......@@ -110,7 +63,6 @@
<option value="$PROJECT_DIR$/scripts/leaflet/leafletAjax.js" />
<option value="$PROJECT_DIR$/scripts/setbooking.js" />
<option value="$PROJECT_DIR$/scripts/data/POI.geojson" />
<option value="$PROJECT_DIR$/scripts/filterSites.js" />
<option value="$PROJECT_DIR$/scripts/data/POI.json" />
<option value="$PROJECT_DIR$/scripts/getbookings.js" />
<option value="$PROJECT_DIR$/scripts/switchbooking.js" />
......@@ -122,6 +74,7 @@
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/gitlab-ci.yml" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/scripts/filterSites.js" />
</list>
</option>
</component>
......@@ -146,6 +99,11 @@
<item name="assignment-1" type="b2602c69:ProjectViewProjectNode" />
<item name="assignment-1" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="assignment-1" type="b2602c69:ProjectViewProjectNode" />
<item name="assignment-1" type="462c0819:PsiDirectoryNode" />
<item name="scripts" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
......@@ -201,7 +159,7 @@
<workItem from="1566340107468" duration="6269000" />
<workItem from="1566359872857" duration="22497000" />
<workItem from="1566431482065" duration="6354000" />
<workItem from="1566445705210" duration="17447000" />
<workItem from="1566445705210" duration="17701000" />
</task>
<task id="LOCAL-00001" summary="First Commit">
<created>1565679239864</created>
......@@ -294,15 +252,28 @@
<option name="project" value="LOCAL" />
<updated>1566463674397</updated>
</task>
<option name="localTasksCounter" value="14" />
<task id="LOCAL-00014" summary="Web Push">
<created>1566463801159</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1566463801159</updated>
</task>
<task id="LOCAL-00015" summary="Web Push">
<created>1566464008749</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1566464008749</updated>
</task>
<option name="localTasksCounter" value="16" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67364000" />
<option name="totallyTimeSpent" value="67618000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1104" height="1347" extended-state="0" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.20903955" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
......@@ -365,16 +336,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/leaflet/leafletAjax.js" />
<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">
<caret line="2" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/._campsites.json">
<provider selected="true" editor-type-id="text-editor" />
</entry>
......@@ -385,104 +346,111 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/setbooking.js">
<entry file="file://$PROJECT_DIR$/scripts/data/POI.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="240">
<caret line="16" column="5" lean-forward="true" selection-start-line="16" selection-start-column="5" selection-end-line="16" selection-end-column="5" />
<state relative-caret-position="750">
<caret line="50" column="19" lean-forward="true" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/POI.json">
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="750">
<caret line="50" column="19" lean-forward="true" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
<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/filterSites.js">
<entry file="file://$PROJECT_DIR$/admin.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="428">
<caret line="44" column="16" selection-end-line="90" selection-end-column="37" />
<state relative-caret-position="225">
<caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/getbookings.js">
<entry file="file://$PROJECT_DIR$/scripts/data/bookings.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="25" column="17" lean-forward="true" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" />
<state relative-caret-position="30">
<caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/tentInfo.html">
<entry file="file://$PROJECT_DIR$/scripts/data/reviews.json">
<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 relative-caret-position="180">
<caret line="12" column="38" lean-forward="true" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" />
</state>
</provider>
</entry>
<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="195">
<caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
<state relative-caret-position="509">
<caret line="212" column="13" selection-start-line="212" selection-start-column="13" selection-end-line="212" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/admin.html">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="15" column="31" selection-start-line="15" selection-start-column="31" selection-end-line="15" selection-end-column="31" />
<state relative-caret-position="728">
<caret line="64" column="21" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="12" lean-forward="true" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/map.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="34" column="8" selection-start-line="34" selection-start-column="8" selection-end-line="45" selection-end-column="11" />
<folding>
<element signature="e#9#15#0" expanded="true" />
</folding>
<state relative-caret-position="270">
<caret line="18" column="65" selection-start-line="18" selection-start-column="65" selection-end-line="18" selection-end-column="65" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/reviews.json">
<entry file="file://$PROJECT_DIR$/scripts/reviews.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="12" column="38" lean-forward="true" selection-start-line="12" selection-start-column="38" selection-end-line="12" selection-end-column="38" />
<state relative-caret-position="240">
<caret line="16" column="19" selection-start-line="16" selection-start-column="19" selection-end-line="16" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/style/style.css">
<entry file="file://$PROJECT_DIR$/scripts/setbooking.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="509">
<caret line="212" column="13" selection-start-line="212" selection-start-column="13" selection-end-line="212" selection-end-column="13" />
<state relative-caret-position="90">
<caret line="6" column="43" selection-start-line="6" selection-start-column="43" selection-end-line="6" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/reviews.js">
<entry file="file://$PROJECT_DIR$/scripts/switchbooking.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255">
<caret line="17" column="76" lean-forward="true" selection-start-line="17" selection-start-column="76" selection-end-line="17" selection-end-column="76" />
<state relative-caret-position="195">
<caret line="13" column="26" selection-start-line="13" selection-start-column="26" selection-end-line="13" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/scripts/data/bookings.json">
<entry file="file://$PROJECT_DIR$/scripts/filterSites.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
<caret line="2" column="20" lean-forward="true" selection-start-line="2" selection-start-column="20" selection-end-line="2" selection-end-column="20" />
<state relative-caret-position="640">
<caret line="60" column="67" selection-start-line="60" selection-start-column="67" selection-end-line="60" selection-end-column="67" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/scripts/getbookings.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="728">
<caret line="64" column="21" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="21" />
<state relative-caret-position="225">
<caret line="15" column="9" selection-start-line="15" selection-start-column="9" selection-end-line="15" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<entry file="file://$PROJECT_DIR$/scripts/jquery-3.3.1.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="11" column="12" lean-forward="true" selection-start-line="11" selection-start-column="12" selection-end-line="11" selection-end-column="12" />
<state relative-caret-position="30">
<caret line="2" lean-forward="true" selection-start-line="2" selection-end-line="2" />
<folding>
<element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
......
{
"type": "FeatureCollection",
"features": [
{
"type": "camp",
"properties": {
"name": "Dunedin Holiday Park",
"info": "Our wonderfully-located holiday park"
},
"geometry": {
"coordinates": [-45.85865,170.52722],
"polygon": true,
"polygonCoords":
[[-45.860062, 170.527563],
[-45.859151, 170.528905],
[-45.858478, 170.528368],
[-45.858097, 170.528583],
[-45.857918, 170.528991],
[-45.857395, 170.527123],
[-45.858829, 170.525234],
[-45.859502, 170.526908],
[-45.859674, 170.526726],
[-45.860107, 170.527531]]
}
},
{
"type": "restaurant",
"properties": {
"name": "The Manor Bar and Grill",
"info": "Your local for everything brewed or grilled."
},
"geometry": {
"coordinates": [-45.862184, 170.518165],
"polygon": true,
"polygonCoords":
[[-45.862083, 170.518046],
[-45.862236, 170.517967],
[-45.862337, 170.518316],
[-45.862188, 170.518407]]
}
},
{
"type": "attraction",
"properties": {
"name": "The Dunedin Botanic Gardens",
"info": "Don't forget to visit the aviary, Home of Sid the cockatoo.",
"type": "activity"
},
"geometry": {
"coordinates": [-45.858291, 170.521797]
}
},
{
"type": "restaurant",
"properties": {
"type": "restaurant",
"name": "Debacle Crepes and Pancakes",
"info": "The place to go for a great breakfast."
},
"geometry": {
"coordinates": [-45.860712,170.514705],
"polygon": true,
"polygonCoords": [
[-45.860731, 170.514592],
[-45.860776, 170.514758],
[-45.860656, 170.514839],
[-45.8606, 170.514662]]
}
},
{
"type": "restaurant",
"properties": {
"marker-size": "medium",
"name": "Big Red's Bigger Burgers.",
"info": ""
},
"geometry": {
"coordinates": [-45.86184, 170.516915],
"polygon": true,
"polygonCoords": [
[-45.861811, 170.516797],
[-45.861904, 170.516829],
[-45.861859, 170.517044],
[-45.861769, 170.517012]]
}
},
{
"type": "attraction",
"properties": {
"name": "Signal Hill Lookout",
"info": "A lookout overlooking the city of Dunedin."
},
"geometry": {
"coordinates": [-45.858755, 170.546715]
}
},
{
"type": "attraction",
"properties": {
"polygon": true,
"polygonCoords": "",
"name": "Willowbank Hot Yoga",
"info": "Just the thing to warm you up on a cold Dunedin afternoon!"
},
"geometry": {
"coordinates": [-45.855347, 170.515338],
"polygon": true,
"polygonCoords": [
[-45.855463, 170.515386],
[-45.855344, 170.515504],
[-45.85522, 170.515317],
[-45.855295, 170.515247],
[-45.855265, 170.515193],
[-45.855317, 170.515129]]
}
}
]
}
\ No newline at end of file
{
"bookings": {
"booking": [
{
"number": "101",
"name": "Mr and Mrs Smith",
"checkin": {
"day": "15",
"month": "8",
"year": "2018"
},
"checkout": {
"day": "21",
"month": "8",
"year": "2018"
}
},
{
"number": "203",
"name": "Alice, Bob, and family",
"checkin": {
"day": "12",
"month": "8",
"year": "2018"
},
"checkout": {
"day": "17",
"month": "8",
"year": "2018"
}
},
{
"number": "204",
"name": "Alice, Bob, and family",
"checkin": {
"day": "12",
"month": "8",
"year": "2018"
},
"checkout": {
"day": "17",
"month": "8",
"year": "2018"
}
},
{
"number": "203",
"name": "Carol and Dave",
"checkin": {
"day": "17",
"month": "8",
"year": "2018"
},
"checkout": {
"day": "21",
"month": "8",
"year": "2018"
}
},
{
"number": "101",
"name": "Nicks Test # 101",
"checkin": {
"day": "1",
"month": "10",
"year": "2018"
},
"checkout": {
"day": "10",
"month": "10",
"year": "2018"
}
},
{
"number": "203",
"name": "Nicks Test # 203",
"checkin": {
"day": "1",
"month": "10",
"year": "2018"
},
"checkout": {
"day": "10",
"month": "10",
"year": "2018"
}
}
]
}
}
\ No newline at end of file
{
"campSites": {
"site": [
{
"number": "101",
"siteType": "Tent",
"description": "Tent site.",
"pricePerNight": "40.0"
},
{
"number": "102",
"siteType": "Tent",
"description": "tent site.",
"pricePerNight": "40.0"
},
{
"number": "201",
"siteType": "Tent",
"description": "Tent site",
"pricePerNight": "40.0"
},
{
"number": "202",
"siteType": "Tent",
"description": "tent site",
"pricePerNight": "40.0"
},
{
"number": "203",
"siteType": "Cabin",
"description": "Cabin",
"pricePerNight": "195.00"
},
{
"number": "204",
"siteType": "Cabin",
"description": "Cabin",
"pricePerNight": "80.0"
},
{
"number": "205",
"siteType": "Cabin",
"description": "Cabin",
"pricePerNight": "80.0"
},
{
"number": "301",