Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
445f34a
chore: add tanstack dev tools
ijo42 Feb 12, 2025
abb412e
fix: proper events cache
ijo42 Feb 12, 2025
f69deb9
chore: tile request tanstacked
ijo42 Feb 12, 2025
4e1ef27
chore: ical request time limit
ijo42 Feb 12, 2025
d958c01
chore: add loading state ical validate
ijo42 Feb 12, 2025
1643266
chore: time limit on mapi
ijo42 Feb 12, 2025
d139d94
chore: hide qr scanner on non-vk context
ijo42 Feb 12, 2025
7afd5e8
chore: telegram connect rework
ijo42 Feb 13, 2025
96dffd9
feat: tiles fallback
ijo42 Feb 24, 2025
68d5041
chore: implement tg qr scanner
ijo42 Mar 12, 2025
14e786d
chore: implement notifications
ijo42 Mar 12, 2025
48ac6a1
feat: testing invite banner
ijo42 Mar 12, 2025
409bebd
chore: rewrite indooreq classes
ijo42 Mar 12, 2025
7ab6e7a
refactor: apply formating
actions-user Mar 12, 2025
c5a3d8c
fix: control button styles
ijo42 Mar 12, 2025
8236d94
chore: theme storage logic
ijo42 Mar 12, 2025
b656107
chore: hide banner
ijo42 Mar 12, 2025
0f38bb7
chore: change loading animation
ijo42 Mar 12, 2025
3e012dc
refactor: apply formating
actions-user Mar 12, 2025
84a1472
chore: decompose map
ijo42 Mar 14, 2025
441fc1f
chore: rework ical context
ijo42 Mar 14, 2025
ec6c799
chore: rework ical context
ijo42 Mar 14, 2025
3792b45
chore: rework popup utils
ijo42 Mar 14, 2025
513031e
chore: hide testing banner
ijo42 Mar 14, 2025
b88e209
fix: handle hash-param level change
ijo42 Mar 14, 2025
6fd8ced
chore: notification on auth error
ijo42 Mar 14, 2025
f16b9f3
refactor: apply formating
actions-user Mar 14, 2025
731315d
chore: map context
ijo42 Mar 15, 2025
2374995
chore: map context
ijo42 Mar 15, 2025
7108011
chore: map context
ijo42 Mar 15, 2025
dd5378a
chore: map context
ijo42 Mar 15, 2025
f9553c5
chore: map context
ijo42 Mar 15, 2025
8cadea5
chore: map context
ijo42 Mar 15, 2025
d43ab7f
fix: poi handler missregister
ijo42 Mar 15, 2025
af84473
chore: delayed poi select
ijo42 Mar 15, 2025
7ccc732
fix: prevent testing banner blink
ijo42 Mar 16, 2025
1cd4228
feat: telegram user card supported
ijo42 Mar 16, 2025
b9ddcf0
chore: rework storage
ijo42 Mar 16, 2025
92042cf
chore: handle tg authdata
ijo42 Mar 16, 2025
b385738
feat: auth server availability check
ijo42 Mar 17, 2025
a295c03
deps: update packages
ijo42 Mar 17, 2025
12594d9
deps: exchange packages
ijo42 Mar 17, 2025
ef7f0f1
deps: update eslint
ijo42 Mar 17, 2025
a681e0b
refactor: apply eslint
ijo42 Mar 17, 2025
b4b6c17
refactor: apply eslint
ijo42 Mar 17, 2025
3433ce0
fix: open poi by hash
ijo42 Mar 18, 2025
5d80019
fix: qrscanner
ijo42 Mar 18, 2025
0a04b29
refactor: apply formatting
ijo42 Mar 18, 2025
85d7303
fix: qrscanner2
ijo42 Mar 18, 2025
6732e9c
chore: bridge determinant
ijo42 Mar 18, 2025
4b39fb2
deps: optimize bundle
ijo42 Mar 18, 2025
83205b6
deps: disable sourcemap
ijo42 Mar 19, 2025
0888bf9
fix: handle layer loaded
ijo42 Mar 19, 2025
8a9860f
chore: update search handlers
ijo42 Mar 19, 2025
2350214
chore: version bump
ijo42 Apr 22, 2025
eaf7ae4
should be fixed
esperor May 31, 2025
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
29 changes: 5 additions & 24 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
{
"projectName": "mini-app",
"projectOwner": "psumaps",
"files": [
"README.md"
],
"files": ["README.md"],
"commitType": "docs",
"commitConvention": "angular",
"contributorsPerLine": 7,
Expand All @@ -13,45 +11,28 @@
"name": "esperor",
"avatar_url": "https://avatars.githubusercontent.com/u/49198951?v=4",
"profile": "https://github.com/esperor",
"contributions": [
"projectManagement",
"code",
"platform",
"ideas"
]
"contributions": ["projectManagement", "code", "platform", "ideas"]
},
{
"login": "ijo42",
"name": "Aleksandr",
"avatar_url": "https://avatars.githubusercontent.com/u/53531892?v=4",
"profile": "https://ijo42.ru",
"contributions": [
"projectManagement",
"code",
"ideas",
"infra",
"data"
]
"contributions": ["projectManagement", "code", "ideas", "infra", "data"]
},
{
"login": "Toderry",
"name": "Toderry",
"avatar_url": "https://avatars.githubusercontent.com/u/106995468?v=4",
"profile": "https://github.com/Toderry",
"contributions": [
"code",
"ideas"
]
"contributions": ["code", "ideas"]
},
{
"login": "li3pm",
"name": "li3pm",
"avatar_url": "https://avatars.githubusercontent.com/u/118972242?v=4",
"profile": "https://github.com/li3pm",
"contributions": [
"code",
"ideas"
]
"contributions": ["code", "ideas"]
}
]
}
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ IJO42_URL = ijo42.ru

VITE_MAPTILES_STYLE_KEY = 1XfSivF5uaaJV0EiuRS1

VITE_URL_IJO42_TILES = https://tiles2.$IJO42_URL/
VITE_URL_IJO42_TILES = martin://tiles2.$IJO42_URL/
VITE_URL_MAP_ASSETS = https://res.$IJO42_URL/
VITE_URL_IJO42_MAPI = https://mapi.$IJO42_URL/v2
VITE_URL_PSU_TOOLS_API = https://events.$IJO42_URL
Expand Down
88 changes: 0 additions & 88 deletions .eslintrc.cjs

This file was deleted.

6 changes: 2 additions & 4 deletions .github/workflows/netlify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@ jobs:
uses: actions/setup-node@v4
with:
node-version: 20
cache: "npm"
cache: 'npm'

- name: Install Dependencies & Build root
run: |
npm ci && npm ci --prefix shared && npm ci --prefix web


- name: Install Dependencies & Build web
run: |
npm run build --prefix web
Expand All @@ -32,11 +31,10 @@ jobs:
publish-dir: './web/dist'
production-branch: master
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: "Deploy from GitHub Actions"
deploy-message: 'Deploy from GitHub Actions'
alias: deploy-preview-${{ github.event.number }}
netlify-config-path: ./web/netlify.toml
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 1

10 changes: 2 additions & 8 deletions .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
{
"*.css": [
"prettier --write"
],
"*.{ts,tsx}": [
"prettier --write",
"eslint --ignore-path .gitignore --fix",
"vitest related --run"
]
"*.css": ["prettier --write"],
"*.{ts,tsx}": ["prettier --write", "eslint --fix", "vitest related --run"]
}
13 changes: 0 additions & 13 deletions .prettierrc

This file was deleted.

14 changes: 14 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export default {
printWidth: 80,
tabWidth: 2,
useTabs: false,
semi: true,
singleQuote: true,
quoteProps: 'as-needed',
jsxSingleQuote: false,
trailingComma: 'all',
bracketSpacing: true,
jsxBracketSameLine: false,
arrowParens: 'always',
endOfLine: 'auto',
};
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
"strings": true
},
"tailwindCSS.classAttributes": ["class", "className", "ngClass", ".*Styles"]
}
}
71 changes: 37 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,16 @@
- [Структура](#Структура)
- 📒 [Стек](#Стек)
- 🚀 [Запуск](#Запуск)
- [Web - Mini App](#Web)
- [Native - Mobile app](#Native)
- [Web - Mini App](#Web)
- [Native - Mobile app](#Native)
- [Архитектура](#Архитектура)
- [Рабочий процесс](#Рабочий-процесс)
- [Оформление изменений](#Оформление-изменений)
- [Ветки](#Ветки)
- [Коммиты](#Коммиты)
- [PR](#PR)
- [Ветки](#Ветки)
- [Коммиты](#Коммиты)
- [PR](#PR)
- 👨‍💻 [Contributors](#Contributors)


# Структура

Приложение разбито на три части:
Expand All @@ -65,26 +64,30 @@
- [Tailwind](https://tailwindcss.com)

Для упрощения работы:

- Tailwind IntelliSense ([IntelliJ IDEa](https://plugins.jetbrains.com/plugin/15260-tailwind-intellisense), [VS Code](https://marketplace.visualstudio.com/items?itemName=bradlc.vscode-tailwindcss))
- [Codeium AI](https://codeium.com)

# Запуск

Запускать из корня:

- `npm run storybook`: storybook
- `npm run web`: запустит параллельно dev и tailwind:watch скрипты web модуля
- `npm run native`: запустит start скрипт native модуля

## Web

Запускать из web/

- `npm run dev`
- `npm run preview`
- `npm run build`: сборка

## Native (n/a)

Запускать из native/

- `npm start`
- `npx expo start`
- `npx expo run:android`: сборка, требует android SDK и JDK
Expand All @@ -94,16 +97,16 @@
Общий код находится в папке shared. Компоненты помещаются в папку shared/components, для каждого компонента создается история (`shared/stories/<componentName>.stories.tsx`). Истории помогают лучше и проще тестировать и понимать компоненты. Для всех значимых вариантов компонента должен быть создан отдельный шаблон. Пример:

```typescript
import type { Meta, StoryObj } from "@storybook/react";
import Input from "../components/controls/input";
import type { Meta, StoryObj } from '@storybook/react';
import Input from '../components/controls/input';

const meta: Meta<typeof Input> = {
title: "Controls/Input",
title: 'Controls/Input',
component: Input,
tags: ["autodocs"],
tags: ['autodocs'],
parameters: {
// More on how to position stories at: https://storybook.js.org/docs/configure/story-layout
layout: "centered",
layout: 'centered',
},
};

Expand All @@ -112,25 +115,25 @@ type Story = StoryObj<typeof meta>;

export const Default: Story = {
args: {
label: "Имя",
name: "firstName",
type: "text",
label: 'Имя',
name: 'firstName',
type: 'text',
},
};

export const Email: Story = {
args: {
label: "Почта",
name: "email",
type: "email",
label: 'Почта',
name: 'email',
type: 'email',
},
};

export const Password: Story = {
args: {
label: "Пароль",
name: "password",
type: "password",
label: 'Пароль',
name: 'password',
type: 'password',
},
};
```
Expand All @@ -144,26 +147,26 @@ export const Password: Story = {
## Ветки

Ветки должны иметь название, соответствующее своему содержанию, и префикс:
| Название ветки | Значение ветки | Пример ветки |
| Название ветки | Значение ветки | Пример ветки |
| --------------- | ------------------------------------------- | --------------- |
| **fix-\*** | Исправление баг в функционале | _fix-auth_ |
| **feat-\*** | Добавление новой возможности | _feat-auth_ |
| **refactor-\*** | Рефакторинг существующего кода | _refactor-auth_ |
| **fix-\*** | Исправление баг в функционале | _fix-auth_ |
| **feat-\*** | Добавление новой возможности | _feat-auth_ |
| **refactor-\*** | Рефакторинг существующего кода | _refactor-auth_ |

## Коммиты

Имя коммита должно иметь префикс в зависимости от внесенных изменений, а также указывать на измененную часть кода
| Название ветки | Значение ветки | Пример ветки |
| Название ветки | Значение ветки | Пример ветки |
| ---------------- | ------------------------------------------- | -------------------------------------- |
| **fix: \*** | Исправление бага в функционале | _fix: submit button in map screen_ |
| **feat: \*** | Добавление новой возможности | _feat: dark theme_ |
| **refactor: \*** | Рефакторинг существующего кода | _refactor: home screen_ |
| **chore: \*** | Общие действия по поддержке проекта | _chore: update tailwind version_ |
| **docs: \*** | Документация (например, истории storybook) | _docs: add story for Button_ |
| **deps: \*** | Настройка зависимостей проекта | _deps: add Tailwind_ |
| **style: \*** | Нефункциональные изменения дизайна | _style: change text color (calendar)_ |
| **tests: \*** | Добавление/обновление тестов | _tests: cover Button_ |
| **any: \*** | Все, что не подходит к предыдущему | _any: prettify_ |
| **fix: \*** | Исправление бага в функционале | _fix: submit button in map screen_ |
| **feat: \*** | Добавление новой возможности | _feat: dark theme_ |
| **refactor: \*** | Рефакторинг существующего кода | _refactor: home screen_ |
| **chore: \*** | Общие действия по поддержке проекта | _chore: update tailwind version_ |
| **docs: \*** | Документация (например, истории storybook) | _docs: add story for Button_ |
| **deps: \*** | Настройка зависимостей проекта | _deps: add Tailwind_ |
| **style: \*** | Нефункциональные изменения дизайна | _style: change text color (calendar)_ |
| **tests: \*** | Добавление/обновление тестов | _tests: cover Button_ |
| **any: \*** | Все, что не подходит к предыдущему | _any: prettify_ |

## PR

Expand Down
Loading
Loading