api ok

27983368 · Mario Chirinos Colunga · 4c69c454 · 27983368 · 27983368 · 27983368
Commit 27983368 authored Jul 12, 2017 by Mario Chirinos Colunga 💬
23 changed files
--- a/GeoInt_SIDT/__init__.pyc
+++ b/GeoInt_SIDT/__init__.pyc
--- a/GeoInt_SIDT/settings.pyc
+++ b/GeoInt_SIDT/settings.pyc
--- a/GeoInt_SIDT/urls.pyc
+++ b/GeoInt_SIDT/urls.pyc
--- a/GeoInt_SIDT/wsgi.pyc
+++ b/GeoInt_SIDT/wsgi.pyc
--- a/catalog/__init__.pyc
+++ b/catalog/__init__.pyc
--- a/catalog/admin.pyc
+++ b/catalog/admin.pyc
--- a/catalog/apps.pyc
+++ b/catalog/apps.pyc
--- a/catalog/forms.pyc
+++ b/catalog/forms.pyc
--- a/catalog/migrations/0001_initial.py
+++ b/catalog/migrations/0001_initial.py
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-07-11 14:33
+from __future__ import unicode_literals
+from django.db import migrations, models
+class Migration(migrations.Migration):
+    initial = True
+    dependencies = [
+    ]
+    operations = [
+        migrations.CreateModel(
+            name='Platform',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=64)),
+                ('acronym', models.CharField(max_length=16)),
+            ],
+        ),
+    ]
--- a/catalog/migrations/0001_initial.pyc
+++ b/catalog/migrations/0001_initial.pyc
--- a/catalog/migrations/__init__.pyc
+++ b/catalog/migrations/__init__.pyc
--- a/catalog/models.pyc
+++ b/catalog/models.pyc
--- a/catalog/static/css/body.css
+++ b/catalog/static/css/body.css
@@ -3,5 +3,5 @@
 }
 body
 {
-	color:white;
+/*	color:white;*/
 }
--- a/catalog/static/css/leftPanel.css
+++ b/catalog/static/css/leftPanel.css
@@ -3,9 +3,10 @@
 	position:fixed;
 	top:0px;
 	left:0px;
-	border: 1px solid DarGrey;
+	border: 1px solid DarkSlateGray;
-	background-color: rgba(50,50,50,0.8);
+	background-color: rgba(250,250,255,0.8);
-	width:320px;
+	color:DarkSlateGray;
+	width:300px;
 	height:100%;
 	font-size:0.8em;
 }

--- a/catalog/static/css/rightPanel.css
+++ b/catalog/static/css/rightPanel.css
@@ -3,9 +3,44 @@
 	position:absolute;
 	top:0;
 	right:0;
-	border: 1px solid blue;
+	width: 350px;
-	width: 256px;
 	height: 100%;
-	background-color: rgba(50,50,50,0.8);
+	border: 1px solid DarkSlateGray;
+	background-color: rgba(250,250,255,0.8);
+	color:DarkSlateGray;
 }
+.catalog li
+{
+/*	border:2px solid blue;*/
+	list-style: none;
+	height: 64px;
+	font-size:0.6em;
+}
+.catalog li div
+{
+	display:inline-block;
+}
+.buyIcon
+{
+	display:inline-block;
+/*	border:2px solid blue;*/
+/*	border:none;*/
+/*	background-color:rgba(255,255,255,1);*/
+	opacity:0.7;
+	width:64px;
+	height:64px;
+	background-image: url("../images/star.png");
+    	background-size: 50px 50px;
+	background-position: center; 
+	background-repeat: no-repeat;
+	cursor:pointer;
+    	transition:  0.2s;
+}
+.buyIcon:hover 
+{
+	opacity:1;
+	margin:0;
+    	background-size: 60px 60px;
+    	transition:  0.2s;
+}
--- a/catalog/static/images/cart.png
+++ b/catalog/static/images/cart.png
--- a/catalog/static/images/star.png
+++ b/catalog/static/images/star.png
--- a/catalog/templates/map.html
+++ b/catalog/templates/map.html
@@ -24,7 +24,7 @@
 	<div id="leftPanel">
 			<form id="searchForm" action="/catalog/productlist/" method="post" target="catalogFrame">
 			{% csrf_token %}
-				<input type="submit" value="search" onclick="submitSearchForm()" />
+				<input type="submit" value="search" />
 				<table>{{ searchForm.as_table }}</table>
 			</form>
 	</div>

--- a/catalog/templates/productList.html
+++ b/catalog/templates/productList.html
+<!DOCTYPE html>
+{% load static %}
+<html>
+	<head>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link rel="stylesheet" href="{% static 'css/rightPanel.css'%}" type="text/css">
+	</head>
+	<body>
+		<ul class="catalog">
+		{% for i in catalog %}
+			<li>
+				<div><img src="{{i.thumbnailUrl}}" width="64px"/></div>
+				<div>
+					{{i.productName}}<br>
+					{{i.sceneDate}}
+				</div>
+				<div class="buyIcon"></div>
+			</li>
+		{% endfor %}
+		</ul>
+	</body>
+</html>
-hola hola
--- a/catalog/urls.pyc
+++ b/catalog/urls.pyc
--- a/catalog/views.py
+++ b/catalog/views.py
@@ -26,10 +26,11 @@ def producList(request):
 	r2 = dict(request.POST)
 	r2.pop('csrfmiddlewaretoken', None)
-	url = 'https://api.daac.asf.alaska.edu/services/search/'+urlencode(r2, 'utf-8')+"&output=JSON"
+	url = 'https://api.daac.asf.alaska.edu/services/search/param?'+urlencode(r2, 'utf-8')+"&output=JSON"
 	print url
 	response = requests.get(url)
-	print response.json()
+	json  = response.json()
-	return render(request,'productList.html',{})
+	return render(request,'productList.html',{"catalog":json[0]})
--- a/catalog/views.pyc
+++ b/catalog/views.pyc
--- a/db.sqlite3
+++ b/db.sqlite3