diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml new file mode 100644 index 0000000..14bb2c8 --- /dev/null +++ b/.github/workflows/dev.yml @@ -0,0 +1,39 @@ +# Deploing to dev server +name: Deploy the application to Google Cloud Run + +on: + pull_request: + branches: + - 'develop' + + push: + branches: + - 'develop' + +jobs: + deploy: + name: Deploy job for dev + runs-on: ubuntu-latest + steps: + - name: Checkout the repository + uses: actions/checkout@v1 + + - name: Build Docker image + run: | + docker build . --tag gcr.io/${{ secrets.GCLOUD_PROJECT }}/${{ secrets.GCLOUD_APP_NAME_DEV }} + + - name: Authenticate into Google Cloud Platform + uses: GoogleCloudPlatform/github-actions/setup-gcloud@master + with: + service_account_email: ${{ secrets.GCLOUD_EMAIL }} + service_account_key: ${{ secrets.GCLOUD_AUTH }} + + - name: Configure Docker to use Google Cloud Platform + run: "gcloud auth configure-docker --quiet" + + - name: Push image to Google Cloud Container Registry + run: docker push gcr.io/${{ secrets.GCLOUD_PROJECT }}/${{ secrets.GCLOUD_APP_NAME_DEV }} + + - name: Install commands and deploy on cloud run + run: | + gcloud run deploy ${{ secrets.GCLOUD_APP_NAME_DEV }} --quiet --image gcr.io/${{ secrets.GCLOUD_PROJECT }}/${{ secrets.GCLOUD_APP_NAME_DEV }} --project ${{ secrets.GCLOUD_PROJECT }} --region europe-west1 --platform managed diff --git a/.github/workflows/google.yml b/.github/workflows/prod.yml similarity index 90% rename from .github/workflows/google.yml rename to .github/workflows/prod.yml index a8a9d7e..0a9e8fe 100644 --- a/.github/workflows/google.yml +++ b/.github/workflows/prod.yml @@ -1,21 +1,23 @@ - +# Deploing to prod server name: Deploy the application to Google Cloud Run + on: - push: + pull_request: branches: - 'master' jobs: deploy: - name: Deploy job + name: Deploy job for prod runs-on: ubuntu-latest steps: - name: Checkout the repository uses: actions/checkout@v1 - - name: Build Docker image + - name: Build Docker image for production run: | docker build . --tag gcr.io/${{ secrets.GCLOUD_PROJECT }}/${{ secrets.GCLOUD_APP_NAME }} + - name: Authenticate into Google Cloud Platform uses: GoogleCloudPlatform/github-actions/setup-gcloud@master with: diff --git a/assets/colors.scss b/assets/colors.scss index e69de29..10ff7c3 100644 --- a/assets/colors.scss +++ b/assets/colors.scss @@ -0,0 +1,3 @@ +$background: #2F2F2F; +$textColor: #F1F1F1; +$footer: #4A4A4A; diff --git a/assets/global.scss b/assets/global.scss index 8cc3b76..09eefea 100644 --- a/assets/global.scss +++ b/assets/global.scss @@ -1,25 +1,23 @@ +@import '@/assets/colors'; + * { box-sizing: border-box; - margin: 0; - padding: 0; } -html { - background: #2F2F2F; +html, body { + margin: 0; + padding: 0; font-family: 'Montserrat', sans-serif; + background: $background; } -h1, h2, h3, h4, h5, p { - color: #F1F1F1; +h1, h2, h3, p, a { + color: $textColor; text-align: center; } -h2 { - margin-bottom: 10px; -} - -a { - color:#F1F1F1; - text-decoration: none; - margin: 10px; -} +@media only screen and (max-width: 765px) { + body { + padding: 10px; + } +} \ No newline at end of file diff --git a/components/about.vue b/components/about.vue deleted file mode 100644 index 44c3050..0000000 --- a/components/about.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - diff --git a/components/home.vue b/components/home.vue deleted file mode 100644 index 8dcb338..0000000 --- a/components/home.vue +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - diff --git a/components/homepage/about.vue b/components/homepage/about.vue new file mode 100644 index 0000000..0509c85 --- /dev/null +++ b/components/homepage/about.vue @@ -0,0 +1,20 @@ + + + diff --git a/components/design.vue b/components/homepage/design.vue similarity index 73% rename from components/design.vue rename to components/homepage/design.vue index a2504d0..29ac8e2 100644 --- a/components/design.vue +++ b/components/homepage/design.vue @@ -1,21 +1,38 @@ - + diff --git a/components/features.vue b/components/homepage/features.vue similarity index 60% rename from components/features.vue rename to components/homepage/features.vue index a2f4da2..4111a14 100644 --- a/components/features.vue +++ b/components/homepage/features.vue @@ -1,56 +1,58 @@ - - - + + diff --git a/components/homepage/mission.vue b/components/homepage/mission.vue new file mode 100644 index 0000000..d421160 --- /dev/null +++ b/components/homepage/mission.vue @@ -0,0 +1,20 @@ + + + diff --git a/components/safety.vue b/components/homepage/safety.vue similarity index 53% rename from components/safety.vue rename to components/homepage/safety.vue index ccec5eb..2b503c6 100644 --- a/components/safety.vue +++ b/components/homepage/safety.vue @@ -1,15 +1,31 @@ - + diff --git a/components/homepage/sponsor.vue b/components/homepage/sponsor.vue new file mode 100644 index 0000000..ac039d9 --- /dev/null +++ b/components/homepage/sponsor.vue @@ -0,0 +1,21 @@ + + + diff --git a/components/homepage/useCases.vue b/components/homepage/useCases.vue new file mode 100644 index 0000000..a945a8f --- /dev/null +++ b/components/homepage/useCases.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/components/imgElememt.vue b/components/imgElememt.vue new file mode 100644 index 0000000..3f5125d --- /dev/null +++ b/components/imgElememt.vue @@ -0,0 +1,100 @@ + + + + + diff --git a/components/mission.vue b/components/mission.vue deleted file mode 100644 index 72c7a63..0000000 --- a/components/mission.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - diff --git a/components/useCases.vue b/components/useCases.vue deleted file mode 100644 index 3352057..0000000 --- a/components/useCases.vue +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - diff --git a/layouts/default.vue b/layouts/default.vue index 3f73f58..58f7460 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,9 +1,47 @@ - diff --git a/layouts/error.vue b/layouts/error.vue new file mode 100644 index 0000000..0ea07e6 --- /dev/null +++ b/layouts/error.vue @@ -0,0 +1,22 @@ + + + \ No newline at end of file diff --git a/pages/imprint.vue b/pages/imprint.vue new file mode 100644 index 0000000..2133410 --- /dev/null +++ b/pages/imprint.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/pages/index.vue b/pages/index.vue index bd0457c..ceda5ac 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -7,9 +7,12 @@ + +
- + Imprint +

© Autofly 2020

@@ -18,12 +21,14 @@ import { Vue, Component } from 'nuxt-property-decorator' import { Meta } from '@/decorators/meta' -import home from '@/components/home.vue' -import mission from '@/components/mission.vue' -import features from '@/components/features.vue' -import useCases from '@/components/useCases.vue' -import design from '@/components/design.vue' -import safety from '@/components/safety.vue' +import home from '@/components/homepage/home.vue' +import mission from '@/components/homepage/mission.vue' +import features from '@/components/homepage/features.vue' +import useCases from '@/components/homepage/useCases.vue' +import design from '@/components/homepage/design.vue' +import safety from '@/components/homepage/safety.vue' +import about from '@/components/homepage/about.vue' +import sponsor from '@/components/homepage/sponsor.vue' @Component({ components: { @@ -32,7 +37,9 @@ import safety from '@/components/safety.vue' features, useCases, design, - safety + safety, + about, + sponsor } }) export default class Home extends Vue { @@ -53,16 +60,24 @@ export default class Home extends Vue { diff --git a/static/images/logo.svg b/static/images/logo.svg new file mode 100644 index 0000000..a0a9f7e --- /dev/null +++ b/static/images/logo.svg @@ -0,0 +1,4 @@ + + + +