feat: Add zodiac signs to the day & month view + refactor json data loader #155

zohary89 · 2021-01-29T18:46:47Z

Add the zodiac signs with start and end day and month to the db
Add images of the 12 zodiac signs (images from wikipedia- no copyright)
The sign will appear in the day view. (with an existing function for the option to add into the month view in the future. Each sign will contain a link to an external website with info about the sign.
create generic json data loader (change the load of the daily quotes and convert it into generic module with relavent tests changes)- everyone can use this module for loading required data from json structure..
In the future- option to add a setting in the profile settings panel - whether to display the zodiac signs or not.

create generic json data loader

again

yammesicka

High quality work! Great job. I do see how some minor improvement can make it perfect, please take a look :)

app/internal/json_data_loader.py

app/internal/zodiac.py

tests/zodiac_fixture.py

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

…into feature/zodiac-signs

yammesicka · 2021-02-01T03:05:14Z

app/internal/quotes/load_quotes.py

@@ -1,41 +0,0 @@
-import json


You should remove this file using git rm

I think I've already removed these files.. I did git rm before the first commit and now again after the pull upstream. I dont have these files in my updated branch...
Maybe I missed something?

Maybe git rm --cached [full_file_path].

Remember to git commit and git push after running git rm.

Yes but I did it.. I don't understand, the deleted files are no longer in my branch and in the PR it is written that they are deleted..

In addition to my previous comment, I want to make sure we are aligned - both of the deleted files exist in the develop branch(already merged). I replaced them as I refactored the code. Maybe that's why they appear in the pr.
And as I understand, they will be removed just after the merge back to develop...

app/internal/json_data_loader.py

yammesicka · 2021-02-01T03:07:44Z

tests/test_load_quotes.py

@@ -1,25 +0,0 @@
-from app.database.models import Quote


Remove using git rm

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

yammesicka

Last push ;)

app/static/images/zodiac/Taurus.svg

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

@hadaskedar2020

* update ORM and added export for an event * update ORM and added export for an event * Added in app shareable events * docs: add type annotation and fix folder structure * docs: add type annotation and fix folder structure * docs: fix documentation * feat: get weather forecast for date and location * feat: get weather forecast for date and location * add: tests * set up commit * add: timezone support * add: session management * fix bug * split conftest file * split conftest file * move "utils" folder into "internal" folder * working day view with jinja2 template * with tests for pytest * feat: get weather forecast - fixes according to requested changes. * change file structure * feat: get weather forecast - fixes according to requested changes. * first functioning day-view html, css and router * feat: Basic responsive calender day view page Added dayview template with css and router. An tempreroy event class with, processing function for the day view to work. * feat: Basic responsive calender day view page Added dayview template with css and router. An tempreroy event class with, processing function for the day view to work. fixed after taking notes. * fix lint now for sure * more lint * feat: get weather forecast - fix requirements.txt * feat: enable invited users to view events * feat: flake8 changes * fix: requirements bug * fix: requirements bug * feat: flake8 changes * add: tests * feat: flake8 changes * add: tests * feat: flake8 changes * edit: file structure * edit: file structure * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * feat: add route tests * feat: get weather forecast - fix changes & add cache support * feat: get weather forecast - fix changes & add cache support * fix: test bug * remove: config.py * after all notes and started use the orm * fix: type annotation * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * feat: get weather forecast - add API mocking * fixed: changed "size" var in html and and more acuurate typing * deleted some testing lines * add requirements missing * add: minor changes * feat: flake8 changes * @hadaskedar2020 * feat: get weather forecast - add API mocking * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * feat: weather forecast - add API mocking & improve coverage * fixed: statements of event select more accurate * new test and lint fix * added more contants abd more notes taken * feat: weather forecast - move feat to internal * Delete Scripts directory * update constants * more notes * forgot white space * feat: gets a link to the suitable image of a given event content. (#70) * feat: gets a link to the suitable image of a given event content. * Add basic update event (#100) * Add basic update event * Added search feature (#98) * Added search feature * Add telegram client (#111) Add telegram client * feat: Add a feature for sharing information with a WhatsApp account (#83) * feat: Add a feature to share to a WhatsApp account * Feature/logging system (#112) * feat: first logging commit Co-authored-by: Liad Noam <LiadN@Taldor.corp> * feat: add a daily inspirational quote (#128) * feat: add a daily inspirational quote * Feature/delete event (#139) * basic delete event * Add an event delete function * Fix flake8 * Deleting an unnecessary model * Extract lines from try * fix: modify psycopg2 dependency (#164) * Bugfix/logging system (#158) * Changed logging config to be received by separate parameters for simplicity, removed option to receive configuration as a dict, added .vscode to gitignore * removed logging_config file which is no longer needed * Fixing merge conflicts - missing whitespace on config.py.example Co-authored-by: Liad Noam <LiadN@Taldor.corp> * Added checking for zoom link and saving the event (#122) * Added checking for zoom link and saving the event * Feature/import to calendar (#119) * feat: import file to calendar * docs: adding community standard documents (#173) * Feat: Event View Backend (#159) * Moved the route to top of file * Feature/send email (#88) * Added files for sending invitations by email This includes - templates - routes and internal code - configuration - tests Co-authored-by: leddest <46251307+leddest@users.noreply.github.com> Co-authored-by: Ellen <ellenc345@gmail.com> * Feature/translation - add an functionality to translate event data etc. (#167) * translation feature stuff * Update event - Improving the code (#138) * Add basic update event * Support categories for events (#137) * Support categories for events * Style/grid (#106) * Hello Wrold * Creating Html Template * Calendar dates calculation intigrating with html, HTML\CSS improvments. * Tests for calender_grid.py, changing function according to currections, fixing bugs * linting bug fixing * before merge with develop * Creating a Day object and days subclasses, changing all function and tests according to the new objects, Changing front to get information from Day objects, Re-arranging calendar.html grid stracture to be render by weeks, adding js functionality for day view section, adding css effects on daily event display * fix lintings * fix lintings * tests next week scroll * js updates * Calendar Scrolling with javascript * Fix lintings * Fix lintings * Calendar infinit scrolling ducplicates weeks bug fixed * seetings global parameters for calendar.py * Js - changing to fetch, removing jquery, fixing hint tpying, adding Week object, changing tests * Front end bug fixing * Fix linting * Fix lintings * Fix lintings * fixing syntax * Get user local date and time when enter calendar. * Fix lintings * Fix lintings * Fix lintings * Bugs fixing * Bugs fixing * Bugs fixing * Bugs fixing * JS alerts removal * Fix Lintings * Js syntext fixing * Bugs fixing * Bugs fixing * Js fixing varibales and adding div element to request. * Develop Update * Js - eliminate global parameters * Linting fixing * Fix Lintings * Fix flake8 * syntac fixing * Feature/translations workflow (#150) * feat: add translations workflow * fix(translations-workflow): fix doc * fix(translations-workflow): fixed code and added automatic commit Co-authored-by: Gonny <1@1> * Revert "Feature/translations workflow (#150)" (#208) This reverts commit 2e6a2c2. * feat: Add zodiac signs to the day & month view + refactor json data loader (#155) * feat: Add zodiac signs to the day/month view + * Change calendar link from '#' to '/' to get the home page (#194) when clicking on the logo * Style/grid (#200) * Js scrolling duplication days fixed Co-authored-by: Idan Pelled <pelled.idan@gmail.com> Co-authored-by: Hadas Kedar <hadasit@gmail.com> Co-authored-by: Sagi Zaid Or <sagi@eretz.org.il> Co-authored-by: sagizaidor <71097154+sagizaidor@users.noreply.github.com> Co-authored-by: hadaskedar2020 <70915466+hadaskedar2020@users.noreply.github.com> Co-authored-by: nir9696 <35953934+nir9696@users.noreply.github.com> Co-authored-by: efratush <70986341+efratush@users.noreply.github.com> Co-authored-by: advaa123 <64307569+advaa123@users.noreply.github.com> Co-authored-by: leddest <46251307+leddest@users.noreply.github.com> Co-authored-by: nelliei <71073199+nelliei@users.noreply.github.com> Co-authored-by: Liad-n <52039539+Liad-n@users.noreply.github.com> Co-authored-by: Liad Noam <LiadN@Taldor.corp> Co-authored-by: zohary89 <71074080+zohary89@users.noreply.github.com> Co-authored-by: Ron Huberfeld <32178925+ron-huberfeld@users.noreply.github.com> Co-authored-by: Ap1234567 <58956386+Ap1234567@users.noreply.github.com> Co-authored-by: Nir-P <70997974+Nir-P@users.noreply.github.com> Co-authored-by: Ode <odechann@gmail.com> Co-authored-by: Anna Shtirberg <71028276+annashtirberg@users.noreply.github.com> Co-authored-by: Ellen <ellenc345@gmail.com> Co-authored-by: ivarshav <ivarshav@users.noreply.github.com> Co-authored-by: Aviad <38867584+aviadamar@users.noreply.github.com> Co-authored-by: Gonzom <gonnym@gmail.com> Co-authored-by: Gonny <1@1> Co-authored-by: YairEn <71101056+YairEn@users.noreply.github.com>

zohary89 added 6 commits January 29, 2021 20:27

feat: Add zodiac signs to the day/month view +

39e5d00

create generic json data loader

update requirements

962739e

try to fix tests

25b35a9

fix flake error

4ccfebc

cancle change in tests- to see if errors happen

7e31139

again

fix test again- in asyncio_fixture

507fae3

yammesicka requested changes Jan 31, 2021

View reviewed changes

zohary89 added 2 commits January 31, 2021 19:33

Merge branch 'develop' of

090bb09

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

fix - changes requested

115f453

zohary89 requested a review from yammesicka January 31, 2021 21:24

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

62f1cb7

…into feature/zodiac-signs

yammesicka requested changes Feb 1, 2021

View reviewed changes

zohary89 added 2 commits February 1, 2021 15:44

Merge branch 'develop' of

b422f2a

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

fix exception

e719290

zohary89 requested a review from yammesicka February 1, 2021 14:09

change png images to svg

9b49b5a

yammesicka reviewed Feb 2, 2021

View reviewed changes

app/static/images/zodiac/Taurus.svg Show resolved Hide resolved

zohary89 added 3 commits February 2, 2021 07:50

Merge branch 'develop' of

7820580

http://github.com/PythonFreeCourse/calendar into feature/zodiac-signs

remove thumbs.db

355bbd5

update requirements

20dc1b3

zohary89 requested a review from yammesicka February 2, 2021 10:26

yammesicka merged commit bd9ccb0 into PythonFreeCourse:develop Feb 5, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat: Add zodiac signs to the day & month view + refactor json data loader #155

feat: Add zodiac signs to the day & month view + refactor json data loader #155

Uh oh!

zohary89 commented Jan 29, 2021 •

edited

Loading

Uh oh!

yammesicka left a comment •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yammesicka Feb 1, 2021

Uh oh!

zohary89 Feb 1, 2021

Uh oh!

yammesicka Feb 3, 2021

Uh oh!

zohary89 Feb 3, 2021

Uh oh!

zohary89 Feb 3, 2021

Uh oh!

Uh oh!

yammesicka Feb 1, 2021

Uh oh!

yammesicka left a comment

Uh oh!

Uh oh!

Uh oh!

feat: Add zodiac signs to the day & month view + refactor json data loader #155

feat: Add zodiac signs to the day & month view + refactor json data loader #155

Uh oh!

Conversation

zohary89 commented Jan 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

yammesicka left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yammesicka Feb 1, 2021

Choose a reason for hiding this comment

Uh oh!

zohary89 Feb 1, 2021

Choose a reason for hiding this comment

Uh oh!

yammesicka Feb 3, 2021

Choose a reason for hiding this comment

Uh oh!

zohary89 Feb 3, 2021

Choose a reason for hiding this comment

Uh oh!

zohary89 Feb 3, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

yammesicka Feb 1, 2021

Choose a reason for hiding this comment

Uh oh!

yammesicka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

zohary89 commented Jan 29, 2021 •

edited

Loading

yammesicka left a comment •

edited

Loading