Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ FROM node as builder
ARG VITE_TDEI_API_URL
ARG VITE_TDEI_USER_API_URL
ARG VITE_API_URL
ARG VITE_NEW_API_URL
ARG VITE_OSM_URL
ARG VITE_RAPID_URL
ARG VITE_PATHWAYS_EDITOR_URL
Expand All @@ -29,8 +30,8 @@ COPY --from=builder /app/.output/public /usr/share/nginx/html/
# https://stackoverflow.com/questions/44438637/arg-substitution-in-run-command-not-working-for-dockerfile
ARG CODE_VERSION

RUN echo "This is (frontend, cgimap, osmrails, pathways, rapid, taskingmanager) $CODE_VERSION"
RUN echo "This is (frontend, cgimap, osmrails, pathways, rapid, taskingmanager) $CODE_VERSION" > /usr/share/nginx/html/VERSION
RUN echo "This is (frontend, api, cgimap, osmrails, pathways, rapid, taskingmanager) $CODE_VERSION"
RUN echo "This is (frontend, api, cgimap, osmrails, pathways, rapid, taskingmanager) $CODE_VERSION" > /usr/share/nginx/html/VERSION

RUN chown -R nginx:nginx /usr/share/nginx/html/

Expand Down
8 changes: 5 additions & 3 deletions app.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<template>
<nuxt-layout>
<nuxt-page />
</nuxt-layout>
<b-app>
<nuxt-layout>
<nuxt-page />
</nuxt-layout>
</b-app>
</template>
1 change: 1 addition & 0 deletions assets/scss/main.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@import "theme.scss";
@import "bootstrap/scss/bootstrap.scss";
@import "maplibre-gl/dist/maplibre-gl.css";
@import "vue3-toastify/dist/index.css";

:root {
--ws-create-color: $review-create-color;
Expand Down
25 changes: 14 additions & 11 deletions components/AppNavbar.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template>
<nav class="app-navbar navbar navbar-expand-md shadow">
<div class="container-lg">
<nuxt-link class="navbar-brand" to="/">

Check warning on line 4 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'to' should be on a new line
<app-logo />
<span>TDEI</span>&nbsp;<span>Workspaces</span>
</nuxt-link>

<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'aria-label' should be on a new line

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'aria-expanded' should be on a new line

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'aria-controls' should be on a new line

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'data-bs-target' should be on a new line

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'data-bs-toggle' should be on a new line

Check warning on line 9 in components/AppNavbar.vue

View workflow job for this annotation

GitHub Actions / run-lint

'type' should be on a new line
<span class="navbar-toggler-icon"></span>
</button>

Expand All @@ -29,18 +29,21 @@
<span class="mx-auto" />

<nuxt-link v-show="!auth.ok" to="/signin" class="btn">Sign In</nuxt-link>
<span v-show="auth.ok" class="nav-item dropdown">
<a class="nav-link" href="#" id="navbarAccountMenuLink" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<b-dropdown
v-show="auth.ok"
class="nav-item"
placement="bottom-end"
:variant="null"
is-nav
no-caret
>
<template #button-content>
<app-icon variant="account_circle" size="24" />{{ auth.displayName }}
</a>
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="navbarAccountMenuLink">
<li>
<nuxt-link class="dropdown-item" to="/" @click="auth.clear()">
<app-icon variant="logout" class="me-3" />Logout
</nuxt-link>
</li>
</ul>
</span>
</template>
<b-dropdown-item to="/" @click="auth.clear()">
<app-icon variant="logout" class="me-3" />Logout
</b-dropdown-item>
</b-dropdown>
</div>
</div>
</nav>
Expand Down
20 changes: 20 additions & 0 deletions components/ReturnToDashboardButton.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<template>
<b-button
:variant="props.variant"
to="/dashboard"
>
Return to Dashboard
</b-button>
</template>

<script setup lang="ts">
import type { BButtonProps } from 'bootstrap-vue-next/types';

interface Props {
variant?: BButtonProps['variant'];
}

const props = withDefaults(defineProps<Props>(), {
variant: 'primary',
});
</script>
119 changes: 59 additions & 60 deletions components/review/FilterDropdown.vue
Original file line number Diff line number Diff line change
@@ -1,73 +1,72 @@
<template>
<div class="dropdown ms-auto">
<button
id="reviewSettingsBtn"
type="button"
class="btn btn-light btn-sm border"
data-bs-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<b-dropdown
class="ms-auto"
toggle-class="border"
variant="light"
size="sm"
placement="bottom-end"
auto-close="outside"
no-caret
>
<template #button-content>
<app-icon variant="settings" no-margin />
<span class="visually-hidden">Settings</span>
</button>
</template>

<div class="dropdown-menu dropdown-menu-end" aria-labelledby="reviewSettingsBtn">
<div class="px-3 py-2">
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeChangesets"
type="checkbox"
class="form-check-input"
/>
Changesets
</label>
</div>
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeFeedback"
type="checkbox"
class="form-check-input"
/>
Feedback
</label>
</div>
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeNotes"
type="checkbox"
class="form-check-input"
/>
Notes
</label>
</div>
<div class="px-3 py-2">
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeChangesets"
type="checkbox"
class="form-check-input"
/>
Changesets
</label>
</div>
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeFeedback"
type="checkbox"
class="form-check-input"
/>
Feedback
</label>
</div>
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeNotes"
type="checkbox"
class="form-check-input"
/>
Notes
</label>
</div>
</div>

<div class="dropdown-divider" />
<b-dropdown-divider />

<div class="px-3 py-2">
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeResolved"
type="checkbox"
class="form-check-input"
/>
Show Resolved
</label>
</div>
<div class="px-3 py-2">
<div class="form-check form-switch">
<label class="form-check-label">
<input
v-model="filter.includeResolved"
type="checkbox"
class="form-check-input"
/>
Show Resolved
</label>
</div>
</div>

<div class="dropdown-divider" />
<div class="dropdown-divider" />

<div class="px-3 py-2">
<button class="d-block btn btn-primary btn-sm" @click="apply">Apply</button>
</div>
</div><!-- .dropdown-menu -->
</div><!-- .dropdown -->
<div class="px-3 py-2">
<button class="d-block btn btn-primary btn-sm" @click="apply">Apply</button>
</div>
</b-dropdown>
</template>

<script setup lang="ts">
Expand Down
19 changes: 19 additions & 0 deletions components/settings/Nav.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<template>
<nav class="list-group mb-4">
<settings-nav-link
to=""
icon="settings"
>
General
</settings-nav-link>
<settings-nav-link
to="/teams"
icon="group"
>
Teams
</settings-nav-link>
</nav>
</template>

<script setup lang="ts">
</script>
29 changes: 29 additions & 0 deletions components/settings/NavLink.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<template>
<nuxt-link
class="list-group-item"
:class="{ active }"
:to="to"
>
<app-icon :variant="props.icon" />
<slot />
</nuxt-link>
</template>

<script setup lang="ts">
import type { Workspace } from '~/types/workspaces';

interface Props {
to: string;
icon: string;
}

const props = defineProps<Props>();
const route = useRoute();

const workspace = inject<Workspace>('workspace')!;
const to = computed(() => `/workspace/${workspace.id}/settings${props.to}`);

const active = computed(() =>
(route.path.endsWith('/settings') && to.value.endsWith('/settings'))
|| (!to.value.endsWith('/settings') && route.path.startsWith(to.value)));
</script>
Loading
Loading