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

Develop #13

Merged
merged 145 commits into from
Jan 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
145 commits
Select commit Hold shift + click to select a range
80e07c7
Начало перевода на FSD
Bricks666 Dec 9, 2022
61aa87b
Рапределение комнат
Bricks666 Dec 10, 2022
d89e23f
перевод auth модуля
Bricks666 Dec 10, 2022
077b476
Перенос групп
Bricks666 Dec 15, 2022
5e75400
Перевод задач
Bricks666 Dec 15, 2022
e805f2a
Перевод активностей
Bricks666 Dec 16, 2022
e1d8ed5
Перенос прогресса
Bricks666 Dec 16, 2022
35d6e02
Пернос попапов
Bricks666 Dec 16, 2022
803dbf3
Разбиение оставшихся модулей
Bricks666 Dec 17, 2022
8bc3705
Завершение переведения на fsd
Bricks666 Dec 18, 2022
3b80178
Завершение переведения на fsd. 2
Bricks666 Dec 18, 2022
2e4ee98
Merge pull request #6 from Bricks666/feature/fsd
Bricks666 Dec 18, 2022
9fc64d6
Добавление обработки одного уведомления
Bricks666 Dec 18, 2022
cfbf6e4
Что то
Bricks666 Dec 19, 2022
e92a2f2
Старт стандартизации загрузки и кеширования
Bricks666 Dec 19, 2022
39c9cce
Запросы и кеши
Bricks666 Dec 19, 2022
fd78e32
Перенос запросов данных на открытие путей
Bricks666 Dec 20, 2022
ffa65ac
Переименования
Bricks666 Dec 20, 2022
82bb94a
Merge pull request #7 from Bricks666:features/notifications
Bricks666 Dec 20, 2022
98f31df
Добавление списка пользователей
Bricks666 Jan 6, 2023
b2a00d7
Добавление поиска и добавления пользователей
Bricks666 Jan 6, 2023
1f78951
Merge pull request #8 from Bricks666:feature/users
Bricks666 Jan 6, 2023
8e8243f
Обновление farfetched. WIP
Bricks666 Jan 6, 2023
484691a
Обновление farfetched
Bricks666 Jan 7, 2023
42c38d7
Некоторые корректировки
Bricks666 Jan 7, 2023
5c2f37e
Внесение еще нескольких исправлений
Bricks666 Jan 7, 2023
21195c6
Merge pull request #9 from Bricks666:migrate/change-dependencies
Bricks666 Jan 8, 2023
80f3bef
Первичное разделение на вкладки
Bricks666 Jan 9, 2023
72e3073
Удаление лишнего кода в сфере запросов
Bricks666 Jan 9, 2023
f10f641
Добавление списка последних активностей
Bricks666 Jan 9, 2023
1e5baca
Добавление сообщений об ошибки загрузки
Bricks666 Jan 10, 2023
00abe7a
Замена выпадающего меню с одним действием на кнопку
Bricks666 Jan 10, 2023
620e7e9
Фильтры для активностей
Bricks666 Jan 10, 2023
037b39d
Мобильные фильтры для активностей
Bricks666 Jan 11, 2023
af41981
Добавление пагинации к активностям. WIP
Bricks666 Jan 11, 2023
c5b4631
Разделение вкладок комнаты на разные страницы
Bricks666 Jan 11, 2023
9f9b16d
Добавление синхронизации фильтров и пагинации с query
Bricks666 Jan 11, 2023
78f015e
Некоторые исправления
Bricks666 Jan 11, 2023
52ea0f2
Отделение недавних активностей и кеширование
Bricks666 Jan 12, 2023
8f687cd
Некоторые изменения в прогрессе
Bricks666 Jan 12, 2023
62ff066
Первоначальная реализация списка уведомлений
Bricks666 Jan 12, 2023
3195423
Сделал фабрику для уведомлений
Bricks666 Jan 12, 2023
3ed0ea4
Добавление тестов и комментариев к фабрике
Bricks666 Jan 13, 2023
f16f156
Разделение попапов на страницы
Bricks666 Jan 13, 2023
8957aa4
Перевод форм на effector-form. WIP
Bricks666 Jan 13, 2023
e5fc51a
Перенос на effector-forms формы комнаты
Bricks666 Jan 14, 2023
a56020d
Перевод на effector-forms формы задач
Bricks666 Jan 14, 2023
16538a4
Перевод на effector-forms формы групп
Bricks666 Jan 14, 2023
6ff9b31
Перевод всех форм на effector-forms
Bricks666 Jan 14, 2023
e27629a
Обновление зависимостей
Bricks666 Jan 14, 2023
de70519
Поправка адаптации форм
Bricks666 Jan 14, 2023
9e82344
Фильтры задач. WIP
Bricks666 Jan 14, 2023
0d23bd8
Добавление фильтров для задач
Bricks666 Jan 14, 2023
d626218
Изменение карточек комнат
Bricks666 Jan 15, 2023
8a17d0a
Изменение окна добавления пользователя
Bricks666 Jan 15, 2023
198beb7
Перенос попапов в фичи
Bricks666 Jan 15, 2023
9702b69
Добавление ошибок на страницу авторизации
Bricks666 Feb 1, 2023
c302d57
Добавление меню и слитие шапки
Bricks666 Feb 1, 2023
36cd07b
Изменение фильтров у задач
Bricks666 Feb 1, 2023
a91f172
Небольшие изменения
Bricks666 Feb 2, 2023
b49231f
Переработка дизайна главной страницы
Bricks666 Feb 2, 2023
0514d46
Изменение дизайна страницы пользователей
Bricks666 Feb 3, 2023
7b486e5
Изменения страницы фильтров
Bricks666 Feb 5, 2023
916e003
Изменение типов и добавление API
Bricks666 Feb 28, 2023
13b8afc
Изменение в сущностях и зависимостях активностей
Bricks666 Mar 1, 2023
c504dd4
Небольшие изменения в авторизации
Bricks666 Mar 1, 2023
020c3ea
Некоторые изменения
Bricks666 Mar 2, 2023
4a2964e
Перемименование групп в теги
Bricks666 Mar 2, 2023
e21bd81
Обновление зависимостей
Bricks666 Mar 2, 2023
fc91a93
Изменение API
Bricks666 Mar 3, 2023
5b34f7c
Компонент заголовка секции
Bricks666 Mar 4, 2023
dbb9d61
Работа с пикерами
Bricks666 Mar 4, 2023
f8d0f57
Работа с задачами
Bricks666 Mar 4, 2023
a8a5ee7
---
Bricks666 May 15, 2023
36b85f2
update dependencies
Bricks666 Sep 6, 2023
db08b30
fix registration form
Bricks666 Sep 6, 2023
39661e0
add effector-mui-snacks
Bricks666 Sep 6, 2023
e5bd394
lint code
Bricks666 Sep 6, 2023
22e4d46
add session model
Bricks666 Sep 6, 2023
443d53a
change pages layer
Bricks666 Sep 6, 2023
eb8f984
mode notification models into created
Bricks666 Sep 6, 2023
019ed04
rework registration and login page
Bricks666 Sep 10, 2023
1ff1572
change tabs styles
Bricks666 Sep 19, 2023
06ce644
add new response structs
Bricks666 Sep 19, 2023
0a877ac
add user avatar to task card
Bricks666 Sep 19, 2023
d12d23a
rework task form
Bricks666 Sep 19, 2023
ad320ce
rework tasks-filters
Bricks666 Sep 19, 2023
dab736d
fix notifications styles
Bricks666 Sep 19, 2023
84a133e
update tag features
Bricks666 Sep 27, 2023
ab846d4
change activities and filters view
Bricks666 Sep 27, 2023
e22f8eb
move out users features
Bricks666 Oct 1, 2023
c990a7f
add member removing
Bricks666 Oct 1, 2023
a855727
refactoring rooms features
Bricks666 Oct 2, 2023
2924d9c
rework tasks featuires
Bricks666 Oct 11, 2023
92607c1
rename retry-loading-slat to text-with-action
Bricks666 Oct 15, 2023
bf6c36b
fix change room refetch issue
Bricks666 Oct 15, 2023
d0287d6
add friendly list for most cases
Bricks666 Oct 15, 2023
9a91a5d
fix layout in room
Bricks666 Oct 15, 2023
3804999
fix room and aside markup
Bricks666 Oct 15, 2023
a338f1c
change last activities count
Bricks666 Oct 19, 2023
af91e4b
add roboto font
Bricks666 Oct 19, 2023
dd77f31
fix progress list styles
Bricks666 Oct 19, 2023
3d93f0d
change tasks columns actions
Bricks666 Oct 19, 2023
72bd7f8
fix debug params
Bricks666 Oct 19, 2023
128463e
swap refresh to start
Bricks666 Oct 19, 2023
d50432c
move tasks groupping into model
Bricks666 Oct 19, 2023
ee003c3
fix create task form
Bricks666 Oct 19, 2023
bec0120
add activities sorting
Bricks666 Oct 19, 2023
f4464c6
add color scheme toggler
Bricks666 Oct 19, 2023
e070c9d
change way working with locales
Bricks666 Oct 20, 2023
a53b28a
changeinternationalization for registration page
Bricks666 Oct 20, 2023
7228c87
rework translatation on room page
Bricks666 Oct 20, 2023
1dc72a6
move localization. WIP
Bricks666 Oct 21, 2023
dcba563
move localization. rooms
Bricks666 Oct 21, 2023
4c063bb
move localization. tasks
Bricks666 Oct 21, 2023
2a204a3
move localization. tags
Bricks666 Oct 21, 2023
ec765ff
move localization. activities
Bricks666 Oct 21, 2023
d4af7cc
move localization. users
Bricks666 Oct 21, 2023
307f6d1
move localization. russian
Bricks666 Oct 21, 2023
18f6ea6
fix activities localization
Bricks666 Oct 21, 2023
97c364b
add localization for notifications
Bricks666 Oct 21, 2023
55e5f2d
add language changer
Bricks666 Oct 22, 2023
fe06e72
change layouts
Bricks666 Oct 22, 2023
7a47aa4
change color scheme toggler
Bricks666 Oct 22, 2023
66fc33e
fix localization
Bricks666 Oct 22, 2023
510c59d
fix notifications messages
Bricks666 Oct 22, 2023
0e1568d
fix thanks registration page
Bricks666 Oct 29, 2023
30b270f
add account activation
Bricks666 Oct 29, 2023
e716d64
change url to members endpoint
Bricks666 Nov 4, 2023
5944330
add invite room url
Bricks666 Nov 4, 2023
1a2344a
add invitations api
Bricks666 Dec 1, 2023
0155a4e
move user invitations
Bricks666 Dec 1, 2023
adecc47
add invite link generation
Bricks666 Dec 5, 2023
709d0dc
add invitation list and item
Bricks666 Dec 5, 2023
2f3c1ba
add asnwering on invitations
Bricks666 Dec 7, 2023
b1156a5
Merge pull request #10 from Bricks666/feature/several-page
Bricks666 Dec 10, 2023
0e027f9
fix building
Bricks666 Dec 10, 2023
8c978c4
remove debug
Bricks666 Dec 10, 2023
0819a43
fix runtypes type for invitation
Bricks666 Dec 10, 2023
a9896d0
again fix runtypes type for invitation
Bricks666 Dec 10, 2023
f9faa3d
fix invitation types
Bricks666 Dec 10, 2023
036fe0e
fix redirect after answering on invitation
Bricks666 Dec 10, 2023
fff061d
add github action
Bricks666 Jan 23, 2024
7aec3a7
fix docker and nginx work
Bricks666 Jan 23, 2024
81e9e71
Merge pull request #12 from Bricks666/features/docker-image
Bricks666 Jan 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
node_modules
dist
buid
.github
.husky
.env*
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_API_HOST=''
128 changes: 126 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"plugin:import/recommended",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:boundaries/recommended",
"airbnb",
"prettier"
],
Expand Down Expand Up @@ -56,8 +57,63 @@
],
"no-restricted-exports": "off",
"prefer-arrow-callback": "off",
"no-shadow": "warn",
"no-shadow": "off",
"default-param-last": "warn",
"no-restricted-imports": [
"error",
{
"patterns": [
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/app/**"]
},
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/pages/*/**"]
},
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/widgets/*/**"]
},
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/features/*/**"]
},
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/entities/*/**"]
},
{
"message": "Private imports are prohibited, use public imports instead",
"group": ["@/shared/*/*/**"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/app"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/pages"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/widgets"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/features"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/entities"]
},
{
"message": "Prefer absolute imports instead of relatives (for root modules)",
"group": ["../**/shared"]
}
]
}
],

/* REACT */
"react/jsx-filename-extension": [1, { "extensions": [".tsx", ".ts"] }],
Expand All @@ -69,8 +125,44 @@
"react/function-component-definition": "off",
"react/no-unused-prop-types": "off",
"react/no-array-index-key": "off",
"react/react-in-jsx-scope": "off",

/* IMPORT */
"import/order": [
"error",
{
"alphabetize": { "order": "asc", "caseInsensitive": true },
"newlines-between": "always",
"pathGroups": [
{ "group": "internal", "position": "after", "pattern": "@/pages/**" },
{
"group": "internal",
"position": "after",
"pattern": "@/widgets/**"
},
{
"group": "internal",
"position": "after",
"pattern": "@/features/**"
},
{
"group": "internal",
"position": "after",
"pattern": "@/entities/**"
},
{ "group": "internal", "position": "after", "pattern": "@/shared/**" }
],
"pathGroupsExcludedImportTypes": ["builtin"],
"groups": [
"builtin",
"external",
"internal",
"parent",
"sibling",
"index"
]
}
],
"import/extensions": [
"error",
"never",
Expand All @@ -87,9 +179,41 @@
"import/no-unresolved": 0,
"import/prefer-default-export": "off",

/* BOUNDARIES */
"boundaries/element-types": [
"warn",
{
"default": "disallow",
"rules": [
{
"from": "@/app",
"allow": [
"@/pages",
"@/widgets",
"@/features",
"@/entities",
"@/shared"
]
},
{
"from": "@/pages",
"allow": ["@/widgets", "@/features", "@/entities", "@/shared"]
},
{
"from": "@/widgets",
"allow": ["@/features", "@/entities", "@/shared"]
},
{ "from": "@/features", "allow": ["@/entities", "@/shared"] },
{ "from": "@/entities", "allow": ["@/shared"] },
{ "from": "@/shared", "allow": ["@/shared"] }
]
}
],

/* TS */
"@typescript-eslint/no-unused-vars": ["error"],
"@typescript-eslint/no-empty-interface": ["off"]
"@typescript-eslint/no-empty-interface": ["off"],
"@typescript-eslint/no-explicit-any": "warn"
},
"ignorePatterns": ["templates/**/*", "*.css.d.ts", "configs/*"]
}
39 changes: 39 additions & 0 deletions .github/workflows/publish-docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Docker

on:
push:
tags: [ 'v*.*.*' ]
pull_request:
branches: [ "main", "develop" ]
release:
types: [ published ]


jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v4

- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
with:
images: bricks667/abctasks-client

- name: Build and push Docker image
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
with:
context: .
file: ./Dockerfile
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

# production
/build
dist

# misc
.DS_Store
Expand Down
32 changes: 24 additions & 8 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,26 @@
FROM node:18-alpine as build
FROM node:lts-alpine as build

WORKDIR /app
COPY package.json /app/package.json
RUN npm i --omit=dev --ignore-scripts --force && npm i -D typescript --force
COPY . /app

COPY package*.json /app/
RUN npm ci --ignore-scripts

COPY . /app/

RUN npm run build
FROM nginx:1.23.0-alpine
COPY --from=build /app/dist /usr/share/nginx/html
EXPOSE 80
CMD ["nginx", "-g", "daemon off;"]

FROM nginx:alpine

WORKDIR /app

COPY --from=build /app/dist/ /usr/share/nginx/html
COPY ./deploy/nginx/ /etc/nginx/

EXPOSE 80 443

ENV SERVER_NAME="localhost"

ENV API_PROXY_PASS=""
ENV DOCS_PROXY_PASS=""

CMD [ "nginx", "-g", "daemon off;" ]
6 changes: 0 additions & 6 deletions configs/.browserslistrc

This file was deleted.

3 changes: 0 additions & 3 deletions configs/postcss.config.js

This file was deleted.

36 changes: 36 additions & 0 deletions deploy/nginx/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
user nginx;
worker_processes auto;

error_log /var/log/nginx/error.log notice;
pid /var/run/nginx.pid;


events {
worker_connections 1024;
}


http {
include /etc/nginx/mime.types;
default_type application/octet-stream;

log_format main '$remote_addr - $remote_user [$time_local] "$request" '
'$status $body_bytes_sent "$http_referer" '
'"$http_user_agent" "$http_x_forwarded_for"';

access_log /var/log/nginx/access.log main;

sendfile on;
#tcp_nopush on;

keepalive_timeout 65;

gzip on;
gzip_disable "MSIE [1-6]\.(?!.*SV1)";
gzip_proxied any;
gzip_buffers 16 8k;
gzip_types in application/javascript application/x-javascript text/javascript text/xml text/css;
gzip_vary on;

include /etc/nginx/conf.d/*.conf;
}
33 changes: 33 additions & 0 deletions deploy/nginx/templates/default.conf.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
server {
listen 80 default_server;
server_name ${SERVER_NAME} www.${SERVER_NAME};

access_log /var/log/nginx/${SERVER_NAME}.access.log;
error_log /var/log/nginx/${SERVER_NAME}.error.log;

root /usr/share/nginx/html;

location / {
try_files $uri /index.html;
}

location /api {
proxy_pass ${API_PROXY_PASS};
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}

location /api/docs {
proxy_pass ${DOCS_PROXY_PASS};
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-NginX-Proxy true;
proxy_ssl_session_reuse off;
proxy_set_header Host $http_host;
proxy_redirect off;
}
}
38 changes: 0 additions & 38 deletions generate-react-cli.json

This file was deleted.

Loading
Loading