diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/__init__.cpython-39.pyc b/hotelApi/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..4dfd30e --- /dev/null +++ b/hotelApi/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/__init__.cpython-39.pyc b/hotelApi/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..4dfd30e --- /dev/null +++ b/hotelApi/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/settings.cpython-39.pyc b/hotelApi/__pycache__/settings.cpython-39.pyc new file mode 100644 index 0000000..d20bdf9 --- /dev/null +++ b/hotelApi/__pycache__/settings.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/__init__.cpython-39.pyc b/hotelApi/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..4dfd30e --- /dev/null +++ b/hotelApi/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/settings.cpython-39.pyc b/hotelApi/__pycache__/settings.cpython-39.pyc new file mode 100644 index 0000000..d20bdf9 --- /dev/null +++ b/hotelApi/__pycache__/settings.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/tricks.cpython-39.pyc b/hotelApi/__pycache__/tricks.cpython-39.pyc new file mode 100644 index 0000000..67f8683 --- /dev/null +++ b/hotelApi/__pycache__/tricks.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/__init__.cpython-39.pyc b/hotelApi/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..4dfd30e --- /dev/null +++ b/hotelApi/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/settings.cpython-39.pyc b/hotelApi/__pycache__/settings.cpython-39.pyc new file mode 100644 index 0000000..d20bdf9 --- /dev/null +++ b/hotelApi/__pycache__/settings.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/tricks.cpython-39.pyc b/hotelApi/__pycache__/tricks.cpython-39.pyc new file mode 100644 index 0000000..67f8683 --- /dev/null +++ b/hotelApi/__pycache__/tricks.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/urls.cpython-39.pyc b/hotelApi/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..05133ea --- /dev/null +++ b/hotelApi/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/.idea/hotelApi.iml b/.idea/hotelApi.iml index 6d4c768..c6581ff 100644 --- a/.idea/hotelApi.iml +++ b/.idea/hotelApi.iml @@ -14,7 +14,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 70eb041..b040823 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg new file mode 100644 index 0000000..7c0c64e --- /dev/null +++ b/MediaDev/logos/b015897afa6a4f6489461a6e7a1c2d12.jpg Binary files differ diff --git a/MediaDev/room/1.jpg b/MediaDev/room/1.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1.jpg Binary files differ diff --git a/MediaDev/room/1_ejOT9Mz.jpg b/MediaDev/room/1_ejOT9Mz.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_ejOT9Mz.jpg Binary files differ diff --git a/MediaDev/room/1_oe7vRkL.jpg b/MediaDev/room/1_oe7vRkL.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/1_oe7vRkL.jpg Binary files differ diff --git a/MediaDev/room/1_yvaXWYI.jpg b/MediaDev/room/1_yvaXWYI.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/1_yvaXWYI.jpg Binary files differ diff --git a/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/227137af1a9d4309973909118570d8ba.jpg Binary files differ diff --git a/MediaDev/room/4.jpg b/MediaDev/room/4.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/4.jpg Binary files differ diff --git a/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7dc5061e43934b70a73d6fdc1b26f39b.jpg Binary files differ diff --git a/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/7f2f06b8e5bd420eaded8a3998d3ef42.jpg Binary files differ diff --git a/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg new file mode 100644 index 0000000..a49c30b --- /dev/null +++ b/MediaDev/room/b70e468afab145acad7309ab7625553c.jpg Binary files differ diff --git a/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg new file mode 100644 index 0000000..c0668da --- /dev/null +++ b/MediaDev/room/c9fb8411fef44d5ab5f8f79b581487fe.jpg Binary files differ diff --git a/apps/__pycache__/__init__.cpython-39.pyc b/apps/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..8389f5b --- /dev/null +++ b/apps/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/__init__.cpython-39.pyc b/apps/hotel/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..50483be --- /dev/null +++ b/apps/hotel/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/admin.cpython-39.pyc b/apps/hotel/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..66a78b1 --- /dev/null +++ b/apps/hotel/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/apps.cpython-39.pyc b/apps/hotel/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..38c975a --- /dev/null +++ b/apps/hotel/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/models.cpython-39.pyc b/apps/hotel/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..b17b99c --- /dev/null +++ b/apps/hotel/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/serializer.cpython-39.pyc b/apps/hotel/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..47fdc9a --- /dev/null +++ b/apps/hotel/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/urls.cpython-39.pyc b/apps/hotel/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..8700189 --- /dev/null +++ b/apps/hotel/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/hotel/__pycache__/views.cpython-39.pyc b/apps/hotel/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..9f13a05 --- /dev/null +++ b/apps/hotel/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/hotel/models.py b/apps/hotel/models.py index 432a164..cfaf59d 100644 --- a/apps/hotel/models.py +++ b/apps/hotel/models.py @@ -50,6 +50,6 @@ def save(self, *args, **kwargs): if self.id is None or self.photo != self.__original_photo: - new_image = compress(self.foto) + new_image = compress(self.photo) self.photo = new_image super(Room, self).save(*args, **kwargs) diff --git a/apps/hotel/urls.py b/apps/hotel/urls.py index 47834bd..531e2bf 100644 --- a/apps/hotel/urls.py +++ b/apps/hotel/urls.py @@ -1,12 +1,14 @@ from django.urls import path, include from rest_framework import routers -from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet +from apps.hotel.views import HotelViewSet, TypeRoomViewSet, RoomViewSet, AvailableRoomViewSet router = routers.DefaultRouter() router.register(r'hotel', HotelViewSet) router.register(r'type_room', TypeRoomViewSet) router.register(r'room', RoomViewSet) +router.register(r'availableroom', AvailableRoomViewSet) + urlpatterns = [ path('', include(router.urls)), diff --git a/apps/hotel/views.py b/apps/hotel/views.py index da07a05..e7f16f8 100644 --- a/apps/hotel/views.py +++ b/apps/hotel/views.py @@ -1,6 +1,9 @@ from rest_framework import viewsets from apps.hotel.models import Hotel, TypeRoom, Room from apps.hotel.serializer import HotelSerializer, TypeRoomSerializer, RoomSerializer +from rest_framework.decorators import action + +from rest_framework.response import Response class HotelViewSet(viewsets.ModelViewSet): @@ -16,3 +19,15 @@ class RoomViewSet(viewsets.ModelViewSet): queryset = Room.objects.all() serializer_class = RoomSerializer + + #@action(detail=True) + #def availableroom(self, request, *kwargs): + # availableRoom = Room.objects.filter(active=True) + # serializer = RoomSerializer(availableRoom, many=True) + + # return Response({'data': serializer.data}) + + +class AvailableRoomViewSet(viewsets.ModelViewSet): + queryset = Room.objects.all().filter(active=True) + serializer_class = RoomSerializer \ No newline at end of file diff --git a/apps/service/__pycache__/__init__.cpython-39.pyc b/apps/service/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..42a65fb --- /dev/null +++ b/apps/service/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/admin.cpython-39.pyc b/apps/service/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..3487c96 --- /dev/null +++ b/apps/service/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/apps.cpython-39.pyc b/apps/service/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..40adb06 --- /dev/null +++ b/apps/service/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/models.cpython-39.pyc b/apps/service/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..9581d5e --- /dev/null +++ b/apps/service/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/serializer.cpython-39.pyc b/apps/service/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..b7eb382 --- /dev/null +++ b/apps/service/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/urls.cpython-39.pyc b/apps/service/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..bd619e8 --- /dev/null +++ b/apps/service/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/service/__pycache__/views.cpython-39.pyc b/apps/service/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..a4c32a8 --- /dev/null +++ b/apps/service/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/__init__.cpython-39.pyc b/apps/user/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..72de2d1 --- /dev/null +++ b/apps/user/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/admin.cpython-39.pyc b/apps/user/__pycache__/admin.cpython-39.pyc new file mode 100644 index 0000000..65f5ce4 --- /dev/null +++ b/apps/user/__pycache__/admin.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/apps.cpython-39.pyc b/apps/user/__pycache__/apps.cpython-39.pyc new file mode 100644 index 0000000..7ca5bcd --- /dev/null +++ b/apps/user/__pycache__/apps.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/models.cpython-39.pyc b/apps/user/__pycache__/models.cpython-39.pyc new file mode 100644 index 0000000..1a1e477 --- /dev/null +++ b/apps/user/__pycache__/models.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/serializer.cpython-39.pyc b/apps/user/__pycache__/serializer.cpython-39.pyc new file mode 100644 index 0000000..2282da5 --- /dev/null +++ b/apps/user/__pycache__/serializer.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/urls.cpython-39.pyc b/apps/user/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..98aaa05 --- /dev/null +++ b/apps/user/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/apps/user/__pycache__/views.cpython-39.pyc b/apps/user/__pycache__/views.cpython-39.pyc new file mode 100644 index 0000000..2d4cbb4 --- /dev/null +++ b/apps/user/__pycache__/views.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/__init__.cpython-39.pyc b/hotelApi/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..4dfd30e --- /dev/null +++ b/hotelApi/__pycache__/__init__.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/settings.cpython-39.pyc b/hotelApi/__pycache__/settings.cpython-39.pyc new file mode 100644 index 0000000..d20bdf9 --- /dev/null +++ b/hotelApi/__pycache__/settings.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/tricks.cpython-39.pyc b/hotelApi/__pycache__/tricks.cpython-39.pyc new file mode 100644 index 0000000..67f8683 --- /dev/null +++ b/hotelApi/__pycache__/tricks.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/urls.cpython-39.pyc b/hotelApi/__pycache__/urls.cpython-39.pyc new file mode 100644 index 0000000..05133ea --- /dev/null +++ b/hotelApi/__pycache__/urls.cpython-39.pyc Binary files differ diff --git a/hotelApi/__pycache__/wsgi.cpython-39.pyc b/hotelApi/__pycache__/wsgi.cpython-39.pyc new file mode 100644 index 0000000..00371a1 --- /dev/null +++ b/hotelApi/__pycache__/wsgi.cpython-39.pyc Binary files differ