Remove

an-dev · Dec 15, 2020 · 00efe00 · 00efe00
1 parent ba9f2c1
commit 00efe00
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 327 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -17,7 +17,6 @@ django-appconf==1.0.4
 django-celery-email==3.0.0
 django-heroku==0.3.1
 django-model-utils==4.0.0
-django-markdownx==3.0.1
 gunicorn==20.0.4
 idna==2.8
 importlib-metadata==1.6.0

diff --git a/templates/blog/index.html b/templates/blog/index.html
diff --git a/templates/blog/post.html b/templates/blog/post.html
diff --git a/templates/web/base.html b/templates/web/base.html
@@ -10,7 +10,7 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
  <meta
  name="description"
- content={% block description %}"Native Slack integration for Calendly. Receive Slack messages for new scheduled and cancelled events. No other third party needed."{% endblock %}
+ content="Native Slack integration for Calendly. Receive Slack messages for new scheduled and cancelled events. No other third party needed."
  />
  <meta name="slack-app-id" content="AS7JCAATV">
  <meta name="theme-color" content="#003c5b">
@@ -76,7 +76,6 @@
  </button>
  <div class="navbar-collapse collapse">
  <ul class="navbar-nav ml-auto text-center">
- {% if not blog_nav %}
  <li class="nav-item">
  <a class="nav-link" href="/#how-it-works">How it works</a>
  </li>
@@ -85,19 +84,6 @@
  </li>
  {% block pricing %}
  {% endblock %}
- <li class="nav-item">
- <a class="nav-link" href="/blog/">Blog</a>
- </li>
- {% else %}
- <li class="nav-item">
- <a class="nav-link" href="https://twitter.com/calenduckapp">
- <i class="fab fa-twitter"></i>
- </a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="/">Go back Home</a>
- </li>
- {% endif %}
  {% block cta %}
  {% endblock %}
  </ul>

diff --git a/templates/web/index.html b/templates/web/index.html
@@ -126,7 +126,7 @@ <h2 class="h1 font-weight-bold">Filter incoming events</h2>
  </div>
 </section>
 
-<section>
+<section class="cbot-bg text-light">
  <div class="container my-5 py-5">
  <div class="row align-items-center justify-content-center">
  <div class="col-lg-5 order-lg-2">

diff --git a/web/blog/__init__.py b/web/blog/__init__.py
diff --git a/web/blog/admin.py b/web/blog/admin.py
diff --git a/web/blog/apps.py b/web/blog/apps.py
diff --git a/web/blog/data/dump.json b/web/blog/data/dump.json
diff --git a/web/blog/migrations/0001_initial.py b/web/blog/migrations/0001_initial.py
diff --git a/web/blog/migrations/0002_auto_20200604_1301.py b/web/blog/migrations/0002_auto_20200604_1301.py
diff --git a/web/blog/migrations/0003_post_description.py b/web/blog/migrations/0003_post_description.py
diff --git a/web/blog/migrations/0004_auto_20200604_2252.py b/web/blog/migrations/0004_auto_20200604_2252.py
diff --git a/web/blog/migrations/0005_auto_20200604_2256.py b/web/blog/migrations/0005_auto_20200604_2256.py
diff --git a/web/blog/migrations/__init__.py b/web/blog/migrations/__init__.py
diff --git a/web/blog/models.py b/web/blog/models.py
diff --git a/web/blog/templatetags/__init__.py b/web/blog/templatetags/__init__.py
diff --git a/web/blog/templatetags/markdown_extras.py b/web/blog/templatetags/markdown_extras.py
diff --git a/web/blog/urls.py b/web/blog/urls.py
diff --git a/web/blog/views.py b/web/blog/views.py
diff --git a/web/core/admin.py b/web/core/admin.py
@@ -10,6 +10,7 @@ class SubscriptionInline(admin.StackedInline):
 
 class WorkspaceAdmin(admin.ModelAdmin):
  inlines = (SubscriptionInline,)
+ search_fields = ('name', 'slack_id', 'bot_token', 'user_count', 'trial_end', 'created', 'modified')
  fields = ('name', 'slack_id', 'bot_token', 'user_count', 'trial_end', 'created', 'modified')
  readonly_fields = ('slack_id', 'bot_token', 'user_count', 'created', 'modified')
 
@@ -28,6 +29,8 @@ class FiltersInline(admin.StackedInline):
 
 class SlackUserAdmin(admin.ModelAdmin):
  inlines = (WebhooksInline, FiltersInline)
+ search_fields = ('slack_id', 'slack_name', 'slack_email', 'calendly_email', 'calendly_authtoken', 'created',
+ 'modified')
  fields = (
  'slack_id', 'slack_name', 'slack_email', 'calendly_email', 'calendly_authtoken', 'created',
  'modified', 'workspace')

diff --git a/web/settings/base.py b/web/settings/base.py
@@ -40,9 +40,7 @@
  'django.contrib.messages',
  'django.contrib.sitemaps',
  'web.core',
- 'web.blog',
  'djcelery_email',
- 'markdownx'
 ]
 
 MIDDLEWARE = [