Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1ba91a8
feat(wip): onboarding
ijo42 Aug 24, 2024
4e740e1
refactor: apply formating
actions-user Aug 24, 2024
5a08d92
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat-onbo…
ijo42 Aug 25, 2024
5f695b7
chore: retext onboarding
ijo42 Aug 25, 2024
3422a6c
chore: enable onboarding state load
ijo42 Aug 25, 2024
3ec5b0f
chore: update onboarding images
ijo42 Aug 25, 2024
96be234
Merge branch 'refs/heads/dev' into feat-onboarding
ijo42 Aug 28, 2024
2733f2f
chore: retext onboarding
ijo42 Aug 30, 2024
55c19e2
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat-onbo…
ijo42 Aug 30, 2024
ecb1133
chore: disable force onboarding
ijo42 Sep 1, 2024
f9a1024
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat-onbo…
ijo42 Sep 13, 2024
da24fe6
Merge branch 'dev' into feat-onboarding
ijo42 Sep 13, 2024
6cd4eb4
Merge branch 'dev' into feat-onboarding
ijo42 Sep 13, 2024
e3a59a6
Merge branch 'dev' into feat-onboarding
ijo42 Sep 17, 2024
adb2e9b
chore: empty events message
ijo42 Oct 1, 2024
c31543e
feat: view map button correctly
ijo42 Oct 1, 2024
17f7fa6
Merge remote-tracking branch 'refs/remotes/origin/dev' into feat-onbo…
ijo42 Oct 17, 2024
d7f241e
chore: retext
ijo42 Oct 17, 2024
38ae868
chore: update events endpoint
ijo42 Nov 7, 2024
f6bb6eb
chore: add aboutUrl, cleanup tags
ijo42 Nov 8, 2024
d9a8d88
chore: load past events by default
ijo42 Nov 10, 2024
59b1417
chore: disable img proxy
ijo42 Nov 11, 2024
91e1ef3
fix: level choosing
ijo42 Nov 11, 2024
74f749c
chore: change lecture calendar color
ijo42 Dec 21, 2024
b8a581e
feat: ical token hash param (#86)
ijo42 Jan 10, 2025
addb3d9
fix: use navigate to prevent page-reload (spa) (#87)
ijo42 Feb 12, 2025
71cfca7
chore: update (#88)
ijo42 Jul 4, 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"]
}
]
}
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ 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://api.psu-tools.ru
VITE_URL_PSU_TOOLS_API = https://events.$IJO42_URL
VITE_URL_ICAL_ENDPOINT = https://ical.psu.ru/calendars/

VITE_URL_MAPTILER_STYLE = https://api.maptiler.com/maps/streets/style.json
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