From c12e294599bbd4164feae0f6637f519a7b02eb48 Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Mon, 21 Jan 2019 18:21:25 -0500 Subject: [PATCH] Snipt -> Siftie, first pass. --- README.md | 10 +++++----- accounts/models.py | 4 ++-- accounts/templates/stats.html | 2 +- app.json | 6 +++--- blogs/middleware.py | 4 ++-- .../templates/blogs/themes/default/base.html | 2 +- blogs/templates/blogs/themes/default/rss.xml | 6 +++--- media/js/src/modules/partials/blogging.html | 2 +- settings.py | 8 ++++---- snipts/management/commands/import_snipts.py | 4 ++-- snipts/models.py | 20 +++++++++---------- snipts/templates/snipts/embed.html | 4 ++-- snipts/templates/snipts/list.html | 8 ++++---- .../snipts/snipt-edit-js-template.html | 2 +- snipts/templates/snipts/snipt-list.html | 2 +- snipts/tests.py | 14 ++++++------- teams/migrations/0002_team_email.py | 2 +- teams/templates/teams/for-teams-complete.html | 2 +- teams/templates/teams/for-teams.html | 8 ++++---- teams/templates/teams/team-members.html | 2 +- templates/add-snipt.html | 2 +- templates/base.html | 4 ++-- templates/homepage.html | 2 +- templates/profile.html | 6 +++--- templates/registration/activation_email.txt | 2 +- .../registration/activation_email_subject.txt | 2 +- .../registration/password_reset_email.html | 2 +- templates/rss.xml | 10 +++++----- 28 files changed, 71 insertions(+), 71 deletions(-) diff --git a/README.md b/README.md index b783f47..d705793 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Snipt +# Siftie Snippets ## Automatic deploy to Heroku -You can click the button below to automatically deploy Snipt to Heroku. +You can click the button below to automatically deploy Siftie Snippets to Heroku. -[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/nicksergeant/snipt) +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/siftie/snippets) ## Manual deploy to Heroku @@ -20,8 +20,8 @@ You can click the button below to automatically deploy Snipt to Heroku. ## Updating your Heroku instance after an automatic deploy -- `git clone https://github.com/nicksergeant/snipt` -- `cd snipt` +- `git clone https://github.com/siftie/snippets` +- `cd snippets` - `git checkout heroku` - `heroku git:remote -a ` - `git push heroku heroku:master` diff --git a/accounts/models.py b/accounts/models.py index 5839803..72ba0b9 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -99,11 +99,11 @@ class UserProfile(models.Model): # Otherwise, if they have blog posts, use their Snipt blog URL. elif self.get_blog_posts(): - url = 'https://{}.snipt.net/'.format(self.user.username) + url = 'https://{}.snippets.siftie.com/'.format(self.user.username) # Otherwise, use their regular Snipt profile page. else: - url = 'https://snipt.net/{}/'.format(self.user.username) + url = 'https://snippets.siftie.com/{}/'.format(self.user.username) return url diff --git a/accounts/templates/stats.html b/accounts/templates/stats.html index 39c7e83..4a078f9 100644 --- a/accounts/templates/stats.html +++ b/accounts/templates/stats.html @@ -18,7 +18,7 @@ - + diff --git a/app.json b/app.json index c8242e0..17a6662 100644 --- a/app.json +++ b/app.json @@ -1,12 +1,12 @@ { - "name": "Snipt", + "name": "Siftie Snippets", "description": "Code snippets for teams and individuals.", "keywords": [ "snipt", "code snippets" ], - "website": "https://snipt.net", - "repository": "https://github.com/nicksergeant/snipt", + "website": "https://snippets.siftie.com", + "repository": "https://github.com/siftie/snippets", "logo": "https://snipt.s3.amazonaws.com/logo.png", "success_url": "/", "scripts": { diff --git a/blogs/middleware.py b/blogs/middleware.py index 644032c..785340c 100644 --- a/blogs/middleware.py +++ b/blogs/middleware.py @@ -11,9 +11,9 @@ class BlogMiddleware: host = request.META.get('HTTP_HOST', '') host_s = host.replace('www.', '').split('.') - if host != 'snipt.net' and \ + if host != 'snippets.siftie.com' and \ host != 'snipt.localhost' and \ - host != 'local.snipt.net': + host != 'local.snippets.siftie.com': if len(host_s) > 2: if host_s[1] == 'snipt': diff --git a/blogs/templates/blogs/themes/default/base.html b/blogs/templates/blogs/themes/default/base.html index f1ee54e..1a53ba3 100644 --- a/blogs/templates/blogs/themes/default/base.html +++ b/blogs/templates/blogs/themes/default/base.html @@ -79,7 +79,7 @@ {% endif %} diff --git a/blogs/templates/blogs/themes/default/rss.xml b/blogs/templates/blogs/themes/default/rss.xml index 3571af1..bd3c810 100644 --- a/blogs/templates/blogs/themes/default/rss.xml +++ b/blogs/templates/blogs/themes/default/rss.xml @@ -1,9 +1,9 @@ - + {% firstof request.blog_user.profile.blog_title request.blog_user.username %} {% firstof request.blog_user.profile.blog_title request.blog_user.username %} - {% if request.blog_user.profile.get_primary_blog_domain %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snipt.net/?rss{% endif %} + {% if request.blog_user.profile.get_primary_blog_domain %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snippets.siftie.com/?rss{% endif %} {% for snipt in snipts %} {{ snipt.title }} @@ -11,7 +11,7 @@ {% for tag in snipt.tags.all %}{{ tag }}{% if not forloop.last %}, {% endif %}{% endfor %} {{ snipt.created|date:"r" }} - snipt-net-{{ snipt.id }} + siftie-snippets-com-{{ snipt.id }} {% endfor %} diff --git a/media/js/src/modules/partials/blogging.html b/media/js/src/modules/partials/blogging.html index d35b214..343a9e5 100644 --- a/media/js/src/modules/partials/blogging.html +++ b/media/js/src/modules/partials/blogging.html @@ -18,7 +18,7 @@
- Like 'snipt.nicksergeant.com' or 'nicksergeant.com' (without quotes). Set your CNAME to `snipt.net` or A-record to `96.126.110.160`. You can use multiple domains here: separate each domain with a space. The first domain will be your primary domain. All other domains will redirect to your primary domain. + Like 'snipt.nicksergeant.com' or 'nicksergeant.com' (without quotes). Set your CNAME to `snippets.siftie.com` or A-record to `96.126.110.160`. You can use multiple domains here: separate each domain with a space. The first domain will be your primary domain. All other domains will redirect to your primary domain.
diff --git a/settings.py b/settings.py index 7753c71..8d53029 100644 --- a/settings.py +++ b/settings.py @@ -38,7 +38,7 @@ else: ABSOLUTE_URL_OVERRIDES = {'auth.user': lambda u: "/%s/" % u.username} ACCOUNT_ACTIVATION_DAYS = 0 -ADMINS = (('Nick Sergeant', 'nick@snipt.net'),) +ADMINS = (('Siftie', 'team@siftie.com'),) ALLOWED_HOSTS = ['*'] AUTH_PROFILE_MODULE = 'accounts.UserProfile' AUTHENTICATION_BACKENDS = ('utils.backends.EmailOrUsernameModelBackend',) @@ -46,7 +46,7 @@ BASE_PATH = os.path.dirname(__file__) CSRF_COOKIE_SECURE = True if 'USE_SSL' in os.environ else False CORS_ORIGIN_ALLOW_ALL = True DEBUG = True if 'DEBUG' in os.environ else False -DEFAULT_FROM_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@snipt.net') +DEFAULT_FROM_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@siftie.com') EMAIL_BACKEND = 'postmark.django_backend.EmailBackend' HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' INTERNAL_IPS = ('127.0.0.1',) @@ -75,7 +75,7 @@ SECRET_KEY = os.environ.get('SECRET_KEY', 'changeme') SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') SECURE_SSL_REDIRECT = True if 'USE_SSL' in os.environ else False SEND_BROKEN_LINK_EMAILS = False -SERVER_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@snipt.net') +SERVER_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@siftie.com') SESSION_COOKIE_AGE = 15801100 SESSION_COOKIE_SECURE = True if 'USE_SSL' in os.environ else False SITE_ID = 1 @@ -86,7 +86,7 @@ STATICFILES_STORAGE = 'whitenoise.django.GzipManifestStaticFilesStorage' STATIC_ROOT = os.path.join(BASE_PATH, 'static') STATIC_URL = '/static/' TASTYPIE_CANNED_ERROR = """There was an error with your request. The site - developers have a record of this error, please email api@snipt.net and + developers have a record of this error, please email support@siftie.com and we'll help you out.""" TEMPLATES = [ diff --git a/snipts/management/commands/import_snipts.py b/snipts/management/commands/import_snipts.py index 039fdbf..3511140 100644 --- a/snipts/management/commands/import_snipts.py +++ b/snipts/management/commands/import_snipts.py @@ -9,7 +9,7 @@ import requests def get_snipts(api_key, from_username, url=None, snipts=[]): path = url or '/api/private/snipt/?limit=50&api_key={}&username={}&format=json'.format(api_key, from_username) - res = requests.get('https://snipt.net' + path) + res = requests.get('https://snippets.siftie.com' + path) json = res.json() print(u"Fetched snipts {} through {} of {}".format( @@ -27,7 +27,7 @@ def get_snipts(api_key, from_username, url=None, snipts=[]): class Command(BaseCommand): - help = u"Import snipts from snipt.net." + help = u"Import snipts from Siftie Snippets." def add_arguments(self, parser): parser.add_argument('api_key', nargs='+', type=str) diff --git a/snipts/models.py b/snipts/models.py index 15c63dc..7826eee 100644 --- a/snipts/models.py +++ b/snipts/models.py @@ -79,12 +79,12 @@ class Snipt(models.Model): if self.lexer == 'markdown': self.stylized = markdown(self.code, 'default') - # Snipt embeds + # Snippet embeds for match in re.findall('\[\[(\w{32})\]\]', self.stylized): self.stylized = self.stylized.replace('[[' + str(match) + ']]', """
""".format(match, match)) @@ -123,10 +123,10 @@ class Snipt(models.Model): '
' .format(str(match))) - # Parse Snipt usernames + # Parse usernames for match in re.findall('@(\w+) ', self.stylized): - # Try and get the Snipt user by username. + # Try and get the user by username. user = get_object_or_None(User, username=match) if user: @@ -214,7 +214,7 @@ class Snipt(models.Model): return u'http://{}/{}/'.format( self.user.profile.blog_domain.split(' ')[0], self.slug) else: - return u'https://{}.snipt.net/{}/'.format( + return u'https://{}.snippets.siftie.com/{}/'.format( self.user.username.replace('_', '-'), self.slug) if self.custom_slug: @@ -233,7 +233,7 @@ class Snipt(models.Model): return u'http://{}/{}/'.format( self.user.profile.blog_domain.split(' ')[0], self.slug) else: - return u'https://{}.snipt.net/{}/'.format( + return u'https://{}.snippets.siftie.com/{}/'.format( self.user.username, self.slug) if self.public: @@ -263,9 +263,9 @@ class Snipt(models.Model): def get_embed_url(self): if settings.DEBUG: - root = 'http://local.snipt.net' + root = 'http://local.snippets.siftie.com' else: - root = 'https://snipt.net' + root = 'https://snippets.siftie.com' return '{}/embed/{}/'.format(root, self.key) @@ -297,7 +297,7 @@ class Snipt(models.Model): class SniptLogEntry(models.Model): - """An individual log entry for a Snipt changeset.""" + """An individual log entry for a snippet changeset.""" user = models.ForeignKey(User) snipt = models.ForeignKey(Snipt) @@ -314,7 +314,7 @@ class SniptLogEntry(models.Model): class SniptSecureView(models.Model): - """A single view to a secure snipt.""" + """A single view to a secure snippet.""" user = models.ForeignKey(User) snipt = models.ForeignKey(Snipt) diff --git a/snipts/templates/snipts/embed.html b/snipts/templates/snipts/embed.html index 982a685..a7b83dd 100644 --- a/snipts/templates/snipts/embed.html +++ b/snipts/templates/snipts/embed.html @@ -1,2 +1,2 @@ -{% if 'snipt' in request.GET %}document.addEventListener('DOMContentLoaded', function() { document.getElementById('snipt-embed-{{ snipt.key }}').innerHTML = '
{% for line in lines %}{{ line|safe }}\n{% endfor %}
'; }); -{% else %}document.open();document.writeln('
');{% for line in lines %}document.writeln('{{ line|safe }}');{% endfor %}document.writeln('');document.writeln('
');document.close();{% endif %} +{% if 'snipt' in request.GET %}document.addEventListener('DOMContentLoaded', function() { document.getElementById('snipt-embed-{{ snipt.key }}').innerHTML = '
{% for line in lines %}{{ line|safe }}\n{% endfor %}
'; }); +{% else %}document.open();document.writeln('
');{% for line in lines %}document.writeln('{{ line|safe }}');{% endfor %}document.writeln('');document.writeln('
');document.close();{% endif %} diff --git a/snipts/templates/snipts/list.html b/snipts/templates/snipts/list.html index e6cd5af..5688bc5 100644 --- a/snipts/templates/snipts/list.html +++ b/snipts/templates/snipts/list.html @@ -27,10 +27,10 @@ {% empty %}
{% if request.user == user and not request.user.is_active and not public %} - Welcome! Please activate your account to create your first snipt. + Welcome! Please activate your account to create your first snippet. {% else %} {% if request.user == user and request.user.is_authenticated %} - Welcome! Create your first snipt by clicking "Add Snipt" above. + Welcome! Create your first snippet by clicking "Add Snippet" above. {% else %} No snipts to show here. Sorry! {% endif %} @@ -44,10 +44,10 @@ {% empty %}
{% if request.user == user and not request.user.is_active and not public %} - Welcome! Please activate your account to create your first snipt. + Welcome! Please activate your account to create your first snippet. {% else %} {% if request.user == user and request.user.is_authenticated %} - Welcome! Create your first snipt by clicking "Add Snipt" above. + Welcome! Create your first snippet by clicking "Add Snippet" above. {% else %} No snipts to show here. Sorry! {% endif %} diff --git a/snipts/templates/snipts/snipt-edit-js-template.html b/snipts/templates/snipts/snipt-edit-js-template.html index 6303a80..5863055 100644 --- a/snipts/templates/snipts/snipt-edit-js-template.html +++ b/snipts/templates/snipts/snipt-edit-js-template.html @@ -70,7 +70,7 @@ Private snipts do not appear in the public listing, but are accessible via the direct URL.
- Public snipts are accessible by all Snipt.net users and appear in the public listing. + Public snipts are accessible by all Siftie Snippets users and appear in the public listing.
SniptSnippet Views Favs