Skip to content

Style/grid #200

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.

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

Merged
merged 58 commits into from
Feb 5, 2021
Merged
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
f6c619b
Hello Wrold
aviadamar Jan 15, 2021
1ee94e4
Creating Html Template
aviadamar Jan 15, 2021
96b80de
First Calendar Monthly View - HTML\CSS only
aviadamar Jan 16, 2021
4614585
Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…
aviadamar Jan 16, 2021
82249b5
Calendar dates calculation intigrating with html, HTML\CSS improvments.
aviadamar Jan 17, 2021
d2208d6
Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…
aviadamar Jan 17, 2021
178e904
Tests for calender_grid.py, changing function according to currection…
aviadamar Jan 17, 2021
f385c56
linting bug fixing
aviadamar Jan 18, 2021
c2aa519
before merge with develop
aviadamar Jan 19, 2021
3a563cc
after merge with develop
aviadamar Jan 19, 2021
6f9a2ba
Creating a Day object and days subclasses, changing all function and …
aviadamar Jan 20, 2021
a17e89b
Fixing Conflicts
aviadamar Jan 21, 2021
75abb99
fix lintings
aviadamar Jan 21, 2021
d2577aa
fix lintings
aviadamar Jan 21, 2021
e76ed53
tests next week scroll
aviadamar Jan 23, 2021
19768ca
js updates
aviadamar Jan 23, 2021
b288c49
Calendar Scrolling with javascript
aviadamar Jan 24, 2021
5621485
Calendar infinit scrolling and functions changes, bus fixing
aviadamar Jan 24, 2021
10b836c
Fix lintings
aviadamar Jan 24, 2021
43dd46e
Fix lintings
aviadamar Jan 24, 2021
248a0ba
Calendar infinit scrolling ducplicates weeks bug fixed
aviadamar Jan 24, 2021
59b7fe3
seetings global parameters for calendar.py
aviadamar Jan 24, 2021
efa6b2d
Js - changing to fetch, removing jquery, fixing hint tpying, adding W…
aviadamar Jan 24, 2021
1df4cd5
Front end bug fixing
aviadamar Jan 24, 2021
2e02b65
Fix linting
aviadamar Jan 24, 2021
e02bd14
Fix lintings
aviadamar Jan 24, 2021
2271a3c
Fix lintings
aviadamar Jan 24, 2021
126c92e
gixing js bugs
aviadamar Jan 25, 2021
8af556c
fixing syntax
aviadamar Jan 25, 2021
bc3322f
Get user local date and time when enter calendar.
aviadamar Jan 26, 2021
a60c7c8
Fix lintings
aviadamar Jan 26, 2021
60849ab
bug fixging and pull develop update
aviadamar Jan 29, 2021
b8e6044
Fix lintings
aviadamar Jan 29, 2021
0b601e2
Fix lintings
aviadamar Jan 29, 2021
9ca2183
Bugs fixing
aviadamar Jan 29, 2021
79b2f5c
Bugs fixing
aviadamar Jan 29, 2021
e4c662d
Js fixing bugs and syntext.
aviadamar Jan 31, 2021
03e4349
Bugs fixing
aviadamar Jan 31, 2021
982daea
Bugs fixing
aviadamar Jan 31, 2021
19de078
JS alerts removal
aviadamar Jan 31, 2021
b97279f
Fix Lintings
aviadamar Jan 31, 2021
6516f7c
Js syntext fixing
aviadamar Jan 31, 2021
d496b07
Bugs fixing
aviadamar Jan 31, 2021
41b7bd4
Bugs fixing
aviadamar Jan 31, 2021
66d8972
Js fixing varibales and adding div element to request.
aviadamar Jan 31, 2021
4f54e25
Js global parameters fixing
aviadamar Feb 1, 2021
f0bd6ac
Develop update
aviadamar Feb 2, 2021
b9a0c0b
Develop Update
aviadamar Feb 2, 2021
5cbf776
Js - eliminate global parameters
aviadamar Feb 2, 2021
901f88f
Linting fixing
aviadamar Feb 2, 2021
445a962
Fix Lintings
aviadamar Feb 2, 2021
dd0f480
Js fixings
aviadamar Feb 3, 2021
1e8e206
Fix flake8
aviadamar Feb 3, 2021
85d904f
syntac fixing
aviadamar Feb 3, 2021
30df427
Merge branch 'develop' of https://github.com/PythonFreeCourse/calenda…
aviadamar Feb 4, 2021
d39d7e7
Js html\body duplication bug fix
aviadamar Feb 4, 2021
b44c386
Js extra div bug fix
aviadamar Feb 4, 2021
3ee9bd3
Js scrolling duplication days fixed
aviadamar Feb 4, 2021
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
8 changes: 2 additions & 6 deletions app/static/js/grid_scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,12 @@ function loadWeek(lastDay, index) {
if (lastDay.dataset.last === "false") {
return false;
}
lastDay.dataset.last = false;
const path = '/calendar/month/' + lastDay.id;
const newDays = document.createElement('html');
fetch(path).then(function (response) {
lastDay.dataset.last = false;
return response.text();
}).then(function (html) {
const newDiv = document.createElement("div");
newDays.innerHTML = html;
newDiv.appendChild(newDays);
document.getElementById("calender-grid").append(newDays);
document.getElementById("calender-grid").insertAdjacentHTML('beforeEnd', html);
setToggle("day", "day-view", "day-view-visible", index);
});
}
Expand Down