Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
d6970d6
о себе
Sep 15, 2024
ebb7be1
typescript домашняя работа 1
Sep 17, 2024
cc06fc5
Merge pull request #1 from yurabox2017/homework1
yurabox2017 Sep 17, 2024
367d431
Revert "typescript домашняя работа 1"
Sep 18, 2024
d2ff9ff
Merge branch 'main' of https://github.com/yurabox2017/yurabox2017.git…
Sep 18, 2024
657a717
пытаюсь починить
Sep 18, 2024
ee2872b
Merge branch 'homework1'
Sep 18, 2024
e7a1801
test
Sep 18, 2024
6435beb
сделал
Sep 18, 2024
07b3deb
исправил по ревью
Sep 19, 2024
a258748
Merge pull request #4 from yurabox2017/homework1
yurabox2017 Sep 20, 2024
7bb7b43
вторая домашняя работа
Sep 24, 2024
a41c38c
вторая домашняя работа
Sep 24, 2024
3524043
1
Sep 24, 2024
e940a81
домашняя работа 2
Sep 25, 2024
901fccb
storybook
Sep 25, 2024
30dda28
тест
Sep 25, 2024
d6ae984
.
Sep 25, 2024
d9a5c5d
проработал ревью по 2й домашней работе
Sep 26, 2024
43b4188
не отображалось модальное окно
Sep 26, 2024
3ae424a
типизировал пропсы
Oct 1, 2024
9a10420
типизировал пропсы исправил ошибку key
Oct 1, 2024
b8bb3a8
переименовал компоненты
Oct 2, 2024
e8992c5
добавляем состояние в приложение react hooks(2)
Oct 12, 2024
3ca3759
no message
Oct 13, 2024
b1e1d2e
a
Oct 13, 2024
3d571a5
react hooks(2)
Oct 13, 2024
c9a984f
hooks(2)
Oct 16, 2024
9f896e4
сделал
Oct 19, 2024
5e1c30a
react patterns
yurabox2017 Oct 27, 2024
19a5cce
Features react patterns review
yurabox2017 Nov 14, 2024
34a73c9
сделал

yurabox2017 Nov 17, 2024
27b1ada
поправил ошибку key
yurabox2017 Nov 17, 2024
8a39dc6
сделал
yurabox2017 Nov 21, 2024
ac01579
1
yurabox2017 Nov 21, 2024
c4ccdc9
перенос компонентов сторибук в основной проект, раньше дублировал в р…
yurabox2017 Nov 23, 2024
39d99c2
react routing
yurabox2017 Nov 26, 2024
69bae51
поправил ошибку сборки
yurabox2017 Nov 26, 2024
bc224b3
ошибка роутинга
yurabox2017 Nov 27, 2024
b8685d5
add redux persist
yurabox2017 Nov 28, 2024
f01d61f
переделал роутинг
yurabox2017 Nov 28, 2024
19071ca
Merge branch 'features-routing'
yurabox2017 Nov 28, 2024
bafaa79
1
yurabox2017 Nov 28, 2024
077b40a
добавил кнопки в хедер добавить редактировать товар
yurabox2017 Nov 28, 2024
c9d69f7
сделал слайдер карусель
yurabox2017 Dec 2, 2024
9e0573b
поправил ошибку сборки
yurabox2017 Dec 2, 2024
5bd464c
1
yurabox2017 Dec 2, 2024
a82f2ff
2
yurabox2017 Dec 2, 2024
57530b5
3
yurabox2017 Dec 2, 2024
e7323f8
4
yurabox2017 Dec 2, 2024
2173470
поправил замечания по ревью
yurabox2017 Dec 3, 2024
56d89c2
saga делаю открытие модального окна
yurabox2017 Dec 14, 2024
2bd3cf5
сделал
yurabox2017 Dec 14, 2024
473a813
поправил ошибку линта
yurabox2017 Dec 14, 2024
25c7529
фото профиля
yurabox2017 Dec 15, 2024
402f3d7
добавил бэдж к корзине
yurabox2017 Dec 15, 2024
68175a2
ревью кода
yurabox2017 Dec 18, 2024
03bde8e
сделал тесты
yurabox2017 Dec 23, 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
24 changes: 12 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test, Lint, Build and Deploy on Github Pages

on:
push:
branches: ["master", "main"]
branches: ['master', 'main']

# Позволяет запустить этот рабочий процесс вручную на вкладке Actions
workflow_dispatch:
Expand Down Expand Up @@ -45,17 +45,17 @@ jobs:
branch: gh-pages
folder: dist

# # Собираем Storybook
# - name: Build Storybook
# run: npm run build-storybook
#
# # Публикуем Storybook на Github Pages
# - name: Deploy Storybook to Github Pages
# uses: JamesIves/[email protected]
# with:
# branch: gh-pages
# folder: storybook-static
# commit-message: "Automatically publish Storybook"
# Собираем Storybook
# - name: Build Storybook
# run: npm run build-storybook

# # Публикуем Storybook на Github Pages
# - name: Deploy Storybook to Github Pages
# uses: JamesIves/[email protected]
# with:
# branch: gh-pages
# folder: storybook-static
# commit-message: 'Automatically publish Storybook'

# Останавливаем выполнение строго при неудачных тестах
- name: Fail on failed tests
Expand Down
18 changes: 10 additions & 8 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
const config = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|ts|tsx)"],
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|ts|tsx)'],
// staticDirs: ['../src/assets'],
staticDirs: [{ from: '../src/assets', to: '../../assets' }],
addons: [
"@storybook/addon-links",
"@storybook/addon-essentials",
"@storybook/addon-interactions",
"@storybook/preset-scss",
"@storybook/addon-mdx-gfm"
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/preset-scss',
'@storybook/addon-mdx-gfm',
],
framework: {
name: "@storybook/react-webpack5",
name: '@storybook/react-webpack5',
options: {},
},
docs: {
autodocs: "tag",
autodocs: 'tag',
},
};
export default config;
1 change: 1 addition & 0 deletions .storybook/preview-body.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div id="root-modal"></div>
15 changes: 0 additions & 15 deletions .storybook/preview.ts

This file was deleted.

57 changes: 57 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
import type { Preview } from '@storybook/react';
import 'bootstrap/dist/css/bootstrap.min.css';
import i18n from '../src/localization/settings';
import React, { Suspense } from 'react';
import { I18nextProvider } from 'react-i18next';

const preview: Preview = {
parameters: {
actions: { argTypesRegex: '^on[A-Z].*' },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
},
};

export default preview;


// Wrap your stories in the I18nextProvider component
const withI18next = (Story) => {
return (
// This catches the suspense from components not yet ready (still loading translations)
// Alternative: set useSuspense to false on i18next.options.react when initializing i18next
<Suspense fallback={<div>loading translations...</div>}>
<I18nextProvider i18n={i18n}>
<Story />
</I18nextProvider>
</Suspense>
);
};

// export decorators for storybook to wrap your stories in
export const decorators = [withI18next];


/* Snipped for brevity */

// Create a global variable called locale in storybook
// and add a menu in the toolbar to change your locale
export const globalTypes = {
locale: {
name: 'Locale',
description: 'Internationalization locale',
toolbar: {
icon: 'globe',
items: [
{ value: 'en', title: 'English' },
{ value: 'de', title: 'Deutsch' },
],
showName: true,
},
},
};

16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "chrome",
"request": "launch",
"name": "Launch Chrome against localhost",
"url": "http://localhost:8080",
"webRoot": "${workspaceFolder}",
// "runtimeExecutable": "/Applications/Сhrome.app",
}
]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"workbench.externalBrowser": "chrome"
}
2 changes: 2 additions & 0 deletions declarations.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
/// <reference types="redux-persist" />
declare module '*.sass';
declare module '*.scss';
declare module '*.css';
declare module '*.jpg';
declare module '*.jpeg';
declare module '*.png';
declare module '*.svg';
declare module '*d.ts';
Loading