diff --git a/Dockerfile b/Dockerfile index cbe3f53..2a4daf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,14 @@ FROM cypress/base:24.0.0@sha256:a12dd7ba6c42601ba02328491320f04fede8b652f6da2724 WORKDIR /build -COPY ./package.json ./package-lock.json ./.snyk ./ +RUN npm install --global node-gyp && \ + git config --global --add safe.directory /build + +COPY ./package.json ./package-lock.json ./ RUN npm ci --no-progress -COPY ./ ./ -RUN npm run generate && npm run lint +COPY . /build +RUN npm run postinstall && npm run generate && npm run lint #RUN yarn start:ci & yarn wait && yarn test:cypress FROM amd64/nginx:1.29.0@sha256:1255491f87317acd3c7c9329f29054473fd5d4dc84646e47bc672aaa7e9f0c67 diff --git a/assets/scss/global.scss b/app/assets/scss/global.scss similarity index 100% rename from assets/scss/global.scss rename to app/assets/scss/global.scss diff --git a/components/pages/events/event-card.vue b/app/components/pages/events/event-card.vue similarity index 98% rename from components/pages/events/event-card.vue rename to app/components/pages/events/event-card.vue index 3eaff96..022e845 100644 --- a/components/pages/events/event-card.vue +++ b/app/components/pages/events/event-card.vue @@ -113,7 +113,7 @@ import { computed } from 'vue' import { useI18n } from '#i18n' import DistanceDisplay from '~/components/pages/events/event-distance.vue' -import type { Event } from '~/graphql/generated/operations' +import type { Event } from '~~/graphql/generated/operations' const props = defineProps({ event: { diff --git a/components/pages/events/event-distance.vue b/app/components/pages/events/event-distance.vue similarity index 92% rename from components/pages/events/event-distance.vue rename to app/components/pages/events/event-distance.vue index 7391171..e18cd79 100644 --- a/components/pages/events/event-distance.vue +++ b/app/components/pages/events/event-distance.vue @@ -17,7 +17,7 @@ import type { PropType } from 'vue' import { computed } from 'vue' -import type { DanceHallDistance } from '~/graphql/generated/operations' +import type { DanceHallDistance } from '~~/graphql/generated/operations' const props = defineProps({ distance: { diff --git a/components/pages/events/event-list.vue b/app/components/pages/events/event-list.vue similarity index 90% rename from components/pages/events/event-list.vue rename to app/components/pages/events/event-list.vue index 474c835..9515387 100644 --- a/components/pages/events/event-list.vue +++ b/app/components/pages/events/event-list.vue @@ -15,7 +15,7 @@