-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from phoenix741/feature/vuecli3
Got to vue-cli 3
- Loading branch information
Showing
260 changed files
with
18,236 additions
and
22,452 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,11 @@ | ||
.idea | ||
bower_components | ||
mongodb | ||
node_modules | ||
.directory | ||
.dockerignore | ||
.drone.yml | ||
.editorconfig | ||
.env | ||
.eslintignore | ||
.eslintrc.json | ||
.hgflow | ||
.hgignore | ||
docker-compose* | ||
Dockerfile* | ||
Makefile | ||
dist |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,48 @@ | ||
pipeline: | ||
e2e: | ||
group: test | ||
image: node:8 | ||
image: node:10 | ||
commands: | ||
- npm install | ||
- npm run e2e:docker | ||
- cp nightwatch.e2e.json nightwatch.json | ||
- npm run test:e2e | ||
environment: | ||
- MONGODB_HOST=mongodb://mongodb:27017/passprotect | ||
- MONGODB_DATABASE=passprotect | ||
- HOST=e2e | ||
- PROXY_GRAPHQL_SERVER=http://nodejs:4000 | ||
- VUE_APP_PIWIK_ENABLED=false | ||
- VUE_APP_GRAPHQL_HTTP=http://nodejs:4000 | ||
- VUE_APP_GRAPHQL_WS=ws://nodejs:4000 | ||
- VUE_E2E_SERVER_URL=http://e2e:8080 | ||
|
||
unit: | ||
group: test | ||
image: node:8 | ||
image: node:10 | ||
commands: | ||
- wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | apt-key add - | ||
- sh -c 'echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list' | ||
- apt update && apt install -y google-chrome-stable | ||
|
||
- npm install | ||
- npm run unit | ||
|
||
nodejs: | ||
group: build | ||
image: plugins/docker | ||
repo: phoenix741/passprotect-server | ||
secrets: [ docker_username, docker_password ] | ||
tags: develop | ||
dockerfile: Dockerfile.nodejs | ||
# - npm run test:unit | ||
|
||
nginx: | ||
group: build | ||
image: plugins/docker | ||
repo: phoenix741/passprotect-client | ||
secrets: [ docker_username, docker_password ] | ||
tags: develop | ||
dockerfile: Dockerfile.nginx | ||
dockerfile: Dockerfile | ||
|
||
services: | ||
nodejs: | ||
image: phoenix741/passprotect-server:develop | ||
environment: | ||
- MONGODB_HOST=mongodb://mongodb:27017/passprotect | ||
- MONGODB_DATABASE=passprotect | ||
- NODE_ENV=production | ||
- DEBUG=App:* | ||
|
||
selenium: | ||
image: selenium/standalone-chrome | ||
|
||
mongodb: | ||
image: mongo:3.6 | ||
image: mongo:4 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,4 +15,4 @@ indent_style = space | |
indent_size = 4 | ||
|
||
[*.md] | ||
trim_trailing_whitespace = false | ||
trim_trailing_whitespace = false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
VUE_APP_PIWIK_ENABLED=true | ||
VUE_APP_PIWIK_SITE_URL=https://stats.shadoware.org/ | ||
VUE_APP_PIWIK_SITE_ID=36 | ||
|
||
VUE_APP_I18N_LOCALE=fr | ||
VUE_APP_I18N_FALLBACK_LOCALE=en | ||
|
||
#VUE_APP_GRAPHQL_HTTP=https://passprotect.shadoware.org/api/graphql | ||
#VUE_APP_GRAPHQL_WS=wss://passprotect.shadoware.org/api/graphql | ||
VUE_APP_GRAPHQL_HTTP=http://localhost:4000/ | ||
VUE_APP_GRAPHQL_WS=ws://localhost:4000/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1 @@ | ||
/build/ | ||
/config/ | ||
/dist/ | ||
/*.js | ||
/test/unit/coverage/ | ||
*.gql |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# | ||
# -------- Base --------- | ||
|
||
FROM node:8-alpine as builder | ||
LABEL MAINTAINER="Ulrich Van Den Hekke <ulrich.vdh@shadoware.org>" | ||
|
||
WORKDIR /src | ||
COPY package.json /src | ||
RUN apk add --no-cache make gcc g++ python git | ||
RUN npm install | ||
|
||
ENV NODE_ENV=production | ||
|
||
ENV VUE_APP_PIWIK_ENABLED=true | ||
ENV VUE_APP_PIWIK_SITE_URL='${PIWIK_SITE_URL}' | ||
ENV VUE_APP_PIWIK_SITE_ID='${PIWIK_SITE_ID}' | ||
|
||
ENV VUE_APP_I18N_LOCALE=fr | ||
ENV VUE_APP_I18N_FALLBACK_LOCALE=en | ||
|
||
ENV VUE_APP_GRAPHQL_HTTP_ENDPOINT='https://${GRAPHQL_SERVER}' | ||
ENV VUE_APP_GRAPHQL_WS='wss://${GRAPHQL_SERVER}' | ||
|
||
COPY . . | ||
RUN npm run build -- --modern | ||
|
||
# | ||
# -------- Dist ----------- | ||
FROM nginx:alpine as final | ||
LABEL MAINTAINER="Ulrich Van Den Hekke <ulrich.vdh@shadoware.org>" | ||
|
||
COPY src-docker/nginx/default.conf /etc/nginx/conf.d/default.conf | ||
|
||
COPY --from=builder /src/dist /usr/share/nginx/html | ||
COPY --from=builder /src/dist /usr/share/nginx/html.template | ||
|
||
CMD ["/bin/sh", "-c", "cd /usr/share/nginx/html.template && for f in $(find ./ -type f); do envsubst '${PIWIK_SITE_URL} ${PIWIK_SITE_ID} ${GRAPHQL_SERVER}' < $f > \"/usr/share/nginx/html/$f\"; done && nginx -g 'daemon off;'"] |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.