diff --git a/.env.example b/.env.example index c364d03..25dbfc4 100644 --- a/.env.example +++ b/.env.example @@ -24,3 +24,13 @@ GEETEST_ID_RESET=your-gee-test-id GEETEST_KEY_RESET=your-geetest-key PUSHER_API_KEY= PUSHER_API_CLUSTER= + +#SSO +GOOGLE_CLIENT_ID= +GOOGLE_CALLBACK_URL=http://localhost/v1/auth/google/callback + +FACEBOOK_APP_ID= +FACEBOOK_CALLBACK_URL=http://localhost/v1/auth/facebook/callback + +GITHUB_CLIENT_ID= +GITHUB_CALLBACK_URL=http://localhost/v1/auth/github/callback diff --git a/.github/workflows/vercel-preview.yaml b/.github/workflows/vercel-preview.yaml new file mode 100644 index 0000000..7b62609 --- /dev/null +++ b/.github/workflows/vercel-preview.yaml @@ -0,0 +1,21 @@ +name: Vercel Preview Deployment +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} +on: + push: + branches: + - develop +jobs: + Deploy-Preview: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }} diff --git a/.github/workflows/vercel-prod.yaml b/.github/workflows/vercel-prod.yaml new file mode 100644 index 0000000..5e86d1e --- /dev/null +++ b/.github/workflows/vercel-prod.yaml @@ -0,0 +1,21 @@ +name: Vercel Production Deployment +env: + VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }} + VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }} +on: + push: + branches: + - master +jobs: + Deploy-Production: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Install Vercel CLI + run: npm install --global vercel@latest + - name: Pull Vercel Environment Information + run: vercel pull --yes --environment=production --token=${{ secrets.VERCEL_TOKEN }} + - name: Build Project Artifacts + run: vercel build --prod --token=${{ secrets.VERCEL_TOKEN }} + - name: Deploy Project Artifacts to Vercel + run: vercel deploy --prebuilt --prod --token=${{ secrets.VERCEL_TOKEN }} diff --git a/components/buttons/social-button-large.vue b/components/buttons/social-button-large.vue new file mode 100644 index 0000000..486e78f --- /dev/null +++ b/components/buttons/social-button-large.vue @@ -0,0 +1,50 @@ + + diff --git a/components/commons/social-sign.vue b/components/commons/social-sign.vue new file mode 100644 index 0000000..c6c217b --- /dev/null +++ b/components/commons/social-sign.vue @@ -0,0 +1,78 @@ + + diff --git a/components/modals/integration-info.vue b/components/modals/integration-info.vue new file mode 100644 index 0000000..ea9d875 --- /dev/null +++ b/components/modals/integration-info.vue @@ -0,0 +1,91 @@ + + diff --git a/components/modals/login-modal.vue b/components/modals/login-modal.vue index d88871b..48a76ae 100644 --- a/components/modals/login-modal.vue +++ b/components/modals/login-modal.vue @@ -55,6 +55,7 @@ + @@ -95,8 +96,11 @@ import GeneralLoading from "~/components/loadings/general-loading"; import { ValidationObserver } from "vee-validate"; import BasicInput from "~/components/inputs/basic-input"; import { mapGetters } from "vuex"; +import SocialSign from "~/components/commons/social-sign.vue"; + export default { components: { + SocialSign, BasicInput, ValidationObserver, GeneralLoading, diff --git a/components/modals/user-registration-modal.vue b/components/modals/user-registration-modal.vue index 28e9aac..fa61776 100644 --- a/components/modals/user-registration-modal.vue +++ b/components/modals/user-registration-modal.vue @@ -72,6 +72,7 @@ + @@ -96,7 +97,8 @@

- {{ $t("registration_done") }}
+ + {{ $t("registration_done") }}
{{ $t("please_check_email_inbox") }}

@@ -111,8 +113,11 @@ import TosRemind from "~/components/commons/tos-remind"; import { ValidationObserver } from "vee-validate"; import BasicInput from "~/components/inputs/basic-input"; import GeneralContentLoading from "~/components/loadings/general-content-loading"; +import SocialSign from "@/components/commons/social-sign.vue"; + export default { components: { + SocialSign, GeneralContentLoading, BasicInput, ValidationObserver, diff --git a/layouts/default.vue b/layouts/default.vue index e705dc7..f14e617 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -17,6 +17,7 @@ +