Skip to content

Commit

Permalink
#456 #393 minor formatting of view selector; add L10n to create org page
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewtavis committed Oct 26, 2023
1 parent 275912a commit 69dd95d
Show file tree
Hide file tree
Showing 45 changed files with 84 additions and 74 deletions.
4 changes: 2 additions & 2 deletions frontend/components/card/CardAbout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
</template>

<script setup lang="ts">
import type { Event } from "../../types/event";
import type { Organization } from "../../types/organization";
import type { Event } from "~/types/event";
import type { Organization } from "~/types/organization";
defineProps<{
organization?: Organization;
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/card/CardGetInvolved.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@
</template>

<script setup lang="ts">
import type { Event } from "../../types/event";
import type { Organization } from "../../types/organization";
import type { Event } from "~/types/event";
import type { Organization } from "~/types/organization";
defineProps<{
organization?: Organization;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</template>
<script setup lang="ts">
import type { DiscussionEntry } from "../../../types/discussion-entry";
import type { DiscussionEntry } from "~/types/card-discussion-entry";
defineProps<{
isPrivate?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</template>

<script setup lang="ts">
import type { DiscussionInput } from "~/types/discussion-input";
import type { DiscussionInput } from "~/types/card-discussion-input";
defineProps<{
discussionInput: DiscussionInput;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/card/discussion/CardDiscussionText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
</template>

<script setup lang="ts">
import type { DiscussionText } from "../../../types/discussion-text";
import type { DiscussionText } from "~/types/card-discussion-text";
defineProps<{
isPrivate?: boolean;
Expand Down
8 changes: 4 additions & 4 deletions frontend/components/card/search-result/CardSearchResult.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
</template>

<script setup lang="ts">
import type { Event } from "../../../types/event";
import type { Organization } from "../../../types/organization";
import type { Resource } from "../../../types/resource";
import type { User } from "../../../types/user";
import type { Event } from "~/types/event";
import type { Organization } from "~/types/organization";
import type { Resource } from "~/types/resource";
import type { User } from "~/types/user";
defineProps<{
searchResultType: "organization" | "event" | "resource" | "user";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</template>
<script setup lang="ts">
import type { Event } from "../../../types/event";
import type { Event } from "~/types/event";
defineProps<{
isPrivate?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
</template>

<script setup lang="ts">
import type { Organization } from "../../../types/organization";
import type { Organization } from "~/types/organization";
defineProps<{
isPrivate?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</template>

<script setup lang="ts">
import type { Resource } from "../../../types/resource";
import type { Resource } from "~/types/resource";
defineProps<{
isPrivate?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</template>

<script setup lang="ts">
import type { User } from "../../../types/user";
import type { User } from "~/types/user";
defineProps<{
isPrivate?: boolean;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/feed/FeedItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</template>

<script setup lang="ts">
import type { FeedItem } from "../../types/feedItem";
import type { FeedItem } from "~/types/feed-item";
const props = defineProps<{
url: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/FormSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
placeholder?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/FormTextField.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
placeholder?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/checkbox/FormCheckbox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
label?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/checkbox/FormCheckboxBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
label?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/checkbox/FormCheckboxGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</template>

<script setup lang="ts">
import useFormCheckboxRadio from "../../../composables/useFormCheckboxRadio";
import useFormCheckboxRadio from "~/composables/useFormCheckboxRadio";
/**
* The available checkbox type option.
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/radio/FormRadio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
label?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/radio/FormRadioBtn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<script setup lang="ts">
// @ts-nocheck
import { v4 as uuidv4 } from "uuid";
import useFormInput from "../../../composables/useFormSetup";
import useFormInput from "~/composables/useFormSetup";
export interface Props {
label?: string;
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/form/radio/FormRadioGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<script setup lang="ts">
import { computed } from "vue";
import useFormCheckboxRadio from "../../../composables/useFormCheckboxRadio";
import useFormCheckboxRadio from "~/composables/useFormCheckboxRadio";
// TODO: This type should be defined for the props definition type from FromRadioButton and FromRadio.
/**
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/grid/GridDocEntries.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</template>

<script setup lang="ts">
import type { DocsEntry } from "../../types/docs-entry";
import type { DocsEntry } from "~/types/card-docs-entry";
defineProps<{
cards?: DocsEntry[];
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/header/HeaderAppPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
</template>

<script setup lang="ts">
import type { Event } from "../../types/event";
import type { Organization } from "../../types/organization";
import type { Event } from "~/types/event";
import type { Organization } from "~/types/organization";
const props = defineProps<{
header?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
</template>

<script setup lang="ts">
import { menuItems } from "../../utils/navMenuItems";
import { isRouteActive } from "../../utils/routeUtils";
import { menuItems } from "~/utils/navMenuItems";
import { isRouteActive } from "~/utils/routeUtils";
const isActive = (routeURL: string) => {
return isRouteActive(routeURL);
Expand Down
4 changes: 2 additions & 2 deletions frontend/components/page/PageBreadcrumbs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@

<script setup lang="ts">
import { onMounted, ref } from "vue";
import type { Event } from "../../types/event";
import type { Organization } from "../../types/organization";
import type { Event } from "~/types/event";
import type { Organization } from "~/types/organization";
const { locales } = useI18n();
defineProps<{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
</template>

<script setup lang="ts">
import { MenuTopBarSelector } from "../../types/menu-top-bar-selector";
import { SubPageSelector } from "~/types/sub-page-selector";
defineProps<{
selectors: MenuTopBarSelector[];
selectors: SubPageSelector[];
}>();
</script>
2 changes: 1 addition & 1 deletion frontend/components/sidebar/left/SidebarLeftFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@
<script setup lang="ts">
import { Disclosure, DisclosureButton, DisclosurePanel } from "@headlessui/vue";
import type { Ref } from "vue";
import { MenuSelector } from "../../../types/menu-selector";
import { MenuSelector } from "~/types/menu-selector";
const disclosureButtons = ref<
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/components/sidebar/left/SidebarLeftIndex.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</template>

<script setup lang="ts">
import { MenuSelector } from "../../../types/menu-selector";
import { MenuSelector } from "~/types/menu-selector";
const sidebar = useSidebar();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
</template>

<script setup lang="ts">
import { menuItems } from "../../../utils/navMenuItems";
import { isRouteActive } from "../../../utils/routeUtils";
import { menuItems } from "~/utils/navMenuItems";
import { isRouteActive } from "~/utils/routeUtils";
const isActive = (routeURL: string) => {
return isRouteActive(routeURL);
Expand Down
12 changes: 10 additions & 2 deletions frontend/i18n/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@
"title-aria-label": "Select a view type",
"view-as-grid-aria-label": "View as grid",
"view-as-list-aria-label": "View as list",
"view-as-map-aria-label": "View as map",
"view-as-map-aria-label": "View as map",
"view-as-calendar-aria-label": "View as calendar"
}
},
Expand Down Expand Up @@ -747,11 +747,19 @@
"title": "Organizations Home"
},
"create": {
"complete-application": "Complete application",
"description": "Description",
"header": "Application information",
"location": "Location",
"location-placeholder": "Where the organization is based or active",
"organization-name": "Organization name",
"organization-name-placeholder": "The name of the organization",
"subtext": "Thanks for bringing your organization to activist! The following information is requested so that our community can better understand what the goals of the organization are. Checking each new organization takes time for all of us, but in this way we can maintain trust within the network. We look forward to working with and supporting you all!",
"tagline": "Tagline",
"tagline-placeholder": "Please provide a tagline for the organization",
"terms-pt-1": "I have read and agree to the",
"terms-pt-2": "activist terms and conditions",
"complete-application": "Complete application"
"topic-selection-prompt": "Please select up to three topics that this organization predominantly works on so that the community can more easily find it."
},
"id": {
"events": {
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/about/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script setup lang="ts">
import type { DocsEntry } from "../../types/docs-entry";
import type { DocsEntry } from "~/types/card-docs-entry";
const cards: DocsEntry[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/docs/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script setup lang="ts">
import type { DocsEntry } from "../../types/docs-entry";
import type { DocsEntry } from "~/types/card-docs-entry";
const cards: DocsEntry[] = [
{
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/events/[id]/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
</template>

<script setup lang="ts">
import type { Event } from "../../../types/event";
import type { Event } from "~/types/event";
definePageMeta({
layout: "sidebar",
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/events/[id]/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@

<script setup lang="ts">
import { onMounted } from "vue";
import { Event } from "../../../types/event";
import { MenuSelector } from "../../../types/menu-selector";
import { Event } from "~/types/event";
import { MenuSelector } from "~/types/menu-selector";
definePageMeta({
layout: "sidebar",
Expand Down
2 changes: 1 addition & 1 deletion frontend/pages/help/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script setup lang="ts">
import type { DocsEntry } from "../../types/docs-entry";
import type { DocsEntry } from "~/types/card-docs-entry";
const cards: DocsEntry[] = [
{
Expand Down
15 changes: 8 additions & 7 deletions frontend/pages/home/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
</template>

<script setup lang="ts">
import { DiscussionEntry } from "../../types/discussion-entry";
import { DiscussionInput } from "../../types/discussion-input";
import { DiscussionText } from "../../types/discussion-text";
import { Event } from "../../types/event";
import { Organization } from "../../types/organization";
import { Resource } from "../../types/resource";
import { User } from "../../types/user";
import { DiscussionEntry } from "~/types/card-discussion-entry";
import { DiscussionInput } from "~/types/card-discussion-input";
import { DiscussionText } from "~/types/card-discussion-text";
import { Event } from "~/types/event";
import { Organization } from "~/types/organization";
import { Resource } from "~/types/resource";
import { User } from "~/types/user";
const { data: organizations } = await useFetch(
"http://127.0.0.1:8000/organizations"
Expand Down Expand Up @@ -140,3 +140,4 @@ const discussionText: DiscussionText = {
date: new Date(),
};
</script>
~/types/card-discussion-input
2 changes: 1 addition & 1 deletion frontend/pages/legal/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</template>

<script setup lang="ts">
import type { DocsEntry } from "../../types/docs-entry";
import type { DocsEntry } from "~/types/card-docs-entry";
const cards: DocsEntry[] = [
{
Expand Down
4 changes: 2 additions & 2 deletions frontend/pages/organizations/[id]/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@

<script setup lang="ts">
import { onMounted } from "vue";
import { MenuSelector } from "../../../types/menu-selector";
import { Organization } from "../../../types/organization";
import { MenuSelector } from "~/types/menu-selector";
import { Organization } from "~/types/organization";
definePageMeta({
layout: "sidebar",
Expand Down
Loading

0 comments on commit 69dd95d

Please sign in to comment.