Skip to content

Commit 6c2ea98

Browse files
stepanzhstepanzh
authored
Merge pull request #62 from stepanzh/migration-to-vue
Migration to new design & Vue 3
2 parents 006bef5 + 5b92ca3 commit 6c2ea98

File tree

105 files changed

+3327
-2405
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3327
-2405
lines changed

‎.github/workflows/draft-deploy.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# See https://vitejs.dev/guide/static-deploy
2+
3+
4+
# Simple workflow for deploying static content to GitHub Pages
5+
name: Deploy static content to Pages
6+
7+
on:
8+
# Runs on pushes targeting the default branch
9+
push:
10+
branches: ['main']
11+
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
14+
15+
# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
16+
permissions:
17+
contents: read
18+
pages: write
19+
id-token: write
20+
21+
# Allow one concurrent deployment
22+
concurrency:
23+
group: 'pages'
24+
cancel-in-progress: true
25+
26+
jobs:
27+
# Single deploy job since we're just deploying
28+
deploy:
29+
environment:
30+
name: github-pages
31+
url: ${{ steps.deployment.outputs.page_url }}
32+
runs-on: ubuntu-latest
33+
steps:
34+
- name: Checkout
35+
uses: actions/checkout@v4
36+
- name: Set up Node
37+
uses: actions/setup-node@v4
38+
with:
39+
node-version: 20
40+
cache: 'npm'
41+
- name: Install dependencies
42+
run: npm ci
43+
- name: Build
44+
run: npm run build
45+
- name: Setup Pages
46+
uses: actions/configure-pages@v4
47+
- name: Upload artifact
48+
uses: actions/upload-pages-artifact@v3
49+
with:
50+
# Upload dist folder
51+
path: './dist'
52+
- name: Deploy to GitHub Pages
53+
id: deployment
54+
uses: actions/deploy-pages@v4

‎.github/workflows/vite-deploy-draft

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Simple workflow for deploying static content to GitHub Pages
2+
# See https://vitejs.dev/guide/static-deploy
3+
name: Deploy static content to Pages
4+
5+
on:
6+
# Runs on pushes targeting the default branch
7+
push:
8+
branches: ['main']
9+
10+
# Allows you to run this workflow manually from the Actions tab
11+
workflow_dispatch:
12+
13+
# Sets the GITHUB_TOKEN permissions to allow deployment to GitHub Pages
14+
permissions:
15+
contents: read
16+
pages: write
17+
id-token: write
18+
19+
# Allow one concurrent deployment
20+
concurrency:
21+
group: 'pages'
22+
cancel-in-progress: true
23+
24+
jobs:
25+
# Single deploy job since we're just deploying
26+
deploy:
27+
environment:
28+
name: github-pages
29+
url: ${{ steps.deployment.outputs.page_url }}
30+
runs-on: ubuntu-latest
31+
steps:
32+
- name: Checkout
33+
uses: actions/checkout@v4
34+
- name: Set up Node
35+
uses: actions/setup-node@v4
36+
with:
37+
node-version: 20
38+
cache: 'npm'
39+
- name: Install dependencies
40+
run: npm ci
41+
- name: Build
42+
run: npm run build
43+
- name: Setup Pages
44+
uses: actions/configure-pages@v4
45+
- name: Upload artifact
46+
uses: actions/upload-pages-artifact@v3
47+
with:
48+
# Upload dist folder
49+
path: './dist'
50+
- name: Deploy to GitHub Pages
51+
id: deployment
52+
uses: actions/deploy-pages@v4

‎.gitignore

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,30 @@
1-
debug
2-
deploy
3-
venv
4-
static/promo.jpg
5-
config.cfg
1+
# Logs
2+
logs
3+
*.log
4+
npm-debug.log*
5+
yarn-debug.log*
6+
yarn-error.log*
7+
pnpm-debug.log*
8+
lerna-debug.log*
69

7-
*.pyc
10+
node_modules
11+
.DS_Store
12+
dist
13+
dist-ssr
14+
coverage
15+
*.local
816

17+
/cypress/videos/
18+
/cypress/screenshots/
19+
20+
# Editor directories and files
21+
.vscode/*
22+
!.vscode/extensions.json
23+
.idea
24+
*.suo
25+
*.ntvs*
26+
*.njsproj
27+
*.sln
28+
*.sw?
29+
30+
*.tsbuildinfo

‎Makefile

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎README.md

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,30 @@
1-
# Proportio
2-
3-
*Web app that scales. Made with love.*
1+
# Пропорцио 🧑‍🍳
42

53
https://stepanzh.github.io/Proportio/
64

7-
Proportio is handy calculator for scaling moderate-size lists of items (e.g. a recipe). All you need is to enter a recipe with original amounts of items, and enter a new amount of an item you want to scale on. Just try it.
5+
Пропорцио пересчитывает кулинарные рецепты.
6+
На любой ингредиент или количество порций.
7+
8+
Что удобно пересчитать в Пропорцио?
9+
10+
- Соусы и заправки
11+
- Тесто и выпечка
12+
- Кондитерские изделия: торты, конфеты, пирожные
13+
- Напитки: без или с алкоголем
14+
- Салаты
15+
- Маринады и консервацию
816

9-
**Use cases**
17+
Что ещё можно сделать?
1018

11-
- Cooking
12-
- Baking
13-
- Canning
14-
- Investment portfolio planning
15-
- *etc*
19+
- Сохранить и загрузить рецепт
20+
- Скопировать и отправить рецепт в сообщении или вставить в таблицу
1621

17-
## Features
22+
Подписывайтесь на новости в Телеграмм канале
1823

19-
- Reactive (linear) scaling on any item of a recipe
20-
- Load and saving of recipes
21-
- Copy to cliboard, spreadsheet-optimized
24+
| <img src="https://upload.wikimedia.org/wikipedia/commons/8/83/Telegram_2019_Logo.svg" width=64 height=64> |
25+
| ------ |
26+
| https://t.me/proportioapp |
2227

23-
## Authors
28+
## Авторы
2429

25-
- Stepan Zakharov, https://t.me/red_deer
26-
- Mariya Lukyanova, https://t.me/marnia_made
27-
- Alexandra Kobets, https://t.me/kobets_dez
30+
Степан Захаров, https://stepanzh.github.io/

‎build.py

Lines changed: 0 additions & 164 deletions
This file was deleted.

0 commit comments

Comments
 (0)