Phase2 partial ---- 1 (#64)

* added description to the video url field in project creation form issue #50 (#61) * new deployment changes (#62) * domain setup step 1 test 5 * domain setup step 2(backend) test 1 * domain setup step2(backend) test2 * removed .ssl-data from .dockerignore * added custom nginx container to handle reverse proxying and https requests * made important changes to deploy_frontend.sh, added google tracking code to index.html, enabled crawling * increased pagination limit from 6 to 20 (#63)
unstructuredstudio · Jan 7, 2021 · 62eeb96 · 62eeb96
1 parent b2b5c3c
commit 62eeb96
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 30 deletions.
diff --git a/zubhub_backend/zubhub/creators/pagination.py b/zubhub_backend/zubhub/creators/pagination.py
@@ -2,4 +2,4 @@
 
 
 class CreatorNumberPagination(PageNumberPagination):
-    page_size = 3
+    page_size = 20
diff --git a/zubhub_backend/zubhub/projects/pagination.py b/zubhub_backend/zubhub/projects/pagination.py
@@ -2,4 +2,4 @@
 
 
 class ProjectNumberPagination(PageNumberPagination):
-    page_size = 6
+    page_size = 20
diff --git a/zubhub_frontend/zubhub/deploy_frontend.sh b/zubhub_frontend/zubhub/deploy_frontend.sh
@@ -1,6 +1,7 @@
 #! /bin/bash
 
 mv zubhub_frontend/zubhub/.env zubhub/zubhub_frontend/zubhub/.env
+mv zubhub_frontend/zubhub/.zero-ssl zubhub/zubhub_frontend/zubhub/
 rm -rf zubhub_frontend
 cp -r zubhub/zubhub_frontend/ zubhub_frontend/
 rm -rf zubhub/ zubhub_frontend/zubhub/.env.example

diff --git a/zubhub_frontend/zubhub/public/index.html b/zubhub_frontend/zubhub/public/index.html
@@ -1,11 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=G-VMZVCLR1EY"></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag(){dataLayer.push(arguments);}
+      gtag('js', new Date());
+
+      gtag('config', 'G-VMZVCLR1EY');
+    </script>
     <meta charset="utf-8" />
     <link rel="icon" href="%PUBLIC_URL%/logo-small.png"/>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="robots" content="noindex, noodp, noarchive, noimageindex" /><!-- to be remove later -->
     <meta
       name="description"
       content="Hub of creative projects built by awesome kids!"

diff --git a/zubhub_frontend/zubhub/public/robots.txt b/zubhub_frontend/zubhub/public/robots.txt
@@ -1,27 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
-# User-agent: *
-# Disallow:
-
-User-agent: Desktop
-Disallow: /
-
-User-agent: Mobile
-Disallow: /
-
-User-agent: Yandex
-Disallow: /
-
-User-agent: Slurp
-Disallow: /
-
-User-agent: DuckDuckBot
-Disallow: /
-
-User-agent: ia_archiver
-Disallow: /
-
-User-agent: aolbuild
-Disallow: /
-
-User-agent: teoma
-Disallow: /
+User-agent: *
+Disallow:
diff --git a/zubhub_frontend/zubhub/src/components/pages/projects/projects_components/CreateProject.jsx b/zubhub_frontend/zubhub/src/components/pages/projects/projects_components/CreateProject.jsx
@@ -494,7 +494,7 @@ class CreateProject extends Component {
                             placeholder="Project Title"
                             onChange={this.props.handleChange}
                             onBlur={this.props.handleBlur}
-                            labelWidth={90}
+                            labelWidth={40}
                           />
                           <FormHelperText error>
                             {this.props.touched["title"] &&
@@ -611,6 +611,14 @@ class CreateProject extends Component {
                             labelWidth={90}
                           />
                           <FormHelperText error>
+                            <Typography
+                              color="textSecondary"
+                              variant="caption"
+                              component="span"
+                            >
+                              YouTube, Vimeo, Google Drive links are supported
+                            </Typography>
+                            <br />
                             {this.props.touched["video"] &&
                               this.props.errors["video"]}
                           </FormHelperText>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		class CreatorNumberPagination(PageNumberPagination):
		page_size = 3
		page_size = 20
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@


		class ProjectNumberPagination(PageNumberPagination):
		page_size = 6
		page_size = 20