From ec7e5d6d78ec30978b2fbd15cb76b3c29e4eb8b2 Mon Sep 17 00:00:00 2001 From: Robonen Date: Fri, 1 Apr 2022 14:23:22 +0700 Subject: [PATCH 1/3] Fix language --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index b50759e..a8bec38 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + From 110563f1a4c9ebb5eb63904baa7f40ed71fc1fa0 Mon Sep 17 00:00:00 2001 From: zakiquel Date: Sat, 2 Apr 2022 22:55:17 +0700 Subject: [PATCH 2/3] login signin pages --- assets/css/login.css | 94 ++++++++++++++++++++++++++++++++++++++++++ assets/css/signin.css | 94 ++++++++++++++++++++++++++++++++++++++++++ assets/css/style.css | 2 +- assets/images/metr.svg | 3 ++ login.html | 38 +++++++++++++++++ signin.html | 38 +++++++++++++++++ 6 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 assets/css/login.css create mode 100644 assets/css/signin.css create mode 100644 assets/images/metr.svg create mode 100644 login.html create mode 100644 signin.html diff --git a/assets/css/login.css b/assets/css/login.css new file mode 100644 index 0000000..405564f --- /dev/null +++ b/assets/css/login.css @@ -0,0 +1,94 @@ +body { + margin: 0; + font-family: 'Inter', sans-serif; + background-color: rgba(124, 173, 201, 1); + font-size: 17px; + color: white; + line-height: 1.6; +} + +*, +*:before, +*:after { + box-sizing: border-box; +} + +h1, h2, h3, h4, h5, h6 { + margin: 0; + font-family: 'Montserrat', sans-serif; +} + +.container { + width: 100%; + height: 100vh; + max-width: 1920px; + margin: 0 auto; + background-image: linear-gradient(to top, rgb(124, 173, 201, 0.2), rgb(124, 173, 201, 0.2)), url( + "../images/intro.jpg"); + background-size: cover; + display: flex; + flex-direction: column; + justify-content:center; +} + +.logo { + display: flex; + flex-direction: column; + align-items: center; +} + +.logoMetr { + width: 185px; + height: 100px; + background: url("../images/metr.svg") center + no-repeat; + background-size: cover; +} + +.title { + margin: 1% 0; + display: flex; + flex-direction: column; + align-items: center; +} + +.title h2{ + font-size: 35px; +} + +.form__example { + display: flex; + flex-direction: column; + align-items: center; +} + +.form__input { + margin-top: 30px; + width: 320px; + height: 40px; + background-color: #1A89C9; + color: white; + font-family: 'Montserrat', sans-serif; + font-size: 14px; + border-radius: 10px; + border: 0px; +} + +.form__input:hover { + color: rgb(15, 10, 41); + font-weight: 600; + transition: color .1s linear; +} + +.login { + width: 320px; + height: 50px; + padding-left: 1%; +} + +input { + margin: 0; + padding: 0; + color: rgb(129, 125, 125); + font-family: 'Montserrat', sans-serif; +} diff --git a/assets/css/signin.css b/assets/css/signin.css new file mode 100644 index 0000000..405564f --- /dev/null +++ b/assets/css/signin.css @@ -0,0 +1,94 @@ +body { + margin: 0; + font-family: 'Inter', sans-serif; + background-color: rgba(124, 173, 201, 1); + font-size: 17px; + color: white; + line-height: 1.6; +} + +*, +*:before, +*:after { + box-sizing: border-box; +} + +h1, h2, h3, h4, h5, h6 { + margin: 0; + font-family: 'Montserrat', sans-serif; +} + +.container { + width: 100%; + height: 100vh; + max-width: 1920px; + margin: 0 auto; + background-image: linear-gradient(to top, rgb(124, 173, 201, 0.2), rgb(124, 173, 201, 0.2)), url( + "../images/intro.jpg"); + background-size: cover; + display: flex; + flex-direction: column; + justify-content:center; +} + +.logo { + display: flex; + flex-direction: column; + align-items: center; +} + +.logoMetr { + width: 185px; + height: 100px; + background: url("../images/metr.svg") center + no-repeat; + background-size: cover; +} + +.title { + margin: 1% 0; + display: flex; + flex-direction: column; + align-items: center; +} + +.title h2{ + font-size: 35px; +} + +.form__example { + display: flex; + flex-direction: column; + align-items: center; +} + +.form__input { + margin-top: 30px; + width: 320px; + height: 40px; + background-color: #1A89C9; + color: white; + font-family: 'Montserrat', sans-serif; + font-size: 14px; + border-radius: 10px; + border: 0px; +} + +.form__input:hover { + color: rgb(15, 10, 41); + font-weight: 600; + transition: color .1s linear; +} + +.login { + width: 320px; + height: 50px; + padding-left: 1%; +} + +input { + margin: 0; + padding: 0; + color: rgb(129, 125, 125); + font-family: 'Montserrat', sans-serif; +} diff --git a/assets/css/style.css b/assets/css/style.css index c5c3804..8eaa5ca 100644 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -66,7 +66,7 @@ h1, h2, h3, h4, h5, h6 { height: 96px; margin: 0 auto; - background: url("../images/metr.jpg") center + background: url("../images/metr.svg") center no-repeat; background-size: cover; border-right: 2px solid white; diff --git a/assets/images/metr.svg b/assets/images/metr.svg new file mode 100644 index 0000000..43bd468 --- /dev/null +++ b/assets/images/metr.svg @@ -0,0 +1,3 @@ + + + diff --git a/login.html b/login.html new file mode 100644 index 0000000..61d91e3 --- /dev/null +++ b/login.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + Metr + + +
+ +
+

Авторизируйтесь

+
+
+
+ + +
+
+ + +
+
+ +
+
+
+ + \ No newline at end of file diff --git a/signin.html b/signin.html new file mode 100644 index 0000000..7911e74 --- /dev/null +++ b/signin.html @@ -0,0 +1,38 @@ + + + + + + + + + + + + Metr + + +
+ +
+

Вход Метр

+
+
+
+ + +
+
+ + +
+
+ +
+
+
+ + \ No newline at end of file From 79a51a12583e4add3c1e2323e51c728b0b512348 Mon Sep 17 00:00:00 2001 From: robonen Date: Fri, 15 Apr 2022 01:37:50 +0700 Subject: [PATCH 3/3] CD pipeline --- .github/workflows/release.yml | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..8144c3e --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,40 @@ +name: Release + +on: + + push: + tags: + - 'v*' + +jobs: + prepare: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Get the version + id: get_version + run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + + - name: Deploy + uses: appleboy/scp-action@master + with: + host: ${{ secrets.SSH_HOST }} + username: ${{ secrets.SSH_USERNAME }} + password: ${{ secrets.SSH_PASSWORD }} + port: ${{ secrets.SSH_PORT }} + rm: true + strip_components: 1 + source: "dist/" + target: ${{ secrets.SERVER_DIR }} + + - name: Notify + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_ID }} + token: ${{ secrets.TELEGRAM_TOKEN }} + format: markdown + message: | + ✅ *${{ github.actor }} выпустил новый релиз: ${{ github.repository }}: ${{ steps.get_version.outputs.VERSION }}*: + [Просмотреть релиз](https://forma-web.ru) \ No newline at end of file