diff options
35 files changed, 1282 insertions, 691 deletions
diff --git a/apps/accounts/migrations/0001_initial.py b/apps/accounts/migrations/0001_initial.py index 36aa6ba..b23159c 100644 --- a/apps/accounts/migrations/0001_initial.py +++ b/apps/accounts/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.1.2 on 2018-11-24 04:41 +# Generated by Django 2.1.2 on 2019-05-02 14:30 from django.conf import settings import django.contrib.auth.models @@ -46,10 +46,10 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('photo', models.ImageField(blank=True, null=True, upload_to='profile')), - ('website', models.CharField(blank=True, default='', max_length=300, null=True)), - ('location', models.CharField(blank=True, default='', max_length=300, null=True)), - ('bio', models.TextField(blank=True, default='', null=True)), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ('website', models.CharField(blank=True, default='', max_length=300)), + ('location', models.CharField(blank=True, default='', max_length=300)), + ('bio', models.CharField(blank=True, default='', max_length=350)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL)), ], ), ] diff --git a/apps/accounts/migrations/0002_auto_20190108_2115.py b/apps/accounts/migrations/0002_auto_20190108_2115.py deleted file mode 100644 index 1ebb280..0000000 --- a/apps/accounts/migrations/0002_auto_20190108_2115.py +++ /dev/null @@ -1,35 +0,0 @@ -# Generated by Django 2.1.2 on 2019-01-09 03:15 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('accounts', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='userprofile', - name='bio', - field=models.CharField(blank=True, default='', max_length=350), - ), - migrations.AlterField( - model_name='userprofile', - name='location', - field=models.CharField(blank=True, default='', max_length=300), - ), - migrations.AlterField( - model_name='userprofile', - name='user', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='profile', to=settings.AUTH_USER_MODEL), - ), - migrations.AlterField( - model_name='userprofile', - name='website', - field=models.CharField(blank=True, default='', max_length=300), - ), - ] diff --git a/apps/notes/migrations/0001_initial.py b/apps/notes/migrations/0001_initial.py index f8e2fff..d2bb58e 100644 --- a/apps/notes/migrations/0001_initial.py +++ b/apps/notes/migrations/0001_initial.py @@ -1,9 +1,10 @@ -# Generated by Django 2.1.2 on 2018-11-24 13:55 +# Generated by Django 2.1.2 on 2019-05-02 14:30 from django.conf import settings import django.contrib.postgres.fields.jsonb from django.db import migrations, models import django.db.models.deletion +import django.db.models.manager import taggit.managers import uuid @@ -13,12 +14,39 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('taggit', '0002_auto_20150616_2121'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('contenttypes', '0002_remove_content_type_name'), ] operations = [ migrations.CreateModel( + name='Annotation', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('unique_id', models.UUIDField(default=uuid.uuid4, editable=False)), + ('date_created', models.DateTimeField(auto_now_add=True)), + ('date_updated', models.DateTimeField(auto_now=True)), + ('highlight_text', models.TextField(blank=True)), + ('body_text', models.TextField(blank=True)), + ('body_html', models.TextField(blank=True)), + ('body_qjson', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), + ('is_public', models.BooleanField(default=False)), + ], + ), + migrations.CreateModel( + name='LuxTag', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), + ('slug', models.SlugField(max_length=100, unique=True, verbose_name='Slug')), + ('color_rgb', models.CharField(blank=True, max_length=20)), + ], + options={ + 'verbose_name_plural': 'Tags', + 'verbose_name': 'Tag', + }, + ), + migrations.CreateModel( name='Note', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), @@ -26,13 +54,19 @@ class Migration(migrations.Migration): ('date_created', models.DateTimeField(auto_now_add=True)), ('date_updated', models.DateTimeField(auto_now=True)), ('title', models.CharField(max_length=250)), - ('body_text', models.TextField(null=True)), - ('body_html', models.TextField(blank=True, null=True)), + ('body_text', models.TextField(blank=True)), + ('body_html', models.TextField(blank=True)), ('body_qjson', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), - ('url', models.CharField(blank=True, max_length=250, null=True)), + ('url', models.CharField(blank=True, max_length=250)), ('slug', models.SlugField(blank=True)), ('is_public', models.BooleanField(default=False)), ], + options={ + 'ordering': ('-date_created', '-date_updated'), + }, + managers=[ + ('include_trash', django.db.models.manager.Manager()), + ], ), migrations.CreateModel( name='Notebook', @@ -40,12 +74,30 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('unique_id', models.UUIDField(default=uuid.uuid4, editable=False)), ('name', models.CharField(max_length=250)), - ('url', models.CharField(blank=True, max_length=250, null=True)), + ('color_rgb', models.CharField(blank=True, max_length=20)), ('slug', models.SlugField(blank=True)), ('date_created', models.DateTimeField(auto_now_add=True)), ('date_updated', models.DateTimeField(auto_now=True)), ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], + options={ + 'ordering': ('name', 'date_created', 'date_updated'), + }, + managers=[ + ('include_trash', django.db.models.manager.Manager()), + ], + ), + migrations.CreateModel( + name='TaggedNotes', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('object_id', models.IntegerField(db_index=True, verbose_name='Object id')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes_taggednotes_tagged_items', to='contenttypes.ContentType', verbose_name='Content type')), + ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes_taggednotes_items', to='notes.LuxTag')), + ], + options={ + 'abstract': False, + }, ), migrations.AddField( model_name='note', @@ -60,11 +112,21 @@ class Migration(migrations.Migration): migrations.AddField( model_name='note', name='tags', - field=taggit.managers.TaggableManager(blank=True, help_text='Tags', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags'), + field=taggit.managers.TaggableManager(blank=True, help_text='Tags', through='notes.TaggedNotes', to='notes.LuxTag', verbose_name='Tags'), + ), + migrations.AddField( + model_name='annotation', + name='note', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='notes.Note'), + ), + migrations.AddField( + model_name='annotation', + name='owner', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), ), migrations.AlterUniqueTogether( name='notebook', - unique_together={('owner', 'slug')}, + unique_together={('owner', 'name')}, ), migrations.AlterUniqueTogether( name='note', diff --git a/apps/notes/migrations/0002_auto_20181204_0620.py b/apps/notes/migrations/0002_auto_20181204_0620.py deleted file mode 100644 index e7cb38d..0000000 --- a/apps/notes/migrations/0002_auto_20181204_0620.py +++ /dev/null @@ -1,42 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 12:20 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('notes', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='Tag', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=40)), - ('slug', models.SlugField(blank=True)), - ('color_hex', models.CharField(max_length=6)), - ('date_created', models.DateTimeField(auto_now_add=True)), - ('date_updated', models.DateTimeField(auto_now=True)), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_tag', to='notes.Tag')), - ], - ), - migrations.AlterModelOptions( - name='note', - options={'ordering': ('-date_created', '-date_updated')}, - ), - migrations.AddField( - model_name='note', - name='tagstwo', - field=models.ManyToManyField(blank=True, to='notes.Tag'), - ), - migrations.AlterUniqueTogether( - name='tag', - unique_together={('owner', 'name')}, - ), - ] diff --git a/apps/notes/migrations/0003_auto_20181204_0641.py b/apps/notes/migrations/0003_auto_20181204_0641.py deleted file mode 100644 index 9423058..0000000 --- a/apps/notes/migrations/0003_auto_20181204_0641.py +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 12:41 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('contenttypes', '0002_remove_content_type_name'), - ('notes', '0002_auto_20181204_0620'), - ] - - operations = [ - migrations.CreateModel( - name='LuxTag', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=100, unique=True, verbose_name='Name')), - ('slug', models.SlugField(max_length=100, unique=True, verbose_name='Slug')), - ('color_hex', models.CharField(max_length=6)), - ], - options={ - 'verbose_name': 'Tag', - 'verbose_name_plural': 'Tags', - }, - ), - migrations.CreateModel( - name='TaggedNotes', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('object_id', models.IntegerField(db_index=True, verbose_name='Object id')), - ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes_taggednotes_tagged_items', to='contenttypes.ContentType', verbose_name='Content type')), - ('tag', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='notes_taggednotes_items', to='notes.LuxTag')), - ], - options={ - 'abstract': False, - }, - ), - migrations.AlterUniqueTogether( - name='tag', - unique_together=set(), - ), - migrations.RemoveField( - model_name='tag', - name='owner', - ), - migrations.RemoveField( - model_name='tag', - name='parent', - ), - migrations.RemoveField( - model_name='note', - name='tagstwo', - ), - migrations.DeleteModel( - name='Tag', - ), - ] diff --git a/apps/notes/migrations/0004_auto_20181204_0653.py b/apps/notes/migrations/0004_auto_20181204_0653.py deleted file mode 100644 index fc6d911..0000000 --- a/apps/notes/migrations/0004_auto_20181204_0653.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 12:53 - -from django.db import migrations -import taggit.managers - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0003_auto_20181204_0641'), - ] - - operations = [ - migrations.AlterField( - model_name='note', - name='tags', - field=taggit.managers.TaggableManager(blank=True, help_text='Tags', through='notes.TaggedNotes', to='notes.LuxTag', verbose_name='Tags'), - ), - ] diff --git a/apps/notes/migrations/0005_luxtag_owner.py b/apps/notes/migrations/0005_luxtag_owner.py deleted file mode 100644 index 168bd0b..0000000 --- a/apps/notes/migrations/0005_luxtag_owner.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 13:06 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('notes', '0004_auto_20181204_0653'), - ] - - operations = [ - migrations.AddField( - model_name='luxtag', - name='owner', - field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - ] diff --git a/apps/notes/migrations/0006_auto_20181204_0957.py b/apps/notes/migrations/0006_auto_20181204_0957.py deleted file mode 100644 index bf4293c..0000000 --- a/apps/notes/migrations/0006_auto_20181204_0957.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 15:57 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0005_luxtag_owner'), - ] - - operations = [ - migrations.RemoveField( - model_name='notebook', - name='url', - ), - migrations.AddField( - model_name='notebook', - name='color_hex', - field=models.CharField(blank=True, max_length=6, null=True), - ), - ] diff --git a/apps/notes/migrations/0007_auto_20181204_1050.py b/apps/notes/migrations/0007_auto_20181204_1050.py deleted file mode 100644 index a4bdc30..0000000 --- a/apps/notes/migrations/0007_auto_20181204_1050.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 16:50 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0006_auto_20181204_0957'), - ] - - operations = [ - migrations.RemoveField( - model_name='notebook', - name='color_hex', - ), - migrations.AddField( - model_name='notebook', - name='color_rgb', - field=models.CharField(blank=True, max_length=20, null=True), - ), - ] diff --git a/apps/notes/migrations/0008_auto_20181204_1311.py b/apps/notes/migrations/0008_auto_20181204_1311.py deleted file mode 100644 index 02bf272..0000000 --- a/apps/notes/migrations/0008_auto_20181204_1311.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-04 19:11 - -from django.conf import settings -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('notes', '0007_auto_20181204_1050'), - ] - - operations = [ - migrations.AlterUniqueTogether( - name='notebook', - unique_together={('owner', 'name')}, - ), - ] diff --git a/apps/notes/migrations/0009_remove_luxtag_owner.py b/apps/notes/migrations/0009_remove_luxtag_owner.py deleted file mode 100644 index 18896f3..0000000 --- a/apps/notes/migrations/0009_remove_luxtag_owner.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-05 03:15 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0008_auto_20181204_1311'), - ] - - operations = [ - migrations.RemoveField( - model_name='luxtag', - name='owner', - ), - ] diff --git a/apps/notes/migrations/0010_auto_20181204_2117.py b/apps/notes/migrations/0010_auto_20181204_2117.py deleted file mode 100644 index 69da825..0000000 --- a/apps/notes/migrations/0010_auto_20181204_2117.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-05 03:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0009_remove_luxtag_owner'), - ] - - operations = [ - migrations.RemoveField( - model_name='luxtag', - name='color_hex', - ), - migrations.AddField( - model_name='luxtag', - name='color_rgb', - field=models.CharField(blank=True, max_length=20, null=True), - ), - ] diff --git a/apps/notes/migrations/0011_auto_20181221_1029.py b/apps/notes/migrations/0011_auto_20181221_1029.py deleted file mode 100644 index 7b88a62..0000000 --- a/apps/notes/migrations/0011_auto_20181221_1029.py +++ /dev/null @@ -1,39 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-21 16:29 - -from django.conf import settings -import django.contrib.postgres.fields.jsonb -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('notes', '0010_auto_20181204_2117'), - ] - - operations = [ - migrations.CreateModel( - name='Annotation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('unique_id', models.UUIDField(default=uuid.uuid4, editable=False)), - ('date_created', models.DateTimeField(auto_now_add=True)), - ('date_updated', models.DateTimeField(auto_now=True)), - ('highlight_text', models.TextField(null=True)), - ('body_text', models.TextField(null=True)), - ('body_html', models.TextField(blank=True, null=True)), - ('body_qjson', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)), - ('is_public', models.BooleanField(default=False)), - ('note', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='notes.Note')), - ('owner', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.AddField( - model_name='luxtag', - name='owner', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - ), - ] diff --git a/apps/notes/migrations/0012_auto_20181221_1038.py b/apps/notes/migrations/0012_auto_20181221_1038.py deleted file mode 100644 index f02cbeb..0000000 --- a/apps/notes/migrations/0012_auto_20181221_1038.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-21 16:38 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -from django.contrib import auth -User = auth.get_user_model() - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0011_auto_20181221_1029'), - ] - - operations = [ - migrations.AlterField( - model_name='luxtag', - name='owner', - field=models.ForeignKey(default=User.objects.get(username='luxagraf').id, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), - preserve_default=False, - ), - ] diff --git a/apps/notes/migrations/0013_remove_luxtag_owner.py b/apps/notes/migrations/0013_remove_luxtag_owner.py deleted file mode 100644 index a96b105..0000000 --- a/apps/notes/migrations/0013_remove_luxtag_owner.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 2.1.2 on 2018-12-21 17:20 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0012_auto_20181221_1038'), - ] - - operations = [ - migrations.RemoveField( - model_name='luxtag', - name='owner', - ), - ] diff --git a/apps/notes/migrations/0014_auto_20190104_1945.py b/apps/notes/migrations/0014_auto_20190104_1945.py deleted file mode 100644 index 42398a3..0000000 --- a/apps/notes/migrations/0014_auto_20190104_1945.py +++ /dev/null @@ -1,56 +0,0 @@ -# Generated by Django 2.1.2 on 2019-01-05 01:45 - -from django.db import migrations, models -import django.db.models.manager - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0013_remove_luxtag_owner'), - ] - - operations = [ - migrations.AlterModelManagers( - name='note', - managers=[ - ('include_trash', django.db.models.manager.Manager()), - ], - ), - migrations.AlterModelManagers( - name='notebook', - managers=[ - ('include_trash', django.db.models.manager.Manager()), - ], - ), - migrations.AlterField( - model_name='annotation', - name='body_html', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - migrations.AlterField( - model_name='annotation', - name='body_text', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - migrations.AlterField( - model_name='annotation', - name='highlight_text', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - migrations.AlterField( - model_name='note', - name='body_html', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - migrations.AlterField( - model_name='note', - name='body_text', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - ] diff --git a/apps/notes/migrations/0015_auto_20190104_1946.py b/apps/notes/migrations/0015_auto_20190104_1946.py deleted file mode 100644 index 542dfc6..0000000 --- a/apps/notes/migrations/0015_auto_20190104_1946.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 2.1.2 on 2019-01-05 01:46 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('notes', '0014_auto_20190104_1945'), - ] - - operations = [ - migrations.AlterField( - model_name='luxtag', - name='color_rgb', - field=models.CharField(blank=True, default='', max_length=20), - preserve_default=False, - ), - migrations.AlterField( - model_name='note', - name='url', - field=models.CharField(blank=True, default='', max_length=250), - preserve_default=False, - ), - migrations.AlterField( - model_name='notebook', - name='color_rgb', - field=models.CharField(blank=True, default='', max_length=20), - preserve_default=False, - ), - ] diff --git a/apps/notes/views.py b/apps/notes/views.py index 280020a..2418043 100644 --- a/apps/notes/views.py +++ b/apps/notes/views.py @@ -20,7 +20,7 @@ from rest_framework import permissions from .serializers import NoteSerializer, NotebookSerializer, NoteTagSerializer from .models import Note, Notebook, LuxTag from .forms import NoteForm, NotebookForm -from utils.views import AjaxableResponseMixin +from utils.views import AjaxableResponseMixin, LoggedInViewWithUser ################## # Base Views @@ -37,15 +37,6 @@ class BaseDetailView(DetailView): pass -@method_decorator(login_required, name='dispatch') -class LoggedInViewWithUser(FormView): - - def get_form_kwargs(self, **kwargs): - kwargs = super().get_form_kwargs(**kwargs) - kwargs.update({'user': self.request.user}) - return kwargs - - ################## # Note Views ################## diff --git a/apps/utils/views.py b/apps/utils/views.py index c752706..677ac4b 100644 --- a/apps/utils/views.py +++ b/apps/utils/views.py @@ -4,6 +4,7 @@ from django.http import Http404, HttpResponse, JsonResponse from django.apps import apps from django.views.generic import ListView from django.views.generic.base import View, RedirectView +from django.views.generic.edit import FormView, ModelFormMixin from django.utils.decorators import method_decorator from django.contrib.auth.decorators import login_required #from photos.models import LuxImage, LuxVideo @@ -42,6 +43,14 @@ class LoggedInViewWithUser(View): return kwargs +@method_decorator(login_required, name='dispatch') +class LoggedInViewWithUser(FormView): + + def get_form_kwargs(self, **kwargs): + kwargs = super().get_form_kwargs(**kwargs) + kwargs.update({'user': self.request.user}) + return kwargs + class AjaxableResponseMixin: """ diff --git a/config/base_urls.py b/config/base_urls.py index ed4bd91..19d6499 100644 --- a/config/base_urls.py +++ b/config/base_urls.py @@ -39,6 +39,7 @@ urlpatterns += [ path(r'', NoteListView.as_view(), name='homepage',), path(r'forum/', include('forum.urls')), path(r'n/', include('notes.notes_urls')), + path(r'o/', include('outlines.urls')), path(r'nb/', include('notes.notebook_urls')), path(r'api/v1/', include(router.urls)), path(r'<slug>', PageDetailView.as_view(), name="pages"), diff --git a/config/requirements.txt b/config/requirements.txt index 634c3b6..d443342 100644 --- a/config/requirements.txt +++ b/config/requirements.txt @@ -41,7 +41,6 @@ parso==0.3.1 pexpect==4.6.0 pickleshare==0.7.5 Pillow==5.3.0 -pkg-resources==0.0.0 prompt-toolkit==2.0.7 psycopg2==2.7.5 psycopg2-binary==2.7.6.1 diff --git a/config/settings.py b/config/settings.py index dcd14ee..d2b0b08 100644 --- a/config/settings.py +++ b/config/settings.py @@ -77,6 +77,7 @@ LOCAL_APPS = [ 'pages', 'accounts', 'notes', + 'outlines', 'forum', ] INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS @@ -87,7 +88,7 @@ MIDDLEWARE = [ 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', - #'debug_toolbar.middleware.DebugToolbarMiddleware', + # 'debug_toolbar.middleware.DebugToolbarMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', @@ -99,9 +100,7 @@ ROOT_URLCONF = 'config.base_urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [ - os.path.join(BASE_DIR, 'design/templates'), - ], + 'DIRS': [os.path.join(BASE_DIR, 'design/templates'), ], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -109,7 +108,6 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', - #'notes.context_processors.add_login_form', ], }, }, diff --git a/design/logo-blk.svg b/design/logo-blk.svg new file mode 100644 index 0000000..d2471a1 --- /dev/null +++ b/design/logo-blk.svg @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="44" + height="40" + version="1.1" + id="svg819" + sodipodi:docname="logo-blk.svg" + inkscape:version="0.92.2 2405546, 2018-03-11"> + <metadata + id="metadata825"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs823" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1916" + inkscape:window-height="1041" + id="namedview821" + showgrid="false" + inkscape:zoom="15.026019" + inkscape:cx="23.681881" + inkscape:cy="19.843404" + inkscape:window-x="0" + inkscape:window-y="18" + inkscape:window-maximized="0" + inkscape:current-layer="svg819" /> + <path + d="M 42,11 H 2" + id="path4672" + style="stroke:#000000;stroke-opacity:1;stroke-width:0.11338583;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,20 H 42" + id="path4670" + style="stroke-width:0.11338583;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" /> + <path + d="M 42,29 H 2" + id="path4668" + style="stroke:#000000;stroke-opacity:1;stroke-width:0.11338583;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,38 H 42" + id="path815" /> + <path + d="m19.5,11v18h5V11" + id="path817" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + x="0.99826831" + y="31.947302" + id="text4660"><tspan + sodipodi:role="line" + id="tspan4658" + x="0.99826831" + y="31.947302" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light'">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none" + x="24.091545" + y="31.747648" + id="text4664"><tspan + sodipodi:role="line" + id="tspan4662" + x="24.091545" + y="31.747648" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light'">N</tspan></text> +</svg> diff --git a/design/logo-org.svg b/design/logo-org.svg new file mode 100644 index 0000000..10ffcfa --- /dev/null +++ b/design/logo-org.svg @@ -0,0 +1,90 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="44" + height="40" + version="1.1" + id="svg819" + sodipodi:docname="logo-org.svg" + inkscape:version="0.92.2 2405546, 2018-03-11"> + <metadata + id="metadata825"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs823" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1916" + inkscape:window-height="1041" + id="namedview821" + showgrid="false" + inkscape:zoom="15.026019" + inkscape:cx="23.681881" + inkscape:cy="19.843404" + inkscape:window-x="0" + inkscape:window-y="18" + inkscape:window-maximized="0" + inkscape:current-layer="svg819" /> + <path + d="M 42,11 H 2" + id="path4672" + style="stroke:#000000;stroke-opacity:1;stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,20 H 42" + id="path4670" + style="stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none;stroke:#000000;stroke-opacity:1" /> + <path + d="M 42,29 H 2" + id="path4668" + style="stroke:#000000;stroke-opacity:1;stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,38 H 42" + id="path815" /> + <path + d="m19.5,11v18h5V11" + id="path817" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#fc5d2b;fill-opacity:1;stroke:none;" + x="0.99826831" + y="31.947302" + id="text4660"><tspan + sodipodi:role="line" + id="tspan4658" + x="0.99826831" + y="31.947302" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light';fill:#fc5d2b;fill-opacity:1;">A</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#fc5d2b;fill-opacity:1;stroke:none;" + x="24.091545" + y="31.747648" + id="text4664"><tspan + sodipodi:role="line" + id="tspan4662" + x="24.091545" + y="31.747648" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light';fill:#fc5d2b;fill-opacity:1;">N</tspan></text> +</svg> diff --git a/design/logo-sm-caps.svg b/design/logo-sm-caps.svg new file mode 100644 index 0000000..87bf2b6 --- /dev/null +++ b/design/logo-sm-caps.svg @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="44" + height="40" + version="1.1" + id="svg819" + sodipodi:docname="logo-sm-caps.svg" + inkscape:version="0.92.2 2405546, 2018-03-11"> + <metadata + id="metadata825"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs823" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1916" + inkscape:window-height="1041" + id="namedview821" + showgrid="false" + inkscape:zoom="15.026019" + inkscape:cx="23.681881" + inkscape:cy="14.519306" + inkscape:window-x="0" + inkscape:window-y="18" + inkscape:window-maximized="0" + inkscape:current-layer="svg819" /> + <path + d="M 42,11 H 2" + id="path4672" + style="stroke:#000000;stroke-opacity:0.67450982;stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,20 H 42" + id="path4670" + style="stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none;stroke:#595959;stroke-opacity:1" /> + <path + d="M 42,29 H 2" + id="path4668" + style="stroke:#464646;stroke-opacity:1;stroke-width:0.18897638;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="M 2,38 H 42" + id="path815" /> + <path + d="m19.5,11v18h5V11" + id="path817" + style="stroke:none;stroke-opacity:1;stroke-width:1.0015748;stroke-miterlimit:4;stroke-dasharray:none;fill:#636363;fill-opacity:1" /> + <g + aria-label="A" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#fc5d2b;fill-opacity:1;stroke:none;stroke-opacity:1" + id="text4660"> + <path + d="m 18.423191,31.880751 -7.504,-24.9013328 H 8.4178582 L 0.91385847,31.880751 H 3.1911917 l 1.792,-6.16 h 9.3706663 l 1.792,6.16 z M 13.905858,23.854084 H 5.4311917 L 9.6871915,9.4060848 Z" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light';stroke:none;stroke-opacity:1;fill:#fc5d2b;fill-opacity:1" + id="path4695" /> + </g> + <g + aria-label="N" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.33333206px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#fc5d2b;fill-opacity:1;stroke:none" + id="text4664"> + <path + d="M 42.123544,31.747648 V 6.8463158 H 40.032878 V 27.118315 L 28.982212,6.8463158 H 26.891545 V 31.747648 h 2.090667 V 11.176982 l 11.125333,20.570666 z" + style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, Light';fill:#fc5d2b;fill-opacity:1" + id="path4698" /> + </g> +</svg> diff --git a/design/logo-sm.svg b/design/logo-sm.svg new file mode 100644 index 0000000..8bd1aa4 --- /dev/null +++ b/design/logo-sm.svg @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + id="svg819" + version="1.1" + height="40" + width="44"> + <metadata + id="metadata825"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs823" /> + <path + id="path815" + d="m2,2h40m0,9H2m0,9h40m0,9H2m0,9h40" + stroke-width=".3" + stroke="#000" /> + <path + id="path817" + d="m19.5,11v18h5V11" /> + <path + d="M 16.394394,28.431112 V 16.573685 c 0,-3.823845 -2.277487,-5.50774 -5.606123,-5.50774 -2.1723733,0 -4.169555,0.771786 -5.7813157,2.490761 l 1.1212248,1.754057 c 1.3314545,-1.473407 2.6979472,-2.069787 4.2746699,-2.069787 2.207411,0 3.468789,1.298003 3.468789,3.613358 v 2.981897 c -1.086186,-1.54357 -2.732985,-2.210111 -4.4848993,-2.210111 -2.7329854,0 -5.1155882,2.034705 -5.1155882,5.577902 0,3.543196 2.3826028,5.648064 5.1155882,5.648064 1.7168753,0 3.3987133,-0.701623 4.4848993,-2.280275 v 1.859301 z m -6.166736,-1.403246 c -2.1373345,0 -3.3987124,-1.683895 -3.3987124,-3.788764 0,-2.104868 1.2613779,-3.788763 3.3987124,-3.788763 1.436569,0 2.8381,0.631461 3.643981,2.13995 v 3.332709 c -0.805881,1.473408 -2.207412,2.104868 -3.643981,2.104868 z" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:35.05970383px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.97388071" + id="path899" /> + <g + id="text859" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.31906128px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99961776" + transform="scale(1.0225304,0.97796604)" + aria-label="n"> + <path + id="path903" + style="font-size:35.98624039px;stroke-width:0.99961776" + d="M 38.945123,29.332605 V 16.233614 c 0,-3.130803 -1.43945,-4.714198 -4.390321,-4.714198 -2.087202,0 -4.066446,1.403464 -5.07406,2.914886 v -2.483051 h -2.555023 v 17.381354 h 2.555023 V 16.593476 c 0.791697,-1.403463 2.375092,-2.77094 4.102431,-2.77094 1.72734,0 2.770941,0.827683 2.770941,3.166789 v 12.34328 z" /> + </g> +</svg> diff --git a/design/logo.svg b/design/logo.svg new file mode 100644 index 0000000..8d4aea8 --- /dev/null +++ b/design/logo.svg @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="44" + height="40" + version="1.1" + id="svg819" + sodipodi:docname="logo.svg" + inkscape:version="0.92.2 2405546, 2018-03-11"> + <metadata + id="metadata825"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs823" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1916" + inkscape:window-height="1041" + id="namedview821" + showgrid="false" + inkscape:zoom="15.026019" + inkscape:cx="23.482228" + inkscape:cy="-12.868288" + inkscape:window-x="0" + inkscape:window-y="18" + inkscape:window-maximized="0" + inkscape:current-layer="svg819" /> + <path + stroke="#000" + stroke-width=".3" + d="m2,2h40m0,9H2m0,9h40m0,9H2m0,9h40" + id="path815" /> + <path + d="m19.5,11v18h5V11" + id="path817" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:31.16418266px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.97388071" + x="2.8363159" + y="28.413734" + id="text855" + transform="scale(0.99938879,1.0006116)"><tspan + sodipodi:role="line" + id="tspan853" + x="2.8363159" + y="28.413734" + style="font-size:35.05970383px;stroke-width:0.97388071">a</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:37.31906128px;line-height:1.25;font-family:'Proxima Nova Condensed';-inkscape-font-specification:'Proxima Nova Condensed, ';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.99961776" + x="24.550627" + y="29.332605" + id="text859" + transform="scale(1.0225304,0.97796604)"><tspan + sodipodi:role="line" + id="tspan857" + x="24.550627" + y="29.332605" + style="font-size:35.98624039px;stroke-width:0.99961776">n</tspan></text> +</svg> diff --git a/design/sass/_awesomeplete.scss b/design/sass/_awesomeplete.scss new file mode 100644 index 0000000..deb97f3 --- /dev/null +++ b/design/sass/_awesomeplete.scss @@ -0,0 +1,88 @@ +.awesomplete [hidden] { + display: none; +} + +.awesomplete .visually-hidden { + position: absolute; + clip: rect(0, 0, 0, 0); +} + +.awesomplete { + display: inline-block; + position: relative; +} + +.awesomplete > input { + display: block; +} + +.awesomplete > ul { + position: absolute; + left: 0; + z-index: 1; + min-width: 100%; + box-sizing: border-box; + list-style: none; + padding: 0; + margin: 0; + background: #fff; +} + +.awesomplete > ul:empty { + display: none; +} + +.awesomplete > ul { + border-radius: .3em; + margin: .2em 0 0; + background: hsla(0,0%,100%,.9); + background: linear-gradient(to bottom right, white, hsla(0,0%,100%,.8)); + border: 1px solid rgba(0,0,0,.3); + box-shadow: .05em .2em .6em rgba(0,0,0,.2); + text-shadow: none; +} + +@supports (transform: scale(0)) { + .awesomplete > ul { + transition: .3s cubic-bezier(.4,.2,.5,1.4); + transform-origin: 1.43em -.43em; + } + + .awesomplete > ul[hidden], + .awesomplete > ul:empty { + opacity: 0; + display: block; + transition-timing-function: ease; + } +} + + /* Pointer */ + + .awesomplete > ul > li { + position: relative; + padding: .2em .5em; + cursor: pointer; + } + + .awesomplete > ul > li:hover { + background: hsl(200, 40%, 80%); + color: black; + } + + .awesomplete > ul > li[aria-selected="true"] { + background: hsl(205, 40%, 40%); + color: white; + } + + .awesomplete mark { + background: hsl(65, 100%, 50%); + } + + .awesomplete li:hover mark { + background: hsl(68, 100%, 41%); + } + + .awesomplete li[aria-selected="true"] mark { + background: hsl(86, 100%, 21%); + color: inherit; + } diff --git a/design/sass/_global.scss b/design/sass/_global.scss index ff23500..584e4fa 100644 --- a/design/sass/_global.scss +++ b/design/sass/_global.scss @@ -249,6 +249,11 @@ h3 { .space-between { justify-content: space-between; } +.page-subhead { + @include fontsize(15); + @include smcaps; + @include fancy_sans; +} //************** other global classes ************************ .sans { @include generic_sans; diff --git a/design/sass/_icons.scss b/design/sass/_icons.scss new file mode 100644 index 0000000..71f905a --- /dev/null +++ b/design/sass/_icons.scss @@ -0,0 +1 @@ +$trashicon:"PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgdmlld0JveD0iMCAtMjU2IDE3OTIgMTc5MiIKICAgaWQ9InN2ZzM3NDEiCiAgIHZlcnNpb249IjEuMSIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMC40OC4zLjEgcjk4ODYiCiAgIHdpZHRoPSIxMDAlIgogICBoZWlnaHQ9IjEwMCUiCiAgIHNvZGlwb2RpOmRvY25hbWU9InRyYXNoX2ZvbnRfYXdlc29tZS5zdmciPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTM3NTEiPgogICAgPHJkZjpSREY+CiAgICAgIDxjYzpXb3JrCiAgICAgICAgIHJkZjphYm91dD0iIj4KICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4KICAgICAgICA8ZGM6dHlwZQogICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+CiAgICAgIDwvY2M6V29yaz4KICAgIDwvcmRmOlJERj4KICA8L21ldGFkYXRhPgogIDxkZWZzCiAgICAgaWQ9ImRlZnMzNzQ5IiAvPgogIDxzb2RpcG9kaTpuYW1lZHZpZXcKICAgICBwYWdlY29sb3I9IiNmZmZmZmYiCiAgICAgYm9yZGVyY29sb3I9IiM2NjY2NjYiCiAgICAgYm9yZGVyb3BhY2l0eT0iMSIKICAgICBvYmplY3R0b2xlcmFuY2U9IjEwIgogICAgIGdyaWR0b2xlcmFuY2U9IjEwIgogICAgIGd1aWRldG9sZXJhbmNlPSIxMCIKICAgICBpbmtzY2FwZTpwYWdlb3BhY2l0eT0iMCIKICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIgogICAgIGlua3NjYXBlOndpbmRvdy13aWR0aD0iNjQwIgogICAgIGlua3NjYXBlOndpbmRvdy1oZWlnaHQ9IjQ4MCIKICAgICBpZD0ibmFtZWR2aWV3Mzc0NyIKICAgICBzaG93Z3JpZD0iZmFsc2UiCiAgICAgaW5rc2NhcGU6em9vbT0iMC4xMzE2OTY0MyIKICAgICBpbmtzY2FwZTpjeD0iODk2IgogICAgIGlua3NjYXBlOmN5PSI4OTYiCiAgICAgaW5rc2NhcGU6d2luZG93LXg9IjAiCiAgICAgaW5rc2NhcGU6d2luZG93LXk9IjI1IgogICAgIGlua3NjYXBlOndpbmRvdy1tYXhpbWl6ZWQ9IjAiCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ic3ZnMzc0MSIgLz4KICA8ZwogICAgIHRyYW5zZm9ybT0ibWF0cml4KDEsMCwwLC0xLDE5Ny40MjM3MywxMjU1LjA1MDgpIgogICAgIGlkPSJnMzc0MyI+CiAgICA8cGF0aAogICAgICAgZD0iTSA1MTIsODAwIFYgMjI0IHEgMCwtMTQgLTksLTIzIC05LC05IC0yMywtOSBoIC02NCBxIC0xNCwwIC0yMyw5IC05LDkgLTksMjMgdiA1NzYgcSAwLDE0IDksMjMgOSw5IDIzLDkgaCA2NCBxIDE0LDAgMjMsLTkgOSwtOSA5LC0yMyB6IG0gMjU2LDAgViAyMjQgcSAwLC0xNCAtOSwtMjMgLTksLTkgLTIzLC05IGggLTY0IHEgLTE0LDAgLTIzLDkgLTksOSAtOSwyMyB2IDU3NiBxIDAsMTQgOSwyMyA5LDkgMjMsOSBoIDY0IHEgMTQsMCAyMywtOSA5LC05IDksLTIzIHogbSAyNTYsMCBWIDIyNCBxIDAsLTE0IC05LC0yMyAtOSwtOSAtMjMsLTkgaCAtNjQgcSAtMTQsMCAtMjMsOSAtOSw5IC05LDIzIHYgNTc2IHEgMCwxNCA5LDIzIDksOSAyMyw5IGggNjQgcSAxNCwwIDIzLC05IDksLTkgOSwtMjMgeiBNIDExNTIsNzYgdiA5NDggSCAyNTYgViA3NiBRIDI1Niw1NCAyNjMsMzUuNSAyNzAsMTcgMjc3LjUsOC41IDI4NSwwIDI4OCwwIGggODMyIHEgMywwIDEwLjUsOC41IDcuNSw4LjUgMTQuNSwyNyA3LDE4LjUgNyw0MC41IHogTSA0ODAsMTE1MiBoIDQ0OCBsIC00OCwxMTcgcSAtNyw5IC0xNywxMSBIIDU0NiBxIC0xMCwtMiAtMTcsLTExIHogbSA5MjgsLTMyIHYgLTY0IHEgMCwtMTQgLTksLTIzIC05LC05IC0yMywtOSBoIC05NiBWIDc2IHEgMCwtODMgLTQ3LC0xNDMuNSAtNDcsLTYwLjUgLTExMywtNjAuNSBIIDI4OCBxIC02NiwwIC0xMTMsNTguNSBRIDEyOCwtMTEgMTI4LDcyIHYgOTUyIEggMzIgcSAtMTQsMCAtMjMsOSAtOSw5IC05LDIzIHYgNjQgcSAwLDE0IDksMjMgOSw5IDIzLDkgaCAzMDkgbCA3MCwxNjcgcSAxNSwzNyA1NCw2MyAzOSwyNiA3OSwyNiBoIDMyMCBxIDQwLDAgNzksLTI2IDM5LC0yNiA1NCwtNjMgbCA3MCwtMTY3IGggMzA5IHEgMTQsMCAyMywtOSA5LC05IDksLTIzIHoiCiAgICAgICBpZD0icGF0aDM3NDUiCiAgICAgICBpbmtzY2FwZTpjb25uZWN0b3ItY3VydmF0dXJlPSIwIgogICAgICAgc3R5bGU9ImZpbGw6Y3VycmVudENvbG9yIiAvPgogIDwvZz4KPC9zdmc+Cg=="; diff --git a/design/templates/base.html b/design/templates/base.html index cdbed90..7049d5e 100644 --- a/design/templates/base.html +++ b/design/templates/base.html @@ -16,7 +16,7 @@ <!--<link rel="manifest" href="/webmanifest.json">--> <link rel="apple-touch-icon" sizes="256x256" href=""> {% block jsinclude %}{%endblock%} - <script async src="/media/js/main.min.js?{%now "u"%}"></script> + <script async src="/media/js/main.pack.js?{%now "u"%}"></script> </head> <body id="{% block bodyid %}{%endblock%}" class="{% block bodyclass %}{% endblock %}"> <div class="head-wrapper"> diff --git a/design/templates/notes/notes_list.html b/design/templates/notes/notes_list.html index 5b050b4..6cf4347 100644 --- a/design/templates/notes/notes_list.html +++ b/design/templates/notes/notes_list.html @@ -16,7 +16,7 @@ {% endfor %} </ul> {% endif %} - {% if tags|length >= 1%}<h2 class="note-subhed">Tagged with: {% for tag in tags%}<a href="{{tag.slug}}">{{tag.name}}</a>{%endfor%}</h2>{%endif%} + {% if tags|length >= 1%}<h2 class="note-subhed">Tagged with: {% for tag in tags%}<a href="{{tag.slug}}">{{tag.name}}</a> <a href="{% url 'outlines:detail' tag.slug tag.pk %}" class="btn btn-hollow">View Outline</a>{%endfor%}</h2> {%endif%} </div> {%comment%} <label for="choices-single-default">Default</label> <select class="form-control" data-trigger name="choices-single-default" id="choices-single-default" placeholder="This is a search placeholder"> diff --git a/scripts/package.json b/scripts/package.json index 6edaf7b..68fe4de 100644 --- a/scripts/package.json +++ b/scripts/package.json @@ -11,9 +11,11 @@ "include": "cp src/lib/*.js tmp/", "concat": "mkdir -p ../media/js && uglifyjs tmp/*.js -m -b -o tmp/main.js", "browserify": "cd tmp && browserify main.js -o main.pack.js", + "uglify:testing": "mv tmp/main.pack.js ../media/js/main.pack.js", "uglify:local": "uglifyjs tmp/main.pack.js -m -o ../media/js/main.min.js", "uglify:deploy": "mkdir -p ../media/js && uglifyjs tmp/*.js -m -c drop_console=true -o ../media/js/main.min.js", "cleanup": "rm -rf tmp", + "test": "pnpm run babel && pnpm run concat && pnpm run browserify && pnpm run uglify:testing && pnpm run cleanup", "build": "pnpm run babel && pnpm run concat && pnpm run browserify && pnpm run uglify:local && pnpm run cleanup", "deploy": "pnpm run babel && pnpm run include && pnpm run uglify && pnpm run cleanup", "watch": "watch 'pnpm run build' ." diff --git a/scripts/shrinkwrap.yaml b/scripts/shrinkwrap.yaml index 7cf56fd..e3ba602 100644 --- a/scripts/shrinkwrap.yaml +++ b/scripts/shrinkwrap.yaml @@ -4,7 +4,8 @@ dependencies: devDependencies: '@babel/cli': 7.1.5 '@babel/core': 7.1.6 - '@babel/preset-env': 7.1.6 + '@babel/preset-env': 7.2.3 + '@babel/preset-es2015': 7.0.0-beta.53 '@babel/standalone': 7.2.5 babel-plugin-transform-es2015-modules-commonjs: 6.26.2 babel-plugin-transform-runtime: 6.23.0 @@ -38,6 +39,12 @@ packages: dev: true resolution: integrity: sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA== + /@babel/code-frame/7.0.0-beta.53: + dependencies: + '@babel/highlight': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-mA0VYLhjV1v1o3eSUDfgEy71kh4= /@babel/core/7.1.6: dependencies: '@babel/code-frame': 7.0.0 @@ -59,6 +66,16 @@ packages: node: '>=6.9.0' resolution: integrity: sha512-Hz6PJT6e44iUNpAn8AoyAs6B3bl60g7MJQaI0rZEar6ECzh6+srYO1xlIdssio34mPaUtAb1y+XlkkSJzok3yw== + /@babel/generator/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + jsesc: 2.5.2 + lodash: 4.17.11 + source-map: 0.5.7 + trim-right: 1.0.1 + dev: true + resolution: + integrity: sha1-uMrXLFcr4yNK/94ivm2sxCUOA0s= /@babel/generator/7.1.6: dependencies: '@babel/types': 7.1.6 @@ -69,142 +86,257 @@ packages: dev: true resolution: integrity: sha512-brwPBtVvdYdGxtenbQgfCdDPmtkmUBZPjUoK5SXJEBuHaA5BCubh9ly65fzXz7R6o5rA76Rs22ES8Z+HCc0YIQ== + /@babel/generator/7.2.2: + dependencies: + '@babel/types': 7.2.2 + jsesc: 2.5.2 + lodash: 4.17.11 + source-map: 0.5.7 + trim-right: 1.0.1 + dev: true + resolution: + integrity: sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg== /@babel/helper-annotate-as-pure/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-3UYcJUj9kvSLbLbUIfQTqzcy5VX7GRZ/CCDrnOaZorFFM01aXp1+GJwuFGV4NDDoAS+mOUyHcO6UD/RfqOks3Q== + /@babel/helper-annotate-as-pure/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-WZYGKDdcvu+WoH7f4co4t1bwGqg= /@babel/helper-builder-binary-assignment-operator-visitor/7.1.0: dependencies: '@babel/helper-explode-assignable-expression': 7.1.0 - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-qNSR4jrmJ8M1VMM9tibvyRAHXQs2PmaksQF7c1CGJNipfe3D8p+wgNwgso/P2A2r2mdgBWAXljNWR0QRZAMW8w== + /@babel/helper-call-delegate/7.0.0-beta.53: + dependencies: + '@babel/helper-hoist-variables': 7.0.0-beta.53 + '@babel/traverse': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-ld6Lq9A/nmz08rVkoDhwjBOP/jE= /@babel/helper-call-delegate/7.1.0: dependencies: '@babel/helper-hoist-variables': 7.0.0 - '@babel/traverse': 7.1.6 - '@babel/types': 7.1.6 + '@babel/traverse': 7.2.3 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-YEtYZrw3GUK6emQHKthltKNZwszBcHK58Ygcis+gVUrF4/FmTVr5CCqQNSfmvg2y+YDEANyYoaLz/SHsnusCwQ== + /@babel/helper-define-map/7.0.0-beta.53: + dependencies: + '@babel/helper-function-name': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-SOniJlRTeHl1BD76qx7a0jnqlpU= /@babel/helper-define-map/7.1.0: dependencies: '@babel/helper-function-name': 7.1.0 - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 lodash: 4.17.11 dev: true resolution: integrity: sha512-yPPcW8dc3gZLN+U1mhYV91QU3n5uTbx7DUdf8NnPbjS0RMwBuHi9Xt2MUgppmNz7CJxTBWsGczTiEp1CSOTPRg== /@babel/helper-explode-assignable-expression/7.1.0: dependencies: - '@babel/traverse': 7.1.6 - '@babel/types': 7.1.6 + '@babel/traverse': 7.2.3 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-NRQpfHrJ1msCHtKjbzs9YcMmJZOg6mQMmGRB+hbamEdG5PNpaSm95275VD92DvJKuyl0s2sFiDmMZ+EnnvufqA== + /@babel/helper-function-name/7.0.0-beta.53: + dependencies: + '@babel/helper-get-function-arity': 7.0.0-beta.53 + '@babel/template': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-USgEro6cvOVDHr6hnkdijC7WU/I= /@babel/helper-function-name/7.1.0: dependencies: '@babel/helper-get-function-arity': 7.0.0 - '@babel/template': 7.1.2 - '@babel/types': 7.1.6 + '@babel/template': 7.2.2 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw== /@babel/helper-get-function-arity/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ== + /@babel/helper-get-function-arity/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-3tiKsp+bHbYch9G7jTijXdp3neY= /@babel/helper-hoist-variables/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-Ggv5sldXUeSKsuzLkddtyhyHe2YantsxWKNi7A+7LeD12ExRDWTRk29JCXpaHPAbMaIPZSil7n+lq78WY2VY7w== + /@babel/helper-hoist-variables/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-TCfjuHP6CcWtbpPrQHBMIA+EE3w= /@babel/helper-member-expression-to-functions/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-avo+lm/QmZlv27Zsi0xEor2fKcqWG56D5ae9dzklpIaY7cQMK5N8VSpaNVPPagiqmy7LrEjK1IWdGMOqPu5csg== + /@babel/helper-member-expression-to-functions/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-D7Dviy07kD0cO/Qm2kp0V14BnOQ= /@babel/helper-module-imports/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-aP/hlLq01DWNEiDg4Jn23i+CXxW/owM4WpDLFUbpjxe4NS3BhLVZQ5i7E0ZrxuQ/vwekIeciyamgB1UIYxxM6A== - /@babel/helper-module-transforms/7.1.0: + /@babel/helper-module-imports/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-5zXmqjClBLD52Fw4ptRwqfSqgdk= + /@babel/helper-module-transforms/7.0.0-beta.53: + dependencies: + '@babel/helper-module-imports': 7.0.0-beta.53 + '@babel/helper-simple-access': 7.0.0-beta.53 + '@babel/helper-split-export-declaration': 7.0.0-beta.53 + '@babel/template': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-e6IUzcyPhiPy0Xl96v8f80mqzhM= + /@babel/helper-module-transforms/7.2.2: dependencies: '@babel/helper-module-imports': 7.0.0 '@babel/helper-simple-access': 7.1.0 '@babel/helper-split-export-declaration': 7.0.0 - '@babel/template': 7.1.2 - '@babel/types': 7.1.6 + '@babel/template': 7.2.2 + '@babel/types': 7.2.2 lodash: 4.17.11 dev: true resolution: - integrity: sha512-0JZRd2yhawo79Rcm4w0LwSMILFmFXjugG3yqf+P/UsKsRS1mJCmMwwlHDlMg7Avr9LrvSpp4ZSULO9r8jpCzcw== + integrity: sha512-YRD7I6Wsv+IHuTPkAmAS4HhY0dkPobgLftHp0cRGZSdrRvmZY8rFvae/GVu3bD00qscuvK3WPHB3YdNpBXUqrA== /@babel/helper-optimise-call-expression/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-u8nd9NQePYNQV8iPWu/pLLYBqZBa4ZaY1YWRFMuxrid94wKI1QNt67NEZ7GAe5Kc/0LLScbim05xZFWkAdrj9g== + /@babel/helper-optimise-call-expression/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-j8eO9MD2n4uzu980zSMsIBIEFMg= /@babel/helper-plugin-utils/7.0.0: dev: true resolution: integrity: sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA== + /@babel/helper-plugin-utils/7.0.0-beta.53: + dev: true + resolution: + integrity: sha1-1kRYY2/8JYtCcUqd2Trrb4uM8+0= /@babel/helper-regex/7.0.0: dependencies: lodash: 4.17.11 dev: true resolution: integrity: sha512-TR0/N0NDCcUIUEbqV6dCO+LptmmSQFQ7q70lfcEB4URsjD0E1HzicrwUH+ap6BAQ2jhCX9Q4UqZy4wilujWlkg== + /@babel/helper-regex/7.0.0-beta.53: + dependencies: + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-bp0hl7Vid54iVWWUaumoXCFbIl4= /@babel/helper-remap-async-to-generator/7.1.0: dependencies: '@babel/helper-annotate-as-pure': 7.0.0 - '@babel/helper-wrap-function': 7.1.0 - '@babel/template': 7.1.2 - '@babel/traverse': 7.1.6 - '@babel/types': 7.1.6 + '@babel/helper-wrap-function': 7.2.0 + '@babel/template': 7.2.2 + '@babel/traverse': 7.2.3 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-3fOK0L+Fdlg8S5al8u/hWE6vhufGSn0bN09xm2LXMy//REAF8kDCrYoOBKYmA8m5Nom+sV9LyLCwrFynA8/slg== - /@babel/helper-replace-supers/7.1.0: + /@babel/helper-replace-supers/7.0.0-beta.53: + dependencies: + '@babel/helper-member-expression-to-functions': 7.0.0-beta.53 + '@babel/helper-optimise-call-expression': 7.0.0-beta.53 + '@babel/traverse': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-M5tb3BAilElbGifFWBMjBuG3vKc= + /@babel/helper-replace-supers/7.2.3: dependencies: '@babel/helper-member-expression-to-functions': 7.0.0 '@babel/helper-optimise-call-expression': 7.0.0 - '@babel/traverse': 7.1.6 - '@babel/types': 7.1.6 + '@babel/traverse': 7.2.3 + '@babel/types': 7.2.2 dev: true resolution: - integrity: sha512-BvcDWYZRWVuDeXTYZWxekQNO5D4kO55aArwZOTFXw6rlLQA8ZaDicJR1sO47h+HrnCiDFiww0fSPV0d713KBGQ== + integrity: sha512-GyieIznGUfPXPWu0yLS6U55Mz67AZD9cUk0BfirOWlPrXlBcan9Gz+vHGz+cPfuoweZSnPzPIm67VtQM0OWZbA== + /@babel/helper-simple-access/7.0.0-beta.53: + dependencies: + '@babel/template': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-cvbbmr5C+GgfpvAo79WdgVRHUrM= /@babel/helper-simple-access/7.1.0: dependencies: - '@babel/template': 7.1.2 - '@babel/types': 7.1.6 + '@babel/template': 7.2.2 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-Vk+78hNjRbsiu49zAPALxTb+JUQCz1aolpd8osOF16BGnLtseD21nbHgLPGUwrXEurZgiCOUmvs3ExTu4F5x6w== /@babel/helper-split-export-declaration/7.0.0: dependencies: - '@babel/types': 7.1.6 + '@babel/types': 7.2.2 dev: true resolution: integrity: sha512-MXkOJqva62dfC0w85mEf/LucPPS/1+04nmmRMPEBUB++hiiThQ2zPtX/mEWQ3mtzCEjIJvPY8nuwxXtQeQwUag== - /@babel/helper-wrap-function/7.1.0: + /@babel/helper-split-export-declaration/7.0.0-beta.53: + dependencies: + '@babel/types': 7.0.0-beta.53 + dev: true + resolution: + integrity: sha1-rvVLix+ZYW6jfJhHhxajeAJjMls= + /@babel/helper-wrap-function/7.2.0: dependencies: '@babel/helper-function-name': 7.1.0 - '@babel/template': 7.1.2 - '@babel/traverse': 7.1.6 - '@babel/types': 7.1.6 + '@babel/template': 7.2.2 + '@babel/traverse': 7.2.3 + '@babel/types': 7.2.2 dev: true resolution: - integrity: sha512-R6HU3dete+rwsdAfrOzTlE9Mcpk4RjU3aX3gi9grtmugQY0u79X7eogUvfXA5sI81Mfq1cn6AgxihfN33STjJA== + integrity: sha512-o9fP1BZLLSrYlxYEYyl2aS+Flun5gtjTIG8iln+XuEzQTs0PLagAGSXUcqruJwD5fM48jzIEggCKpIfWTcR7pQ== /@babel/helpers/7.1.5: dependencies: '@babel/template': 7.1.2 @@ -215,12 +347,27 @@ packages: integrity: sha512-2jkcdL02ywNBry1YNFAH/fViq4fXG0vdckHqeJk+75fpQ2OH+Az6076tX/M0835zA45E0Cqa6pV5Kiv9YOqjEg== /@babel/highlight/7.0.0: dependencies: - chalk: 2.4.1 + chalk: 2.4.2 esutils: 2.0.2 js-tokens: 4.0.0 dev: true resolution: integrity: sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw== + /@babel/highlight/7.0.0-beta.53: + dependencies: + chalk: 2.4.2 + esutils: 2.0.2 + js-tokens: 3.0.2 + dev: true + resolution: + integrity: sha1-9OlS2tF4fSBeGI0+OEzc5JyjaPs= + /@babel/parser/7.0.0-beta.53: + dev: true + engines: + node: '>=6.0.0' + hasBin: true + resolution: + integrity: sha1-H0XrYXv5Rj1IKywE00nZ5O2/SJI= /@babel/parser/7.1.6: dev: true engines: @@ -228,96 +375,111 @@ packages: hasBin: true resolution: integrity: sha512-dWP6LJm9nKT6ALaa+bnL247GHHMWir3vSlZ2+IHgHgktZQx0L3Uvq2uAWcuzIe+fujRsYWBW2q622C5UvGK9iQ== - /@babel/plugin-proposal-async-generator-functions/7.1.0: + /@babel/parser/7.2.3: + dev: true + engines: + node: '>=6.0.0' + hasBin: true + resolution: + integrity: sha512-0LyEcVlfCoFmci8mXx8A5oIkpkOgyo8dRHtxBnK9RRBwxO2+JZPNsqtVEZQ7mJFPxnXF9lfmU24mHOPI0qnlkA== + /@babel/plugin-proposal-async-generator-functions/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-remap-async-to-generator': 7.1.0 - '@babel/plugin-syntax-async-generators': 7.0.0 + '@babel/plugin-syntax-async-generators': 7.2.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-Fq803F3Jcxo20MXUSDdmZZXrPe6BWyGcWBPPNB/M7WaUYESKDeKMOGIxEzQOjGSmW/NWb6UaPZrtTB2ekhB/ew== - /@babel/plugin-proposal-json-strings/7.0.0: + integrity: sha512-+Dfo/SCQqrwx48ptLVGLdE39YtWRuKc/Y9I5Fy0P1DDBB9lsAHpjcEJQt+4IifuSOSTLBKJObJqMvaO1pIE8LQ== + /@babel/plugin-proposal-json-strings/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 - '@babel/plugin-syntax-json-strings': 7.0.0 + '@babel/plugin-syntax-json-strings': 7.2.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-kfVdUkIAGJIVmHmtS/40i/fg/AGnw/rsZBCaapY5yjeO5RA9m165Xbw9KMOu2nqXP5dTFjEjHdfNdoVcHv133Q== - /@babel/plugin-proposal-object-rest-spread/7.0.0: + integrity: sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg== + /@babel/plugin-proposal-object-rest-spread/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 - '@babel/plugin-syntax-object-rest-spread': 7.0.0 + '@babel/plugin-syntax-object-rest-spread': 7.2.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-14fhfoPcNu7itSen7Py1iGN0gEm87hX/B+8nZPqkdmANyyYWYMY2pjA3r8WXbWVKMzfnSNS0xY8GVS0IjXi/iw== - /@babel/plugin-proposal-optional-catch-binding/7.0.0: + integrity: sha512-1L5mWLSvR76XYUQJXkd/EEQgjq8HHRP6lQuZTTg0VA4tTGPpGemmCdAfQIz1rzEuWAm+ecP8PyyEm30jC1eQCg== + /@babel/plugin-proposal-optional-catch-binding/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 - '@babel/plugin-syntax-optional-catch-binding': 7.0.0 + '@babel/plugin-syntax-optional-catch-binding': 7.2.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-JPqAvLG1s13B/AuoBjdBYvn38RqW6n1TzrQO839/sIpqLpbnXKacsAgpZHzLD83Sm8SDXMkkrAvEnJ25+0yIpw== - /@babel/plugin-proposal-unicode-property-regex/7.0.0: + integrity: sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g== + /@babel/plugin-proposal-unicode-property-regex/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-regex': 7.0.0 - regexpu-core: 4.2.0 + regexpu-core: 4.4.0 dev: true engines: node: '>=4' peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-tM3icA6GhC3ch2SkmSxv7J/hCWKISzwycub6eGsDrFDgukD4dZ/I+x81XgW0YslS6mzNuQ1Cbzh5osjIMgepPQ== - /@babel/plugin-syntax-async-generators/7.0.0: + integrity: sha512-LvRVYb7kikuOtIoUeWTkOxQEV1kYvL5B6U3iWEGCzPNRus1MzJweFqORTj+0jkxozkTSYNJozPOddxmqdqsRpw== + /@babel/plugin-syntax-async-generators/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-im7ged00ddGKAjcZgewXmp1vxSZQQywuQXe2B1A7kajjZmDeY/ekMPmWr9zJgveSaQH0k7BcGrojQhcK06l0zA== - /@babel/plugin-syntax-json-strings/7.0.0: + integrity: sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg== + /@babel/plugin-syntax-json-strings/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-UlSfNydC+XLj4bw7ijpldc1uZ/HB84vw+U6BTuqMdIEmz/LDe63w/GHtpQMdXWdqQZFeAI9PjnHe/vDhwirhKA== - /@babel/plugin-syntax-object-rest-spread/7.0.0: + integrity: sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg== + /@babel/plugin-syntax-object-rest-spread/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-5A0n4p6bIiVe5OvQPxBnesezsgFJdHhSs3uFSvaPdMqtsovajLZ+G2vZyvNe10EzJBWWo3AcHGKhAFUxqwp2dw== - /@babel/plugin-syntax-optional-catch-binding/7.0.0: + integrity: sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA== + /@babel/plugin-syntax-optional-catch-binding/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-Wc+HVvwjcq5qBg1w5RG9o9RVzmCaAg/Vp0erHCKpAYV8La6I94o4GQAmFYNmkzoMO6gzoOSulpKeSSz6mPEoZw== - /@babel/plugin-transform-arrow-functions/7.0.0: + integrity: sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w== + /@babel/plugin-transform-arrow-functions/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-p19fqEl6rBcp0DO/QcJQQWudHgQ= + /@babel/plugin-transform-arrow-functions/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-2EZDBl1WIO/q4DIkIp4s86sdp4ZifL51MoIviLY/gG/mLSuOIEg7J8o6mhbxOTvUJkaN50n+8u41FVsr5KLy/w== - /@babel/plugin-transform-async-to-generator/7.1.0: + integrity: sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg== + /@babel/plugin-transform-async-to-generator/7.2.0: dependencies: '@babel/helper-module-imports': 7.0.0 '@babel/helper-plugin-utils': 7.0.0 @@ -326,16 +488,33 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-rNmcmoQ78IrvNCIt/R9U+cixUHeYAzgusTFgIAv+wQb9HJU4szhpDD6e5GCACmj/JP5KxuCwM96bX3L9v4ZN/g== - /@babel/plugin-transform-block-scoped-functions/7.0.0: + integrity: sha512-CEHzg4g5UraReozI9D4fblBYABs7IM6UerAVG7EJVrTLC5keh00aEuLUT+O40+mJCEzaXkYfTCUKIyeDfMOFFQ== + /@babel/plugin-transform-block-scoped-functions/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-CkMiGhsMkM1NCfG0a5Wd0khlf3M= + /@babel/plugin-transform-block-scoped-functions/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-AOBiyUp7vYTqz2Jibe1UaAWL0Hl9JUXEgjFvvvcSc9MVDItv46ViXFw2F7SVt1B5k+KWjl44eeXOAk3UDEaJjQ== - /@babel/plugin-transform-block-scoping/7.1.5: + integrity: sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w== + /@babel/plugin-transform-block-scoping/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-nv1uUMofo5jcqnEZYh2j8fu4IbY= + /@babel/plugin-transform-block-scoping/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 lodash: 4.17.11 @@ -343,59 +522,98 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-jlYcDrz+5ayWC7mxgpn1Wj8zj0mmjCT2w0mPIMSwO926eXBRxpEgoN/uQVRBfjtr8ayjcmS+xk2G1jaP8JjMJQ== - /@babel/plugin-transform-classes/7.1.0: + integrity: sha512-vDTgf19ZEV6mx35yiPJe4fS02mPQUUcBNwWQSZFXSzTSbsJFQvHt7DqyS3LK8oOWALFOsJ+8bbqBgkirZteD5Q== + /@babel/plugin-transform-classes/7.0.0-beta.53: + dependencies: + '@babel/helper-annotate-as-pure': 7.0.0-beta.53 + '@babel/helper-define-map': 7.0.0-beta.53 + '@babel/helper-function-name': 7.0.0-beta.53 + '@babel/helper-optimise-call-expression': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/helper-replace-supers': 7.0.0-beta.53 + '@babel/helper-split-export-declaration': 7.0.0-beta.53 + globals: 11.9.0 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-XcLsMb8emAZqzfDEiHt3RMFL7G4= + /@babel/plugin-transform-classes/7.2.2: dependencies: '@babel/helper-annotate-as-pure': 7.0.0 '@babel/helper-define-map': 7.1.0 '@babel/helper-function-name': 7.1.0 '@babel/helper-optimise-call-expression': 7.0.0 '@babel/helper-plugin-utils': 7.0.0 - '@babel/helper-replace-supers': 7.1.0 + '@babel/helper-replace-supers': 7.2.3 '@babel/helper-split-export-declaration': 7.0.0 globals: 11.9.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-rNaqoD+4OCBZjM7VaskladgqnZ1LO6o2UxuWSDzljzW21pN1KXkB7BstAVweZdxQkHAujps5QMNOTWesBciKFg== - /@babel/plugin-transform-computed-properties/7.0.0: + integrity: sha512-gEZvgTy1VtcDOaQty1l10T3jQmJKlNVxLDCs+3rCVPr6nMkODLELxViq5X9l+rfxbie3XrfrMCYYY6eX3aOcOQ== + /@babel/plugin-transform-computed-properties/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-l0fiYIKulO2lMPmNLCBZ6NLbwAU= + /@babel/plugin-transform-computed-properties/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-ubouZdChNAv4AAWAgU7QKbB93NU5sHwInEWfp+/OzJKA02E6Woh9RVoX4sZrbRwtybky/d7baTUqwFx+HgbvMA== - /@babel/plugin-transform-destructuring/7.1.3: + integrity: sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA== + /@babel/plugin-transform-destructuring/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-DwrbDhptzTWjZkEBYJ7AYv8SenY= + /@babel/plugin-transform-destructuring/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-Mb9M4DGIOspH1ExHOUnn2UUXFOyVTiX84fXCd+6B5iWrQg/QMeeRmSwpZ9lnjYLSXtZwiw80ytVMr3zue0ucYw== - /@babel/plugin-transform-dotall-regex/7.0.0: + integrity: sha512-coVO2Ayv7g0qdDbrNiadE4bU7lvCd9H539m2gMknyVjjMdwF/iCOM7R+E8PkntoqLkltO0rk+3axhpp/0v68VQ== + /@babel/plugin-transform-dotall-regex/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-regex': 7.0.0 - regexpu-core: 4.2.0 + regexpu-core: 4.4.0 dev: true engines: node: '>=4' peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-00THs8eJxOJUFVx1w8i1MBF4XH4PsAjKjQ1eqN/uCH3YKwP21GCKfrn6YZFZswbOk9+0cw1zGQPHVc1KBlSxig== - /@babel/plugin-transform-duplicate-keys/7.0.0: + integrity: sha512-sKxnyHfizweTgKZf7XsXu/CNupKhzijptfTM+bozonIuyVrLWVUvYjE2bhuSBML8VQeMxq4Mm63Q9qvcvUcciQ== + /@babel/plugin-transform-duplicate-keys/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-D1WZE6v6GCOcpOCPc+7DbF5XuB8= + /@babel/plugin-transform-duplicate-keys/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-w2vfPkMqRkdxx+C71ATLJG30PpwtTpW7DDdLqYt2acXU7YjztzeWW2Jk1T6hKqCLYCcEA5UQM/+xTAm+QCSnuQ== - /@babel/plugin-transform-exponentiation-operator/7.1.0: + integrity: sha512-q+yuxW4DsTjNceUiTzK0L+AfQ0zD9rWaTLiUqHA8p0gxx7lu1EylenfzjeIWNkPy6e/0VG/Wjw9uf9LueQwLOw== + /@babel/plugin-transform-exponentiation-operator/7.2.0: dependencies: '@babel/helper-builder-binary-assignment-operator-visitor': 7.1.0 '@babel/helper-plugin-utils': 7.0.0 @@ -403,16 +621,33 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-uZt9kD1Pp/JubkukOGQml9tqAeI8NkE98oZnHZ2qHRElmeKCodbTZgOEUtujSCSLhHSBWbzNiFSDIMC4/RBTLQ== - /@babel/plugin-transform-for-of/7.0.0: + integrity: sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A== + /@babel/plugin-transform-for-of/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-+gZSFeGFacj3TdUktXIeEdzKlzs= + /@babel/plugin-transform-for-of/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-TlxKecN20X2tt2UEr2LNE6aqA0oPeMT1Y3cgz8k4Dn1j5ObT8M3nl9aA37LLklx0PBZKETC9ZAf9n/6SujTuXA== - /@babel/plugin-transform-function-name/7.1.0: + integrity: sha512-Kz7Mt0SsV2tQk6jG5bBv5phVbkd0gd27SgYD4hH1aLMJRchM0dzHaXvrWhVZ+WxAlDoAKZ7Uy3jVTW2mKXQ1WQ== + /@babel/plugin-transform-function-name/7.0.0-beta.53: + dependencies: + '@babel/helper-function-name': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-Kzpbs2TB4cV+zL/iXGv1XygEET4= + /@babel/plugin-transform-function-name/7.2.0: dependencies: '@babel/helper-function-name': 7.1.0 '@babel/helper-plugin-utils': 7.0.0 @@ -420,35 +655,79 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-VxOa1TMlFMtqPW2IDYZQaHsFrq/dDoIjgN098NowhexhZcz3UGlvPgZXuE1jEvNygyWyxRacqDpCZt+par1FNg== - /@babel/plugin-transform-literals/7.0.0: + integrity: sha512-kWgksow9lHdvBC2Z4mxTsvc7YdY7w/V6B2vy9cTIPtLEE9NhwoWivaxdNM/S37elu5bqlLP/qOY906LukO9lkQ== + /@babel/plugin-transform-instanceof/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-WC2CtyUYggGtDiIx8fzpTHRaLAY= + /@babel/plugin-transform-literals/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-vsTxROmpbvUSHRQwx+vl/QiGV8k= + /@babel/plugin-transform-literals/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-1NTDBWkeNXgpUcyoVFxbr9hS57EpZYXpje92zv0SUzjdu3enaRwF/l3cmyRnXLtIdyJASyiS6PtybK+CgKf7jA== - /@babel/plugin-transform-modules-amd/7.1.0: + integrity: sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg== + /@babel/plugin-transform-modules-amd/7.0.0-beta.53: + dependencies: + '@babel/helper-module-transforms': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-WFTXOeZ5IzqId8C0GCaca+t6Miw= + /@babel/plugin-transform-modules-amd/7.2.0: dependencies: - '@babel/helper-module-transforms': 7.1.0 + '@babel/helper-module-transforms': 7.2.2 '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-wt8P+xQ85rrnGNr2x1iV3DW32W8zrB6ctuBkYBbf5/ZzJY99Ob4MFgsZDFgczNU76iy9PWsy4EuxOliDjdKw6A== - /@babel/plugin-transform-modules-commonjs/7.1.0: + integrity: sha512-mK2A8ucqz1qhrdqjS9VMIDfIvvT2thrEsIQzbaTdc5QFzhDjQv2CkJJ5f6BXIkgbmaoax3zBr2RyvV/8zeoUZw== + /@babel/plugin-transform-modules-commonjs/7.0.0-beta.53: + dependencies: + '@babel/helper-module-transforms': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/helper-simple-access': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-68P7ocWmyHQ7kJQD7NPn42gcr6U= + /@babel/plugin-transform-modules-commonjs/7.2.0: dependencies: - '@babel/helper-module-transforms': 7.1.0 + '@babel/helper-module-transforms': 7.2.2 '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-simple-access': 7.1.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-wtNwtMjn1XGwM0AXPspQgvmE6msSJP15CX2RVfpTSTNPLhKhaOjaIfBaVfj4iUZ/VrFSodcFedwtPg/NxwQlPA== - /@babel/plugin-transform-modules-systemjs/7.1.3: + integrity: sha512-V6y0uaUQrQPXUrmj+hgnks8va2L0zcZymeU7TtWEgdRLNkceafKXEduv7QzgQAE4lT+suwooG9dC7LFhdRAbVQ== + /@babel/plugin-transform-modules-systemjs/7.0.0-beta.53: + dependencies: + '@babel/helper-hoist-variables': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-uA/NnBWXLcaCMhT1JIUnhgu/BY4= + /@babel/plugin-transform-modules-systemjs/7.2.0: dependencies: '@babel/helper-hoist-variables': 7.0.0 '@babel/helper-plugin-utils': 7.0.0 @@ -456,16 +735,25 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-PvTxgjxQAq4pvVUZF3mD5gEtVDuId8NtWkJsZLEJZMZAW3TvgQl1pmydLLN1bM8huHFVVU43lf0uvjQj9FRkKw== - /@babel/plugin-transform-modules-umd/7.1.0: + integrity: sha512-aYJwpAhoK9a+1+O625WIjvMY11wkB/ok0WClVwmeo3mCjcNRjt+/8gHWrB5i+00mUju0gWsBkQnPpdvQ7PImmQ== + /@babel/plugin-transform-modules-umd/7.0.0-beta.53: + dependencies: + '@babel/helper-module-transforms': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-Kjar5AodpnbkOhwwcVeOJ70tZ50= + /@babel/plugin-transform-modules-umd/7.2.0: dependencies: - '@babel/helper-module-transforms': 7.1.0 + '@babel/helper-module-transforms': 7.2.2 '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-enrRtn5TfRhMmbRwm7F8qOj0qEYByqUvTttPEGimcBH4CJHphjyK1Vg7sdU7JjeEmgSpM890IT/efS2nMHwYig== + integrity: sha512-BV3bw6MyUH1iIsGhXlOK6sXhmSarZjtJ/vMiD9dNmpY8QXFFQTj+6v92pcfy1iqa8DeAfJFwoxcrS/TUZda6sw== /@babel/plugin-transform-new-target/7.0.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 @@ -474,16 +762,35 @@ packages: '@babel/core': ^7.0.0-0 resolution: integrity: sha512-yin069FYjah+LbqfGeTfzIBODex/e++Yfa0rH0fpfam9uTbuEeEOx5GLGr210ggOV77mVRNoeqSYqeuaqSzVSw== - /@babel/plugin-transform-object-super/7.1.0: + /@babel/plugin-transform-object-super/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/helper-replace-supers': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-4sTwbts0s9eksnV7oYgp0N8gKcs= + /@babel/plugin-transform-object-super/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 - '@babel/helper-replace-supers': 7.1.0 + '@babel/helper-replace-supers': 7.2.3 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-/O02Je1CRTSk2SSJaq0xjwQ8hG4zhZGNjE8psTsSNPXyLRCODv7/PBozqT5AmQMzp7MI3ndvMhGdqp9c96tTEw== - /@babel/plugin-transform-parameters/7.1.0: + integrity: sha512-VMyhPYZISFZAqAPVkiYb7dUe2AsVi2/wCT5+wZdsNO31FojQJa9ns40hzZ6U9f50Jlq4w6qwzdBB2uwqZ00ebg== + /@babel/plugin-transform-parameters/7.0.0-beta.53: + dependencies: + '@babel/helper-call-delegate': 7.0.0-beta.53 + '@babel/helper-get-function-arity': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-7+YM7IzsoNGdXG+hrnm8TjMnnVY= + /@babel/plugin-transform-parameters/7.2.0: dependencies: '@babel/helper-call-delegate': 7.1.0 '@babel/helper-get-function-arity': 7.0.0 @@ -492,7 +799,7 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-vHV7oxkEJ8IHxTfRr3hNGzV446GAb+0hgbA7o/0Jd76s+YzccdWuTU296FOCOl/xweU4t/Ya4g41yWz80RFCRw== + integrity: sha512-kB9+hhUidIgUoBQ0MsxMewhzr8i60nMa2KgeJKQWYrqQpqcBYtnpR+JgkadZVZoaEZ/eKu9mclFaVwhRpLNSzA== /@babel/plugin-transform-regenerator/7.0.0: dependencies: regenerator-transform: 0.13.3 @@ -501,23 +808,56 @@ packages: '@babel/core': ^7.0.0-0 resolution: integrity: sha512-sj2qzsEx8KDVv1QuJc/dEfilkg3RRPvPYx/VnKLtItVQRWt1Wqf5eVCOLZm29CiGFfYYsA3VPjfizTCV0S0Dlw== - /@babel/plugin-transform-shorthand-properties/7.0.0: + /@babel/plugin-transform-regenerator/7.0.0-beta.53: + dependencies: + regenerator-transform: 0.13.3 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-T+u/YISvoMHJ7ISX3mjAaV/p2gs= + /@babel/plugin-transform-shorthand-properties/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-38SIG2vXZYoAMew7gWPliPCJjUs= + /@babel/plugin-transform-shorthand-properties/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-g/99LI4vm5iOf5r1Gdxq5Xmu91zvjhEG5+yZDJW268AZELAu4J1EiFLnkSG3yuUsZyOipVOVUKoGPYwfsTymhw== - /@babel/plugin-transform-spread/7.0.0: + integrity: sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg== + /@babel/plugin-transform-spread/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-g+j2Rsok8cmCKPnxREz2DL1JOLw= + /@babel/plugin-transform-spread/7.2.2: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-L702YFy2EvirrR4shTj0g2xQp7aNwZoWNCkNu2mcoU0uyzMl0XRwDSwzB/xp6DSUFiBmEXuyAyEN16LsgVqGGQ== - /@babel/plugin-transform-sticky-regex/7.0.0: + integrity: sha512-KWfky/58vubwtS0hLqEnrWJjsMGaOeSBn90Ezn5Jeg9Z8KKHmELbP1yGylMlm5N6TPKeY9A2+UaSYLdxahg01w== + /@babel/plugin-transform-sticky-regex/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/helper-regex': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-D888mUq92Lq1m6l4L+TZ+KVF1uc= + /@babel/plugin-transform-sticky-regex/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-regex': 7.0.0 @@ -525,8 +865,17 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-LFUToxiyS/WD+XEWpkx/XJBrUXKewSZpzX68s+yEOtIbdnsRjpryDw9U06gYc6klYEij/+KQVRnD3nz3AoKmjw== - /@babel/plugin-transform-template-literals/7.0.0: + integrity: sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw== + /@babel/plugin-transform-template-literals/7.0.0-beta.53: + dependencies: + '@babel/helper-annotate-as-pure': 7.0.0-beta.53 + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-+msLQXEA0j4tsUwd9HorGzl48dk= + /@babel/plugin-transform-template-literals/7.2.0: dependencies: '@babel/helper-annotate-as-pure': 7.0.0 '@babel/helper-plugin-utils': 7.0.0 @@ -534,65 +883,83 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-vA6rkTCabRZu7Nbl9DfLZE1imj4tzdWcg5vtdQGvj+OH9itNNB6hxuRMHuIY8SGnEt1T9g5foqs9LnrHzsqEFg== - /@babel/plugin-transform-typeof-symbol/7.0.0: + integrity: sha512-FkPix00J9A/XWXv4VoKJBMeSkyY9x/TqIh76wzcdfl57RJJcf8CehQ08uwfhCDNtRQYtHQKBTwKZDEyjE13Lwg== + /@babel/plugin-transform-typeof-symbol/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-ZarocamqQPYRSDZlcxIJrr1cKis= + /@babel/plugin-transform-typeof-symbol/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-1r1X5DO78WnaAIvs5uC48t41LLckxsYklJrZjNKcevyz83sF2l4RHbw29qrCPr/6ksFsdfRpT/ZgxNWHXRnffg== - /@babel/plugin-transform-unicode-regex/7.0.0: + integrity: sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw== + /@babel/plugin-transform-unicode-regex/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/helper-regex': 7.0.0-beta.53 + regexpu-core: 4.4.0 + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-CvdOyAGefVnji+ZNt/YikZQv7SU= + /@babel/plugin-transform-unicode-regex/7.2.0: dependencies: '@babel/helper-plugin-utils': 7.0.0 '@babel/helper-regex': 7.0.0 - regexpu-core: 4.2.0 + regexpu-core: 4.4.0 dev: true peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-uJBrJhBOEa3D033P95nPHu3nbFwFE9ZgXsfEitzoIXIwqAZWk7uXcg06yFKXz9FSxBH5ucgU/cYdX0IV8ldHKw== - /@babel/preset-env/7.1.6: + integrity: sha512-m48Y0lMhrbXEJnVUaYly29jRXbQ3ksxPrS1Tg8t+MHqzXhtBYAvI51euOBaoAlZLPHsieY9XPVMf80a5x0cPcA== + /@babel/preset-env/7.2.3: dependencies: '@babel/helper-module-imports': 7.0.0 '@babel/helper-plugin-utils': 7.0.0 - '@babel/plugin-proposal-async-generator-functions': 7.1.0 - '@babel/plugin-proposal-json-strings': 7.0.0 - '@babel/plugin-proposal-object-rest-spread': 7.0.0 - '@babel/plugin-proposal-optional-catch-binding': 7.0.0 - '@babel/plugin-proposal-unicode-property-regex': 7.0.0 - '@babel/plugin-syntax-async-generators': 7.0.0 - '@babel/plugin-syntax-object-rest-spread': 7.0.0 - '@babel/plugin-syntax-optional-catch-binding': 7.0.0 - '@babel/plugin-transform-arrow-functions': 7.0.0 - '@babel/plugin-transform-async-to-generator': 7.1.0 - '@babel/plugin-transform-block-scoped-functions': 7.0.0 - '@babel/plugin-transform-block-scoping': 7.1.5 - '@babel/plugin-transform-classes': 7.1.0 - '@babel/plugin-transform-computed-properties': 7.0.0 - '@babel/plugin-transform-destructuring': 7.1.3 - '@babel/plugin-transform-dotall-regex': 7.0.0 - '@babel/plugin-transform-duplicate-keys': 7.0.0 - '@babel/plugin-transform-exponentiation-operator': 7.1.0 - '@babel/plugin-transform-for-of': 7.0.0 - '@babel/plugin-transform-function-name': 7.1.0 - '@babel/plugin-transform-literals': 7.0.0 - '@babel/plugin-transform-modules-amd': 7.1.0 - '@babel/plugin-transform-modules-commonjs': 7.1.0 - '@babel/plugin-transform-modules-systemjs': 7.1.3 - '@babel/plugin-transform-modules-umd': 7.1.0 + '@babel/plugin-proposal-async-generator-functions': 7.2.0 + '@babel/plugin-proposal-json-strings': 7.2.0 + '@babel/plugin-proposal-object-rest-spread': 7.2.0 + '@babel/plugin-proposal-optional-catch-binding': 7.2.0 + '@babel/plugin-proposal-unicode-property-regex': 7.2.0 + '@babel/plugin-syntax-async-generators': 7.2.0 + '@babel/plugin-syntax-object-rest-spread': 7.2.0 + '@babel/plugin-syntax-optional-catch-binding': 7.2.0 + '@babel/plugin-transform-arrow-functions': 7.2.0 + '@babel/plugin-transform-async-to-generator': 7.2.0 + '@babel/plugin-transform-block-scoped-functions': 7.2.0 + '@babel/plugin-transform-block-scoping': 7.2.0 + '@babel/plugin-transform-classes': 7.2.2 + '@babel/plugin-transform-computed-properties': 7.2.0 + '@babel/plugin-transform-destructuring': 7.2.0 + '@babel/plugin-transform-dotall-regex': 7.2.0 + '@babel/plugin-transform-duplicate-keys': 7.2.0 + '@babel/plugin-transform-exponentiation-operator': 7.2.0 + '@babel/plugin-transform-for-of': 7.2.0 + '@babel/plugin-transform-function-name': 7.2.0 + '@babel/plugin-transform-literals': 7.2.0 + '@babel/plugin-transform-modules-amd': 7.2.0 + '@babel/plugin-transform-modules-commonjs': 7.2.0 + '@babel/plugin-transform-modules-systemjs': 7.2.0 + '@babel/plugin-transform-modules-umd': 7.2.0 '@babel/plugin-transform-new-target': 7.0.0 - '@babel/plugin-transform-object-super': 7.1.0 - '@babel/plugin-transform-parameters': 7.1.0 + '@babel/plugin-transform-object-super': 7.2.0 + '@babel/plugin-transform-parameters': 7.2.0 '@babel/plugin-transform-regenerator': 7.0.0 - '@babel/plugin-transform-shorthand-properties': 7.0.0 - '@babel/plugin-transform-spread': 7.0.0 - '@babel/plugin-transform-sticky-regex': 7.0.0 - '@babel/plugin-transform-template-literals': 7.0.0 - '@babel/plugin-transform-typeof-symbol': 7.0.0 - '@babel/plugin-transform-unicode-regex': 7.0.0 - browserslist: 4.3.5 + '@babel/plugin-transform-shorthand-properties': 7.2.0 + '@babel/plugin-transform-spread': 7.2.2 + '@babel/plugin-transform-sticky-regex': 7.2.0 + '@babel/plugin-transform-template-literals': 7.2.0 + '@babel/plugin-transform-typeof-symbol': 7.2.0 + '@babel/plugin-transform-unicode-regex': 7.2.0 + browserslist: 4.3.7 invariant: 2.2.4 js-levenshtein: 1.1.4 semver: 5.6.0 @@ -600,11 +967,53 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 resolution: - integrity: sha512-YIBfpJNQMBkb6MCkjz/A9J76SNCSuGVamOVBgoUkLzpJD/z8ghHi9I42LQ4pulVX68N/MmImz6ZTixt7Azgexw== + integrity: sha512-AuHzW7a9rbv5WXmvGaPX7wADxFkZIqKlbBh1dmZUQp4iwiPpkE/Qnrji6SC4UQCQzvWY/cpHET29eUhXS9cLPw== + /@babel/preset-es2015/7.0.0-beta.53: + dependencies: + '@babel/helper-plugin-utils': 7.0.0-beta.53 + '@babel/plugin-transform-arrow-functions': 7.0.0-beta.53 + '@babel/plugin-transform-block-scoped-functions': 7.0.0-beta.53 + '@babel/plugin-transform-block-scoping': 7.0.0-beta.53 + '@babel/plugin-transform-classes': 7.0.0-beta.53 + '@babel/plugin-transform-computed-properties': 7.0.0-beta.53 + '@babel/plugin-transform-destructuring': 7.0.0-beta.53 + '@babel/plugin-transform-duplicate-keys': 7.0.0-beta.53 + '@babel/plugin-transform-for-of': 7.0.0-beta.53 + '@babel/plugin-transform-function-name': 7.0.0-beta.53 + '@babel/plugin-transform-instanceof': 7.0.0-beta.53 + '@babel/plugin-transform-literals': 7.0.0-beta.53 + '@babel/plugin-transform-modules-amd': 7.0.0-beta.53 + '@babel/plugin-transform-modules-commonjs': 7.0.0-beta.53 + '@babel/plugin-transform-modules-systemjs': 7.0.0-beta.53 + '@babel/plugin-transform-modules-umd': 7.0.0-beta.53 + '@babel/plugin-transform-object-super': 7.0.0-beta.53 + '@babel/plugin-transform-parameters': 7.0.0-beta.53 + '@babel/plugin-transform-regenerator': 7.0.0-beta.53 + '@babel/plugin-transform-shorthand-properties': 7.0.0-beta.53 + '@babel/plugin-transform-spread': 7.0.0-beta.53 + '@babel/plugin-transform-sticky-regex': 7.0.0-beta.53 + '@babel/plugin-transform-template-literals': 7.0.0-beta.53 + '@babel/plugin-transform-typeof-symbol': 7.0.0-beta.53 + '@babel/plugin-transform-unicode-regex': 7.0.0-beta.53 + deprecated: "\U0001F44B We've deprecated any official yearly presets in 6.x in favor or babel-preset-env. For 7.x it would be @babel/preset-env." + dev: true + peerDependencies: + '@babel/core': '>=7.0.0-beta.50 <7.0.0-rc.0' + resolution: + integrity: sha1-SYL6GUjbEJN2Yoj2mRPizjYDEeQ= /@babel/standalone/7.2.5: dev: true resolution: integrity: sha512-U00wHmbh0eCUCAsCN1cz/WS2aB/UXjQrALsUmVIcugiK3HiI4PEh93PeGsaJttBmj0+Zfp1SpUNxPl6s8KPHUQ== + /@babel/template/7.0.0-beta.53: + dependencies: + '@babel/code-frame': 7.0.0-beta.53 + '@babel/parser': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-MyIpCQDQsYewpxdDgeHzu3EFDS4= /@babel/template/7.1.2: dependencies: '@babel/code-frame': 7.0.0 @@ -613,6 +1022,29 @@ packages: dev: true resolution: integrity: sha512-SY1MmplssORfFiLDcOETrW7fCLl+PavlwMh92rrGcikQaRq4iWPVH0MpwPpY3etVMx6RnDjXtr6VZYr/IbP/Ag== + /@babel/template/7.2.2: + dependencies: + '@babel/code-frame': 7.0.0 + '@babel/parser': 7.2.3 + '@babel/types': 7.2.2 + dev: true + resolution: + integrity: sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g== + /@babel/traverse/7.0.0-beta.53: + dependencies: + '@babel/code-frame': 7.0.0-beta.53 + '@babel/generator': 7.0.0-beta.53 + '@babel/helper-function-name': 7.0.0-beta.53 + '@babel/helper-split-export-declaration': 7.0.0-beta.53 + '@babel/parser': 7.0.0-beta.53 + '@babel/types': 7.0.0-beta.53 + debug: 3.2.6 + globals: 11.9.0 + invariant: 2.2.4 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha1-ANMs2NC1j0wB0xFXvmIsZigm00Q= /@babel/traverse/7.1.6: dependencies: '@babel/code-frame': 7.0.0 @@ -627,6 +1059,28 @@ packages: dev: true resolution: integrity: sha512-CXedit6GpISz3sC2k2FsGCUpOhUqKdyL0lqNrImQojagnUMXf8hex4AxYFRuMkNGcvJX5QAFGzB5WJQmSv8SiQ== + /@babel/traverse/7.2.3: + dependencies: + '@babel/code-frame': 7.0.0 + '@babel/generator': 7.2.2 + '@babel/helper-function-name': 7.1.0 + '@babel/helper-split-export-declaration': 7.0.0 + '@babel/parser': 7.2.3 + '@babel/types': 7.2.2 + debug: 4.1.1 + globals: 11.9.0 + lodash: 4.17.11 + dev: true + resolution: + integrity: sha512-Z31oUD/fJvEWVR0lNZtfgvVt512ForCTNKYcJBGbPb1QZfve4WGH8Wsy7+Mev33/45fhP/hwQtvgusNdcCMgSw== + /@babel/types/7.0.0-beta.53: + dependencies: + esutils: 2.0.2 + lodash: 4.17.11 + to-fast-properties: 2.0.0 + dev: true + resolution: + integrity: sha1-GaRhwNpRVZXftnQLS0Xce7Dms3U= /@babel/types/7.1.6: dependencies: esutils: 2.0.2 @@ -635,6 +1089,14 @@ packages: dev: true resolution: integrity: sha512-DMiUzlY9DSjVsOylJssxLHSgj6tWM9PRFJOGW/RaOglVOK9nzTxoOMfTfRQXGUCUQ/HmlG2efwC+XqUEJ5ay4w== + /@babel/types/7.2.2: + dependencies: + esutils: 2.0.2 + lodash: 4.17.11 + to-fast-properties: 2.0.0 + dev: true + resolution: + integrity: sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg== /JSONStream/1.3.5: dependencies: jsonparse: 1.3.1 @@ -1110,15 +1572,15 @@ packages: hasBin: true resolution: integrity: sha512-zQt/Gd1+W+IY+h/xX2NYMW4orQWhqSwyV+xsblycTtpOuB27h1fZhhNQuipJ4t79ohw4P4mMem0jp/ZkISQtjQ== - /browserslist/4.3.5: + /browserslist/4.3.7: dependencies: - caniuse-lite: 1.0.30000912 - electron-to-chromium: 1.3.86 - node-releases: 1.0.5 + caniuse-lite: 1.0.30000927 + electron-to-chromium: 1.3.98 + node-releases: 1.1.3 dev: true hasBin: true resolution: - integrity: sha512-z9ZhGc3d9e/sJ9dIx5NFXkKoaiQTnrvrMsN3R1fGb1tkWWNSz12UewJn9TNxGo1l7J23h0MRaPmk7jfeTZYs1w== + integrity: sha512-pWQv51Ynb0MNk9JGMCZ8VkM785/4MQNXiFYtPqI7EEP0TJO+/d/NqRVn1uiAN0DNbnlUSpL2sh16Kspasv3pUQ== /buffer-from/1.1.1: dev: true resolution: @@ -1173,10 +1635,10 @@ packages: node: '>=0.10.0' resolution: integrity: sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo= - /caniuse-lite/1.0.30000912: + /caniuse-lite/1.0.30000927: dev: true resolution: - integrity: sha512-M3zAtV36U+xw5mMROlTXpAHClmPAor6GPKAMD5Yi7glCB5sbMPFtnQ3rGpk4XqPdUrrTIaVYSJZxREZWNy8QJg== + integrity: sha512-ogq4NbUWf1uG/j66k0AmiO3GjqJAlQyF8n4w8a954cbCyFKmYGvRtgz6qkq2fWuduTXHibX7GyYL5Pg58Aks2g== /chalk/1.1.3: dependencies: ansi-styles: 2.2.1 @@ -1199,6 +1661,16 @@ packages: node: '>=4' resolution: integrity: sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ== + /chalk/2.4.2: + dependencies: + ansi-styles: 3.2.1 + escape-string-regexp: 1.0.5 + supports-color: 5.5.0 + dev: true + engines: + node: '>=4' + resolution: + integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== /chardet/0.7.0: dev: true resolution: @@ -1412,12 +1884,24 @@ packages: dev: true resolution: integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + /debug/3.2.6: + dependencies: + ms: 2.1.1 + dev: true + resolution: + integrity: sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== /debug/4.1.0: dependencies: ms: 2.1.1 dev: true resolution: integrity: sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg== + /debug/4.1.1: + dependencies: + ms: 2.1.1 + dev: true + resolution: + integrity: sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== /decode-uri-component/0.2.0: dev: true engines: @@ -1518,10 +2002,10 @@ packages: dev: true resolution: integrity: sha1-ixLauHjA1p4+eJEFFmKjL8a93ME= - /electron-to-chromium/1.3.86: + /electron-to-chromium/1.3.98: dev: true resolution: - integrity: sha512-BcmXOu37FCPxrrh0wyKgKi5dAjIu2ohxN5ptapkLPKRC3IBK2NeIwh9n1x/8HzSRQiEKamJkDce1ZgOGgEX9iw== + integrity: sha512-WIZdNuvE3dFr6kkPgv4d/cfswNZD6XbeLBM8baOIQTsnbf4xWrVEaLvp7oNnbnMWWXDqq7Tbv+H5JfciLTJm4Q== /elliptic/6.4.1: dependencies: bn.js: 4.11.8 @@ -2535,12 +3019,12 @@ packages: dev: true resolution: integrity: sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - /node-releases/1.0.5: + /node-releases/1.1.3: dependencies: semver: 5.6.0 dev: true resolution: - integrity: sha512-Ky7q0BO1BBkG/rQz6PkEZ59rwo+aSfhczHP1wwq8IowoVdN/FpiP7qp0XW0P2+BVCWe5fQUBozdbVd54q1RbCQ== + integrity: sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ== /normalize-path/2.1.1: dependencies: remove-trailing-separator: 1.1.0 @@ -2865,30 +3349,30 @@ packages: node: '>=6.5.0' resolution: integrity: sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== - /regexpu-core/4.2.0: + /regexpu-core/4.4.0: dependencies: regenerate: 1.4.0 regenerate-unicode-properties: 7.0.0 - regjsgen: 0.4.0 - regjsparser: 0.3.0 + regjsgen: 0.5.0 + regjsparser: 0.6.0 unicode-match-property-ecmascript: 1.0.4 unicode-match-property-value-ecmascript: 1.0.2 dev: true engines: node: '>=4' resolution: - integrity: sha512-Z835VSnJJ46CNBttalHD/dB+Sj2ezmY6Xp38npwU87peK6mqOzOpV8eYktdkLTEkzzD+JsTcxd84ozd8I14+rw== - /regjsgen/0.4.0: + integrity: sha512-eDDWElbwwI3K0Lo6CqbQbA6FwgtCz4kYTarrri1okfkRLZAqstU+B3voZBCjg8Fl6iq0gXrJG6MvRgLthfvgOA== + /regjsgen/0.5.0: dev: true resolution: - integrity: sha512-X51Lte1gCYUdlwhF28+2YMO0U6WeN0GLpgpA7LK7mbdDnkQYiwvEpmpe0F/cv5L14EbxgrdayAG3JETBv0dbXA== - /regjsparser/0.3.0: + integrity: sha512-RnIrLhrXCX5ow/E5/Mh2O4e/oa1/jW0eaBKTSy3LaCj+M3Bqvm97GWDp2yUtzIs4LEn65zR2yiYGFqb2ApnzDA== + /regjsparser/0.6.0: dependencies: jsesc: 0.5.0 dev: true hasBin: true resolution: - integrity: sha512-zza72oZBBHzt64G7DxdqrOo/30bhHkwMUoT0WqfGu98XLd7N+1tsy5MJ96Bk4MD0y74n629RhmrGW6XlnLLwCA== + integrity: sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ== /remove-trailing-separator/1.1.0: dev: true optional: true @@ -3551,7 +4035,8 @@ shrinkwrapVersion: 3 specifiers: '@babel/cli': ^7.1.5 '@babel/core': ^7.1.6 - '@babel/preset-env': ^7.1.6 + '@babel/preset-env': ^7.2.3 + '@babel/preset-es2015': ^7.0.0-beta.53 '@babel/standalone': ^7.2.5 babel-plugin-transform-es2015-modules-commonjs: ^6.26.2 babel-plugin-transform-runtime: ^6.23.0 diff --git a/scripts/src/note-edit.js b/scripts/src/note-edit.js index 390b93d..57ef6c0 100644 --- a/scripts/src/note-edit.js +++ b/scripts/src/note-edit.js @@ -132,51 +132,49 @@ function notebookCreate(form) { request.send(new FormData(form)); } if (typeof(document.getElementById('note-edit-form')) != 'undefined' && document.getElementById('note-edit-form') != null) { - document.addEventListener("DOMContentLoaded", function () { - var quill = initQuill("#note-body"); - quill.change = false; - var btn = document.getElementById('edit-toggle-btn'), - qcontainer = document.getElementById('q-container'), - title = document.getElementById('note-title'), - tag_wrapper = document.getElementById('tag-wrapper'), - form = document.getElementById('note-edit-form'), - note_html = document.createElement('textarea'), - note_qjson = document.createElement('textarea'); + var quill = initQuill("#note-body"); + quill.change = false; + var btn = document.getElementById('edit-toggle-btn'), + qcontainer = document.getElementById('q-container'), + title = document.getElementById('note-title'), + tag_wrapper = document.getElementById('tag-wrapper'), + form = document.getElementById('note-edit-form'), + note_html = document.createElement('textarea'), + note_qjson = document.createElement('textarea'); - note_html.setAttribute('name', 'body_html'); - note_html.setAttribute('class', 'hide'); - note_html.setAttribute('id', 'id_body_html'); - note_qjson.setAttribute('name', 'body_qjson'); - note_qjson.setAttribute('id', 'id_body_qjson'); - note_qjson.setAttribute('class', 'hide'); - form.appendChild(note_html); - form.appendChild(note_qjson); - form.formchange = false; - form.addEventListener('input', function (e) { - form.formchange = true; - }); - var formbtn = document.getElementById('btn-js-hide') - formbtn.classList.add('hide'); - console.log(formbtn); - btn.classList.remove('hide'); - btn.editing = false; - btn.addEventListener('click', function(e){ - e.preventDefault(); - edit_note(e.target, form, title, quill, qcontainer, window.location.href ); - }, false); - var notebookAddForm = document.getElementById('nb-create-form'); - initColorPicker(notebookAddForm); - ajaxHijack(notebookAddForm, notebookCreate) - var create_notebook_btn = document.getElementById('add_id_notebook'); - addHandler(create_notebook_btn); - function addHandler(el){ - el.addEventListener('click', function(e){ - e.preventDefault(); - var modalContent = document.getElementById('js-overlay-notebook'); - modalContent.wrapperClass = 'overlay'; //add a wrapper class to the modal for styling - var modal = modalBox(modalContent, el); - }); - } + note_html.setAttribute('name', 'body_html'); + note_html.setAttribute('class', 'hide'); + note_html.setAttribute('id', 'id_body_html'); + note_qjson.setAttribute('name', 'body_qjson'); + note_qjson.setAttribute('id', 'id_body_qjson'); + note_qjson.setAttribute('class', 'hide'); + form.appendChild(note_html); + form.appendChild(note_qjson); + form.formchange = false; + form.addEventListener('input', function (e) { + form.formchange = true; }); + var formbtn = document.getElementById('btn-js-hide') + formbtn.classList.add('hide'); + console.log(formbtn); + btn.classList.remove('hide'); + btn.editing = false; + btn.addEventListener('click', function(e){ + e.preventDefault(); + edit_note(e.target, form, title, quill, qcontainer, window.location.href ); + }, false); + var notebookAddForm = document.getElementById('nb-create-form'); + initColorPicker(notebookAddForm); + ajaxHijack(notebookAddForm, notebookCreate) + var create_notebook_btn = document.getElementById('add_id_notebook'); + addHandler(create_notebook_btn); + function addHandler(el){ + el.addEventListener('click', function(e){ + e.preventDefault(); + var modalContent = document.getElementById('js-overlay-notebook'); + modalContent.wrapperClass = 'overlay'; //add a wrapper class to the modal for styling + var modal = modalBox(modalContent, el); + }); + } } |
