Merge pull request #12 from csc301-winter-2019/master

Merging new commits from master into feat/5 branch

4 files changed, 34 insertions, 0 deletions

diff --git a/web/views/error.pug b/web/views/error.pug
new file mode 100644
index 0000000..51ec12c
--- /dev/null
+++ b/web/views/error.pug
@@ -0,0 +1,6 @@
+extends layout
+
+block content
+  h1= message
+  h2= error.status
+  pre #{error.stack}
diff --git a/web/views/index.pug b/web/views/index.pug
new file mode 100644
index 0000000..be7ff98
--- /dev/null
+++ b/web/views/index.pug
@@ -0,0 +1,5 @@
+extends layout
+
+block content
+  h1= title
+  p Welcome to our site, please go to /map to see a map
diff --git a/web/views/layout.pug b/web/views/layout.pug
new file mode 100644
index 0000000..f46138c
--- /dev/null
+++ b/web/views/layout.pug
@@ -0,0 +1,12 @@
+doctype html
+html
+  head
+    title= title
+    link(rel='stylesheet', href='https://unpkg.com/leaflet@1.0.3/dist/leaflet.css')
+    link(rel='stylesheet', href='https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css')
+    link(rel='stylesheet', href='/stylesheets/style.css')
+    script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.12.2/jquery.min.js')
+    script(src='https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js')
+    script(src='https://unpkg.com/leaflet@1.0.3/dist/leaflet.js')
+  body
+    block content
diff --git a/web/views/map.pug b/web/views/map.pug
new file mode 100644
index 0000000..b7781fa
--- /dev/null
+++ b/web/views/map.pug
@@ -0,0 +1,11 @@
+extends layout.pug
+block content
+    #sidebar
+        h1 This is a sidebar
+    #map
+
+    script(type='text/javascript').
+        var map = L.map('map').setView([#{lat},#{lng}], 15);
+    script(src='/javascripts/map.js')
+
+