diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index f819d17..dfb538c 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -21,6 +21,7 @@ jobs: uses: actions/setup-node@v1 with: node-version: ${{ matrix.node-version }} + - run: cd client/ - run: npm ci - run: npm run build --if-present - run: npm test diff --git a/babel.config.js b/client/babel.config.js similarity index 100% rename from babel.config.js rename to client/babel.config.js diff --git a/package-lock.json b/client/package-lock.json similarity index 100% rename from package-lock.json rename to client/package-lock.json diff --git a/package.json b/client/package.json similarity index 100% rename from package.json rename to client/package.json diff --git a/src/App.vue b/client/src/App.vue similarity index 100% rename from src/App.vue rename to client/src/App.vue diff --git a/src/assets/logo.png b/client/src/assets/logo.png similarity index 100% rename from src/assets/logo.png rename to client/src/assets/logo.png diff --git a/src/components/aboutme.vue b/client/src/components/aboutme.vue similarity index 100% rename from src/components/aboutme.vue rename to client/src/components/aboutme.vue diff --git a/src/components/answer.vue b/client/src/components/answer.vue similarity index 100% rename from src/components/answer.vue rename to client/src/components/answer.vue diff --git a/src/components/qa.vue b/client/src/components/qa.vue similarity index 100% rename from src/components/qa.vue rename to client/src/components/qa.vue diff --git a/src/components/question.vue b/client/src/components/question.vue similarity index 100% rename from src/components/question.vue rename to client/src/components/question.vue diff --git a/src/main.js b/client/src/main.js similarity index 100% rename from src/main.js rename to client/src/main.js diff --git a/src/me.js b/client/src/me.js similarity index 100% rename from src/me.js rename to client/src/me.js diff --git a/src/remote.js b/client/src/remote.js similarity index 100% rename from src/remote.js rename to client/src/remote.js diff --git a/test/me.js b/client/test/me.js similarity index 100% rename from test/me.js rename to client/test/me.js diff --git a/test/remote.js b/client/test/remote.js similarity index 100% rename from test/remote.js rename to client/test/remote.js diff --git a/docker-compose.yml b/docker-compose.yml index 683f3fa..36c11b4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3" +version: '3' services: website-dev: @@ -6,6 +6,6 @@ services: context: ./ dockerfile: docker/dev/Dockerfile volumes: - - ./src:/var/www/app + - ./client/src:/var/www/app ports: - 8080:8080 diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index 9eee66b..e17e22c 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -4,16 +4,16 @@ FROM node:lts-alpine WORKDIR /app # get the sauce -COPY /src/ /app/src/ +COPY /client/src/ /app/src/ # add `/app/node_modules/.bin` to $PATH ENV PATH /app/node_modules/.bin:$PATH # make sure the packages are the same -COPY package-lock.json /app/package.json +COPY /client/package-lock.json /app/package.json # install and cache app dependencies -COPY package.json /app/package.json +COPY /client/package.json /app/package.json RUN npm install # start app