From 79e3cff25c7ab19871fe35466d4504c7eb4c1e66 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 22 Sep 2021 18:32:23 +0000 Subject: [PATCH 1/5] Add 'Jenkinsfile' --- Jenkinsfile | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..e1569fe --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,25 @@ +pipeline { + agent { + node { + label 'willa' + } + + } + stages { + stage('build') { + steps { + sh 'docker build -t registry.willaspace.com/willaspace/$IMAGE_NAME:latest .' + } + } + + stage('deploy') { + steps { + sh 'cd /apps/$IMAGE_NAME/; docker-compose up -d' + } + } + + } + environment { + IMAGE_NAME = 'champya-front' + } +} \ No newline at end of file From 5f6c67bc705066f686bcd0f566985cf33fcd2f4a Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 22 Sep 2021 18:44:17 +0000 Subject: [PATCH 2/5] Add 'Dockerfile' --- Dockerfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b53a884 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +Raw +Permalink +Blame +History + +FROM node:16.7.0-alpine AS builder + +WORKDIR /app + +COPY package*.json ./ + +RUN yarn + +COPY . . + +RUN yarn build + + +FROM nginx:1.21.1 + +COPY --from=builder /app/dist /usr/share/nginx/html \ No newline at end of file From 1068dd66fab20a10894b3087208e8f34517753b3 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 22 Sep 2021 19:21:24 +0000 Subject: [PATCH 3/5] Update 'Dockerfile' --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index b53a884..90edced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,3 @@ -Raw -Permalink -Blame -History - FROM node:16.7.0-alpine AS builder WORKDIR /app From 424bcf0764f89fd8a3140471fdbc5986a9ca3811 Mon Sep 17 00:00:00 2001 From: "f.saravi" Date: Wed, 22 Sep 2021 19:26:34 +0000 Subject: [PATCH 4/5] Update 'vue.config.js' --- vue.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/vue.config.js b/vue.config.js index 061635e..270e6ef 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,3 +1,4 @@ +const path = require('path'); module.exports = { transpileDependencies: [ 'vuetify' From 0bcbdd4db2decf5957ea7675c7370176e28a7d22 Mon Sep 17 00:00:00 2001 From: sajjad_talkhabi Date: Thu, 23 Sep 2021 00:07:44 +0330 Subject: [PATCH 5/5] fix --- package-lock.json | 165 +++++++++++++++++++++-------------------- package.json | 1 + src/views/Register.vue | 21 ++++-- vue.config.js | 9 --- 4 files changed, 101 insertions(+), 95 deletions(-) diff --git a/package-lock.json b/package-lock.json index 76ad679..4a8ce2a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1753,6 +1753,63 @@ "integrity": "sha1-/q7SVZc9LndVW4PbwIhRpsY1IPo=", "dev": true }, + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "optional": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "optional": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "optional": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "optional": true + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "optional": true + }, + "loader-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", + "dev": true, + "optional": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, "ssri": { "version": "8.0.1", "resolved": "https://registry.nlark.com/ssri/download/ssri-8.0.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fssri%2Fdownload%2Fssri-8.0.1.tgz", @@ -1761,6 +1818,28 @@ "requires": { "minipass": "^3.1.1" } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "optional": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "vue-loader-v16": { + "version": "npm:vue-loader@16.7.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.7.1.tgz", + "integrity": "sha512-6dOj/8DQ3lcfLwsFT9X5N1qvaMSqi8zsYTD0hE4iNp7G/mgZ39cgzvwCP3rxDwQD2adl65UmoRxnqBTHrK4u6A==", + "dev": true, + "optional": true, + "requires": { + "chalk": "^4.1.0", + "hash-sum": "^2.0.0", + "loader-utils": "^2.0.0" + } } } }, @@ -7498,6 +7577,11 @@ "minimist": "^1.2.5" } }, + "module-alias": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.2.tgz", + "integrity": "sha512-A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q==" + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npm.taobao.org/move-concurrently/download/move-concurrently-1.0.1.tgz", @@ -11339,87 +11423,6 @@ } } }, - "vue-loader-v16": { - "version": "npm:vue-loader@16.7.0", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.7.0.tgz", - "integrity": "sha512-43I0grWtwSCE8fiH/hAwFK+6sNlmvDuHhXScYH8HVSVAMS81IM66tgUOcxbPCeqhhz/1BE51YPxX59eZKGallQ==", - "dev": true, - "optional": true, - "requires": { - "chalk": "^4.1.0", - "hash-sum": "^2.0.0", - "loader-utils": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "optional": true, - "requires": { - "color-convert": "^2.0.1" - } - }, - "chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "optional": true, - "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "optional": true, - "requires": { - "color-name": "~1.1.4" - } - }, - "color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "optional": true - }, - "has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "optional": true - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "optional": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - }, - "supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "optional": true, - "requires": { - "has-flag": "^4.0.0" - } - } - } - }, "vue-meta": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/vue-meta/-/vue-meta-2.4.0.tgz", diff --git a/package.json b/package.json index 69fd989..1843980 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "core-js": "^3.6.5", "jquery": "^3.6.0", "meta-router": "^4.0.1", + "module-alias": "^2.2.2", "popper.js": "^1.16.1", "vue": "^2.6.11", "vue-meta": "^2.4.0", diff --git a/src/views/Register.vue b/src/views/Register.vue index 39299c6..ceae195 100644 --- a/src/views/Register.vue +++ b/src/views/Register.vue @@ -20,7 +20,8 @@ placeholder="your email address" label="your email address" class="no-error-msg" - + dark + v-model="form.email" > @@ -30,7 +31,8 @@ placeholder="your full name" label="your full name" class="no-error-msg" - + dark + v-model="form.first_name" > @@ -40,7 +42,8 @@ placeholder="password" label="password" class="no-error-msg" - + dark + v-model="form.password" > @@ -50,7 +53,8 @@ placeholder="your password again" label="your password again" class="no-error-msg" - + dark + v-model="form.password_confirmation" > @@ -63,10 +67,10 @@ height="25" :text-mode="true" text="do sign up" + @click.native="register(form)" /> -