Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
7d59c00
add django-rest-auth
DerouineauNicolas May 25, 2020
24f41bf
Add history viewset
DerouineauNicolas May 25, 2020
78122c0
Add faststart for mp4 muxing
DerouineauNicolas May 25, 2020
4f613c3
Create Private Route
DerouineauNicolas May 25, 2020
454611d
Add signin/signup form
DerouineauNicolas May 25, 2020
6f749e0
Switch App to a functionnal component
worms19 May 26, 2020
e141476
Update location and history
worms19 May 26, 2020
bfd0004
Add sample code to log to login API
DerouineauNicolas May 26, 2020
f6bb72f
connect frontend login module to backend
DerouineauNicolas May 26, 2020
d304f5d
Connect frontend signup form to backend
DerouineauNicolas May 26, 2020
3f57a9a
Add utils file
worms19 May 26, 2020
b407000
Merge branch 'tokenauth' of https://github.com/Web-Multi-Media/HttpSt…
worms19 May 26, 2020
fa1f3df
Clean & Refactor backend
xavierfav May 26, 2020
f5a9fc0
Do not use email for signup POST and fix incorrect check code
DerouineauNicolas May 27, 2020
a603288
Add logout
DerouineauNicolas May 27, 2020
8476387
Retrieve user token from props
DerouineauNicolas May 27, 2020
dd0e2ce
Use only one model file & Add UserVideoHistory
xavierfav May 27, 2020
09694a0
Add created_at and updated_at fields history
xavierfav May 27, 2020
3019219
Add history view WIP
xavierfav May 27, 2020
e3ccf8d
update Netflix arrows
worms19 May 27, 2020
7cd54a7
add history function in front
worms19 May 27, 2020
5da52f2
fix little undefined bug
worms19 May 27, 2020
eae3866
remove bearer
worms19 May 27, 2020
772e9b3
Fix post history
xavierfav May 27, 2020
dd5b889
Fix get video history
xavierfav May 27, 2020
f98f222
add getHistory
worms19 May 27, 2020
a2621ef
Get token from header get history
xavierfav May 27, 2020
62ee2c4
Add pagination history
xavierfav May 28, 2020
4b8247a
add history carousel
worms19 May 28, 2020
6b1b830
Handle exceptions history
xavierfav May 28, 2020
db7fc41
Keep only one history per series
xavierfav May 28, 2020
d88aa5a
update frontend
worms19 May 28, 2020
3034f43
remove history when logout
worms19 May 28, 2020
d235056
Send history on history post
xavierfav May 28, 2020
ae581f2
Merge branch 'tokenauth' of github.com:Web-Multi-Media/HttpStreamingS…
xavierfav May 28, 2020
90e210b
Add timeStamp for history video
worms19 May 28, 2020
98f6d0b
Add time history in video serializer
xavierfav May 28, 2020
541e0f9
abstract axios request + add timestamp to history videos
worms19 May 28, 2020
e01a5d7
Add longer test file
DerouineauNicolas May 29, 2020
aa48029
Refactor front API client, Fix bug backend history
xavierfav May 29, 2020
49b7989
update history when watching video
worms19 May 29, 2020
b57a3ae
remove updateHistory when starting the video
worms19 May 29, 2020
b92ba0d
update TimeStamp on canPlay event
worms19 May 29, 2020
5bffbc3
push current branch to dockerhub
DerouineauNicolas May 29, 2020
a78ed6d
Fix repo
DerouineauNicolas May 29, 2020
bfc5313
add header and update general css
worms19 May 29, 2020
2a23e0b
Use correct input image name for travis build
DerouineauNicolas May 30, 2020
813fae9
Add csrf in post requests
xavierfav May 30, 2020
959a401
Update css
worms19 May 30, 2020
66bb765
Clean App.js
worms19 May 30, 2020
46f2fa4
update CSS
worms19 May 30, 2020
e932fb8
update css
worms19 May 30, 2020
ae2c8a3
invert arrow opacity
worms19 May 30, 2020
6e04ef3
Add visual shadow fx video image
xavierfav May 31, 2020
9ff5196
Carousel style edit
xavierfav May 31, 2020
f67fb43
add modal
worms19 May 31, 2020
43d23d6
add login / logout
worms19 May 31, 2020
2ad7629
Remove useless css
worms19 May 31, 2020
f3112e3
fix logout
worms19 May 31, 2020
defb21d
add modal toggle
worms19 May 31, 2020
1fd1a3c
add login functionalities
worms19 May 31, 2020
ebaf2b7
Optimization back history
xavierfav May 31, 2020
ee8eb17
Merge branch 'tokenauth' of github.com:Web-Multi-Media/HttpStreamingS…
xavierfav May 31, 2020
73af7c5
Revert "Optimization back history"
xavierfav May 31, 2020
3c6abd6
improve modal
worms19 May 31, 2020
61f7ab6
Add api auth middleware opti
xavierfav Jun 1, 2020
baf886a
Merge branch 'tokenauth' of github.com:Web-Multi-Media/HttpStreamingS…
xavierfav Jun 1, 2020
970ee04
Fix bug authentication
xavierfav Jun 1, 2020
5645ebe
update time and next episode when clicking on an episode
worms19 Jun 1, 2020
16f6380
Add simple video serializer
xavierfav Jun 1, 2020
a6099a8
Increase time rate post history
xavierfav Jun 1, 2020
904fdf6
update responsive css
worms19 Jun 1, 2020
4c872f2
Fix bug request arg client get
xavierfav Jun 1, 2020
01235a4
remove useless request
worms19 Jun 1, 2020
6c62ce7
Fix bug get video by id
xavierfav Jun 1, 2020
de1f38c
Get csrf cookie only once
xavierfav Jun 1, 2020
59caca7
Style header
xavierfav Jun 1, 2020
2d4cb86
Add history tests
xavierfav Jun 1, 2020
c76aeba
Clean fix variable name
xavierfav Jun 1, 2020
2611677
Add db indexes
xavierfav Jun 1, 2020
770d3d5
Remove video_set from series query
xavierfav Jun 2, 2020
994a409
Opti db & Add django debug toolbar
xavierfav Jun 2, 2020
b1936aa
Opti db history
xavierfav Jun 2, 2020
2b33928
Bypass output sub presence checks in tests for the moment
DerouineauNicolas Jun 2, 2020
9eb25c0
Revert "Opti db history"
xavierfav Jun 2, 2020
226c735
Merge branch 'tokenauth' of github.com:Web-Multi-Media/HttpStreamingS…
xavierfav Jun 2, 2020
fbef13d
Remove auth unit test (already tested by rest-auth)
DerouineauNicolas Jun 2, 2020
eab5cd2
Use master tag for docker-compose prod file
DerouineauNicolas Jun 2, 2020
d5b3d9c
WIP: Add tests for movies
DerouineauNicolas Jun 2, 2020
c894f14
Update movies test
DerouineauNicolas Jun 3, 2020
b1c0079
Test video detail when logged out
DerouineauNicolas Jun 3, 2020
99d7010
Fix coding style
xavierfav Jun 3, 2020
aad577e
Clean and rename test
xavierfav Jun 3, 2020
22de28a
Add videos list pagination test
xavierfav Jun 3, 2020
6ce7abb
Add simple search movie test
xavierfav Jun 3, 2020
c6fecb0
Improve movies test
xavierfav Jun 3, 2020
ed11731
Add Model test
xavierfav Jun 3, 2020
0d50f1b
Add models tests
xavierfav Jun 3, 2020
824eb1b
Refactor populatedatabase function
DerouineauNicolas Jun 3, 2020
9b53169
Add update database function
DerouineauNicolas Jun 3, 2020
2b14954
Check database against filesystem during update
DerouineauNicolas Jun 3, 2020
96e91db
Use set() to check for old files during db update and add test
DerouineauNicolas Jun 4, 2020
08017b9
Fix camelcase var
DerouineauNicolas Jun 4, 2020
8ab4ee2
Add post on logout API when user logs out
DerouineauNicolas Jun 5, 2020
56e3ecf
update player
worms19 Jun 5, 2020
5b11121
Add pycodestyle checks in CI
DerouineauNicolas Jun 5, 2020
e93209e
Fix E302,E211,E202,E712,E225,E231 on backend code
DerouineauNicolas Jun 5, 2020
e39e2cf
Move login functionnilities to subfolder
DerouineauNicolas Jun 5, 2020
3ab5261
Uncomment STATICFILES_DIRS in settings.py
DerouineauNicolas Jun 6, 2020
6e9788d
Serve react static files only in prod
xavierfav Jun 6, 2020
1459d58
Clean django settings
xavierfav Jun 6, 2020
23a8131
Add missing comma
xavierfav Jun 6, 2020
b0692d0
bump subliminal to 2.1.0
DerouineauNicolas Jun 7, 2020
790e646
Remove node_modules volume and add install pre-script in package.json
DerouineauNicolas Jun 9, 2020
db6cedc
Use native html player until reactjs player is ready
DerouineauNicolas Jun 9, 2020
6712c8f
remove reactjs player from tokenauth branch
DerouineauNicolas Jun 9, 2020
7c35e99
Fix comments relative to PR #34
DerouineauNicolas Jun 10, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,8 @@ db.sqlite3
# OS files
.DS_Store

Videos/*
backend/cachefile.*



3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,11 @@ install:

script:
- docker-compose -f docker-compose-prod.yml run --rm web ./wait-for-it.sh db:5432 -- python3 manage.py test
- docker-compose -f docker-compose-prod.yml run --rm web python3 -m pycodestyle --select=E302,E211,E202,E712,E225,E231 .

deploy:
provider: script
script: bash docker_push
on:
branch: master
all_branches: true

Binary file not shown.
4 changes: 2 additions & 2 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

FROM node:8

RUN apt-get update -y
RUN apt-get install -y python3-pip python-dev build-essential \
RUN apt-get update -y --allow-unauthenticated
RUN apt-get install -y --allow-unauthenticated python3-pip python-dev build-essential \
software-properties-common python3-software-properties \
x264 x265 ffmpeg && rm -rf /var/lib/apt/lists/*

Expand Down
16 changes: 12 additions & 4 deletions backend/StreamServerApp/admin.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
from django.contrib import admin
from StreamServerApp.models import Video
from StreamServerApp.utils import delete_DB_Infos, populate_db_from_local_folder
from StreamServerApp.database_utils import delete_DB_Infos, populate_db_from_local_folder, update_db_from_local_folder
from django.conf import settings


def reload_video(modeladmin, request, queryset):
def populate_videos(modeladmin, request, queryset):
delete_DB_Infos()
populate_db_from_local_folder(settings.VIDEO_ROOT, settings.VIDEO_URL)
reload_video.short_description = "Reload videos"
populate_videos.short_description = "Populate videos database"


def update_videos(modeladmin, request, queryset):
update_db_from_local_folder(settings.VIDEO_ROOT, settings.VIDEO_URL)
update_videos.short_description = "Update videos database"


class VideoAdmin(admin.ModelAdmin):
actions = []


admin.site.register(Video, VideoAdmin)
admin.site.add_action(reload_video)
admin.site.add_action(populate_videos)
admin.site.add_action(update_videos)
Loading