diff --git a/.gitignore b/.gitignore index 7186d22..6c42964 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ */__pycache__ */*/__pycache__ .env +db.sqlite3 diff --git a/db.sqlite3 b/db.sqlite3 deleted file mode 100644 index d68e2eb..0000000 Binary files a/db.sqlite3 and /dev/null differ diff --git a/events/scrapers/run_media_update.sh b/events/scrapers/run_media_update.sh index 6f2a12b..afed243 100644 --- a/events/scrapers/run_media_update.sh +++ b/events/scrapers/run_media_update.sh @@ -1,12 +1,13 @@ #!/bin/bash -# BASEDIR=/var/www/digisnaxx.com/ -# DJANGODIR=/var/www/digisnaxx.com/ds_events -# EVENTDIR=/var/www/digisnaxx.com/ds_events/event_scrapers +ENVDIR=/var/www/digisnaxx.com/ +DJANGODIR=/var/www/digisnaxx.com/ds_events +EVENTDIR=/var/www/digisnaxx.com/ds_events/event_scrapers +WORKMEDIADIR=/var/www/digisnaxx.com/ds_events/event_scrapers/Working/smedia -ENVDIR=/home/canin/Downloads/DigiSnaxxEvents -DJANGODIR=/home/canin/Documents/repos/digisnaxx/ds_events -WORKMEDIADIR=/home/canin/Documents/repos/digisnaxx/ds_events/event_scrapers/Working/smedia +# ENVDIR=/home/canin/Downloads/DigiSnaxxEvents +# DJANGODIR=/home/canin/Documents/repos/digisnaxx/ds_events +# WORKMEDIADIR=/home/canin/Documents/repos/digisnaxx/ds_events/event_scrapers/Working/smedia cd $ENVDIR pwd diff --git a/events/scrapers/run_scrapers.sh b/events/scrapers/run_scrapers.sh index 4f81f5e..49fdfcc 100644 --- a/events/scrapers/run_scrapers.sh +++ b/events/scrapers/run_scrapers.sh @@ -16,35 +16,24 @@ export DJANGO_SUPERUSER_USERNAME=canin export DJANGO_SUPERUSER_PASSWORD='hello123' cd $BASEDIR -pwd source venv/bin/activate cd $DJANGODIR -pwd mv db.sqlite3 db.sqlite3.bak -# rm ../db.sqlite3 -touch db.sqlite3 python manage.py migrate -python manage.py createsuperuser --noinput -python manage.py loaddata events/fixtures/organizations.json -python manage.py loaddata events/fixtures/promo.json cd $EVENTDIR -python start_up.py - bash run_venues.sh $1 bash run_ical.sh bash run_govt.sh $1 bash run_news.sh $1 -python Working/bluesky.py -python Working/redsky.py - -cd $EVENTDIR +python Working/smedia/bluesky.py +python Working/smedia/bluesky_media.py +python Working/smedia/redsky.py python clean_up.py deactivate -bash run_media_update.sh rm -rf ../*/__pycache__ rm -rf ../*/*/__pycache__ \ No newline at end of file diff --git a/events/scrapers/zArchive/run_scrapers.sh b/events/scrapers/zArchive/run_scrapers.sh new file mode 100644 index 0000000..f83ee32 --- /dev/null +++ b/events/scrapers/zArchive/run_scrapers.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +# BASEDIR=/var/www/digisnaxx.com/ +# DJANGODIR=/var/www/digisnaxx.com/ds_events +# EVENTDIR=/var/www/digisnaxx.com/ds_events/event_scrapers + +BASEDIR=/home/canin/Downloads/DigiSnaxxEvents +DJANGODIR=/home/canin/Downloads/DigiSnaxxEvents/ds_events +EVENTDIR=/home/canin/Downloads/DigiSnaxxEvents/ds_events/event_scrapers +VENUESDIR=/home/canin/Downloads/DigiSnaxxEvents/ds_events/event_scrapers/Working/venues +ICALDIR=/home/canin/Downloads/DigiSnaxxEvents/ds_events/event_scrapers/Working/iCal +GOVTDIR=/home/canin/Downloads/DigiSnaxxEvents/ds_events/event_scrapers/Working/govt + +export DJANGO_SUPERUSER_EMAIL=canin@dreamfreely.org +export DJANGO_SUPERUSER_USERNAME=canin +export DJANGO_SUPERUSER_PASSWORD='hello123' + +cd $BASEDIR +pwd +source venv/bin/activate + +cd $DJANGODIR +pwd +mv db.sqlite3 db.sqlite3.bak +# rm ../db.sqlite3 +# touch db.sqlite3 +python manage.py migrate +# python manage.py createsuperuser --noinput +# python manage.py loaddata events/fixtures/organizations.json +# python manage.py loaddata events/fixtures/promo.json + +# cd $EVENTDIR +# python start_up.py + +bash run_venues.sh $1 +bash run_ical.sh +bash run_govt.sh $1 +bash run_news.sh $1 + +python Working/bluesky.py +python Working/redsky.py + +cd $EVENTDIR +python clean_up.py + +deactivate +bash run_media_update.sh + +rm -rf ../*/__pycache__ +rm -rf ../*/*/__pycache__ \ No newline at end of file diff --git a/socials/urls.py b/socials/urls.py index 1d94c53..e20d604 100644 --- a/socials/urls.py +++ b/socials/urls.py @@ -20,6 +20,7 @@ from .views import * urlpatterns = [ # re_path(r'^faqs/', FAQsAPIView.as_view(), name="get-faqs"), re_path(r'^links/', SocialLinksAPIView.as_view(), name="get-links"), + re_path(r'^list-links/', SocialLinksListAPIView.as_view(), name="list-links"), # re_path(r'^posts/', SocialPostsAPIView.as_view(), name="get-posts"), re_path(r'^images/', SocialImgsAPIView.as_view(), name="get-images"), # re_path(r'^events-token/', EventsTokenAPIView.as_view(), name="get-token-events"), diff --git a/socials/views.py b/socials/views.py index b559000..fdebe65 100644 --- a/socials/views.py +++ b/socials/views.py @@ -13,9 +13,7 @@ from rest_framework.authentication import SessionAuthentication, BasicAuthentica from rest_framework.permissions import IsAuthenticated from rest_framework_api_key.permissions import HasAPIKey -# from durin.auth import TokenAuthentication -# from durin.views import APIAccessTokenView from django_filters.rest_framework import DjangoFilterBackend from rest_framework import filters @@ -40,6 +38,12 @@ class SocialPostsAPIView(generics.ListAPIView): permission_classes = [HasAPIKey] +class SocialLinksListAPIView(generics.ListAPIView): + serializer_class = SocialLinkSerializer + queryset = SocialLink.objects.all()[:96] + permission_classes = [HasAPIKey] + + class SocialLinksAPIView(generics.ListAPIView): serializer_class = SocialLinkSerializer queryset = SocialLink.objects.all()[:50]