Repo Cleaning

DEKHTIARJonathan · Aug 14, 2017 · cf962f9 · cf962f9
1 parent 2039c12
commit cf962f9
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 8 deletions.
diff --git a/feedcrunch/migrations/0001_initial.py b/feedcrunch/migrations/0001_initial.py
@@ -76,7 +76,7 @@ class Migration(migrations.Migration):
                 ('description', models.TextField(blank=True, default='Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam dui nisl, aliquam nec quam nec, laoreet porta odio. Morbi ultrices sagittis ligula ut consectetur. Aenean quis facilisis augue. Vestibulum maximus aliquam augue, ut lobortis turpis euismod vel. Sed in mollis tellus, eget eleifend turpis. Vivamus aliquam ornare felis at dignissim. Integer vitae cursus eros, non dignissim dui. Suspendisse porttitor justo nec lacus dictum commodo. Sed in fringilla tortor, at pharetra tortor. Vestibulum tempor sapien id justo molestie imperdiet. Nulla efficitur mattis ante, nec iaculis lorem consequat in. Nullam sit amet diam augue. Nulla ullamcorper imperdiet turpis a maximus. Donec iaculis porttitor ultrices. Morbi lobortis dui molestie ullamcorper varius. Maecenas eu laoreet ipsum orci aliquam.', null=True)),
                 ('job', models.CharField(blank=True, default='Chief Admission Officer at', max_length=80, null=True)),
                 ('company_name', models.CharField(blank=True, default='Holy Paradise Inc.', max_length=80, null=True)),
-                ('company_website', models.URLField(blank=True, default='http://www.feedcrunch.io/', max_length=120, null=True)),
+                ('company_website', models.URLField(blank=True, default='https://www.feedcrunch.io/', max_length=120, null=True)),
                 ('apikey', encrypted_model_fields.fields.EncryptedCharField(default=uuid.uuid4, editable=False, max_length=500, unique=True)),
                 ('profile_picture', models.ImageField(blank=True, default='images/user_photos/dummy_user.png', null=True, upload_to=feedcrunch.model_files.models_user.get_photo_path)),
                 ('twitter_token', encrypted_model_fields.fields.EncryptedCharField(blank=True, default='', max_length=500, null=True)),

diff --git a/feedcrunch/model_files/models_user.py b/feedcrunch/model_files/models_user.py
@@ -302,7 +302,7 @@ class FeedUser(AbstractFeedUser):
 
     job = models.CharField(max_length=80, default='Chief Admission Officer at', blank=True, null=True)
     company_name = models.CharField(max_length=80, default='Holy Paradise Inc.', blank=True, null=True)
-    company_website = models.URLField(max_length=120, default='http://www.feedcrunch.io/', blank=True, null=True)
+    company_website = models.URLField(max_length=120, default='https://www.feedcrunch.io/', blank=True, null=True)
 
     profile_picture = models.ImageField(upload_to=get_photo_path, default=settings.USER_PHOTO_PATH+'dummy_user.png', blank=True, null=True)
     onboarding_done = models.BooleanField(default=False)

diff --git a/...static/images/services/slack_btn_icon.png → ...static/images/services/slack-btn-icon.png b/...static/images/services/slack_btn_icon.png → ...static/images/services/slack-btn-icon.png
diff --git a/feedcrunch_rssadmin/static/images/social-logos/bg-fb.jpg b/feedcrunch_rssadmin/static/images/social-logos/bg-fb.jpg
diff --git a/feedcrunch_rssadmin/static/images/social-logos/bg-fb.png b/feedcrunch_rssadmin/static/images/social-logos/bg-fb.png
diff --git a/...dmin/static/images/social-logos/bg-gp.jpg → ...dmin/static/images/social-logos/bg-sk.jpg b/...dmin/static/images/social-logos/bg-gp.jpg → ...dmin/static/images/social-logos/bg-sk.jpg
diff --git a/feedcrunch_rssadmin/static/images/social-logos/slack.png b/feedcrunch_rssadmin/static/images/social-logos/slack.png
diff --git a/feedcrunch_rssadmin/static/js/admin-social-linking.js b/feedcrunch_rssadmin/static/js/admin-social-linking.js
@@ -5,8 +5,7 @@ $(document).ready(function() {
     var social_networks_dict = {
         twitter:  "#twitter-btn-div",
         facebook: "#facebook-btn-div",
-        linkedin: "192",
-        slack:    "#slack-btn-div",
+        linkedin: "#linkedin-btn-div",
     };
 
 	function checkSocialNetworkStatus(social_network) {

diff --git a/feedcrunch_rssadmin/static/onboarding/css/onboarding.css b/feedcrunch_rssadmin/static/onboarding/css/onboarding.css
@@ -1,4 +1,4 @@
-@import url(http://fonts.googleapis.com/css?family=Roboto);
+@import url(https://fonts.googleapis.com/css?family=Roboto);
 
 body {
 	font-family: Roboto;

diff --git a/feedcrunch_rssadmin/templates/admin/admin_base.html b/feedcrunch_rssadmin/templates/admin/admin_base.html
@@ -87,8 +87,8 @@
         <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
         <!--[if lt IE 9]>
-            <script type="text/javascript" src="http://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js" %}"></script>
-            <script type="text/javascript" src="http://oss.maxcdn.com/respond/1.4.2/respond.min.js" %}"></script>
+            <script type="text/javascript" src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js" %}"></script>
+            <script type="text/javascript" src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js" %}"></script>
         <![endif]-->
 
     </head>

diff --git a/manifest-dev.yml b/manifest-dev.yml
@@ -1,6 +1,6 @@
 applications:
 - name: Feedcrunch-Front-Dev
-  host: eedcrunch-front-dev
+  host: feedcrunch-front-dev
   instances: 1
   memory: 512M
   disk_quota: 2G
@@ -9,6 +9,7 @@ applications:
   command: chmod +x launch_server.sh && ./launch_server.sh
   stack: cflinuxfs2
   url:
+  - dev.feedcrunch.io
   - feedcrunch-dev.eu-gb.mybluemix.net
 
 - name: Feedcrunch-Worker-Dev