Merge pull request #6 from thewebplatform/master

Updating From Parent
thewebplatform · Jul 25, 2015 · 0e43fd7 · 0e43fd7
2 parents b24c267 + 649e436
commit 0e43fd7
Show file tree

Hide file tree

Showing 12 changed files with 191 additions and 237 deletions.
diff --git a/app/elements/about-us/about-us.html b/app/elements/about-us/about-us.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="about-us">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>About us Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'about-us'
+		});
+	})();
+</script>
diff --git a/app/elements/elements.html b/app/elements/elements.html
@@ -13,6 +13,7 @@
 <link rel="import" href="../bower_components/iron-icons/iron-icons.html">
 <link rel="import" href="../bower_components/iron-pages/iron-pages.html">
 <link rel="import" href="../bower_components/iron-selector/iron-selector.html">
+<link rel="import" href="../bower_components/iron-image/iron-image.html">
 
 <!-- Paper elements -->
 <link rel="import" href="../bower_components/paper-drawer-panel/paper-drawer-panel.html">
@@ -24,6 +25,8 @@
 <link rel="import" href="../bower_components/paper-styles/paper-styles-classes.html">
 <link rel="import" href="../bower_components/paper-toast/paper-toast.html">
 <link rel="import" href="../bower_components/paper-toolbar/paper-toolbar.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html" >
+<link rel="import" href="../bower_components/paper-tabs/paper-tab.html" >
 
 <!-- Platinum elements -->
 <!--
@@ -36,8 +39,9 @@
 
 <!-- Add your elements here -->
 <link rel="import" href="../styles/app-theme.html">
-<link rel="import" href="my-greeting/my-greeting.html">
-<link rel="import" href="my-list/my-list.html">
+<link rel="import" href="new-episode/new-episode.html">
+<link rel="import" href="previous-episodes/previous-episodes.html">
+<link rel="import" href="about-us/about-us.html">
 
 <!-- Configure your routes here -->
 <link rel="import" href="routing.html">
diff --git a/app/elements/my-greeting/my-greeting.html b/app/elements/my-greeting/my-greeting.html
diff --git a/app/elements/my-list/my-list.html b/app/elements/my-list/my-list.html
diff --git a/app/elements/new-episode/new-episode.html b/app/elements/new-episode/new-episode.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="new-episode">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>New Episode Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'new-episode'
+		});
+	})();
+</script>
diff --git a/app/elements/previous-episodes/previous-episodes.html b/app/elements/previous-episodes/previous-episodes.html
@@ -0,0 +1,20 @@
+<link rel="import" href="../elements.html">
+
+<dom-module id="previous-episodes">
+	<style>
+		:host {
+			height: 100%;
+			width: 100%;
+		}
+	</style>
+	<template>
+		<h1>Previous Episodes Page</h1>
+	</template>
+</dom-module>
+<script>
+	( function() {
+		Polymer({
+			is: 'previous-episodes'
+		});
+	})();
+</script>
diff --git a/app/elements/routing.html b/app/elements/routing.html
@@ -16,20 +16,20 @@
     // client-side router inspired by the Express router
     // More info: https://visionmedia.github.io/page.js/
     page('/', function () {
-      app.route = 'home';
+      app.route = 'new';
     });
 
-    page('/users', function () {
-      app.route = 'users';
+    page('/old', function () {
+      app.route = 'old';
     });
 
-    page('/users/:name', function (data) {
-      app.route = 'user-info';
+    page('/old/:id', function (data) {
+      app.route = 'old-episode';
       app.params = data.params;
     });
 
-    page('/contact', function () {
-      app.route = 'contact';
+    page('/about', function () {
+      app.route = 'about';
     });
 
     // add #! before urls

diff --git a/app/images/logo.png b/app/images/logo.png