Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

193 implement mobile redesign #197

Merged
merged 3 commits into from
Jan 24, 2025
Merged

193 implement mobile redesign #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d27112
Refactor search bar to be a part of the parent app component
hminsky2002 Jan 15, 2025
6f0fa68
add mobile map page
hminsky2002 Jan 24, 2025
eb6874a
check-in latest front-end assets
hminsky2002 Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/.vite/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"index.html": {
"file": "assets/index-peuHzKWn.js",
"file": "assets/index-Bho4XSe1.js",
"name": "index",
"src": "index.html",
"isEntry": true,
"css": [
"assets/index-CEMw8OvV.css"
"assets/index-D5EU3I_Q.css"
]
}
}
31 changes: 31 additions & 0 deletions archesdataviewer/static/vite_build/assets/index-Bho4XSe1.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion archesdataviewer/static/vite_build/assets/index-CEMw8OvV.css
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions archesdataviewer/static/vite_build/assets/index-D5EU3I_Q.css
View file
Open in desktop

Large diffs are not rendered by default.

31 changes: 0 additions & 31 deletions archesdataviewer/static/vite_build/assets/index-peuHzKWn.js
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions archesdataviewer/static/vite_build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Arches Data Viewer</title>
<script type="module" crossorigin src="/assets/index-peuHzKWn.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-CEMw8OvV.css">
<script type="module" crossorigin src="/assets/index-Bho4XSe1.js"></script>
<link rel="stylesheet" crossorigin href="/assets/index-D5EU3I_Q.css">
</head>
<body>
<div id="app"></div>
Expand Down
188 changes: 180 additions & 8 deletions front-end/src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="home">
<header class="welcome">
<div class="welcome-content">
<h1>
<h1 class="welcome-text">
Explore Chicago’s <br />
Wabash Arts Corridor
</h1>
Expand Down Expand Up @@ -36,7 +36,7 @@
</header>
<main>
<div id="map-container">
<LeafletMap
<DesktopLeafletMap
v-if="resourcesPrefetch && idReferences && locationsPrefetch"
:resources-prefetch="resourcesPrefetch"
:id-references="idReferences"
Expand All @@ -45,16 +45,67 @@
<div v-else class="map-placeholder">Loading map…</div>
</div>
<div id="search-list-container">
<div class="search-header">
<div class="search-input-wrapper">
<MagnifyingGlassIcon class="search-icon" />
<input v-model="query" class="search-input" placeholder="Search" />
</div>
<button
type="button"
class="nav-button"
:class="{ active: activePage === '/artworks' }"
@click="router.push('/artworks')"
>
<PhotoIcon class="button-icon" />
<span>Artworks</span>
</button>
<button
type="button"
class="nav-button"
:class="{ active: activePage === '/artists' }"
@click="router.push('/artists')"
>
<UserIcon class="button-icon" />
<span>Artists</span>
</button>
<button
id="map-icon"
type="button"
class="nav-button map-icon"
:class="{ active: activePage === '/map' }"
@click="router.push('/map')"
>
<MapPinIcon class="button-icon" />
<span>Map</span>
</button>
<button
type="button"
class="nav-button"
:class="{ active: activePage === '/about' }"
@click="router.push('/about')"
>
<InformationCircleIcon class="button-icon" />
<span>About</span>
</button>
</div>
<RouterView v-slot="{ Component }">
<Transition
v-if="resourcesPrefetch && resourceRelationsPrefetch && idReferences && imagesPrefetch"
v-if="
resourcesPrefetch &&
resourceRelationsPrefetch &&
idReferences &&
imagesPrefetch &&
locationsPrefetch
"
>
<component
:is="Component"
:resources-prefetch="resourcesPrefetch"
:resource-relations-prefetch="resourceRelationsPrefetch"
:id-references="idReferences"
:images-prefetch="imagesPrefetch"
:locations-prefetch="locationsPrefetch"
:query="query"
/>
</Transition>
</RouterView>
Expand All @@ -64,8 +115,16 @@
</template>

<script setup lang="ts">
import { ref } from 'vue';
import LeafletMap from '@/components/LeafletMap.vue';
import { ref, watch } from 'vue';
import DesktopLeafletMap from '@/components/DesktopLeafletMap.vue';
import { useRouter } from 'vue-router';
import {
PhotoIcon,
UserIcon,
InformationCircleIcon,
MagnifyingGlassIcon,
MapPinIcon
} from '@heroicons/vue/24/outline';
import type {
ImageTileData,
Tile,
Expand All @@ -75,13 +134,17 @@ import type {
ResourceXResource
} from './types';

const router = useRouter();

const isProd = import.meta.env.PROD;

const idReferences = ref<Prefetch['idReferences'] | undefined>(undefined);
const imagesPrefetch = ref<Array<Tile<ImageTileData[]>> | undefined>(undefined);
const locationsPrefetch = ref<Array<Tile<CoordinatesTileData>> | undefined>(undefined);
const resourceRelationsPrefetch = ref<Array<ResourceXResource> | undefined>(undefined);
const resourcesPrefetch = ref<Array<Resource> | undefined>(undefined);
const query = ref<string>('');
const activePage = ref<string>('');

async function prefetchResources() {
try {
Expand All @@ -103,6 +166,14 @@ async function prefetchResources() {
}

prefetchResources();

watch(
() => router.currentRoute.value,
(newValue) => {
activePage.value = newValue.path;
return true;
}
);
</script>

<style scoped>
Expand All @@ -113,7 +184,6 @@ main {
.home {
display: flex;
flex-direction: column;
gap: var(--wac--semantic-spacing--primary);
}

.welcome {
Expand All @@ -124,6 +194,7 @@ main {
line-height: var(--wac--line-height--tight);
font-size: var(--wac--font-size--lg);
text-wrap: balance;
margin: var(--wac--accessible-spacing--2x);
}

.welcome-content {
Expand All @@ -150,10 +221,14 @@ main {
object-fit: contain;
}

.welcome-text {
font-size: var(--wac--font-size--xxl);
}

.welcome-credits p {
font-weight: var(--wac--font-weight--normal);
font-size: var(--wac--font-size);
margin: 0;
margin: 0px;
white-space: nowrap;
}

Expand All @@ -169,9 +244,72 @@ main {
}

#search-list-container {
background-color: #fff8e0;
border-radius: 32px;
order: -1;
background: #fff8e0;
}

#map-container {
display: none;
}

.search-header {
--wac--search-header--internal-spacing: var(--wac--semantic-spacing--tertiary);
position: sticky;
top: 0;
display: grid;
grid-template-columns: 1fr 1fr 1fr 1fr;
align-items: center;
justify-content: center;
background: linear-gradient(
180deg,
white calc(100% - var(--wac--search-header--internal-spacing)),
rgba(255, 255, 255, 0) 100%
);
width: 100vw;
gap: var(--wac--semantic-spacing--tertiary);
z-index: 999;
}

.search-input-wrapper {
display: flex;
align-items: center;
background: #ffd54f;
max-height: 50px;
width: 100%;
border-radius: 32px;
padding: var(--wac--accessible-spacing--2x);
gap: var(--wac--accessible-spacing--halfx);
grid-column-start: 1;
grid-column-end: 5;
}

.search-input {
width: 100%;
border: none;
font-size: inherit;
background: transparent;
outline: none;
}

.search-icon {
width: 24px;
height: 24px;
color: black;
}
.nav-button {
display: flex;
flex-direction: column;
align-items: center;
gap: var(--wac--accessible-spacing--halfx);
border: none;
background: none;
font-size: inherit;
cursor: pointer;
font-weight: var(--wac--font-weight--normal);
&.active {
background: var(--wac--color--highlight);
}
}

@media screen and (min-width: 940px) {
Expand Down Expand Up @@ -215,8 +353,42 @@ main {
font-size: var(--wac--font-size--xxl);
}

#search-list-container {
order: 0;
padding: var(--wac--accessible-spacing--2x);
background: none;
}

main {
flex-direction: row-reverse;
}
.home {
gap: var(--wac--semantic-spacing--primary);
}
#map-container {
display: block;
}

.search-header {
--wac--search-header--internal-spacing: var(--wac--semantic-spacing--tertiary);
position: sticky;
top: 0;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
gap: var(--wac--search-header--internal-spacing);
padding-block: var(--wac--search-header--internal-spacing);
width: 100%;

background: linear-gradient(
180deg,
#fff8e0 calc(100% - var(--wac--search-header--internal-spacing)),
rgba(255, 255, 255, 0) 100%
);
}
#map-icon {
display: none;
}
}
</style>
52 changes: 51 additions & 1 deletion front-end/src/assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ body {
font-size: var(--wac--font-size);
line-height: var(--wac--line-height);
color: black;
padding: var(--wac--semantic-spacing--tertiary);
background-image: linear-gradient(to bottom, white 30%, rgba(255, 255, 255, 0) 70%),
url('https://arches-app-demo.opentechstrategies.com/archesdataviewer/background.png');
background-size: cover;
background-repeat: no-repeat;
background-attachment: fixed;
margin: 0px;
}

h1,
Expand Down Expand Up @@ -169,8 +169,58 @@ button,
height: 1rem;
}

.map-icon {
display: flex;
}

.search-results-container {
display: flex;
flex-direction: column;
gap: var(--wac--accessible-spacing--1x);
}

.search-results {
display: flex;
flex-direction: column;
gap: 1rem;
margin: auto;
max-width: 650px;
overflow-x: scroll;
}

.search-results-header {
display: flex;
justify-content: space-between;
}

.search-results-header-icon {
width: calc(var(--wac--line-height) * 1em);
height: calc(var(--wac--line-height) * 1em);
}

.search-results-header-title {
display: flex;
font-size: var(--wac--font-size--xxl);
gap: var(--wac--accessible-spacing--2x);
}

@media screen and (min-width: 940px) {
body {
padding: var(--wac--semantic-spacing--primary);
margin: 8px;
}

.map-icon {
display: none;
}

.search-results {
display: grid;
flex-direction: column;
grid-template-columns: 1fr 1fr;
gap: 1rem;
margin: auto;
max-width: 650px;
overflow-x: scroll;
}
}
0 front-end/src/components/LeafletMap.vue → ...-end/src/components/DesktopLeafletMap.vue
View file
Open in desktop
File renamed without changes.
Loading
Loading