Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed bug that occurs when user submit google drive video link #72

Merged
merged 21 commits into from
Jan 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
788a6dc
added functionality to format youtube video url to embedable format
NdibeRaymond Dec 17, 2020
5476bcb
made video url optional
NdibeRaymond Dec 17, 2020
f5bfc5e
Merge branch 'master' into project_creation_feature
NdibeRaymond Dec 17, 2020
5ea1d2e
Merge branch 'master' into project_creation_feature
NdibeRaymond Dec 18, 2020
8abcef2
switched image upload location from cloudinary to digital ocean spaces
NdibeRaymond Dec 19, 2020
a4448a0
Merge branch 'project_creation_feature' of https://github.com/unstruc…
NdibeRaymond Dec 20, 2020
c0790b0
added functionality to automatically delete image from digitalocean s…
NdibeRaymond Dec 20, 2020
1fec3be
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 21, 2020
5615e10
added image count indicator and made video optional. also added proje…
NdibeRaymond Dec 21, 2020
56ed2ca
removed .ssl from git
NdibeRaymond Dec 21, 2020
aac1861
untracked .ssl-data
NdibeRaymond Dec 21, 2020
41c028c
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 21, 2020
f2a5bb3
added support for various forms of youtube video url, vimeo and googl…
NdibeRaymond Dec 22, 2020
762990b
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 22, 2020
ca39013
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Dec 22, 2020
a997044
fixed issues #35, #33, #32, #30, #29
NdibeRaymond Dec 23, 2020
451b547
Merge branch 'master' into project_creation_feature
NdibeRaymond Dec 27, 2020
73d11c5
fixed issue #46
NdibeRaymond Dec 27, 2020
e0a406e
phase2 patial ----- 2 (#66)
NdibeRaymond Jan 7, 2021
fdb6d4d
fixed issue #68
NdibeRaymond Jan 10, 2021
e6eac4e
Merge branch 'master' of https://github.com/unstructuredstudio/zubhub…
NdibeRaymond Jan 10, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zubhub_backend/zubhub/projects/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def save(self, *args, **kwargs):
self.video = "player.vimeo.com/video".join(
self.video.split("vimeo.com"))

elif self.video.find("drive.google.com") != -1 and self.video.find("view") != -1:
self.video = self.video.split("view")[0] + "preview"
elif self.video.find("drive.google.com") != -1 and self.video.find("/view") != -1:
self.video = self.video.split("/view")[0] + "/preview"

if self.id:
self.likes_count = self.likes.count()
Expand Down
2 changes: 1 addition & 1 deletion zubhub_frontend/zubhub/deploy_frontend.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#! /bin/bash

mv zubhub_frontend/zubhub/.env zubhub/zubhub_frontend/zubhub/.env
mv zubhub_frontend/zubhub/.zero-ssl zubhub/zubhub_frontend/zubhub/
mv zubhub_frontend/zubhub/.ssl-data zubhub/zubhub_frontend/zubhub/
rm -rf zubhub_frontend
cp -r zubhub/zubhub_frontend/ zubhub_frontend/
rm -rf zubhub/ zubhub_frontend/zubhub/.env.example
Expand Down
12 changes: 9 additions & 3 deletions zubhub_frontend/zubhub/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,20 @@ services:
- "8080:80"

reverse-proxy:
image: nginx:stable-alpine
image: valian/docker-nginx-auto-ssl:1.0.0
container_name: reverse-proxy
restart: on-failure
ports:
- 80:80
- 443:443
volumes:
- ./.zero-ssl:/etc/ssl
- ./reverse-proxy:/etc/nginx
- ./.ssl-data:/etc/resty-auto-ssl
environment:
ALLOWED_DOMAINS: "(zubhub|www.zubhub).unstructured.studio"
SITES: "zubhub.unstructured.studio=zubhub_frontend;www.zubhub.unstructured.studio=zubhub_frontend"
FORCE_HTTPS: "true"
depends_on:
- zubhub_frontend

volumes:
.ssl-data: