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.

Sign up for GitHub

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

Jump to bottom

Feature/parasha #260

Open

elor555 wants to merge 88 commits into PythonFreeCourse:develop from elor555:feature/parasha

elor555 commented Feb 11, 2021 •

edited

Create a new feature
In my feature, the parshas of the week are displayed every Saturday (on the dayview page).

Needs further treatment:

As part of the feature I have a link to a separate link (I set it to open a new pane). Is it problematic?

elor555 added 2 commits

February 11, 2021 14:02


          add parasha feature

25ad676


          update

eed8d7c

ivarshav reviewed

View reviewed changes

app/database/models.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/internal/json_data_loader.py Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/internal/load_parasha.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/internal/load_parasha.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/internal/load_parasha.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/resources/parashot.json Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/calendar.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/calendar.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/calendar.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/calendar_grid.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/calendar_grid.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

app/routers/parasha.py Outdated Show resolved Hide resolved

ivarshav reviewed

View reviewed changes

tests/test_parasha.py Outdated Show resolved Hide resolved

Contributor

ivarshav commented Feb 11, 2021

Nice work!
Please fix flake 8 :)

elor555 added 12 commits

February 11, 2021 20:00


          update

eaadce0


          Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

ecff42d

…into feature/parasha

lines starting with '#' will be ignored, and an empty message aborts


          Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

1b1faf2

…into feature/parasha


          Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

5646a56

…into feature/parasha

git push
:x


          	ines starting

407d692


          dd space

3ea2768


          fix farts of flake8

c3aa08a


          edit

819f2b2


          edit

e5bfc87


          edit5

75805fc


          edit6

91fff6f


          edit api

161cb98

yammesicka requested changes

View reviewed changes

Member

yammesicka left a comment

Great start! I've added some insights.

app/templates/partials/calendar/monthly_view/add_week.html Outdated Show resolved Hide resolved

app/routers/calendar.py Outdated Show resolved Hide resolved

app/routers/calendar.py Outdated Show resolved Hide resolved


          edit by yam

91b9fe3

elor555 added 5 commits

February 21, 2021 18:07


          edit

66dc75e


          edit

21b8033


          edit

66b4457


          edit

fdc0219


          edit

0fd6e7e

elor555 requested a review from yammesicka

February 23, 2021 11:55

yammesicka reviewed

View reviewed changes

Member

yammesicka left a comment

Great job, please review the insights I've added :)

app/internal/json_data_loader.py Outdated Show resolved Hide resolved

app/internal/json_data_loader.py Show resolved Hide resolved

app/internal/weekly_parasha.py Outdated Show resolved Hide resolved

app/internal/weekly_parasha.py Outdated Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

app/internal/weekly_parasha.py Outdated Show resolved Hide resolved

elor555 added 6 commits

February 23, 2021 15:23


          Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

f011437

…into feature/parasha


          edit

60ce6ce


          edit

d9b1745


          edit

ee9faf7


          edit

59c61e6


          edit

a3099f4

yammesicka requested changes

View reviewed changes

app/internal/json_data_loader.py Show resolved Hide resolved

Gonzom reviewed

View reviewed changes

app/internal/json_data_loader.py Show resolved Hide resolved

app/resources/parashot.json Show resolved Hide resolved


          Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar …

108e152

…into feature/parasha

yammesicka requested changes

View reviewed changes

app/routers/calendar.py Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

yammesicka requested changes

View reviewed changes

app/internal/weekly_parasha.py Show resolved Hide resolved

app/internal/weekly_parasha.py Outdated Show resolved Hide resolved

app/internal/weekly_parasha.py Show resolved Hide resolved

elor555 added 5 commits

February 25, 2021 00:47


          Details Message

4729f27


          Details Message

5d27e04


          Merge remote-tracking branch 'upstream/develop' into feature/parasha

9f14957

# Conflicts:
#	app/routers/dayview.py
#	app/static/dayview.css
#	app/templates/calendar_day_view.html


          fix: style improvements

122574f


          fix: style improvements

1421c19

yammesicka requested changes

View reviewed changes

app/internal/weekly_parasha.py Outdated Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

elor555 added 3 commits

February 26, 2021 21:23


          fix: improvments

52df059


          Details Message


          fix: improvments

09aceb1

yammesicka requested changes

View reviewed changes

app/routers/dayview.py Show resolved Hide resolved

app/internal/json_data_loader.py Outdated Show resolved Hide resolved

app/templates/calendar_day_view.html Outdated Show resolved Hide resolved

elor555 added 2 commits

March 1, 2021 13:56


          Merge remote-tracking branch 'upstream/develop' into feature/parasha

baf06ac

# Conflicts:
#	tests/test_calendar_grid.py


          fix: styling

6d430ed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment