diff --git a/zubhub_backend/docker-compose.yml b/zubhub_backend/docker-compose.yml index bc10ea2ed..e378e447f 100644 --- a/zubhub_backend/docker-compose.yml +++ b/zubhub_backend/docker-compose.yml @@ -25,6 +25,7 @@ services: dockerfile: ./compose/media/dev/Dockerfile restart: on-failure volumes: + - ./media:/home/media - media_data:/home/media/media_store - ./compose/media/requirements.txt:/home/requirements.txt:ro ports: diff --git a/zubhub_backend/zubhub/creators/views.py b/zubhub_backend/zubhub/creators/views.py index 2016f64f9..c99ebe158 100644 --- a/zubhub_backend/zubhub/creators/views.py +++ b/zubhub_backend/zubhub/creators/views.py @@ -80,9 +80,12 @@ def get(self, request, format=None): class UserProfileAPIView(RetrieveAPIView): """ Fetch Profile of user with given username. - Requires username of user. Returns user profile. + + Note that this schema returns the full user profile, but the api sometimes + returns a minimal version of the user profile, omitting certain fields that + are not neccessary or are sensitive. """ queryset = Creator.objects.filter(is_active=True) @@ -91,10 +94,10 @@ class UserProfileAPIView(RetrieveAPIView): throttle_classes = [GetUserRateThrottle, SustainedRateThrottle] def get_serializer_class(self): - if self.kwargs.get("username") == self.request.user.username: - return CreatorSerializer - else: + if self.request and self.kwargs.get("username") != self.request.user.username: return CreatorMinimalSerializer + else: + return CreatorSerializer class RegisterCreatorAPIView(RegisterView): diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/login/loginStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/login/loginStyles.js index d42465e83..8f70b778d 100644 --- a/zubhub_frontend/zubhub/src/assets/js/styles/views/login/loginStyles.js +++ b/zubhub_frontend/zubhub/src/assets/js/styles/views/login/loginStyles.js @@ -77,6 +77,7 @@ const styles = theme => ({ alignItems: 'center', }, dividerText: { + whiteSpace: 'nowrap', [theme.breakpoints.up('1600')]: { fontSize: '1.2rem', }, diff --git a/zubhub_frontend/zubhub/src/views/PageWrapper.jsx b/zubhub_frontend/zubhub/src/views/PageWrapper.jsx index dc7605667..507afdb99 100644 --- a/zubhub_frontend/zubhub/src/views/PageWrapper.jsx +++ b/zubhub_frontend/zubhub/src/views/PageWrapper.jsx @@ -179,7 +179,7 @@ function PageWrapper(props) { name="q" id="q" type="search" - defaultValue={props.location.search && getQueryParams(props.location.search).query} + defaultValue={getQueryParams(window.location.href).get('q')} className={clsx( classes.searchFormInputStyle, 'search-form-input',