Commit a35e7792 authored by Christoph Mayr's avatar Christoph Mayr

query results are now styled too

parent f5809160
......@@ -2,10 +2,10 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="03703853-d797-498e-a74c-c726d51baed3" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/style.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/search.js" afterPath="$PROJECT_DIR$/search.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/style.css" afterPath="$PROJECT_DIR$/style.css" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -22,8 +22,8 @@
<file leaf-file-name="search.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/search.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="63" column="22" lean-forward="false" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
<state relative-caret-position="395">
<caret line="88" column="49" lean-forward="false" selection-start-line="88" selection-start-column="49" selection-end-line="88" selection-end-column="49" />
<folding />
</state>
</provider>
......@@ -34,26 +34,37 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<marker date="1529015541057" expanded="true" signature="460:2819851" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2816449:2819850" ph="[...]" />
<marker date="1529015541057" expanded="true" signature="2816482:2819816" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2817831:2819813" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2817936:2819811" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818353:2819806" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818421:2819796" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818624:2819782" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818686:2819764" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2819472:2819697" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" 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="443">
<caret line="43" column="81" lean-forward="false" selection-start-line="43" selection-start-column="81" selection-end-line="43" selection-end-column="81" />
<state relative-caret-position="-7">
<caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current-in-tab="false">
<file leaf-file-name="style.css" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="488">
<caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<state relative-caret-position="713">
<caret line="87" column="26" lean-forward="false" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
<folding />
</state>
</provider>
......@@ -123,9 +134,9 @@
<option value="$PROJECT_DIR$/package.json" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/querytest.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/search.js" />
<option value="$PROJECT_DIR$/style.css" />
<option value="$PROJECT_DIR$/index.html" />
</list>
</option>
</component>
......@@ -212,12 +223,12 @@
<option name="presentableId" value="Default" />
<updated>1528804284204</updated>
<workItem from="1528804285428" duration="15571000" />
<workItem from="1528882827788" duration="9586000" />
<workItem from="1528882827788" duration="11743000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="25157000" />
<option name="totallyTimeSpent" value="27314000" />
</component>
<component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="877" extended-state="0" />
......@@ -324,30 +335,41 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
<folding>
<marker date="1529015541057" expanded="true" signature="460:2819851" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2816449:2819850" ph="[...]" />
<marker date="1529015541057" expanded="true" signature="2816482:2819816" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2817831:2819813" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2817936:2819811" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818353:2819806" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818421:2819796" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818624:2819782" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2818686:2819764" ph="{...}" />
<marker date="1529015541057" expanded="true" signature="2819472:2819697" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/search.js">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="63" column="22" lean-forward="false" selection-start-line="63" selection-start-column="22" selection-end-line="63" selection-end-column="22" />
<state relative-caret-position="-7">
<caret line="16" column="38" lean-forward="true" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/style.css">
<entry file="file://$PROJECT_DIR$/search.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="488">
<caret line="43" column="13" lean-forward="false" selection-start-line="43" selection-start-column="13" selection-end-line="43" selection-end-column="13" />
<state relative-caret-position="395">
<caret line="88" column="49" lean-forward="false" selection-start-line="88" selection-start-column="49" selection-end-line="88" selection-end-column="49" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<entry file="file://$PROJECT_DIR$/style.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="443">
<caret line="43" column="81" lean-forward="false" selection-start-line="43" selection-start-column="81" selection-end-line="43" selection-end-column="81" />
<state relative-caret-position="713">
<caret line="87" column="26" lean-forward="false" selection-start-line="87" selection-start-column="26" selection-end-line="87" selection-end-column="26" />
<folding />
</state>
</provider>
......
......@@ -8,7 +8,7 @@
</head>
<body>
<section class="top">
<h1 class="title"><p class="blue_dot"></p>Solr Pokédex</h1>
<h1 class="title"><div class="blue_dot"></div>Solr Pokédex</h1>
</section>
<section class="search">
......@@ -45,7 +45,10 @@
</form>
</section>
<section id="results">
<section class="search">
<section id="results">
</section>
......
......@@ -56,7 +56,7 @@ function clearList() {
function sendNameQuery(q){
if(q.length==0){
document.getElementById("results").innerHTML = "Bitte gib' einen Suchbegriff ein!"
document.getElementById("results").innerHTML = "Please enter a search term!"
}else{
//var query = "q=about_txt_en:("+ q +")&rows=100" //rows ist nötig, sonst nur 10 results
......@@ -85,10 +85,9 @@ function sendNameQuery(q){
let item = document.createElement("p")
item.innerHTML =
"<li>Id: <strong>" + entry.id + "</strong></li>" +
"<li>Name: <strong>" + entry.poke_txt_en + "</strong></li>" +
"<li>Description: " + entry.about_txt_en + "</li>" +
"<li>Gen: " + entry.gen_txt_en + "</li>" +
"<li class='poke_title'><strong>" + entry.id + " " + entry.poke_txt_en + "</strong></li>" +
"<li class='poke_about'><i>" + entry.about_txt_en + "</i></li>" +
"<li>" + entry.gen_txt_en + " Pokémon</li>" +
"<li>MaxHP: " + entry.maxHP_txt_en + "</li>" +
"<li>MaxCP: " + entry.maxCP_txt_en + "</li>" +
"<li>Types:</li>" +
......
......@@ -41,7 +41,7 @@ body{
flex-direction: column;
justify-content: center;
background-color: #6AE8F2;
width: 40%;
width: 60%;
padding: 1em;
border-bottom-left-radius: 1em;
color: black;
......@@ -54,4 +54,36 @@ body{
width: 20em;
height: 2em;
margin-top: 1em;
cursor: pointer;
}
#results{
background-color: white;
color: black;
width: 60%;
padding: 1em;
border-style: solid;
border-width: 2px;
font-size: 1.2em;
border-bottom-left-radius: 1em;
}
p{
padding: 1em;
border-bottom: solid;
border-width: 2px;
}
li{
list-style: none;
}
.poke_title{
font-size: 1.3em;
padding-bottom: 0.5em;
}
.poke_about{
padding-bottom: 0.5em;
}
\ No newline at end of file
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