From 894b8cc9dc6bf544ae4ef67aa88b88228e224a6b Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sat, 19 Feb 2022 16:37:50 +0530 Subject: [PATCH 01/10] subject page ui --- static/font-awesome.min.css | 4 +++ templates/base.html | 30 ++++++++++-------- templates/pages/subjects.html | 44 +++++++++++++++++++++++++++ templates/partials/filter_widget.html | 15 +++++++++ templates/partials/search_widget.html | 7 +++++ 5 files changed, 88 insertions(+), 12 deletions(-) create mode 100644 static/font-awesome.min.css create mode 100644 templates/pages/subjects.html create mode 100644 templates/partials/filter_widget.html create mode 100644 templates/partials/search_widget.html diff --git a/static/font-awesome.min.css b/static/font-awesome.min.css new file mode 100644 index 0000000..540440c --- /dev/null +++ b/static/font-awesome.min.css @@ -0,0 +1,4 @@ +/*! + * Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome + * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) + */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.7.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'),url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left{margin-right:.3em}.fa.fa-pull-right{margin-left:.3em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}.fa-pulse{-webkit-animation:fa-spin 1s infinite steps(8);animation:fa-spin 1s infinite steps(8)}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook-f:before,.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-feed:before,.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before,.fa-gratipay:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-resistance:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-y-combinator-square:before,.fa-yc-square:before,.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"}.fa-buysellads:before{content:"\f20d"}.fa-connectdevelop:before{content:"\f20e"}.fa-dashcube:before{content:"\f210"}.fa-forumbee:before{content:"\f211"}.fa-leanpub:before{content:"\f212"}.fa-sellsy:before{content:"\f213"}.fa-shirtsinbulk:before{content:"\f214"}.fa-simplybuilt:before{content:"\f215"}.fa-skyatlas:before{content:"\f216"}.fa-cart-plus:before{content:"\f217"}.fa-cart-arrow-down:before{content:"\f218"}.fa-diamond:before{content:"\f219"}.fa-ship:before{content:"\f21a"}.fa-user-secret:before{content:"\f21b"}.fa-motorcycle:before{content:"\f21c"}.fa-street-view:before{content:"\f21d"}.fa-heartbeat:before{content:"\f21e"}.fa-venus:before{content:"\f221"}.fa-mars:before{content:"\f222"}.fa-mercury:before{content:"\f223"}.fa-intersex:before,.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-venus-double:before{content:"\f226"}.fa-mars-double:before{content:"\f227"}.fa-venus-mars:before{content:"\f228"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-neuter:before{content:"\f22c"}.fa-genderless:before{content:"\f22d"}.fa-facebook-official:before{content:"\f230"}.fa-pinterest-p:before{content:"\f231"}.fa-whatsapp:before{content:"\f232"}.fa-server:before{content:"\f233"}.fa-user-plus:before{content:"\f234"}.fa-user-times:before{content:"\f235"}.fa-hotel:before,.fa-bed:before{content:"\f236"}.fa-viacoin:before{content:"\f237"}.fa-train:before{content:"\f238"}.fa-subway:before{content:"\f239"}.fa-medium:before{content:"\f23a"}.fa-yc:before,.fa-y-combinator:before{content:"\f23b"}.fa-optin-monster:before{content:"\f23c"}.fa-opencart:before{content:"\f23d"}.fa-expeditedssl:before{content:"\f23e"}.fa-battery-4:before,.fa-battery:before,.fa-battery-full:before{content:"\f240"}.fa-battery-3:before,.fa-battery-three-quarters:before{content:"\f241"}.fa-battery-2:before,.fa-battery-half:before{content:"\f242"}.fa-battery-1:before,.fa-battery-quarter:before{content:"\f243"}.fa-battery-0:before,.fa-battery-empty:before{content:"\f244"}.fa-mouse-pointer:before{content:"\f245"}.fa-i-cursor:before{content:"\f246"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-sticky-note:before{content:"\f249"}.fa-sticky-note-o:before{content:"\f24a"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-diners-club:before{content:"\f24c"}.fa-clone:before{content:"\f24d"}.fa-balance-scale:before{content:"\f24e"}.fa-hourglass-o:before{content:"\f250"}.fa-hourglass-1:before,.fa-hourglass-start:before{content:"\f251"}.fa-hourglass-2:before,.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-3:before,.fa-hourglass-end:before{content:"\f253"}.fa-hourglass:before{content:"\f254"}.fa-hand-grab-o:before,.fa-hand-rock-o:before{content:"\f255"}.fa-hand-stop-o:before,.fa-hand-paper-o:before{content:"\f256"}.fa-hand-scissors-o:before{content:"\f257"}.fa-hand-lizard-o:before{content:"\f258"}.fa-hand-spock-o:before{content:"\f259"}.fa-hand-pointer-o:before{content:"\f25a"}.fa-hand-peace-o:before{content:"\f25b"}.fa-trademark:before{content:"\f25c"}.fa-registered:before{content:"\f25d"}.fa-creative-commons:before{content:"\f25e"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-tripadvisor:before{content:"\f262"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-get-pocket:before{content:"\f265"}.fa-wikipedia-w:before{content:"\f266"}.fa-safari:before{content:"\f267"}.fa-chrome:before{content:"\f268"}.fa-firefox:before{content:"\f269"}.fa-opera:before{content:"\f26a"}.fa-internet-explorer:before{content:"\f26b"}.fa-tv:before,.fa-television:before{content:"\f26c"}.fa-contao:before{content:"\f26d"}.fa-500px:before{content:"\f26e"}.fa-amazon:before{content:"\f270"}.fa-calendar-plus-o:before{content:"\f271"}.fa-calendar-minus-o:before{content:"\f272"}.fa-calendar-times-o:before{content:"\f273"}.fa-calendar-check-o:before{content:"\f274"}.fa-industry:before{content:"\f275"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-map-o:before{content:"\f278"}.fa-map:before{content:"\f279"}.fa-commenting:before{content:"\f27a"}.fa-commenting-o:before{content:"\f27b"}.fa-houzz:before{content:"\f27c"}.fa-vimeo:before{content:"\f27d"}.fa-black-tie:before{content:"\f27e"}.fa-fonticons:before{content:"\f280"}.fa-reddit-alien:before{content:"\f281"}.fa-edge:before{content:"\f282"}.fa-credit-card-alt:before{content:"\f283"}.fa-codiepie:before{content:"\f284"}.fa-modx:before{content:"\f285"}.fa-fort-awesome:before{content:"\f286"}.fa-usb:before{content:"\f287"}.fa-product-hunt:before{content:"\f288"}.fa-mixcloud:before{content:"\f289"}.fa-scribd:before{content:"\f28a"}.fa-pause-circle:before{content:"\f28b"}.fa-pause-circle-o:before{content:"\f28c"}.fa-stop-circle:before{content:"\f28d"}.fa-stop-circle-o:before{content:"\f28e"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-hashtag:before{content:"\f292"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-percent:before{content:"\f295"}.fa-gitlab:before{content:"\f296"}.fa-wpbeginner:before{content:"\f297"}.fa-wpforms:before{content:"\f298"}.fa-envira:before{content:"\f299"}.fa-universal-access:before{content:"\f29a"}.fa-wheelchair-alt:before{content:"\f29b"}.fa-question-circle-o:before{content:"\f29c"}.fa-blind:before{content:"\f29d"}.fa-audio-description:before{content:"\f29e"}.fa-volume-control-phone:before{content:"\f2a0"}.fa-braille:before{content:"\f2a1"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asl-interpreting:before,.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-deafness:before,.fa-hard-of-hearing:before,.fa-deaf:before{content:"\f2a4"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-signing:before,.fa-sign-language:before{content:"\f2a7"}.fa-low-vision:before{content:"\f2a8"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-pied-piper:before{content:"\f2ae"}.fa-first-order:before{content:"\f2b0"}.fa-yoast:before{content:"\f2b1"}.fa-themeisle:before{content:"\f2b2"}.fa-google-plus-circle:before,.fa-google-plus-official:before{content:"\f2b3"}.fa-fa:before,.fa-font-awesome:before{content:"\f2b4"}.fa-handshake-o:before{content:"\f2b5"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-o:before{content:"\f2b7"}.fa-linode:before{content:"\f2b8"}.fa-address-book:before{content:"\f2b9"}.fa-address-book-o:before{content:"\f2ba"}.fa-vcard:before,.fa-address-card:before{content:"\f2bb"}.fa-vcard-o:before,.fa-address-card-o:before{content:"\f2bc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-circle-o:before{content:"\f2be"}.fa-user-o:before{content:"\f2c0"}.fa-id-badge:before{content:"\f2c1"}.fa-drivers-license:before,.fa-id-card:before{content:"\f2c2"}.fa-drivers-license-o:before,.fa-id-card-o:before{content:"\f2c3"}.fa-quora:before{content:"\f2c4"}.fa-free-code-camp:before{content:"\f2c5"}.fa-telegram:before{content:"\f2c6"}.fa-thermometer-4:before,.fa-thermometer:before,.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-3:before,.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-thermometer-2:before,.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-1:before,.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-0:before,.fa-thermometer-empty:before{content:"\f2cb"}.fa-shower:before{content:"\f2cc"}.fa-bathtub:before,.fa-s15:before,.fa-bath:before{content:"\f2cd"}.fa-podcast:before{content:"\f2ce"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-times-rectangle:before,.fa-window-close:before{content:"\f2d3"}.fa-times-rectangle-o:before,.fa-window-close-o:before{content:"\f2d4"}.fa-bandcamp:before{content:"\f2d5"}.fa-grav:before{content:"\f2d6"}.fa-etsy:before{content:"\f2d7"}.fa-imdb:before{content:"\f2d8"}.fa-ravelry:before{content:"\f2d9"}.fa-eercast:before{content:"\f2da"}.fa-microchip:before{content:"\f2db"}.fa-snowflake-o:before{content:"\f2dc"}.fa-superpowers:before{content:"\f2dd"}.fa-wpexplorer:before{content:"\f2de"}.fa-meetup:before{content:"\f2e0"}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto} diff --git a/templates/base.html b/templates/base.html index cdc7591..310a92b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,17 +7,23 @@ - - + + + + - + {% block title %}Online Notifier System{% endblock %} @@ -28,12 +34,12 @@ {% include "partials/navbar.html" %} -
+
{% block content %} {% endblock %}
- - + +
{% include "partials/bottom_navigation.html" %}
@@ -41,14 +47,14 @@ + integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"> + + integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"> + + integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"> + {% block scripts %} diff --git a/templates/pages/subjects.html b/templates/pages/subjects.html new file mode 100644 index 0000000..df5fe70 --- /dev/null +++ b/templates/pages/subjects.html @@ -0,0 +1,44 @@ +!{% extends "base.html" %} + +{% block title %}Subjects{% endblock %} + + +{% block content %} + + +
+
+ +

{{subject_name}} Hello

+

{{no_of_curations}} Curated List{% if no_of_curations > 1 %} + s + {% endif %}

+
+
+
+
{%include "partials/search_widget.html"%}
+ +
{%include "partials/filter_widget.html"%}
+
+
+
+
+ +
+
Top Curations
+
+ {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + + {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + + {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + + {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + + {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + + {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + +
+
+{% endblock %} \ No newline at end of file diff --git a/templates/partials/filter_widget.html b/templates/partials/filter_widget.html new file mode 100644 index 0000000..336db86 --- /dev/null +++ b/templates/partials/filter_widget.html @@ -0,0 +1,15 @@ +
+
Filter:   
+ +
+ +
+ Action + Another action + Something else here +
+
+
\ No newline at end of file diff --git a/templates/partials/search_widget.html b/templates/partials/search_widget.html new file mode 100644 index 0000000..9b3835e --- /dev/null +++ b/templates/partials/search_widget.html @@ -0,0 +1,7 @@ +
+ +
+ +
+
\ No newline at end of file From b1b69849394b87095f21dca08e54e68b1577a327 Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sat, 19 Feb 2022 20:32:53 +0530 Subject: [PATCH 02/10] Pagination done, search and filter left --- .../migrations/0002_alter_curation_subject.py | 19 +++++ curations/models.py | 4 +- curatorbackendapi/urls.py | 14 ++-- curatorbackendapi/views.py | 80 +++++++++++++------ templates/pages/home.html | 74 ++++++++--------- templates/pages/subjects.html | 41 ++++++---- templates/partials/curation_card.html | 24 +++--- templates/partials/subject_card.html | 4 +- 8 files changed, 161 insertions(+), 99 deletions(-) create mode 100644 curations/migrations/0002_alter_curation_subject.py diff --git a/curations/migrations/0002_alter_curation_subject.py b/curations/migrations/0002_alter_curation_subject.py new file mode 100644 index 0000000..e1b7a53 --- /dev/null +++ b/curations/migrations/0002_alter_curation_subject.py @@ -0,0 +1,19 @@ +# Generated by Django 4.0.2 on 2022-02-19 14:08 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('curations', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='curation', + name='subject', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='curations', to='curations.subject'), + ), + ] diff --git a/curations/models.py b/curations/models.py index 5cf4f79..04e6f1b 100644 --- a/curations/models.py +++ b/curations/models.py @@ -8,7 +8,9 @@ class Curation(models.Model): description = models.TextField() upvotes = models.IntegerField(default=0) owner = models.ForeignKey(get_user_model(), on_delete=models.CASCADE) - subject = models.ForeignKey("Subject", on_delete=models.CASCADE) + subject = models.ForeignKey( + "Subject", related_name="curations", on_delete=models.CASCADE + ) def __str__(self): return self.title diff --git a/curatorbackendapi/urls.py b/curatorbackendapi/urls.py index 4f35e58..d6f7613 100644 --- a/curatorbackendapi/urls.py +++ b/curatorbackendapi/urls.py @@ -12,13 +12,17 @@ urlpatterns = [ path("admin/", admin.site.urls), path("users/", include("userProfiles.urls")), - path('sign-in/"', auth_views.LoginView.as_view(template_name="sign-in.html"), name="sign-in"), - path('sign-out/', auth_views.LogoutView.as_view(next_page="/"), name="sign-out"), - path('sign-up/', views.signUp, name="sign-up"), + path( + 'sign-in/"', + auth_views.LoginView.as_view(template_name="sign-in.html"), + name="sign-in", + ), + path("sign-out/", auth_views.LogoutView.as_view(next_page="/"), name="sign-out"), + path("sign-up/", views.signUp, name="sign-up"), path("", views.HomePageView.as_view(), name="home"), - path("subjects/", views.SubjectPageView.as_view(), name="home"), + path("subject/", views.SubjectPageView.as_view(), name="home"), ] if settings.DEBUG: urlpatterns += static( settings.MEDIA_URL, document_root=settings.MEDIA_ROOT - ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) \ No newline at end of file + ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/curatorbackendapi/views.py b/curatorbackendapi/views.py index 41c31c1..96360f2 100644 --- a/curatorbackendapi/views.py +++ b/curatorbackendapi/views.py @@ -1,48 +1,78 @@ -from django.views.generic.base import TemplateView +from django.views.generic import View from django.contrib.auth import login from django.shortcuts import redirect, render + +from curations.models import Curation, Subject from .forms import CustomUserCreationForm from django.contrib import messages -class HomePageView(TemplateView): +from django.core.paginator import Paginator + + +class HomePageView(View): template_name = "pages/home.html" - # def get_context_data(self, **kwargs): - # # Call the base implementation first to get a context - # context = super().get_context_data(**kwargs) - # # Add in a QuerySet of all the books - # context["notices"] = Notice.objects.all()[:5] - # context["events"] = Event.objects.all()[:5] - # return context + def get(self, request): + subjects = Subject.objects.all() + curations_whole = Curation.objects.order_by("-upvotes")[:15] + + # pagination stuff + p = Paginator(curations_whole, 15) + page = request.GET.get("page") + curations = p.get_page(page) + + # setting the context + context = {} + context["curations"] = curations + context["subjects"] = subjects + return render(request, self.template_name, context) + + +class SubjectPageView(View): -class SubjectPageView(TemplateView): - template_name = "pages/subjects.html" - # def get_context_data(self, **kwargs): - # # Call the base implementation first to get a context - # context = super().get_context_data(**kwargs) - # # Add in a QuerySet of all the books - # context["notices"] = Notice.objects.all()[:5] - # context["events"] = Event.objects.all()[:5] - # return context + def get(self, request, *args, **kwargs): + + # defining vars + title = kwargs["sub"] + subject = Subject.objects.filter(title=title)[0] + curations_whole = Curation.objects.filter(subject=subject).order_by("-upvotes")[ + :20 + ] + curation_count = subject.curations.all().count() + + # pagination stuff + p = Paginator(curations_whole, 15) + page = request.GET.get("page") + curations = p.get_page(page) + + # setting the context + context = {} + context["curations"] = curations + context["subject"] = subject + context["curation_count"] = curation_count + + return render(request, self.template_name, context) + + def signUp(request): - - if request.method == 'POST': + + if request.method == "POST": form = CustomUserCreationForm(request.POST) if form.is_valid(): email = form.cleaned_data.get("email").lower() user = form.save(commit=False) user.username = email user.save() - login(request,user) - messages.success(request, f"User created and logged in successfully" ) + login(request, user) + messages.success(request, f"User created and logged in successfully") return redirect("/") - + else: return render(request, "sign-up.html", {"form": form}) - + form = CustomUserCreationForm() - + return render(request, "sign-up.html", {"form": form}) diff --git a/templates/pages/home.html b/templates/pages/home.html index 795e18d..7556748 100644 --- a/templates/pages/home.html +++ b/templates/pages/home.html @@ -7,50 +7,42 @@
-
+
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
- -
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
-
- {% include "partials/subject_card.html" with subject="Computer Science" subject_url="#"%} -
- -
-
-
- -
-
Top Curations
-
-{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - -{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} -{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} + {% for subject in subjects %} + {% include "partials/subject_card.html"%} + {% endfor %} -{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} -{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - -{% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} +
+
+
+
Top Curations
+
+ {% for curation in curations %} + {% include "partials/curation_card.html"%} + {% endfor %}
-
-{% endblock %} \ No newline at end of file +
+ + {% if curations.paginator.num_pages > 1 %} +
+ +
+ {% endif %} + {% endblock %} \ No newline at end of file diff --git a/templates/pages/subjects.html b/templates/pages/subjects.html index df5fe70..5c0d516 100644 --- a/templates/pages/subjects.html +++ b/templates/pages/subjects.html @@ -7,10 +7,13 @@
+ {{curations}} + {{curations.number}} + {{curations.paginator.num_pages}}
-

{{subject_name}} Hello

-

{{no_of_curations}} Curated List{% if no_of_curations > 1 %} +

{{subject}}

+

{{curation_count}} curated list{% if curation_count > 1 %} s {% endif %}

@@ -27,18 +30,28 @@

{{subject_name}} Hello

Top Curations
- {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - - {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - - {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - - {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - - {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - - {% include "partials/curation_card.html" with title="TOP 450 DSA" description="This list contains top 450 DSA questions, matlab sab kar loge toh interview mein ho hi jaayega, leetcode ke 1/4th question hai bc" subject="computer Science" subject_url="https://google.com/" author="Kartikey Rawat" author_url="https://google.com/"%} - + {% for curation in curations %} + {% include "partials/curation_card.html"%} + {% endfor %}
+ +{% if curations.paginator.num_pages > 1 %} +
+ +
+{% endif %} {% endblock %} \ No newline at end of file diff --git a/templates/partials/curation_card.html b/templates/partials/curation_card.html index 4458ee7..2413994 100644 --- a/templates/partials/curation_card.html +++ b/templates/partials/curation_card.html @@ -1,27 +1,27 @@
- +
- - - + + +
- - + +
-

{{title}}

-

{{description}}

+

{{curation.title}}

+

{{curation.description}}

- - {{subject}} + + {{curation.subject}}  |  - {{author}} + {{curation.owner}}
-
+
\ No newline at end of file diff --git a/templates/partials/subject_card.html b/templates/partials/subject_card.html index 7ac20f1..aac6ad0 100644 --- a/templates/partials/subject_card.html +++ b/templates/partials/subject_card.html @@ -1,5 +1,7 @@
-

{{subject}}

 + +

{{subject}}

+
\ No newline at end of file From 4ed1a8306a867daaabacc5a0ea9a84dc5e11a3e8 Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sat, 19 Feb 2022 20:34:51 +0530 Subject: [PATCH 03/10] search --- templates/pages/subjects.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/templates/pages/subjects.html b/templates/pages/subjects.html index 5c0d516..276d5c2 100644 --- a/templates/pages/subjects.html +++ b/templates/pages/subjects.html @@ -7,9 +7,7 @@
- {{curations}} - {{curations.number}} - {{curations.paginator.num_pages}} +

{{subject}}

From e3d2ada8c6246b43d9d7ca9491cc1d65431d7ed5 Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sat, 19 Feb 2022 20:43:14 +0530 Subject: [PATCH 04/10] db --- .gitignore | 4 +--- mydatabase | Bin 0 -> 192512 bytes templates/pages/home.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 mydatabase diff --git a/.gitignore b/.gitignore index 7356a91..b493ca3 100644 --- a/.gitignore +++ b/.gitignore @@ -8,11 +8,9 @@ *.pyc __pycache__/ local_settings.py -db.sqlite3 -db.sqlite3-journal media -mydatabase + # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/ # in your Git repository. Update and uncomment the following line accordingly. diff --git a/mydatabase b/mydatabase new file mode 100644 index 0000000000000000000000000000000000000000..332e14cb5be8092c23f3ad85d0deee423a8cd474 GIT binary patch literal 192512 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 Date: Sat, 19 Feb 2022 23:48:10 +0530 Subject: [PATCH 05/10] Search Functionality --- Pipfile | 4 +- Pipfile.lock | 70 --------------------------- curations/filters.py | 9 ++++ curatorbackendapi/settings.py | 5 +- curatorbackendapi/urls.py | 3 +- curatorbackendapi/views.py | 25 ++++++++-- templates/pages/subject_list.html | 22 +++++++++ templates/pages/subjects.html | 6 +-- templates/partials/search_widget.html | 14 +++--- 9 files changed, 70 insertions(+), 88 deletions(-) delete mode 100644 Pipfile.lock create mode 100644 curations/filters.py create mode 100644 templates/pages/subject_list.html diff --git a/Pipfile b/Pipfile index dff9d8a..6a081a1 100644 --- a/Pipfile +++ b/Pipfile @@ -4,8 +4,10 @@ verify_ssl = true name = "pypi" [packages] -pillow = "*" +Pillow = "*" django-crispy-forms = "*" +djangorestframework-filters = "*" +django-filter = "==21.1" [dev-packages] diff --git a/Pipfile.lock b/Pipfile.lock deleted file mode 100644 index 986c780..0000000 --- a/Pipfile.lock +++ /dev/null @@ -1,70 +0,0 @@ -{ - "_meta": { - "hash": { - "sha256": "7c992854c2edcab765b5072720c53b92d4b4e13a34524593a3c1fb81965b0cf0" - }, - "pipfile-spec": 6, - "requires": { - "python_version": "3.9" - }, - "sources": [ - { - "name": "pypi", - "url": "https://pypi.org/simple", - "verify_ssl": true - } - ] - }, - "default": { - "django-crispy-forms": { - "hashes": [ - "sha256:35887b8851a931374dd697207a8f56c57a9c5cb9dbf0b9fa54314da5666cea5b", - "sha256:bc4d2037f6de602d39c0bc452ac3029d1f5d65e88458872cc4dbc01c3a400604" - ], - "index": "pypi", - "version": "==1.14.0" - }, - "pillow": { - "hashes": [ - "sha256:011233e0c42a4a7836498e98c1acf5e744c96a67dd5032a6f666cc1fb97eab97", - "sha256:0f29d831e2151e0b7b39981756d201f7108d3d215896212ffe2e992d06bfe049", - "sha256:12875d118f21cf35604176872447cdb57b07126750a33748bac15e77f90f1f9c", - "sha256:14d4b1341ac07ae07eb2cc682f459bec932a380c3b122f5540432d8977e64eae", - "sha256:1c3c33ac69cf059bbb9d1a71eeaba76781b450bc307e2291f8a4764d779a6b28", - "sha256:1d19397351f73a88904ad1aee421e800fe4bbcd1aeee6435fb62d0a05ccd1030", - "sha256:253e8a302a96df6927310a9d44e6103055e8fb96a6822f8b7f514bb7ef77de56", - "sha256:2632d0f846b7c7600edf53c48f8f9f1e13e62f66a6dbc15191029d950bfed976", - "sha256:335ace1a22325395c4ea88e00ba3dc89ca029bd66bd5a3c382d53e44f0ccd77e", - "sha256:413ce0bbf9fc6278b2d63309dfeefe452835e1c78398efb431bab0672fe9274e", - "sha256:5100b45a4638e3c00e4d2320d3193bdabb2d75e79793af7c3eb139e4f569f16f", - "sha256:514ceac913076feefbeaf89771fd6febde78b0c4c1b23aaeab082c41c694e81b", - "sha256:528a2a692c65dd5cafc130de286030af251d2ee0483a5bf50c9348aefe834e8a", - "sha256:6295f6763749b89c994fcb6d8a7f7ce03c3992e695f89f00b741b4580b199b7e", - "sha256:6c8bc8238a7dfdaf7a75f5ec5a663f4173f8c367e5a39f87e720495e1eed75fa", - "sha256:718856856ba31f14f13ba885ff13874be7fefc53984d2832458f12c38205f7f7", - "sha256:7f7609a718b177bf171ac93cea9fd2ddc0e03e84d8fa4e887bdfc39671d46b00", - "sha256:80ca33961ced9c63358056bd08403ff866512038883e74f3a4bf88ad3eb66838", - "sha256:80fe64a6deb6fcfdf7b8386f2cf216d329be6f2781f7d90304351811fb591360", - "sha256:81c4b81611e3a3cb30e59b0cf05b888c675f97e3adb2c8672c3154047980726b", - "sha256:855c583f268edde09474b081e3ddcd5cf3b20c12f26e0d434e1386cc5d318e7a", - "sha256:9bfdb82cdfeccec50aad441afc332faf8606dfa5e8efd18a6692b5d6e79f00fd", - "sha256:a5d24e1d674dd9d72c66ad3ea9131322819ff86250b30dc5821cbafcfa0b96b4", - "sha256:a9f44cd7e162ac6191491d7249cceb02b8116b0f7e847ee33f739d7cb1ea1f70", - "sha256:b5b3f092fe345c03bca1e0b687dfbb39364b21ebb8ba90e3fa707374b7915204", - "sha256:b9618823bd237c0d2575283f2939655f54d51b4527ec3972907a927acbcc5bfc", - "sha256:cef9c85ccbe9bee00909758936ea841ef12035296c748aaceee535969e27d31b", - "sha256:d21237d0cd37acded35154e29aec853e945950321dd2ffd1a7d86fe686814669", - "sha256:d3c5c79ab7dfce6d88f1ba639b77e77a17ea33a01b07b99840d6ed08031cb2a7", - "sha256:d9d7942b624b04b895cb95af03a23407f17646815495ce4547f0e60e0b06f58e", - "sha256:db6d9fac65bd08cea7f3540b899977c6dee9edad959fa4eaf305940d9cbd861c", - "sha256:ede5af4a2702444a832a800b8eb7f0a7a1c0eed55b644642e049c98d589e5092", - "sha256:effb7749713d5317478bb3acb3f81d9d7c7f86726d41c1facca068a04cf5bb4c", - "sha256:f154d173286a5d1863637a7dcd8c3437bb557520b01bddb0be0258dcb72696b5", - "sha256:f25ed6e28ddf50de7e7ea99d7a976d6a9c415f03adcaac9c41ff6ff41b6d86ac" - ], - "index": "pypi", - "version": "==9.0.1" - } - }, - "develop": {} -} diff --git a/curations/filters.py b/curations/filters.py new file mode 100644 index 0000000..4babdfa --- /dev/null +++ b/curations/filters.py @@ -0,0 +1,9 @@ +from dataclasses import field +import django_filters +from .models import Curation + + +class CurationFilter(django_filters.Filter): + class Meta: + model = Curation + fields = "__all__" diff --git a/curatorbackendapi/settings.py b/curatorbackendapi/settings.py index 14c82db..6ec12d0 100644 --- a/curatorbackendapi/settings.py +++ b/curatorbackendapi/settings.py @@ -38,9 +38,10 @@ "django.contrib.sessions", "django.contrib.messages", "django.contrib.staticfiles", - 'crispy_forms', + "crispy_forms", "curations", "userProfiles", + "django_filters", ] MIDDLEWARE = [ @@ -153,4 +154,4 @@ LOGIN_URL = "sign-in" LOGIN_REDIRECT_URL = "/users/profile/" -CRISPY_TEMPLATE_PACK = 'bootstrap4' \ No newline at end of file +CRISPY_TEMPLATE_PACK = "bootstrap4" diff --git a/curatorbackendapi/urls.py b/curatorbackendapi/urls.py index d6f7613..7dc8a27 100644 --- a/curatorbackendapi/urls.py +++ b/curatorbackendapi/urls.py @@ -19,8 +19,9 @@ ), path("sign-out/", auth_views.LogoutView.as_view(next_page="/"), name="sign-out"), path("sign-up/", views.signUp, name="sign-up"), + path("subjects/", views.SubjectListView.as_view(), name="subjects"), + path("subject/", views.SubjectPageView.as_view(), name="subject"), path("", views.HomePageView.as_view(), name="home"), - path("subject/", views.SubjectPageView.as_view(), name="home"), ] if settings.DEBUG: urlpatterns += static( diff --git a/curatorbackendapi/views.py b/curatorbackendapi/views.py index 96360f2..1bcf025 100644 --- a/curatorbackendapi/views.py +++ b/curatorbackendapi/views.py @@ -1,11 +1,12 @@ -from django.views.generic import View +from django.views.generic import View, ListView from django.contrib.auth import login from django.shortcuts import redirect, render +from curations.filters import CurationFilter from curations.models import Curation, Subject from .forms import CustomUserCreationForm from django.contrib import messages - +from django.db.models import Q from django.core.paginator import Paginator @@ -29,6 +30,12 @@ def get(self, request): return render(request, self.template_name, context) +class SubjectListView(ListView): + model = Subject + context_object_name = "" + template_name = "pages/subject_list.html" + + class SubjectPageView(View): template_name = "pages/subjects.html" @@ -38,10 +45,18 @@ def get(self, request, *args, **kwargs): # defining vars title = kwargs["sub"] subject = Subject.objects.filter(title=title)[0] - curations_whole = Curation.objects.filter(subject=subject).order_by("-upvotes")[ - :20 - ] curation_count = subject.curations.all().count() + # filtering Data + search_term = request.GET.get("search") + if search_term: + curations_whole = Curation.objects.filter( + Q(title__contains=search_term) | Q(description__contains=search_term), + subject=subject, + ).order_by("-upvotes") + else: + curations_whole = Curation.objects.filter(subject=subject).order_by( + "-upvotes" + ) # pagination stuff p = Paginator(curations_whole, 15) diff --git a/templates/pages/subject_list.html b/templates/pages/subject_list.html new file mode 100644 index 0000000..4119b2f --- /dev/null +++ b/templates/pages/subject_list.html @@ -0,0 +1,22 @@ +{% extends "base.html" %} + +{% block title %}Subjects{% endblock %} + + +{% block content %} +
+

Subjects

+
    + {% for subject in object_list %} + +

    +
  1. + {{subject}} +
    2. +

    +     + + {% endfor %} +
+ {% endblock %} +
\ No newline at end of file diff --git a/templates/pages/subjects.html b/templates/pages/subjects.html index 276d5c2..b1c3322 100644 --- a/templates/pages/subjects.html +++ b/templates/pages/subjects.html @@ -1,6 +1,6 @@ -!{% extends "base.html" %} +{% extends "base.html" %} -{% block title %}Subjects{% endblock %} +{% block title %}{{subject}}{% endblock %} {% block content %} @@ -18,7 +18,7 @@

{{subject}}

{%include "partials/search_widget.html"%}
- + {{myFilter}}
{%include "partials/filter_widget.html"%}
diff --git a/templates/partials/search_widget.html b/templates/partials/search_widget.html index 9b3835e..8d1a3cb 100644 --- a/templates/partials/search_widget.html +++ b/templates/partials/search_widget.html @@ -1,7 +1,9 @@ -
- -
- +
+
+ +
-
\ No newline at end of file + \ No newline at end of file From d1f6699262b37b7ef7efbf82933d58f9775f39bf Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sat, 19 Feb 2022 23:53:16 +0530 Subject: [PATCH 06/10] containers --- templates/sign-in.html | 35 ++++++++++++++++------------------- templates/sign-up.html | 10 +++++----- 2 files changed, 21 insertions(+), 24 deletions(-) diff --git a/templates/sign-in.html b/templates/sign-in.html index 8296ec9..4688d36 100644 --- a/templates/sign-in.html +++ b/templates/sign-in.html @@ -4,48 +4,45 @@ {% block content %} - -
+
+
- +
{% endblock %} \ No newline at end of file diff --git a/templates/sign-up.html b/templates/sign-up.html index 2859041..5bd4d1b 100644 --- a/templates/sign-up.html +++ b/templates/sign-up.html @@ -7,20 +7,20 @@ - +
-
{% csrf_token %} {{form|crispy}} - +
- Already have an account. Sign In! -
+ Already have an account. Sign In! +
+
{% endblock %} \ No newline at end of file From 2dcd58bd920e337358f028abe191b24331976850 Mon Sep 17 00:00:00 2001 From: rohitgeddam Date: Sun, 20 Feb 2022 09:08:38 +0530 Subject: [PATCH 07/10] profile pic update --- userProfiles/forms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userProfiles/forms.py b/userProfiles/forms.py index 0579ddf..7ea83c3 100644 --- a/userProfiles/forms.py +++ b/userProfiles/forms.py @@ -13,10 +13,10 @@ class Meta: class CustomUserChangeForm(UserChangeForm): class Meta: model = CustomUser - fields = ('email', 'bio', 'first_name', 'last_name') + fields = ('email', 'bio', 'first_name', 'last_name', 'profile_pic') class CustomUserUpdateForm(UserChangeForm): password = None class Meta: model = CustomUser - fields = ('first_name', 'last_name', 'bio',) + fields = ('first_name', 'last_name', 'bio', 'profile_pic') From 01cb4dde57e745c948c10e6a5d67fac7930f2d9e Mon Sep 17 00:00:00 2001 From: fazer1929 Date: Sun, 20 Feb 2022 20:32:01 +0530 Subject: [PATCH 08/10] added filter --- .gitignore | 2 +- Pipfile | 2 - curations/migrations/0001_initial.py | 7 +-- .../migrations/0002_alter_curation_owner.py | 21 --------- .../migrations/0002_alter_curation_subject.py | 19 -------- .../migrations/0003_merge_20220219_1825.py | 14 ------ curations/models.py | 5 ++- curatorbackendapi/settings.py | 3 +- curatorbackendapi/views.py | 5 +++ mydatabase | Bin 192512 -> 192512 bytes static/style.css | 41 +++++++++++++++--- static/utils.js | 6 +++ templates/base.html | 2 + templates/pages/subjects.html | 5 +-- templates/partials/curation_card.html | 2 +- templates/partials/filter_widget.html | 15 ------- templates/partials/navbar.html | 8 +--- templates/partials/search_filter_widget.html | 22 ++++++++++ templates/partials/search_widget.html | 9 ---- userProfiles/migrations/0001_initial.py | 38 ---------------- .../migrations/0002_auto_20211222_1839.py | 23 ---------- .../0003_alter_customuser_profile_pic.py | 18 -------- userProfiles/migrations/__init__.py | 0 23 files changed, 83 insertions(+), 184 deletions(-) delete mode 100644 curations/migrations/0002_alter_curation_owner.py delete mode 100644 curations/migrations/0002_alter_curation_subject.py delete mode 100644 curations/migrations/0003_merge_20220219_1825.py create mode 100644 static/utils.js create mode 100644 templates/partials/search_filter_widget.html delete mode 100644 templates/partials/search_widget.html delete mode 100644 userProfiles/migrations/0001_initial.py delete mode 100644 userProfiles/migrations/0002_auto_20211222_1839.py delete mode 100644 userProfiles/migrations/0003_alter_customuser_profile_pic.py delete mode 100644 userProfiles/migrations/__init__.py diff --git a/.gitignore b/.gitignore index b493ca3..1a165a2 100644 --- a/.gitignore +++ b/.gitignore @@ -109,7 +109,7 @@ ipython_config.py # PEP 582; used by e.g. github.com/David-OConnor/pyflow __pypackages__/ - +example.json # Celery stuff celerybeat-schedule celerybeat.pid diff --git a/Pipfile b/Pipfile index 6a081a1..1c998ef 100644 --- a/Pipfile +++ b/Pipfile @@ -6,8 +6,6 @@ name = "pypi" [packages] Pillow = "*" django-crispy-forms = "*" -djangorestframework-filters = "*" -django-filter = "==21.1" [dev-packages] diff --git a/curations/migrations/0001_initial.py b/curations/migrations/0001_initial.py index 31152a3..5a91cff 100644 --- a/curations/migrations/0001_initial.py +++ b/curations/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.2.6 on 2021-09-13 05:01 +# Generated by Django 4.0.2 on 2022-02-20 14:31 from django.conf import settings from django.db import migrations, models @@ -21,7 +21,8 @@ class Migration(migrations.Migration): ('title', models.CharField(max_length=64)), ('description', models.TextField()), ('upvotes', models.IntegerField(default=0)), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='curations', to=settings.AUTH_USER_MODEL)), ], ), migrations.CreateModel( @@ -72,6 +73,6 @@ class Migration(migrations.Migration): migrations.AddField( model_name='curation', name='subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='curations.subject'), + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='curations', to='curations.subject'), ), ] diff --git a/curations/migrations/0002_alter_curation_owner.py b/curations/migrations/0002_alter_curation_owner.py deleted file mode 100644 index 477e220..0000000 --- a/curations/migrations/0002_alter_curation_owner.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 4.0.2 on 2022-02-19 10:47 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('curations', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='curation', - name='owner', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='curations', to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/curations/migrations/0002_alter_curation_subject.py b/curations/migrations/0002_alter_curation_subject.py deleted file mode 100644 index e1b7a53..0000000 --- a/curations/migrations/0002_alter_curation_subject.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.0.2 on 2022-02-19 14:08 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('curations', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='curation', - name='subject', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='curations', to='curations.subject'), - ), - ] diff --git a/curations/migrations/0003_merge_20220219_1825.py b/curations/migrations/0003_merge_20220219_1825.py deleted file mode 100644 index ceaf87c..0000000 --- a/curations/migrations/0003_merge_20220219_1825.py +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by Django 4.0.2 on 2022-02-19 18:25 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('curations', '0002_alter_curation_owner'), - ('curations', '0002_alter_curation_subject'), - ] - - operations = [ - ] diff --git a/curations/models.py b/curations/models.py index d25ac62..295ffc4 100644 --- a/curations/models.py +++ b/curations/models.py @@ -1,7 +1,9 @@ +from datetime import date +from sqlite3 import Date +from statistics import mode from django.db import models from django.contrib.auth import get_user, get_user_model - # Create your models here. class Curation(models.Model): title = models.CharField(max_length=64) @@ -13,6 +15,7 @@ class Curation(models.Model): subject = models.ForeignKey( "Subject", related_name="curations", on_delete=models.CASCADE ) + created_at = models.DateTimeField(auto_now_add=True, blank=True) def __str__(self): return self.title diff --git a/curatorbackendapi/settings.py b/curatorbackendapi/settings.py index 6ec12d0..43325c0 100644 --- a/curatorbackendapi/settings.py +++ b/curatorbackendapi/settings.py @@ -41,7 +41,6 @@ "crispy_forms", "curations", "userProfiles", - "django_filters", ] MIDDLEWARE = [ @@ -138,7 +137,7 @@ STATIC_URL = "/static/" STATICFILES_DIRS = [ os.path.join(BASE_DIR, "static"), - "/var/www/static/", + # "/var/www/static/", ] # STATIC_ROOT = os.path.join(BASE_DIR, "static") diff --git a/curatorbackendapi/views.py b/curatorbackendapi/views.py index 1bcf025..f66ab78 100644 --- a/curatorbackendapi/views.py +++ b/curatorbackendapi/views.py @@ -1,3 +1,4 @@ +from asyncio import constants from django.views.generic import View, ListView from django.contrib.auth import login from django.shortcuts import redirect, render @@ -46,6 +47,7 @@ def get(self, request, *args, **kwargs): title = kwargs["sub"] subject = Subject.objects.filter(title=title)[0] curation_count = subject.curations.all().count() + # filtering Data search_term = request.GET.get("search") if search_term: @@ -57,6 +59,9 @@ def get(self, request, *args, **kwargs): curations_whole = Curation.objects.filter(subject=subject).order_by( "-upvotes" ) + filter_term = request.GET.get("filter") + if filter_term: + curations_whole = curations_whole.order_by(filter_term) # pagination stuff p = Paginator(curations_whole, 15) diff --git a/mydatabase b/mydatabase index 97b7d3881ac2a2e395488af37a32b019fc692231..8deb8609e54646bf886f6aed9d7242ca41831387 100644 GIT binary patch delta 6100 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 delta 1745 zcmaJ?YfKbZ6rOWuW@ly}b5~$@d9$Dh3+@}1UC`(PibheXCM}80mf}{|0IR$##s)^? zkD4~R+0fJ#-=H;wDw`EZ4~`s`p{}yiHSygS41T-o!r-)^PTU^ zz2CW+zN@;vtGb<8(`p!oandf*j%Z&No8_fO$K0R!qy>-Dk(rrTza8s5bd{E6pkqdy zHx|h{vvy3oNBfG_Bz-4sODKz___mCtz4Ov}CT~u#xvRaYGZJmB(P=>iv7(Ah-md7Jm8A&$?QR8sqsi=LHt&p z5FgFrHQqo)dB8WcBx{(oiMr0j?j~D6flYR zInAXa>lUXtJEQ9(&G-UiO6oM_iT67TA!F!*)8SHKCwhcq%S9e2L>QX(+P`?P502Qx zZpH{*44xrhkTr%X=^x>3&1FrlIHC{hPV(EuU0f#GLILMv$}E!Y1wWlFVmH5fN+w!8 z-K-c>_NyN+1_P)RD6*u{2k)uz0KAMiT`gmc1+z6?v&K@FPd=)HbW-gDi@MGa#i0IP z1r5Ma%1tq)TfOOnw?M6$17DybYLn3hR(wNvU$c^5$}KefZK%^9)!o(JmB!d&X#v`R z{$OUuf@x&-JSa`<)FM_X^N>Zw=qS4-$4Nf0As0+1r|l?<>@7ulQdfu~WK{`z6|q** zFduwGTM4qdqZTAqeXs})f`%ql(%rjkXg8YXASX(Y9}1o_@FcAi9S1uZEkz}ePppL~ zoop_m%(=7BVOE)4N@8~8fV^bHyIRF)6D-T@ptwmxJ($(+mw;?*?mC#G-8#Kou(;i@Z37vffoxz)YTHl#EJR;I8To7`Dkgb_ zD1&UaBau9uiTc4y4i=$mC?fN0vbxr~@s43SxHB zwAQC4iEMJBisS`~$CMrPeD?JjckM;Iga;XX3xACV>2dDIt1?-Ev6(~(=D*q59&Qb{ z^jPbID^?~upNj-45dc&-t?lZ3Y=5@WAY=rAF_}P;CL>ra&Bx-~Nx{bPZJOa4&Q5B@ zKd%_YAj2>tUos3Qlur%n@FBDmi3qC { + formElement.submit() +}); \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 310a92b..8b3415b 100644 --- a/templates/base.html +++ b/templates/base.html @@ -55,6 +55,8 @@ + + {% block scripts %} diff --git a/templates/pages/subjects.html b/templates/pages/subjects.html index b1c3322..4aefd14 100644 --- a/templates/pages/subjects.html +++ b/templates/pages/subjects.html @@ -1,5 +1,4 @@ {% extends "base.html" %} - {% block title %}{{subject}}{% endblock %} @@ -17,9 +16,7 @@

{{subject}}

-
{%include "partials/search_widget.html"%}
- {{myFilter}} -
{%include "partials/filter_widget.html"%}
+ {%include "partials/search_filter_widget.html"%}
diff --git a/templates/partials/curation_card.html b/templates/partials/curation_card.html index 2413994..f56ed45 100644 --- a/templates/partials/curation_card.html +++ b/templates/partials/curation_card.html @@ -11,7 +11,7 @@

{{curation.title}}

-

{{curation.description}}

+

{{curation.description |truncatechars:200 }}

{{curation.subject}} diff --git a/templates/partials/filter_widget.html b/templates/partials/filter_widget.html index 336db86..e69de29 100644 --- a/templates/partials/filter_widget.html +++ b/templates/partials/filter_widget.html @@ -1,15 +0,0 @@ -
-
Filter:   
- -
- -
- Action - Another action - Something else here -
-
-
\ No newline at end of file diff --git a/templates/partials/navbar.html b/templates/partials/navbar.html index 65b667b..cc11eae 100644 --- a/templates/partials/navbar.html +++ b/templates/partials/navbar.html @@ -12,18 +12,14 @@ Home(current) -->
  • - Home Home(current)
  • Subjects(current)
    • -
  • - Top Lists(current) -
    • - +