Skip to content

Commit 5dba38f

Browse files
committed
Merge branch 'develop' into feature/keyboard-shortcuts
Fix CR and conflicts
2 parents 3615ddc + b91708d commit 5dba38f

File tree

348 files changed

+225371
-8584
lines changed

Some content is hidden

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

348 files changed

+225371
-8584
lines changed
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# This workflow will extract new translatable strings from files under /app and /tests into a base.pot file,
2+
# and update the 'en' and 'he' base.po and base.mo files.
3+
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
4+
5+
name: update-translations
6+
7+
on:
8+
# Trigger the workflow on push request,
9+
# but only for the main branch
10+
push:
11+
branches:
12+
- main
13+
14+
jobs:
15+
update-translations:
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- uses: actions/checkout@v2
21+
22+
- name: Set up Python 3.x
23+
uses: actions/setup-python@v2
24+
with:
25+
python-version: '3.x'
26+
27+
- name: Install prerequesits
28+
run: |
29+
python -m pip install --upgrade pip
30+
pip install Babel Jinja2
31+
32+
- name: Create base.pot file
33+
run: pybabel extract --mapping-file=app/babel_mapping.ini app tests -o app/locales/base.pot -c i18n
34+
35+
- name: Update all language base.po files
36+
run: pybabel update -i app/locales/base.pot -d app/locales -D base
37+
38+
- name: Update all .mo files
39+
run: pybabel compile -d app/locales -D base
40+
41+
# https://github.com/stefanzweifel/git-auto-commit-action
42+
- name: Commit changes
43+
uses: stefanzweifel/git-auto-commit-action@v4
44+
with:
45+
commit_message: Apply automatic translatable string changes

.gitignore

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
dev.db
22
test.db
33
config.py
4-
.vscode/settings.json
54

65
# Byte-compiled / optimized / DLL files
76
__pycache__/
@@ -14,6 +13,8 @@ __pycache__/
1413
# Distribution / packaging
1514
.Python
1615
build/
16+
Scripts/
17+
include/
1718
develop-eggs/
1819
dist/
1920
downloads/
@@ -31,6 +32,8 @@ share/python-wheels/
3132
.installed.cfg
3233
*.egg
3334
MANIFEST
35+
pyvenv.cfg
36+
3437

3538
# PyInstaller
3639
# Usually these files are written by a python script from a template
@@ -117,8 +120,12 @@ venv/
117120
ENV/
118121
env.bak/
119122
venv.bak/
123+
.vscode/
120124
Scripts/*
121125
pyvenv.cfg
126+
.history
127+
calender-venv/
128+
122129

123130
# Spyder project settings
124131
.spyderproject
@@ -138,8 +145,19 @@ dmypy.json
138145
# Pyre type checker
139146
.pyre/
140147

148+
# mac env
149+
bin
150+
151+
# register stuff
152+
run.txt
153+
141154
# VScode
142-
.vscode/
155+
.vscode
143156
app/.vscode/
144157

145158
app/routers/stam
159+
160+
# PyCharm
161+
.idea
162+
163+
junit/

.pre-commit-config.yaml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
repos:
2+
# Flake8 to check style is OK
3+
- repo: https://gitlab.com/pycqa/flake8
4+
rev: 3.8.4
5+
hooks:
6+
- id: flake8
7+
# yapf to fix many style mistakes
8+
- repo: https://github.com/ambv/black
9+
rev: 20.8b1
10+
hooks:
11+
- id: black
12+
entry: black
13+
language: python
14+
language_version: python3
15+
require_serial: true
16+
types_or: [python, pyi]
17+
# More built in style checks and fixes
18+
- repo: https://github.com/pre-commit/pre-commit-hooks
19+
rev: v3.4.0
20+
hooks:
21+
- id: trailing-whitespace
22+
- id: check-docstring-first
23+
- id: check-json
24+
- id: check-added-large-files
25+
- id: check-yaml
26+
- id: debug-statements
27+
- id: requirements-txt-fixer
28+
- id: check-merge-conflict
29+
- id: end-of-file-fixer
30+
- id: sort-simple-yaml
31+
- repo: meta
32+
hooks:
33+
- id: check-useless-excludes
34+
- repo: https://github.com/asottile/add-trailing-comma
35+
rev: v2.1.0
36+
hooks:
37+
- id: add-trailing-comma

AUTHORS.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
🐍 This document only reflects the team at the time of the original release in February 2021.
2+
3+
# Our Authors
4+
5+
* Yam Mesicka - Leader
6+
* Adva Alkalay - Developer
7+
* Aviad Amar - Developer
8+
* Efrat Bar Yehuda - Developer
9+
* Michael Ben David - Developer
10+
* Tamar Berger - Developer
11+
* Yuval Cagan - Developer
12+
* Elior Digmi - Developer
13+
* Adi Faibish - Developer
14+
* Yaakov Fogel - Developer
15+
* Ori Hirshfeld - Developer
16+
* Hadas Kedar - Developer
17+
* Hagai Kraus - Developer
18+
* Eyal Merav - Developer
19+
* Idan Pelled - Developer
20+
* Nadav Pesach - Developer
21+
* Nir Perelshtein - Developer
22+
* Elor Shoshan - Developer
23+
* Anna Shtirberg - Developer
24+
* Zohar Yamin - Developer
25+
* Odelia Yechiel - Developer
26+
* Sagi Zaid Or - Developer
27+
* Ap1234567 - Developer
28+
* ellenc345 - Developer
29+
* Gonzom - Developer
30+
* ivarshav - Developer
31+
* Liad-n - Developer
32+
* leddest - Developer
33+
* PureDreamer - Developer
34+
* ShiZinDle - Developer
35+
* YairEn - Developer
36+
37+
# Special thanks to
38+
39+
Yam Mesicka for dedicated accompaniment throughout the year of fascinating Python studies.

CODE_OF_CONDUCT.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
In the interest of fostering an open and welcoming environment, we as
6+
contributors and maintainers pledge to making participation in our project and
7+
our community a harassment-free experience for everyone, regardless of age, body
8+
size, disability, ethnicity, sex characteristics, gender identity and expression,
9+
level of experience, education, socio-economic status, nationality, personal
10+
appearance, race, religion, or sexual identity and orientation.
11+
12+
## Our Standards
13+
14+
Examples of behavior that contributes to creating a positive environment
15+
include:
16+
17+
* Using welcoming and inclusive language
18+
* Being respectful of differing viewpoints and experiences
19+
* Gracefully accepting constructive criticism
20+
* Focusing on what is best for the community
21+
* Showing empathy towards other community members
22+
23+
Examples of unacceptable behavior by participants include:
24+
25+
* The use of sexualized language or imagery and unwelcome sexual attention or
26+
advances
27+
* Trolling, insulting/derogatory comments, and personal or political attacks
28+
* Public or private harassment
29+
* Publishing others' private information, such as a physical or electronic
30+
address, without explicit permission
31+
* Other conduct which could reasonably be considered inappropriate in a
32+
professional setting
33+
34+
## Our Responsibilities
35+
36+
Project maintainers are responsible for clarifying the standards of acceptable
37+
behavior and are expected to take appropriate and fair corrective action in
38+
response to any instances of unacceptable behavior.
39+
40+
Project maintainers have the right and responsibility to remove, edit, or
41+
reject comments, commits, code, wiki edits, issues, and other contributions
42+
that are not aligned to this Code of Conduct, or to ban temporarily or
43+
permanently any contributor for other behaviors that they deem inappropriate,
44+
threatening, offensive, or harmful.
45+
46+
## Scope
47+
48+
This Code of Conduct applies both within project spaces and in public spaces
49+
when an individual is representing the project or its community. Examples of
50+
representing a project or community include using an official project e-mail
51+
address, posting via an official social media account, or acting as an appointed
52+
representative at an online or offline event. Representation of a project may be
53+
further defined and clarified by project maintainers.
54+
55+
## Enforcement
56+
57+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
58+
reported by contacting the project team at lms@pythonic.guru. All
59+
complaints will be reviewed and investigated and will result in a response that
60+
is deemed necessary and appropriate to the circumstances. The project team is
61+
obligated to maintain confidentiality with regard to the reporter of an incident.
62+
Further details of specific enforcement policies may be posted separately.
63+
64+
Project maintainers who do not follow or enforce the Code of Conduct in good
65+
faith may face temporary or permanent repercussions as determined by other
66+
members of the project's leadership.
67+
68+
## Attribution
69+
70+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
71+
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
72+
73+
[homepage]: https://www.contributor-covenant.org
74+
75+
For answers to common questions about this code of conduct, see
76+
https://www.contributor-covenant.org/faq

CONTRIBUTING.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# Contributing
2+
👍🎉 First off, thanks for taking the time to contribute! 🎉👍
3+
4+
When contributing to this repository, please first discuss the change you wish to make via issue, email, or any other method with the owners of this repository before making a change.
5+
6+
Please note we have a [code of conduct](https://github.com/PythonFreeCourse/calendar/blob/master/CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
7+
8+
## Pull Requests
9+
Create feature branches.
10+
11+
One pull request per feature - If you want to do more than one thing, send multiple pull requests.
12+
13+
Send coherent history - Make sure each individual commit in your pull request is meaningful. If you had to make multiple intermediate commits while developing, please [squash them](https://www.git-scm.com/book/en/v2/Git-Tools-Rewriting-History#Changing-Multiple-Commit-Messages) before submitting.
14+
15+
## Guide
16+
1. Fork the project.
17+
2. Create a new branch (`git checkout -b 'branch name'`).
18+
3. Commit your changes (`git commit -m 'Add something new'`).
19+
4. Push to the branch (`git push -u origin 'branch name'`).
20+
5. Open a Pull Request.
21+
22+
## Style Guide
23+
Follow the [commit messages specification](https://www.conventionalcommits.org/en/v1.0.0/).
24+
25+
Happy coding!

README.md

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,64 @@
11
# PyLander
22

3-
## Open Source Calendar built with Python
3+
<p style="text-align:center">
4+
<img title="Apache-2.0" alt="License Apache-2.0 icon" src="https://img.shields.io/github/license/PythonFreeCourse/calendar.svg">
5+
</p>
46

5-
### Run on Windows:
7+
👋 Welcome to Open Source Calendar built with Python. 🐍
8+
9+
* [Project's objectives](#Project's-objectives)
10+
* [Creating development environment](#creating-development-environment)
11+
* [Contributing](#contributing)
12+
### Project's objectives
13+
1. Develop open source calendar tool using new technics while trying new things.
14+
2. Using Python as main programming language and plain HTML/JS for GUI.
15+
3. Create bonding in our community.
16+
17+
## Creating development environment
18+
### Prerequisites
19+
1. Windows or Linux based system - either [WSL on windows](https://docs.microsoft.com/en-us/windows/wsl/install-win10) or full blown linux.
20+
2. [Python](https://www.python.org/downloads/release/python-385/)
21+
3. Install python's requirements:
22+
```shell
23+
pip install -r requirements.txt
24+
```
25+
4. Install pre-commit hooks:
26+
```shell
27+
pre-commit install
28+
```
29+
30+
### Running on Windows
631

732
```shell
833
virtualenv env
934
.\env\Scripts\activate.bat
1035
pip install -r requirements.txt
11-
# Copy configuration.py.example to configuration.py.
36+
# Copy app\config.py.example to app\config.py.
1237
# Edit the variables' values.
38+
# Rendering JWT_KEY:
39+
python -c "import secrets; from pathlib import Path; f = Path('app/config.py'); f.write_text(f.read_text().replace('JWT_KEY_PLACEHOLDER', secrets.token_hex(32), 1));"
1340
uvicorn app.main:app --reload
1441
```
42+
43+
### Running on Linux
44+
```shell
45+
python -m venv venv
46+
source venv/bin/activate
47+
pip install -r requirements.txt
48+
cp app/config.py.example app/config.py
49+
# Edit the variables' values.
50+
# Rendering JWT_KEY:
51+
python -c "import secrets; from pathlib import Path; f = Path('app/config.py'); f.write_text(f.read_text().replace('JWT_KEY_PLACEHOLDER', secrets.token_hex(32), 1));"
52+
53+
### Running tox
54+
```shell
55+
# Standard tests: 'coverage' and 'flake8'
56+
tox
57+
# Only flake8 tests
58+
tox -e flake8
59+
# Coverage with html reports
60+
tox -e rep
61+
```
62+
63+
## Contributing
64+
View [contributing guidelines](https://github.com/PythonFreeCourse/calendar/blob/master/CONTRIBUTING.md).

0 commit comments

Comments
 (0)