diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..536283e --- /dev/null +++ b/.dockerignore @@ -0,0 +1,9 @@ +**/node_modules +**/dist +**/data.json +**/data +**/radata +**/cypress +.github +.vscode +.idea diff --git a/.gitignore b/.gitignore index 57f99e3..3451f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,12 @@ -/node_modules/ /dist/ /.vscode/ .DS_Store /.idea/ /cypress/screenshots/ /cypress/videos/ +/**/dist/ +/relay/radata/ +/relay/data/ +/relay/data.json/ +/.env.local +/**/node_modules/ diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d7d3db4 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,50 @@ +# Build Project +FROM node:14-alpine as builder +RUN mkdir /work +WORKDIR /work +#RUN apk add --no-cache alpine-sdk python3 +COPY frontend ./frontend +WORKDIR /work/frontend +RUN echo "Build frontend" +RUN mkdir -p "node_modules" +RUN yarn install +RUN VITE_RELAY=http://localhost:8765/gun yarn build + +WORKDIR /work +COPY relay ./relay +WORKDIR /work/relay +RUN echo "Build Relay Server" +RUN mkdir -p "node_modules" +RUN yarn install +RUN yarn build +RUN ls + +# fresh image without dev packages +FROM node:14-alpine +# build-time metadata as defined at http://label-schema.org +ARG BUILD_DATE +ARG VCS_REF +ARG VCS_URL +ARG VERSION +LABEL org.label-schema.build-date=$BUILD_DATE \ + org.label-schema.name="Poddle - Meetings made simple!" \ + org.label-schema.url="https://poddle.network" \ + org.label-schema.vcs-ref=$VCS_REF \ + org.label-schema.vcs-url=$VCS_URL \ + org.label-schema.vendor="The poddle Team" \ + org.label-schema.version=$VERSION \ + org.label-schema.schema-version="1.0" +ARG SHA +RUN mkdir /work +WORKDIR /work +COPY --from=builder /work/frontend/node_modules ./node_modules +COPY --from=builder /work/relay/node_modules ./relay/node_modules +COPY --from=builder /work/frontend/dist ./dist +COPY --from=builder /work/relay/dist ./relay/dist +COPY --from=builder /work/relay/package.json ./relay/package.json +RUN echo "{ \"sha\": \"$SHA\" }" > version.json +RUN cat version.json +WORKDIR /work/relay +RUN ls +EXPOSE 8765 +CMD ["npm","start"] diff --git a/cypress.json b/cypress.json deleted file mode 100644 index 49cee51..0000000 --- a/cypress.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "projectId": "byzw5k", - "pluginsFile": false -} \ No newline at end of file diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js index 7dd0817..59b2bab 100644 --- a/cypress/plugins/index.js +++ b/cypress/plugins/index.js @@ -16,7 +16,7 @@ * @type {Cypress.PluginConfig} */ // eslint-disable-next-line no-unused-vars -// module.exports = (on, config) => { +module.exports = (on, config) => { // `on` is used to hook into various events Cypress emits // `config` is the resolved Cypress config -// } +} diff --git a/frontend/cypress.json b/frontend/cypress.json new file mode 100644 index 0000000..96fb1e9 --- /dev/null +++ b/frontend/cypress.json @@ -0,0 +1,12 @@ +{ + "projectId": "byzw5k", + "fixturesFolder": "../cypress/fixtures", + "integrationFolder": "../cypress/integration", + "pluginsFile": "../cypress/plugins/index.js", + "screenshotsFolder": "../cypress/screenshots", + "videosFolder": "../cypress/videos", + "downloadsFolder": "../cypress/downloads", + "supportFile": "../cypress/support/index.js" + + +} \ No newline at end of file diff --git a/index.html b/frontend/index.html similarity index 100% rename from index.html rename to frontend/index.html diff --git a/package.json b/frontend/package.json similarity index 93% rename from package.json rename to frontend/package.json index d4a5c8d..27435f7 100644 --- a/package.json +++ b/frontend/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "type": "module", "scripts": { - "dev": "vite", + "dev": "APP_ENV=local vite", "build": "vite build --base /", "preview": "vite preview", "cypressUI": "cypress open", @@ -24,6 +24,7 @@ "svelte-preprocess": "^4.10.1", "tailwindcss": "^3.0.12", "tslib": "^2.3.1", + "tui-calendar": "^1.15.3", "typescript": "^4.4.4", "vite": "^2.7.2" }, diff --git a/postcss.config.cjs b/frontend/postcss.config.cjs similarity index 100% rename from postcss.config.cjs rename to frontend/postcss.config.cjs diff --git a/public/favicon.ico b/frontend/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to frontend/public/favicon.ico diff --git a/src/App.svelte b/frontend/src/App.svelte similarity index 96% rename from src/App.svelte rename to frontend/src/App.svelte index cdf833f..96c2909 100644 --- a/src/App.svelte +++ b/frontend/src/App.svelte @@ -7,6 +7,8 @@ import {gun} from "./gun"; import NewMessage from "./view/NewMessage.svelte"; import dayjs from "dayjs"; + import {onMount} from "svelte"; + import Modal from "./lib/Modal.svelte"; if (window.location.search.includes("?k=")) { page.set(Poll) @@ -55,6 +57,7 @@ {/if}
+