diff --git a/daapinterface.py b/daapinterface.py index 5ba1a5a..4ad0efc 100644 --- a/daapinterface.py +++ b/daapinterface.py @@ -46,21 +46,22 @@ def home(): ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() - return render_template('home.html') + return render_template('home.html', results=results) @app.route("/browsethearchive") def browsethearchive(): sparql.setQuery(''' - SELECT ?work ?workLabel ?image ?date - WHERE { - SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } - ?work wdt:P1 wd:Q1. - OPTIONAL { ?work wdt:P30 ?image. } - OPTIONAL { ?work wdt:P13 ?date. } - FILTER(?work != wd:Q57) - } - ORDER BY (?workLabel) + SELECT ?work ?workLabel ?image ?date WHERE { + SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } + ?work wdt:P1 wd:Q1. + OPTIONAL { ?work p:P30 ?statement. + ?statement ps:P30 ?image; + pq:P54 wd:Q90.} + OPTIONAL { ?work wdt:P13 ?date. } + FILTER(?work != wd:Q57) +} +ORDER BY (?workLabel) ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() @@ -80,118 +81,202 @@ def browsebycategory(): return render_template('browsebycategory.html') +########################## +# CATEGORIES TO BE BROWSED +######################### + + ######################### ARTIST INDEX @app.route("/artistsindex") def artistsindex(): sparql.setQuery(''' SELECT ?creators ?creatorsLabel ?creatorsAltLabel ?creatorsDescription WHERE { - SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } - ?work wdt:P1 wd:Q1. - ?work wdt:P9 ?creators. - FILTER (?creators != wd:Q82) + { + SELECT ?creators (COUNT(DISTINCT ?a) AS ?count) WHERE { + ?a ?prop ?creators . + ?a wdt:P1 ?work . + BIND (wdt:P9 AS ?prop) . + BIND (wd:Q1 AS ?work) . + } GROUP BY ?creators + } . + SERVICE wikibase:label { + bd:serviceParam wikibase:language "en" . } + FILTER (?creators !=wd:Q82) + } + ORDER BY DESC(?count) ?creatorsLabel ''') sparql.setReturnFormat(JSON) results = sparql.query().convert() return render_template('artistsindex.html', results=results) +######################### PUBLISHERS INDEX +@app.route("/publishersindex") +def publishersindex(): + sparql.setQuery(''' + SELECT ?publishers ?publishersLabel ?publishersAltLabel ?publishersDescription WHERE { + { + SELECT ?publishers (COUNT(DISTINCT ?a) AS ?count) WHERE { + ?a ?prop ?publishers . + ?a wdt:P1 ?work . + BIND (wdt:P10 AS ?prop) . + BIND (wd:Q1 AS ?work) . + } GROUP BY ?publishers + } . + SERVICE wikibase:label { + bd:serviceParam wikibase:language "en" . + } + FILTER(?publishers != wd:Q83) + FILTER(?publishers != wd:Q71) + } + ORDER BY DESC(?count) ?publishersLabel + ''') + sparql.setReturnFormat(JSON) + results = sparql.query().convert() + return render_template('publishersindex.html', results=results) + +######################### SELF PUBLISHED INDEX +@app.route("/selfpublishedindex") +def selfpublishedindex(): + sparql.setQuery(''' + SELECT ?work ?workLabel ?workAltLabel ?workDescription + WHERE { + SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } + ?work wdt:P1 wd:Q1; + wdt:P10 wd:Q71. + FILTER(?work != wd:Q57) + } + ''') + sparql.setReturnFormat(JSON) + results = sparql.query().convert() + return render_template('selfpublishedindex.html', results=results) + +######################### ZINES INDEX +@app.route("/zinesindex") +def zinesindex(): + sparql.setQuery(''' + SELECT ?work ?workLabel ?workAltLabel ?workDescription + WHERE { + SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } + ?work wdt:P1 wd:Q1; + wdt:P16 wd:Q152. + FILTER(?work != wd:Q57) + } + ''') + sparql.setReturnFormat(JSON) + results = sparql.query().convert() + return render_template('zinesindex.html', results=results) + + +########################## +# DETAILED INDIVIDUAL PAGES +######################### + ######################### ARTWORK @app.route("/artwork", methods=['GET']) def artwork(): artwork_id = request.args.get('id') - # sparql.setQuery(''' - # SELECT ?workLabel ?workDescription - # ?creators ?creatorsLabel ?creatorRoles ?creatorRolesLabel - # ?publishers ?publishersLabel ?publisherRoles ?publisherRolesLabel - # ?date ?dateType ?dateTypeLabel ?dateSource - # ?image ?depicts ?depictsLabel ?annotation ?license ?licenseLabel - # ?descriptionPage ?accessURLdescriptionPage ?authordescriptionPage ?authordescriptionPageLabel ?datedescriptionPage ?sourcedescriptionPage - # ?exhibitionHisPage ?accessURLexhibitionHisPage ?authorexhibitionHisPage ?authorexhibitionHisPageLabel ?dateexhibitionHisPage ?sourceexhibitionHisPage - # ?digitalFacsimile ?digitalFacsimileExternal - # ?digitalArtefact ?format ?formatLabel - # ?distributorLinks - # ?copiesCollections ?collections ?collectionsLabel ?imageCollections - # ?relatedWorks ?relatedWorksLabel ?daterelatedWorks - - # WHERE { - # SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } - # VALUES ?work {wd:'''+artwork_id+'''} - # OPTIONAL { ?work wdt:P9 ?creators. } - # OPTIONAL { ?work p:P9 ?statement0. - # ?statement0 ps:P9 ?creators; - # pq:P49 ?creatorRoles. } + sparql.setQuery(''' + SELECT ?workLabel ?workDescription + ?creators ?creatorsLabel ?creatorRoles ?creatorRolesLabel + ?publishers ?publishersLabel ?publisherRoles ?publisherRolesLabel + ?date ?dateType ?dateTypeLabel ?dateSource + ?image ?depics ?depicsLabel ?annotation ?license ?licenseLabel + ?descriptionQID ?accessURLdescrip ?authordescrip ?authordescripLabel ?datedescrip + ?exhibitionHistoryQID ?accessURLexhibitionHis ?authorexhibitionHis ?authorexhibitionHisLabel ?dateexhibitionHis + ?digitalFacsimile ?digitalFacsimileExternal + ?digitalArtefact ?format ?formatLabel + ?distributorLinks + ?copiesCollections ?collections ?collectionsLabel ?imageCollections + ?relatedWorks ?relatedWorksLabel ?dateRelatedWorks + + WHERE { + SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } + VALUES ?work {wd:'''+artwork_id+'''} + OPTIONAL { ?work wdt:P9 ?creators. } + OPTIONAL { ?work p:P9 ?statement0. + ?statement0 ps:P9 ?creators; + pq:P49 ?creatorRoles. } - # OPTIONAL { ?work wdt:P13 ?date. } - # OPTIONAL { ?work p:P13 ?statement1. - # ?statement1 ps:P13 ?date; - # pq:P51 ?dateType. } - # OPTIONAL { ?work p:P13 ?statement1. - # ?statement1 ps:P13 ?date; - # pq:P50 ?dateSource. } + OPTIONAL { ?work wdt:P13 ?date. } + OPTIONAL { ?work p:P13 ?statement1. + ?statement1 ps:P13 ?date; + pq:P51 ?dateType; + pq:P50 ?dateSource. } - # OPTIONAL { ?work wdt:P10 ?publishers. } - # OPTIONAL { ?work p:P10 ?statement2. - # ?statement2 ps:P10 ?publishers; - # pq:P49 ?publisherRoles. } + OPTIONAL { ?work wdt:P10 ?publishers. } + OPTIONAL { ?work p:P10 ?statement2. + ?statement2 ps:P10 ?publishers; + pq:P49 ?publisherRoles. } - # OPTIONAL { ?work wdt:P30 ?image. } - # OPTIONAL { ?work p:P30 ?statement3. - # ?statement3 ps:P30 ?image; - # pq:P54 ?depicts.} - # OPTIONAL { ?work p:P30 ?statement3. - # ?statement3 ps:P30 ?image; - # pq:P55 ?annotation.} - # OPTIONAL { ?work p:P30 ?statement3. - # ?statement3 ps:P30 ?image; - # pq:P56 ?license.} + OPTIONAL { ?work wdt:P30 ?image. } + OPTIONAL { ?work p:P30 ?statement3. + ?statement3 ps:P30 ?image; + pq:P54 ?depics; + pq:P55 ?annotation; + pq:P56 ?license.} - # OPTIONAL { ?work wdt:P65 ?descriptionPage. } - # OPTIONAL { ?description wdt:P4 ?accessURLdescriptionPage. } - # OPTIONAL { ?description wdt:P9 ?authordescriptionPage. } - # OPTIONAL { ?description wdt:P13 ?datedescriptionPage. } - # OPTIONAL { ?description wdt:P50 ?sourcedescriptionPage. } + OPTIONAL { ?work wdt:P65 ?descriptionQID. } + OPTIONAL { ?descriptionQID wdt:P4 ?accessURLdescrip; + wdt:P9 ?authordescrip; + wdt:P13 ?datedescrip; + wdt:P50 ?sourcedescrip. } - # OPTIONAL { ?work wdt:P66 ?exhibitionHisPage. } - # OPTIONAL { ?exhibitionHisPage wdt:P4 ?accessURLexhibitionHisPage. } - # OPTIONAL { ?exhibitionHisPage wdt:P9 ?authorexhibitionHisPage. } - # OPTIONAL { ?exhibitionHisPage wdt:P13 ?dateexhibitionHisPage. } - # OPTIONAL { ?exhibitionHisPage wdt:P50 ?sourceexhibitionHisPage. } + OPTIONAL { ?work wdt:P66 ?exhibitionHistoryQID. } + OPTIONAL { ?exhibitionHistoryQID wdt:P4 ?accessURLexhibitionHis; + wdt:P9 ?authorexhibitionHis; + wdt:P13 ?dateexhibitionHis; + wdt:P50 ?sourceexhibitionHis. } - # OPTIONAL { ?work wdt:P32 ?digitalFacsimile. } - # OPTIONAL { ?work wdt:P34 ?digitalFacsimileExternal. } + OPTIONAL { ?work wdt:P32 ?digitalFacsimile. } + OPTIONAL { ?work wdt:P34 ?digitalFacsimileExternal. } - # OPTIONAL { ?work wdt:P35 ?digitalArtefact. } - # OPTIONAL { ?work p:P35 ?statement4. - # ?statement4 ps:P35 ?digitalArtefact; - # pq:P16 ?format.} + OPTIONAL { ?work wdt:P35 ?digitalArtefact. } + OPTIONAL { ?work p:P35 ?statement4. + ?statement4 ps:P35 ?digitalArtefact; + pq:P16 ?format.} - # OPTIONAL { ?work wdt:P37 ?distributorLinks. } + OPTIONAL { ?work wdt:P37 ?distributorLinks. } - # OPTIONAL { ?work wdt:P43 ?copiesCollections. } - # OPTIONAL { ?copiesCollections wdt:P47 ?collections. } - # OPTIONAL { ?copiesCollections wdt:P30 ?imageCollections. } + OPTIONAL { ?work wdt:P43 ?copiesCollections. } + OPTIONAL { ?copies_collections wdt:P47 ?collections; + wdt:P30 ?imageCollections. } - # OPTIONAL { ?work wdt:P44 ?relatedWorks.} - # OPTIONAL { ?relatedWorks wdt:P13 ?daterelatedWorks. } - # } + OPTIONAL { ?work wdt:P44 ?relatedWorks. } + OPTIONAL { ?relatedWorks wdt:P13 ?dateRelatedWorks. } - # ''') - # sparql.setReturnFormat(JSON) - # artwork = sparql.query().convert() + } + ''') + sparql.setReturnFormat(JSON) + artwork = sparql.query().convert() # print(artwork) artwork_url = "https://daap.bannerrepeater.org/wiki/Item:Q92" artwork_title = "the human printer" artwork_description = "short description" - return render_template('artwork.html', artwork_title=artwork_title, artwork_description=artwork_description) + return render_template('artwork.html', artwork_title=artwork_title, artwork_description=artwork_description, artwork=artwork, artwork_id=artwork_id) ######################### PERSON @app.route("/person", methods=['GET']) def person(): person_id = request.args.get('id') sparql.setQuery(''' + SELECT ?person ?personLabel ?personDescription ?a ?aLabel ?propLabel ?b ?bLabel + WHERE { + VALUES ?person {wd:'''+person_id+'''} + ?person ?a ?b. + SERVICE wikibase:label { bd:serviceParam wikibase:language "en". } + ?prop wikibase:directClaim ?a . + } + ''') + sparql.setReturnFormat(JSON) + person_details = sparql.query().convert() + print(person_details) + + + sparql2.setQuery(''' SELECT ?work ?workLabel ?image ?date WHERE { SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } @@ -203,10 +288,10 @@ def person(): } ORDER BY (?workLabel) ''') - sparql.setReturnFormat(JSON) - person_creatorof = sparql.query().convert() + sparql2.setReturnFormat(JSON) + person_creatorof = sparql2.query().convert() - sparql2.setQuery(''' + sparql3.setQuery(''' SELECT ?work ?workLabel ?image ?date WHERE { SERVICE wikibase:label { bd:serviceParam wikibase:language "[AUTO_LANGUAGE],en". } @@ -218,13 +303,13 @@ def person(): } ORDER BY (?workLabel) ''') - sparql2.setReturnFormat(JSON) + sparql3.setReturnFormat(JSON) person_publisherof = sparql2.query().convert() person_url = "" person_name = "the name" person_description = "short bio" - return render_template("person.html", person_id=person_id, person_creatorof=person_creatorof, person_publisherof=person_publisherof) + return render_template("person.html", person_id=person_id, person_creatorof=person_creatorof, person_publisherof=person_publisherof, person_details=person_details) @@ -260,6 +345,6 @@ def upload(): -# ALL NAME SPACES +# ALL NAME # https://daap.bannerrepeater.org/w/api.php?action=query&meta=siteinfo&siprop=namespaces|namespacealiases diff --git a/static/css/style.css b/static/css/style.css index 84640bc..790a9ed 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -16,79 +16,209 @@ font-style: normal; } +/***************** EMERGENCY BUTTON****************/ +div#backend-data-button{ + background-color: #1B42D8; + width: 250px; + height: 55px; + border-radius: 6px; + margin: 0 auto; + display: flex; + align-items: center; + justify-content: center; + margin-top: 20px; +} +div#backend-data-button span{ + color: #FFFFFF; + text-decoration: none; + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; +} + +div#container-backend-data-button{ + height: 100px; + width: 100%; + border-bottom: 1px solid black; + height: 70px; +} /************ LAYOUT ************/ html,body{ - margin:0px; - padding:0px; + margin:0; + padding:0; + height: 100%; + font-family: 'Roboto Condensed', sans-serif; + } /*Header*/ div#header{ width: 100%; - border:1px solid blue; + /*border:1px solid blue;*/ background-color: #FFFFFF; + height: 134px; +} +div#header-top{ + display: grid; + grid-template-columns: 5% 67.5% 27.5%; + grid-template-rows: 100%; + grid-column-gap: 0px; + grid-row-gap: 0px; } -div#header-top div#header-title{ +div#animatedlogo{ + grid-area: 1 / 1 / 2 / 2; +} +div#animatedlogo img{ + height: 43px; +} +div#header-title{ + grid-area: 1 / 2 / 2 / 3; font-family: 'Roboto Condensed', sans-serif; font-weight: bold; font-size: 18px; } -div#header-top div#header-keyword-search{ - /*float: right;*/ - border: 1px solid lime; +div#header-title a:link, div#header-title a:visited { + text-decoration: none; + color: #000000; +} +div#header-keyword-search{ + grid-area: 1 / 3 / 2 / 4; +} +div#header-top div#header-keyword-search input[type=text]{ + background-color: #e9e9e9; + color: #7f7f7f; + font-size: 18px; + font-family: 'Roboto Condensed', sans-serif; + width: 257px; + height: 43px; } + div#header-top, div#navigation{ - border:red 1px solid; width: 100%; + height: 67px; } -div#header-top div, div#navigation div{ - display: inline-block; - padding: 3px; + +div#navigation{ + border:red 1px solid; + display: grid; + grid-template-columns: 12.5% repeat(2, 10%) 1fr repeat(2, 10%) 12.5%; + grid-template-rows: 100%; + grid-column-gap: 0px; + grid-row-gap: 0px; } div#navigation a{ font-family: 'Roboto Condensed', sans-serif; text-decoration: none; color: black; + font-size: 16px; + height: 67px; } -div#navigation div#nav-right-side{ - float: right; + +div#nav-about { + grid-area: 1 / 1 / 2 / 2; + padding-left: 50%; } +div#nav-browse-archive { grid-area: 1 / 2 / 2 / 3; } +div#nav-browse-category { grid-area: 1 / 3 / 2 / 4; } +div#nav-search { grid-area: 1 / 4 / 2 / 5; } +div#nav-tutorials { grid-area: 1 / 5 / 2 / 6; } +div#nav-upload { grid-area: 1 / 6 / 2 / 7; } +div#nav-login { grid-area: 1 / 7 / 2 / 8; } + /*Footer*/ div#footer{ + padding-top: 20px; + height: 229px; width: 100%; - border: blue 1px solid; - position: absolute; bottom: 0; background-color: black; color:white; - display: none; + display: grid; + grid-template-columns: 20% 40% 15% 25%; + grid-template-rows: 20% 80%; + grid-column-gap: 0px; + grid-row-gap: 0px; } -div#footer div#footer-top, -div#footer div#footer-bottom{ - border: red solid 1px; - width: 100%; +div#footer-title-br{ + grid-area: 1 / 1 / 2 / 2; + padding-left: 30%; +} +div#footer-title-others{ + grid-area: 1 / 2 / 2 / 3; +} +div#footer-title-socials{ + grid-area: 1 / 3 / 2 / 4; +} + +div#footer-title-subscribe{ + grid-area: 1 / 4 / 2 / 5; +} + +div#footer-title-br p, div#footer-title-others p, div#footer-title-subscribe p, div#footer-title-socials p{ + text-transform: uppercase; + font-family: 'Roboto Condensed', sans-serif; + color:#7f7f7f; + font-size: 16px; } -div#footer div #footertop{ - /*position: absolute;*/ - } + +div#footer-img-br{ + grid-area: 2 / 1 / 3 / 2; + padding-left: 30%; +} +div#footer-img-br img{ + width: 60px; + height: 60px; +} + +div#footer-img-others{ + display: flex; + grid-area: 2 / 2 / 3 / 3; + padding-top: 5%; +} +div#footer-img-lottery{ + padding-left: 10%; +} +div#footer-img-lottery img{ + width: 124px; + height: 81px; +} +div#footer-img-wiki img{ + width: 56px; + height: 56px; +} +div#footer-socials-links{ + grid-area: 2 / 3 / 3 / 4; +} +div#footer-socials-links a{ + text-decoration: none; + color:#FFFFFF; + font-family: 'Roboto Condensed', sans-serif; + +} +div#footer-subscribe{ + grid-area: 2 / 4 / 3 / 5; + padding-top: 5%; + +} + + div#footer div#footer-top div#footer-top-left, div#footer div#footer-top div#footer-top-right{ display: inline-flex; border:lime 1px solid; } -div#footer div#footer-top div#footer-top-left{ +div#footer div#footer-left{ left: 0px; width: 30%; /*display: contents;*/ } -div#footer div#footer-top div#footer-top-right{ +div#footer div#footer-right{ right: 0px; width: 30%; float: right; @@ -96,15 +226,13 @@ div#footer div#footer-top div#footer-top-right{ } -div#footer div#footer-top div#footer-top-left div, -div#footer div#footer-top div#footer-top-right div{ +div#footer div#footer-left div, +div#footer div#footer-right div{ display: inline-block; border:cyan 1px solid; } -div#footer-bottom{ - display: none; -} + input#newslettersubs{ background-color: #000000; color:#FFFFFF; @@ -123,6 +251,12 @@ input.submitemail{ } +/*Titles all pages*/ + +div#home-recent-title, div#browsethearchive-title, div#artistsindex-title, div#publishersindex-title, div#selfpublishedindex-title, div#zinesindex-title{ + margin-top: 60px; + margin-bottom: 30px; +} /******************************************************/ /************ BROWSING SEARCHING INDEXING ************/ @@ -136,23 +270,146 @@ table, th, td { padding: 10px 30px 10px 30px; } +thead tr th{ + text-transform: uppercase; + color:#7f7f7f; + font-size: 16px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: normal; + border-bottom: black 3px solid; +} + +tbody tr th{ + font-size: 20px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: normal; +} + +tbody tr th.label a{ + font-weight: bold; +} + +tbody tr th a{ + text-decoration: none; + color: #000000; +} + +tbody tr th.description{ + font-size: 16px; +} + +/* Titles */ +div#artistsindex-title, div#publishersindex-title, div#selfpublishedindex, div#zinesindex-title{ + font-weight: bold; + font-size: 25px; + font-family: 'Roboto Condensed', sans-serif; +} + + +/************ RECENTLY ADDED + HOME ************/ + + + +/*Top div*/ + +div#home-top-div{ + height: 661px; + border:blue solid 1px; +} + +/*Recent stuff*/ +div#home-recent-title{ + font-size: 25px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; + max-width: 90%; + margin: 0 auto; + padding-left: 20px; +} +img.home-recent-imgs{ + /*max-height: 200px;*/ + width: 200px; +} + +div.home-recent-items{ + display: inline-block; + padding:10px; + font-size: 16px; + font-family: 'Roboto Condensed', sans-serif; + color: #7f7f7f; + margin: 0 auto; + border:solid; +} +div.home-recent-items a{ + font-size: 20px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; + color: #000000; + text-decoration: none; +} +div#home-recent-grid{ + max-width: 90%; + margin: 0 auto; + display: grid; + grid-gap: 2rem; + /*border: 1px solid blue;*/ + text-align: center; +} + +div#show-button-wrapper{ + width: 100%; +} +span.home-show{ + background-color: #1b42d8; + border-radius: 6px; + color: #FFFFFF; + font-family: 'Roboto Condensed', sans-serif; + font-size: 14px; + font-weight: bold; + height: 48px; + width: 365px; + +} + + +@media (min-width: 600px) { + #home-recent-grid { grid-template-columns: repeat(2, 1fr); } +} +@media (min-width: 1000px) { + #home-recent-grid { grid-template-columns: repeat(4, 1fr); } +} +@media (min-width: 1400px) { + #home-recent-grid { grid-template-columns: repeat(6, 1fr); } +} /************ BROWSE THE ARCHIVE ************/ img.browsethearchive-imgs{ - max-height: 200px; - max-width: 200px; + width: 200px; + +} +div#browsethearchive-title{ + font-size: 25px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; } div.browsethearchive-items{ display: inline-block; - width: 250px; - height: 250px; padding:10px; - /*border: red 1px solid;*/ + font-size: 16px; + font-family: 'Roboto Condensed', sans-serif; + color: #7f7f7f; margin: 0 auto; } +div.browsethearchive-items a{ + font-size: 20px; + font-family: 'Roboto Condensed', sans-serif; + font-weight: bold; + text-decoration: none; + color: #000000 +} div#browsethearchive-grid{ max-width: 90%; margin: 0 auto; @@ -163,11 +420,40 @@ div#browsethearchive-grid{ } .current { - color: red; + background-color: #1b42d8; +} +#browsethearchive-pagin li.current a{ + color: #FFFFFF; + font-weight: bold; + text-decoration: none; + font-family: 'Roboto Condensed', sans-serif; +} + +#browsethearchive-pagin li a{ + color: #000000; + font-weight: bold; + text-decoration: none; + font-family: 'Roboto Condensed', sans-serif; } -#pagin li { - display: inline-block; +ul#browsethearchive-pagin{ + display: inline-flex; +} + +#browsethearchive-pagin li { +display: flex; +align-items: center; +justify-content: center; + width: 36px; + height: 36px; + border-radius: 6px; +} +div#browsethearchive-pagination{ + width: 100%; + background-color: #e9e9e9; +border-top: black solid 3px; +height: 139px; +text-align: center; } @media (min-width: 600px) { @@ -181,8 +467,18 @@ div#browsethearchive-grid{ } + /************ BROWSE BY CATEGORY ************/ +div#browsebycategory-listcategories{ + +} +div.browsebycategory-categories{ + border: black 1px solid; + margin: 10px; + padding: 10px; + width: 20em; +} diff --git a/static/imgs/Pages/Artwork page_mock up.png b/static/imgs/Pages/Artwork page_mock up.png new file mode 100644 index 0000000..9aa0da4 Binary files /dev/null and b/static/imgs/Pages/Artwork page_mock up.png differ diff --git a/templates/artistsindex.html b/templates/artistsindex.html index 7f8818f..e4a09c8 100644 --- a/templates/artistsindex.html +++ b/templates/artistsindex.html @@ -1,6 +1,7 @@ {% extends "layout.html" %} {% block content %} +
INDEX OF ARTIST
@@ -14,55 +15,40 @@ {% for x in results['results']['bindings']%} - - - - + + + + {% endfor %}
#{{ x['creators']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }}{{ x["creatorsLabel"]['value'] }} - {% if "creatorsAltLabel" in x %} - {{ x["creatorsAltLabel"]["value"] }} - {% endif %} - - {% if "creatorsDescription" in x %} - {{ x["creatorsDescription"]["value"] }} - {% endif %} - {{ x['creators']['value'] | replace('http://daap.bannerrepeater.org/entity/', '') }}{{ x["creatorsLabel"]['value'] }} + {% if "creatorsAltLabel" in x %} + {{ x["creatorsAltLabel"]["value"] }} + {% endif %} + + {% if "creatorsDescription" in x %} + {{ x["creatorsDescription"]["value"] }} + {% endif %} +
- + + + - + {% endblock content %} \ No newline at end of file diff --git a/templates/artwork.html b/templates/artwork.html index 69d4244..fb9844f 100644 --- a/templates/artwork.html +++ b/templates/artwork.html @@ -1,10 +1,10 @@ {% extends "layout.html" %} {% block content %} -
+ +
+ + + +
+Go to backend to see live data +
+ + +
+ + {% endblock content %} \ No newline at end of file diff --git a/templates/browsebycategory.html b/templates/browsebycategory.html index 7fcad22..3644356 100644 --- a/templates/browsebycategory.html +++ b/templates/browsebycategory.html @@ -1,7 +1,13 @@ {% extends "layout.html" %} {% block content %} - - +
+
BROWSE BY CREATOR/CONTRIBUTOR
+
BROWSE BY PUBLISHER
+
BROWSE ALL SELF-PUBLISHED
+
BROWSE ALL ZINES
+ +
More categories coming soon...
+
{% endblock content %} \ No newline at end of file diff --git a/templates/browsethearchive.html b/templates/browsethearchive.html index 65f4fc4..a8195c7 100644 --- a/templates/browsethearchive.html +++ b/templates/browsethearchive.html @@ -1,9 +1,10 @@ {% extends "layout.html" %} {% block content %} -
- +
+
BROWSE THE ARCHIVE
+
{% for x in results['results']['bindings']%}
@@ -26,9 +27,12 @@
{% endfor %} -
    -
+
+
+
    +
+
+ {% endblock content %} \ No newline at end of file diff --git a/templates/layout.html b/templates/layout.html index 3824f82..b5a411a 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,14 +12,30 @@ @@ -27,24 +43,36 @@ {% endblock content %}