diff options
Diffstat (limited to 'frontend/site')
| -rw-r--r-- | frontend/site/projects/museum/app/revisions.js | 14 | ||||
| -rw-r--r-- | frontend/site/projects/museum/app/roadblock.css | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/constants.js | 8 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/credits.css | 5 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/credits.js | 53 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/jakrawal.links.css | 10 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/jakrawal.links.js | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/landscape.warning.css | 1 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/landscape.warning.js | 3 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/mobile.css | 10 | ||||
| -rw-r--r-- | frontend/site/projects/museum/views/nav.overlay.js | 12 | ||||
| -rw-r--r-- | frontend/site/viewer/viewer.container.js | 1 |
12 files changed, 81 insertions, 38 deletions
diff --git a/frontend/site/projects/museum/app/revisions.js b/frontend/site/projects/museum/app/revisions.js index 6fdef57..13bf2c2 100644 --- a/frontend/site/projects/museum/app/revisions.js +++ b/frontend/site/projects/museum/app/revisions.js @@ -2,14 +2,18 @@ import { isMobile } from "app/utils" export default function reviseSite (graph) { - console.log(graph) + // console.log(graph) if (!isMobile) { return graph } - // graph.pages['/last-museum/home'].tiles = ( - // graph.pages['/last-museum/home'].tiles - // .filter(tile => tile.type !== 'text') - // ) + graph.pages['/last-museum/home'].tiles = ( + graph.pages['/last-museum/home'].tiles + .filter(tile => tile.type !== 'text') + ) + graph.pages['/last-museum/home'].tiles = ( + graph.pages['/last-museum/home'].tiles + .filter(tile => tile.type === 'image' || (tile.type === 'link' && !tile.type.match("stankievech"))) + ) Object.keys(graph.pages).forEach(path => { const page = graph.pages[path] if (path.match("opoku")) { diff --git a/frontend/site/projects/museum/app/roadblock.css b/frontend/site/projects/museum/app/roadblock.css index 6b2cf40..2bf6c38 100644 --- a/frontend/site/projects/museum/app/roadblock.css +++ b/frontend/site/projects/museum/app/roadblock.css @@ -6,6 +6,7 @@ height: 100vh; background: #111; color: #ff790d; + text-shadow: 0 0 3px #ff790d; padding: 1rem 0; display: flex; flex-direction: column; diff --git a/frontend/site/projects/museum/constants.js b/frontend/site/projects/museum/constants.js index 4d983f0..d97920e 100644 --- a/frontend/site/projects/museum/constants.js +++ b/frontend/site/projects/museum/constants.js @@ -288,7 +288,7 @@ export const ARTISTS = { start: "nilthamrong-home", bio: { en: `<p> - Jakrawal Nilthamrong (b.1977) is Thai artist and filmmaker based in Bangkok. He holds a MFA in Art and Technology Studies. In 2007, he was an artist-in-residence at the Rijksakademie in Amsterdam. Jakrawal Nilthamrong’s work spans from short films, documentary films to video installations and feature films. The themes of his work often relate to Eastern philosophy in contemporary context and local history of specific environments to establish dialogue among multiple perspectives. His work has been shown in international film festivals including Rotterdam, Berlinale, Toronto and Yamagata, as well as exhibitions at 2012 Taipei Biennial and 2014 SeMA Biennale Mediacity Seoul, it is collected by institutions including Kadaist. + Jakrawal Nilthamrong (b. 1977) is Thai artist and filmmaker based in Bangkok. He holds a MFA in Art and Technology Studies. In 2007, he was an artist-in-residence at the Rijksakademie in Amsterdam. Jakrawal Nilthamrong’s work spans from short films, documentary films to video installations and feature films. The themes of his work often relate to Eastern philosophy in contemporary context and local history of specific environments to establish dialogue among multiple perspectives. His work has been shown in international film festivals including Rotterdam, Berlinale, Toronto and Yamagata, as well as exhibitions at 2012 Taipei Biennial and 2014 SeMA Biennale Mediacity Seoul, it is collected by institutions including Kadaist. </p>`, de: `<p> Jakrawal Nilthamrong (*1977) ist ein thailändischer Künstler und Filmemacher, der in Bangkok lebt und arbeitet. Er hat einen MFA in Art and Technology Studies. Im Jahr 2007 war er Artist-in-Residence an der Rijksakademie in Amsterdam. Jakrawal Nilthamrongs Werk umfasst Kurzfilme, Dokumentarfilme, Videoinstallationen sowie Spielfilme. In seinen Arbeiten bezieht er sich oft auf östliche Philosophie im zeitgenössischen Kontext und die lokale Geschichte einer bestimmten Umgebung, um einen Dialog zwischen verschiedenen Perspektiven zu schaffen. Seine Arbeiten wurden auf internationalen Filmfestivals gezeigt, unter anderem in Rotterdam, auf der Berlinale, in Toronto und Yamagata, sowie ausgestellt bei der Taipei Biennale 2012 und der SeMA Biennale Mediacity Seoul 2014 und werden von Institutionen wie Kadaist gesammelt. @@ -318,11 +318,17 @@ export const ARTISTS = { bio: { en: ` <p> + <a href="http://zohraopoku.com/" target="_blank">www.zohraopoku.com</a> + </p> + <p> Zohra Opoku (b. 1976) is an artist of Ghanaian and German descent based in Accra, Ghana. Opoku’s practice examines the formation of personal identities, particularly in the context of contemporary Ghana, with a special interest in textiles and dress codes within the context of West Africa’s complex history. While her work relays social commentary and broadly relevant themes around the human experience, each of Zohra’s explorations is intimately rooted in personal identity politics. Exhibited internationally, Zohra Opoku has shown work in association with Mariane Ibrahim Gallery (Chicago), Gallery 1957 (Accra), Nubuke Foundation (Accra), Centre for Contemporary Art (Lagos), !Kauru African Contemporary Art (Johannesburg), Commune.1 (Cape Town), Kunsthaus Hamburg (Hamburg), Iwalewahaus (Bayreuth), Musée de l ́Ethnographie (Bourdeaux), Guggenheim Museum (Bilbao), Kunsthal (Rotterdam), Broad Art Museum (Michigan State University) and Museum for Photography (Chicago). Her recent residencies include Institute Sacatar Salvador da Bahia, Brazil; Art Dubai Residents, United Arab Emirates and Black Rock Dakar, Senegal. </p> `, de: ` <p> + <a href="http://zohraopoku.com/" target="_blank">www.zohraopoku.com</a> + </p> + <p> Zohra Opoku (*1976) ist eine Künstlerin ghanaischer und deutscher Herkunft und lebt in Accra, Ghana. Opokus Praxis untersucht die Bildung persönlicher Identitäten, insbesondere im Kontext des zeitgenössischen Ghanas und mit einem großen Interesse an Textilien und Dresscodes im Zusammenhang mit der komplexen Geschichte Westafrikas. Obwohl ihre Arbeiten sozialkritische und allgemein relevante Themen rund um die menschliche Erfahrung aufgreifen, ist jede von Zohras Auseinandersetzungen tief in der persönlichen Identitätspolitik verankert. International ausgestellt hat Zohra Opoku ihre Arbeiten unter anderem in Kooperation mit der Mariane Ibrahim Gallery (Chicago), Gallery 1957 (Accra), Nubuke Foundation (Accra), dem Centre for Contemporary Art (Lagos), !Kauru African Contemporary Art (Johannesburg), Commune.1 (Kapstadt), Kunsthaus Hamburg (Hamburg), Iwalewahaus (Bayreuth), Musée de l ́Ethnographie (Bordeaux), Guggenheim Museum (Bilbao), Kunsthal (Rotterdam), Broad Art Museum (Michigan State University) sowie dem Museum for Photography (Chicago). Zu ihren jüngsten Residenzen gehören Sacatar Salvador da Bahia, Brazil; Art Dubai Residents, United Arab Emirates und das Black Rock Dakar, Senegal. </p> `, diff --git a/frontend/site/projects/museum/views/credits.css b/frontend/site/projects/museum/views/credits.css index aaf05c7..b5609f0 100644 --- a/frontend/site/projects/museum/views/credits.css +++ b/frontend/site/projects/museum/views/credits.css @@ -49,6 +49,11 @@ text-shadow: 0 0 5px #000; } +/* required for safari */ +.page-credits-inner { + display: block; +} + .app > div.page.page-credits .home-link { color: #000; } diff --git a/frontend/site/projects/museum/views/credits.js b/frontend/site/projects/museum/views/credits.js index 7ed3eb4..2040a0f 100644 --- a/frontend/site/projects/museum/views/credits.js +++ b/frontend/site/projects/museum/views/credits.js @@ -37,28 +37,29 @@ class Credits extends Component { return ( <div className="page page-credits"> <div className="page-title">{LastMuseumLogo}</div> + <div className="page-credits-inner"> + <div className="page-content credits-columns"> + <div className="page-left"> + <div className="page-subtitle">CREDITS</div> + <div dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.site_credits[language] }} /> + </div> - <div className="page-content credits-columns"> - <div className="page-left"> - <div className="page-subtitle">CREDITS</div> - <div dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.site_credits[language] }} /> - </div> - - <div className="page-right"> - <div className="page-subtitle">{CREDITS_STRINGS.artwork_credits_head[language]}</div> - <div className="columns"> - <div className="column" dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.artist_credits_1[language] }} /> - <div className="column" dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.artist_credits_2[language] }} /> + <div className="page-right"> + <div className="page-subtitle">{CREDITS_STRINGS.artwork_credits_head[language]}</div> + <div className="columns"> + <div className="column" dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.artist_credits_1[language] }} /> + <div className="column" dangerouslySetInnerHTML={{ __html: CREDITS_STRINGS.artist_credits_2[language] }} /> + </div> </div> </div> - </div> - <div className="page-content icon-rows"> - <div className="icons"> - <img className="kw-logo" src="/last-museum/static/media/last-museum/kw-black.png" /> - <img src="/last-museum/static/media/last-museum/arte-logo-black.png" /> - <img src="/last-museum/static/media/last-museum/pcai-logo-black.png" className='pcai' /> - <img src="/last-museum/static/media/last-museum/berlin-logo-black.png" /> + <div className="page-content icon-rows"> + <div className="icons"> + <img className="kw-logo" src="/last-museum/static/media/last-museum/kw-black.png" /> + <img src="/last-museum/static/media/last-museum/arte-logo-black.png" /> + <img src="/last-museum/static/media/last-museum/pcai-logo-black.png" className='pcai' /> + <img src="/last-museum/static/media/last-museum/berlin-logo-black.png" /> + </div> </div> </div> <div className="home-link" onClick={this.goHome}> @@ -93,13 +94,13 @@ const CREDITS_STRINGS = { en: ` <div class="credits-rows"> <div> - <div>Curator:</div> <a href="http://nadimsamman.com/">Nadim Samman</a> + <div>Curator:</div> <a href="http://nadimsamman.com/" target="_blank">Nadim Samman</a> </div> <div> - <div>Developer:</div> <a href="https://asdf.us/">Jules LaPlace</a> + <div>Developer:</div> <a href="https://asdf.us/" target="_blank">Jules LaPlace</a> </div> <div> - <div>Design:</div> <a href="https://sometimes-always.com/">Sometimes Always</a> + <div>Design:</div> <a href="https://sometimes-always.com/" target="_blank">Sometimes Always</a> </div> </div> <div> @@ -120,19 +121,19 @@ const CREDITS_STRINGS = { Tel. +49 30 243459 41<br/> <a href="mailto:nvs@kw-berlin.de?subject=The+Last+Museum">nvs@kw-berlin.de</a><br/> Press Releases and Image Material:<br/> - <a href="https://kw-berlin.de/en/press">kw-berlin.de/en/press</a> + <a href="https://kw-berlin.de/en/press" target="_blank">kw-berlin.de/en/press</a> </div> `, de: ` <div class="credits-rows"> <div> - <div>Kurator:</div> <a href="http://nadimsamman.com/">Nadim Samman</a> + <div>Kurator:</div> <a href="http://nadimsamman.com/" target="_blank">Nadim Samman</a> </div> <div> - <div>Entwickler:</div> <a href="https://asdf.us/">Jules LaPlace</a> + <div>Entwickler:</div> <a href="https://asdf.us/" target="_blank">Jules LaPlace</a> </div> <div> - <div>Design:</div> <a href="https://sometimes-always.com/">Sometimes Always</a> + <div>Design:</div> <a href="https://sometimes-always.com/" target="_blank">Sometimes Always</a> </div> </div> <div> @@ -153,7 +154,7 @@ const CREDITS_STRINGS = { Tel. +49 30 243459 41<br/> <a href="mailto:nvs@kw-berlin.de?subject=The+Last+Museum">nvs@kw-berlin.de</a><br/> Press Releases and Image Material:<br/> - <a href="https://kw-berlin.de/en/press">kw-berlin.de/en/press</a> + <a href="https://kw-berlin.de/en/press" target="_blank">kw-berlin.de/en/press</a> </div> ` }, diff --git a/frontend/site/projects/museum/views/jakrawal.links.css b/frontend/site/projects/museum/views/jakrawal.links.css index f14b26d..1a8a5e0 100644 --- a/frontend/site/projects/museum/views/jakrawal.links.css +++ b/frontend/site/projects/museum/views/jakrawal.links.css @@ -57,5 +57,11 @@ position: absolute; top: 0; left: 0; width: 100%; height: 100%; - cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-103.png) 50 50, pointer; -}
\ No newline at end of file + cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-102.png) 50 50, pointer; +} + +.jakrawal-curtain { + position: absolute; + top: 0; left: 0; + width: 100%; height: 100%; +} diff --git a/frontend/site/projects/museum/views/jakrawal.links.js b/frontend/site/projects/museum/views/jakrawal.links.js index e6847f4..92e3b0e 100644 --- a/frontend/site/projects/museum/views/jakrawal.links.js +++ b/frontend/site/projects/museum/views/jakrawal.links.js @@ -122,6 +122,7 @@ class JakrawalLinks extends Component { if (!this.props.interactive || (!left && !right && !vertical)) return null return ( <div> + <div className="jakrawal-curtain" /> {vertical && <div className="jakrawal-full" onClick={this.goVertical} />} {left && <div className="jakrawal-left" onClick={this.goLateral} />} {right && <div className="jakrawal-right" onClick={this.goLateral} />} diff --git a/frontend/site/projects/museum/views/landscape.warning.css b/frontend/site/projects/museum/views/landscape.warning.css index 704ef04..030f4ab 100644 --- a/frontend/site/projects/museum/views/landscape.warning.css +++ b/frontend/site/projects/museum/views/landscape.warning.css @@ -4,6 +4,7 @@ width: 100vw; height: 100vh; background: #111111; color: #ff790d; + text-shadow: 0 0 3px #ff790d; font-family: "Helvetica", sans-serif; font-size: 16px; display: flex; diff --git a/frontend/site/projects/museum/views/landscape.warning.js b/frontend/site/projects/museum/views/landscape.warning.js index 7f03724..a0b6e64 100644 --- a/frontend/site/projects/museum/views/landscape.warning.js +++ b/frontend/site/projects/museum/views/landscape.warning.js @@ -21,6 +21,7 @@ export default class LandscapeWarning extends Component { state = { landscape: !isMobile || window.innerWidth > window.innerHeight, } + constructor(props) { super(props) this.handleResize = this.handleResize.bind(this) @@ -31,7 +32,7 @@ export default class LandscapeWarning extends Component { } handleResize() { - const landscape = window.innerWidth > window.innerHeight + const landscape = !isMobile || window.innerWidth > window.innerHeight if (landscape !== this.state.landscape) { this.setState({ landscape }) } diff --git a/frontend/site/projects/museum/views/mobile.css b/frontend/site/projects/museum/views/mobile.css index 8d68121..0059f94 100644 --- a/frontend/site/projects/museum/views/mobile.css +++ b/frontend/site/projects/museum/views/mobile.css @@ -10,13 +10,18 @@ } .home-footer a { display: inline-block; - padding: 4.5rem; + padding: 5vh; color: #ff790d; font-family: "Druk Wide", sans-serif; - font-size: 3vh; + font-size: 3.4vh; font-style: italic; text-decoration: none; cursor: url(/last-museum/static/uploads/3/cursor/The_Last_Museum_-_Symbols-05.png) 50 50, pointer; + text-shadow: 0 0 5px rgba(0,0,0,0.7); + transition: text-shadow 0.1s; +} +.home-footer a:hover { + text-shadow: 0 0 5px rgba(255, 120, 13, 1.0); } @media only screen and (max-device-height: 500px) { @@ -62,6 +67,7 @@ .home-footer a { padding: 0.5rem 1rem; font-size: 1rem; + text-shadow: 0 0 5px rgba(0,0,0,0.7); } /* footer */ diff --git a/frontend/site/projects/museum/views/nav.overlay.js b/frontend/site/projects/museum/views/nav.overlay.js index 0b14091..011cb2d 100644 --- a/frontend/site/projects/museum/views/nav.overlay.js +++ b/frontend/site/projects/museum/views/nav.overlay.js @@ -76,6 +76,9 @@ class NavOverlay extends Component { orangeClose: false, artist: {}, }) + setTimeout(() => { + this.hideRoadblock() + }, 10) } else if (pathkey === 'home') { this.setState({ @@ -87,7 +90,7 @@ class NavOverlay extends Component { currentArtist: null, showMuteButton: true, isProjectPage: false, - showHomeFooterLinks: true, + showHomeFooterLinks: isMobile, showClose: true, orangeClose: true, artist: {}, @@ -141,6 +144,13 @@ class NavOverlay extends Component { } } + hideRoadblock() { + const roadblock = document.querySelector('.roadblock') + if (roadblock) { + roadblock.style.display = "none" + } + } + quicklyShowFooter() { clearTimeout(this.footerTimeout) // this.footerRef.current.classList.add("instant") diff --git a/frontend/site/viewer/viewer.container.js b/frontend/site/viewer/viewer.container.js index d536ac5..c97b6d6 100644 --- a/frontend/site/viewer/viewer.container.js +++ b/frontend/site/viewer/viewer.container.js @@ -76,6 +76,7 @@ class ViewerContainer extends Component { document.querySelector("title").innerText = page.title // console.log(pages, page) // console.log("show page", page.id) + // page !== pages[home_page] && if (!this.props.interactive && hasAutoplay(page)) { this.setState({ page, hidden: {}, roadblock: true, unloaded: false }) actions.site.setPopups({}) |
