Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

РК4 #56

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f7a0b44
[fix] браны коментарии и начато написание manual
KurenkovDmitry Dec 10, 2024
3e9954e
[feat] реализован функционал промокодов
KurenkovDmitry Dec 11, 2024
fd21556
linter
Dec 12, 2024
49741a1
liner + pre-hook
Dec 12, 2024
d737e1b
[feat] добавлено рекомендации без бека
KurenkovDmitry Dec 13, 2024
151f516
[fix] браны коментарии и начато написание manual
KurenkovDmitry Dec 10, 2024
0170ce9
[feat] реализован функционал промокодов
KurenkovDmitry Dec 11, 2024
dac2ee3
[feat] добавлено рекомендации без бека
KurenkovDmitry Dec 13, 2024
5d99c04
[fix] sw
KurenkovDmitry Dec 13, 2024
c9bf74f
[fix] after git pull
KurenkovDmitry Dec 13, 2024
1fb2961
[fix] svg баг
KurenkovDmitry Dec 13, 2024
eab97a9
[fix] начаты уведомления
KurenkovDmitry Dec 14, 2024
a1586bb
[fix] вернул адрес бека на верный
KurenkovDmitry Dec 14, 2024
d099192
[fix] начаты правки
KurenkovDmitry Dec 15, 2024
9cd7dee
[fix] уведомления done
KurenkovDmitry Dec 15, 2024
0a79e21
[fix] рекомендации апи
KurenkovDmitry Dec 15, 2024
d2e68ab
[fix] внесено большое количество правок
KurenkovDmitry Dec 16, 2024
5ed3715
[fix] готовы продуктовые
KurenkovDmitry Dec 16, 2024
31f712c
Merge pull request #52 from frontend-park-mail-ru/OZON-155
KurenkovDmitry Dec 16, 2024
ff49f06
[fix] правка корзины
KurenkovDmitry Dec 16, 2024
c3ab8db
[fix] починины уведомления
KurenkovDmitry Dec 16, 2024
9230106
Merge pull request #53 from frontend-park-mail-ru/OZON-155
KurenkovDmitry Dec 16, 2024
f4017e1
[fix] поправлена страница товара
KurenkovDmitry Dec 16, 2024
22467a3
Merge pull request #54 from frontend-park-mail-ru/OZON-155
KurenkovDmitry Dec 16, 2024
6092065
[fix] поправлен вес
KurenkovDmitry Dec 16, 2024
1bef4e8
[fix] правки
KurenkovDmitry Dec 16, 2024
85fcd82
Merge pull request #55 from frontend-park-mail-ru/OZON-155
KurenkovDmitry Dec 16, 2024
3dc387a
yandex-api
Dec 13, 2024
9893917
вишлисты
Dec 16, 2024
26aac16
Merge pull request #51 from frontend-park-mail-ru/OZON-127
goriiin Dec 16, 2024
e13d325
modal
Dec 16, 2024
dc44e47
--
Dec 17, 2024
15e63ab
[fix] внесены визуальные изменения
KurenkovDmitry Dec 18, 2024
9aca54b
убрал кнопку
Dec 20, 2024
ae72921
-
Dec 20, 2024
99b856c
Merge pull request #57 from frontend-park-mail-ru/uiux-hotfix-1
goriiin Dec 20, 2024
9446d82
-
JOJOSoderqvist Dec 21, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"root": true,
"extends": [
"plugin:@typescript-eslint/recommended",
"prettier"
],
"parser": "@typescript-eslint/parser",
"plugins": [
"@typescript-eslint",
"prettier"
],
"rules": {
"@typescript-eslint/no-explicit-any": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-unused-vars": "off",
"prettier/prettier": "off"
}
}
48 changes: 48 additions & 0 deletions .github/workflows/manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Kotyari Build

on:
push:
branches: [main]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Install Node
uses: actions/setup-node@v4
with:
node-version: 16

- name: Checkout code
run: actions/checkout@v4

- name: Install deps
run: npm ci

- name: Build
run: npm run build

- name: Upload build result
uses: actions/upload-artifact@v1
with:
name: dist
path: ./dist

deploy:
runs-on: ubuntu-latest

steps:
- name: Download build
uses: actions/download-artifact@v1
with:
name: dist
- name: Transfer build files to server
uses: appleboy/scp-action@master
with:
host: 94.139.246.241
username: ubuntu
key: ${{ secrets.PRIVATE_KEY }}
source: "dist/*"
target: "/home/ubuntu/dist"
strip_components: 1
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
key-yandex.ts

./dist/
node_modules
Expand Down
4 changes: 4 additions & 0 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# .husky/pre-commit

prettier $(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g') --write --ignore-unknown
git update-index --again
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
dist/
9 changes: 9 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"trailingComma": "all",
"tabWidth": 2,
"semi": true,
"singleQuote": true,
"printWidth": 120,
"bracketSpacing": true,
"endOfLine": "lf"
}
4 changes: 0 additions & 4 deletions eslint.config.js

This file was deleted.

27 changes: 0 additions & 27 deletions eslint.config.mjs

This file was deleted.

Loading