diff --git a/docker-compose.yml b/docker-compose.yml index 532127b..ef72c9d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,7 +86,9 @@ services: # To rebuild the site and the server run this #command: bash -c "npm run build && node .output/server/index.mjs" # To just start the server run this - command: bash -c "node .output/server/index.mjs" + #command: bash -c "node .output/server/index.mjs" + # To start the server in dev mode + command: bash -c "yarn dev -o" volumes: #- portfolio-nuxt:/src/node_modules - ./portfolio-nuxt:/src diff --git a/portfolio-nuxt/components/Collapsible/Collapsible.vue b/portfolio-nuxt/components/Collapsible/Collapsible.vue index b17e7ea..e74556d 100644 --- a/portfolio-nuxt/components/Collapsible/Collapsible.vue +++ b/portfolio-nuxt/components/Collapsible/Collapsible.vue @@ -2,6 +2,7 @@ import { Disclosure, DisclosureButton, DisclosurePanel } from '@headlessui/vue' import { ref, toRefs, watch } from 'vue' import CollapseTransition from './CollapseTransition.vue' +import Modal from '../Modal/Modal.vue'; const props = withDefaults( defineProps<{ @@ -70,12 +71,14 @@ const toggle = () => { type="button" @click="toggle" > - +
+ +
diff --git a/portfolio-nuxt/components/ImageSlider.vue b/portfolio-nuxt/components/ImageSlider.vue index abd6319..aee23e4 100644 --- a/portfolio-nuxt/components/ImageSlider.vue +++ b/portfolio-nuxt/components/ImageSlider.vue @@ -23,10 +23,8 @@ > -
-
diff --git a/portfolio-nuxt/components/Modal/Backdrop.vue b/portfolio-nuxt/components/Modal/Backdrop.vue index f59293c..6a14409 100644 --- a/portfolio-nuxt/components/Modal/Backdrop.vue +++ b/portfolio-nuxt/components/Modal/Backdrop.vue @@ -1,3 +1,3 @@ diff --git a/portfolio-nuxt/components/Modal/Modal.vue b/portfolio-nuxt/components/Modal/Modal.vue index 957bd45..9c0e6f0 100644 --- a/portfolio-nuxt/components/Modal/Modal.vue +++ b/portfolio-nuxt/components/Modal/Modal.vue @@ -59,11 +59,11 @@ provide('modal', api) diff --git a/portfolio-nuxt/layouts/default.vue b/portfolio-nuxt/layouts/default.vue index 4710548..784818a 100644 --- a/portfolio-nuxt/layouts/default.vue +++ b/portfolio-nuxt/layouts/default.vue @@ -1,5 +1,5 @@ diff --git a/portfolio-nuxt/pages/about.vue b/portfolio-nuxt/pages/about.vue index 6b2eb55..c657952 100644 --- a/portfolio-nuxt/pages/about.vue +++ b/portfolio-nuxt/pages/about.vue @@ -1,14 +1,14 @@ diff --git a/portfolio-nuxt/pages/events.vue b/portfolio-nuxt/pages/events.vue index b2b16e6..727ba1e 100644 --- a/portfolio-nuxt/pages/events.vue +++ b/portfolio-nuxt/pages/events.vue @@ -4,32 +4,37 @@

performances

- - + +
diff --git a/portfolio-nuxt/pages/index.vue b/portfolio-nuxt/pages/index.vue index 7337585..689a25d 100644 --- a/portfolio-nuxt/pages/index.vue +++ b/portfolio-nuxt/pages/index.vue @@ -31,7 +31,7 @@
- {{ item.entryTags.title }} +
{{ item.entryTags.author }} {{ item.entryTags.booktitle}}.  @@ -118,7 +118,8 @@ work.gallery = gallery } } - let groups = groupBy(works, work => new Date(work.date.$date).getFullYear()) + let priorityGroups = groupBy(works, work => work.priority) + let groups = groupBy(priorityGroups["1"], work => new Date(work.date.$date).getFullYear()) groups = Object.keys(groups).map((year) => { return { year, @@ -126,6 +127,7 @@ }; }); groups.sort((a,b) => b.year - a.year) + groups.push({year: "miscellany", works: priorityGroups["2"].sort((a,b) => b.date.$date - a.date.$date)}) return groups } })