diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig b/templates/Import/wallabagV1.html.twig
similarity index 93%
rename from src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
rename to templates/Import/wallabagV1.html.twig
index 6e0598afa..d9a87a73c 100644
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV1/index.html.twig
+++ b/templates/Import/wallabagV1.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'import.wallabag_v1.page_title'|trans }}{% endblock %}
@@ -6,7 +6,7 @@
- {% include '@WallabagImport/Import/_information.html.twig' %}
+ {% include 'Import/_information.html.twig' %}
{{ import.description|trans }}
diff --git a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig b/templates/Import/wallabagV2.html.twig
similarity index 56%
rename from src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
rename to templates/Import/wallabagV2.html.twig
index 2521578c8..3faa42eff 100644
--- a/src/Wallabag/ImportBundle/Resources/views/WallabagV2/index.html.twig
+++ b/templates/Import/wallabagV2.html.twig
@@ -1,3 +1,3 @@
-{% extends "@WallabagImport/WallabagV1/index.html.twig" %}
+{% extends "Import/wallabagV1.html.twig" %}
{% block title %}{{ 'import.wallabag_v2.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Mail/forgotPassword.txt.twig b/templates/Mail/forgotPassword.txt.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Mail/forgotPassword.txt.twig
rename to templates/Mail/forgotPassword.txt.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/README.md b/templates/README.md
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/README.md
rename to templates/README.md
diff --git a/src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig b/templates/Resetting/passwordAlreadyRequested.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/Resetting/passwordAlreadyRequested.html.twig
rename to templates/Resetting/passwordAlreadyRequested.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/edit.html.twig b/templates/SiteCredential/edit.html.twig
similarity index 98%
rename from src/Wallabag/CoreBundle/Resources/views/SiteCredential/edit.html.twig
rename to templates/SiteCredential/edit.html.twig
index cd9352c07..aec6f9480 100644
--- a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/edit.html.twig
+++ b/templates/SiteCredential/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/index.html.twig b/templates/SiteCredential/index.html.twig
similarity index 97%
rename from src/Wallabag/CoreBundle/Resources/views/SiteCredential/index.html.twig
rename to templates/SiteCredential/index.html.twig
index f3925f47e..a85118a5a 100644
--- a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/index.html.twig
+++ b/templates/SiteCredential/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/new.html.twig b/templates/SiteCredential/new.html.twig
similarity index 97%
rename from src/Wallabag/CoreBundle/Resources/views/SiteCredential/new.html.twig
rename to templates/SiteCredential/new.html.twig
index 5d2db1653..6e92e8053 100644
--- a/src/Wallabag/CoreBundle/Resources/views/SiteCredential/new.html.twig
+++ b/templates/SiteCredential/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'site_credential.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/_bookmarklet.html.twig b/templates/Static/_bookmarklet.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Static/_bookmarklet.html.twig
rename to templates/Static/_bookmarklet.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/templates/Static/about.html.twig
similarity index 99%
rename from src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
rename to templates/Static/about.html.twig
index 2e2e987c7..d3ce774a9 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/templates/Static/about.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'about.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig b/templates/Static/howto.html.twig
similarity index 98%
rename from src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
rename to templates/Static/howto.html.twig
index 5b53aa0c8..c86578076 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Static/howto.html.twig
+++ b/templates/Static/howto.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'howto.page_title'|trans }}{% endblock %}
@@ -46,7 +46,7 @@
{{ 'howto.top_menu.bookmarklet'|trans }}
{{ 'howto.bookmarklet.description'|trans }}
- {% include '@WallabagCore/Static/_bookmarklet.html.twig' %}
+ {% include 'Static/_bookmarklet.html.twig' %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/quickstart.html.twig b/templates/Static/quickstart.html.twig
similarity index 99%
rename from src/Wallabag/CoreBundle/Resources/views/Static/quickstart.html.twig
rename to templates/Static/quickstart.html.twig
index 44bc4ede7..bc8f4c402 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Static/quickstart.html.twig
+++ b/templates/Static/quickstart.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'quickstart.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig b/templates/Tag/new_form.html.twig
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/Tag/new_form.html.twig
rename to templates/Tag/new_form.html.twig
diff --git a/src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig b/templates/Tag/tags.html.twig
similarity index 97%
rename from src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig
rename to templates/Tag/tags.html.twig
index ce4101ec7..85c9633e0 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Tag/tags.html.twig
+++ b/templates/Tag/tags.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'tag.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig b/templates/TwoFactor/email_auth_code.html.twig
similarity index 100%
rename from src/Wallabag/UserBundle/Resources/views/TwoFactor/email_auth_code.html.twig
rename to templates/TwoFactor/email_auth_code.html.twig
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig b/templates/User/edit.html.twig
similarity index 98%
rename from src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
rename to templates/User/edit.html.twig
index 07d99e766..1181c60bc 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/edit.html.twig
+++ b/templates/User/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig b/templates/User/index.html.twig
similarity index 98%
rename from src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
rename to templates/User/index.html.twig
index 434cc04ea..91ab41abd 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/index.html.twig
+++ b/templates/User/index.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig b/templates/User/new.html.twig
similarity index 98%
rename from src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
rename to templates/User/new.html.twig
index 5915e8d3b..b997e67ae 100644
--- a/src/Wallabag/UserBundle/Resources/views/Manage/new.html.twig
+++ b/templates/User/new.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'user.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/templates/base.html.twig
similarity index 99%
rename from src/Wallabag/CoreBundle/Resources/views/base.html.twig
rename to templates/base.html.twig
index 00e66482f..ec4fcf88c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/templates/base.html.twig
@@ -48,7 +48,7 @@
{% endif %}
{% block scripts %}
-
+
{% endblock %}
diff --git a/templates/bundles/CraueConfigBundle/Settings/modify.html.twig b/templates/bundles/CraueConfigBundle/Settings/modify.html.twig
index b4f8a32d3..809c6dff1 100644
--- a/templates/bundles/CraueConfigBundle/Settings/modify.html.twig
+++ b/templates/bundles/CraueConfigBundle/Settings/modify.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
diff --git a/templates/bundles/FOSUserBundle/layout.html.twig b/templates/bundles/FOSUserBundle/layout.html.twig
index 937fd5cb0..c424f42ea 100644
--- a/templates/bundles/FOSUserBundle/layout.html.twig
+++ b/templates/bundles/FOSUserBundle/layout.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'security.login.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig b/templates/layout.html.twig
similarity index 97%
rename from src/Wallabag/CoreBundle/Resources/views/layout.html.twig
rename to templates/layout.html.twig
index f1565f17b..fc3944006 100644
--- a/src/Wallabag/CoreBundle/Resources/views/layout.html.twig
+++ b/templates/layout.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/base.html.twig" %}
+{% extends "base.html.twig" %}
{% block css %}
{{ parent() }}
@@ -156,8 +156,8 @@
- {{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::searchFormAction', {'currentRoute': current_route})) }}
- {{ render(controller('Wallabag\\CoreBundle\\Controller\\EntryController::addEntryFormAction')) }}
+ {{ render(controller('App\\Controller\\EntryController::searchFormAction', {'currentRoute': current_route})) }}
+ {{ render(controller('App\\Controller\\EntryController::addEntryFormAction')) }}
{% endblock %}
diff --git a/src/Wallabag/UserBundle/Resources/views/manage.html.twig b/templates/manage.html.twig
similarity index 97%
rename from src/Wallabag/UserBundle/Resources/views/manage.html.twig
rename to templates/manage.html.twig
index 981e19aaa..74b8fd92b 100644
--- a/src/Wallabag/UserBundle/Resources/views/manage.html.twig
+++ b/templates/manage.html.twig
@@ -1,4 +1,4 @@
-{% extends "@WallabagCore/layout.html.twig" %}
+{% extends "layout.html.twig" %}
{% block title %}{{ 'user.manage.page_title'|trans }}{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/screenshot.jpg b/templates/screenshot.jpg
similarity index 100%
rename from src/Wallabag/CoreBundle/Resources/views/screenshot.jpg
rename to templates/screenshot.jpg
diff --git a/tests/Wallabag/CoreBundle/Command/CleanDuplicatesCommandTest.php b/tests/Command/CleanDuplicatesCommandTest.php
similarity index 92%
rename from tests/Wallabag/CoreBundle/Command/CleanDuplicatesCommandTest.php
rename to tests/Command/CleanDuplicatesCommandTest.php
index d70466818..e4ea47504 100644
--- a/tests/Wallabag/CoreBundle/Command/CleanDuplicatesCommandTest.php
+++ b/tests/Command/CleanDuplicatesCommandTest.php
@@ -1,13 +1,13 @@
getRepository(Entry::class)->findAllByUrlAndUserId($url, $this->getLoggedInUserId());
$this->assertCount(1, $nbEntries);
- $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+ $query = $em->createQuery('DELETE FROM App\Entity\Entry e WHERE e.url = :url');
$query->setParameter('url', $url);
$query->execute();
}
diff --git a/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php b/tests/Command/ExportCommandTest.php
similarity index 95%
rename from tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
rename to tests/Command/ExportCommandTest.php
index abad7cf74..9a465bcb3 100644
--- a/tests/Wallabag/CoreBundle/Command/ExportCommandTest.php
+++ b/tests/Command/ExportCommandTest.php
@@ -1,11 +1,11 @@
assertSame($entry->getHashedUrl(), hash('sha1', $url));
- $query = $em->createQuery('DELETE FROM Wallabag\CoreBundle\Entity\Entry e WHERE e.url = :url');
+ $query = $em->createQuery('DELETE FROM App\Entity\Entry e WHERE e.url = :url');
$query->setParameter('url', $url);
$query->execute();
}
diff --git a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php b/tests/Command/ImportCommandTest.php
similarity index 90%
rename from tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
rename to tests/Command/ImportCommandTest.php
index a58abce9d..6eb2b3db7 100644
--- a/tests/Wallabag/ImportBundle/Command/ImportCommandTest.php
+++ b/tests/Command/ImportCommandTest.php
@@ -1,13 +1,13 @@
execute([
'username' => 'admin',
- 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
+ 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/fixtures/wallabag-v2-read.json',
'--importer' => 'v2',
]);
@@ -83,7 +83,7 @@ class ImportCommandTest extends WallabagCoreTestCase
$tester = new CommandTester($command);
$tester->execute([
'username' => $this->getLoggedInUserId(),
- 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/Wallabag/ImportBundle/fixtures/wallabag-v2-read.json',
+ 'filepath' => $application->getKernel()->getContainer()->getParameter('kernel.project_dir') . '/tests/fixtures/wallabag-v2-read.json',
'--useUserId' => true,
'--importer' => 'v2',
]);
diff --git a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php b/tests/Command/InstallCommandTest.php
similarity index 98%
rename from tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
rename to tests/Command/InstallCommandTest.php
index 79487d6c1..3d024abdb 100644
--- a/tests/Wallabag/CoreBundle/Command/InstallCommandTest.php
+++ b/tests/Command/InstallCommandTest.php
@@ -1,7 +1,9 @@
getResponse()->getContent(), true);
- $this->assertSame($client->getContainer()->getParameter('wallabag_core.version'), $content);
+ $this->assertSame($client->getContainer()->getParameter('wallabag.version'), $content);
}
public function testGetInfo()
diff --git a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php b/tests/Controller/ConfigControllerTest.php
similarity index 99%
rename from tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
rename to tests/Controller/ConfigControllerTest.php
index 03a7485df..be9f8709e 100644
--- a/tests/Wallabag/CoreBundle/Controller/ConfigControllerTest.php
+++ b/tests/Controller/ConfigControllerTest.php
@@ -1,20 +1,20 @@
getRepository(Entry::class)
->find($entry->getId());
- $this->assertNotSame($client->getContainer()->getParameter('wallabag_core.fetching_error_message'), $newContent->getContent());
+ $this->assertNotSame($client->getContainer()->getParameter('wallabag.fetching_error_message'), $newContent->getContent());
}
public function testEdit()
diff --git a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php b/tests/Controller/ExportControllerTest.php
similarity index 99%
rename from tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
rename to tests/Controller/ExportControllerTest.php
index 8ed942020..d9d821bc4 100644
--- a/tests/Wallabag/CoreBundle/Controller/ExportControllerTest.php
+++ b/tests/Controller/ExportControllerTest.php
@@ -1,10 +1,10 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/chrome-bookmarks', 'Bookmarks');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/chrome-bookmarks', 'Bookmarks');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/chrome');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/chrome-bookmarks', 'Bookmarks');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/chrome-bookmarks', 'Bookmarks');
$data = [
'upload_import_file[file]' => $file,
@@ -140,7 +140,7 @@ class ChromeControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/chrome');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/DeliciousControllerTest.php b/tests/Controller/Import/DeliciousControllerTest.php
similarity index 92%
rename from tests/Wallabag/ImportBundle/Controller/DeliciousControllerTest.php
rename to tests/Controller/Import/DeliciousControllerTest.php
index 1aa4d90af..9bf592470 100644
--- a/tests/Wallabag/ImportBundle/Controller/DeliciousControllerTest.php
+++ b/tests/Controller/Import/DeliciousControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious.json');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious.json');
$data = [
'upload_import_file[file]' => $file,
@@ -140,7 +140,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious-read.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/delicious_export.2021.02.06_21.10.json', 'delicious-read.json');
$data = [
'upload_import_file[file]' => $file,
@@ -185,7 +185,7 @@ class DeliciousControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/delicious');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php b/tests/Controller/Import/ElcuratorControllerTest.php
similarity index 93%
rename from tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php
rename to tests/Controller/Import/ElcuratorControllerTest.php
index 38c872774..b7f36ba7d 100644
--- a/tests/Wallabag/ImportBundle/Controller/ElcuratorControllerTest.php
+++ b/tests/Controller/Import/ElcuratorControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/elcurator.json', 'elcurator.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/elcurator.json', 'elcurator.json');
$data = [
'upload_import_file[file]' => $file,
@@ -100,7 +100,7 @@ class ElcuratorControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/elcurator');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/elcurator.json', 'elcurator.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/elcurator.json', 'elcurator.json');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php b/tests/Controller/Import/FirefoxControllerTest.php
similarity index 93%
rename from tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
rename to tests/Controller/Import/FirefoxControllerTest.php
index 1c30d6b0a..08fa01eab 100644
--- a/tests/Wallabag/ImportBundle/Controller/FirefoxControllerTest.php
+++ b/tests/Controller/Import/FirefoxControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/firefox-bookmarks.json', 'Bookmarks');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/firefox-bookmarks.json', 'Bookmarks');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/firefox');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/firefox-bookmarks.json', 'Bookmarks');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/firefox-bookmarks.json', 'Bookmarks');
$data = [
'upload_import_file[file]' => $file,
@@ -154,7 +154,7 @@ class FirefoxControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/firefox');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php b/tests/Controller/Import/ImportControllerTest.php
similarity index 74%
rename from tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
rename to tests/Controller/Import/ImportControllerTest.php
index 06a2a2e21..009328cdf 100644
--- a/tests/Wallabag/ImportBundle/Controller/ImportControllerTest.php
+++ b/tests/Controller/Import/ImportControllerTest.php
@@ -1,8 +1,8 @@
getTestClient();
- $client->request('GET', '/import/');
+ $client->request('GET', '/import');
$this->assertSame(302, $client->getResponse()->getStatusCode());
$this->assertStringContainsString('login', $client->getResponse()->headers->get('location'));
@@ -21,7 +21,7 @@ class ImportControllerTest extends WallabagCoreTestCase
$this->logInAs('admin');
$client = $this->getTestClient();
- $crawler = $client->request('GET', '/import/');
+ $crawler = $client->request('GET', '/import');
$this->assertSame(200, $client->getResponse()->getStatusCode());
$this->assertSame(10, $crawler->filter('blockquote')->count());
diff --git a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php b/tests/Controller/Import/InstapaperControllerTest.php
similarity index 93%
rename from tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
rename to tests/Controller/Import/InstapaperControllerTest.php
index c96941252..02d163dbf 100644
--- a/tests/Wallabag/ImportBundle/Controller/InstapaperControllerTest.php
+++ b/tests/Controller/Import/InstapaperControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/instapaper-export.csv', 'instapaper.csv');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/instapaper-export.csv', 'instapaper.csv');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/instapaper-export.csv', 'instapaper.csv');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/instapaper-export.csv', 'instapaper.csv');
$data = [
'upload_import_file[file]' => $file,
@@ -153,7 +153,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/instapaper-export.csv', 'instapaper-read.csv');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/instapaper-export.csv', 'instapaper-read.csv');
$data = [
'upload_import_file[file]' => $file,
@@ -198,7 +198,7 @@ class InstapaperControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/instapaper');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php b/tests/Controller/Import/PinboardControllerTest.php
similarity index 93%
rename from tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
rename to tests/Controller/Import/PinboardControllerTest.php
index 833061fe8..fb9768647 100644
--- a/tests/Wallabag/ImportBundle/Controller/PinboardControllerTest.php
+++ b/tests/Controller/Import/PinboardControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/pinboard_export', 'pinboard.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/pinboard_export', 'pinboard.json');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/pinboard_export', 'pinboard.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/pinboard_export', 'pinboard.json');
$data = [
'upload_import_file[file]' => $file,
@@ -145,7 +145,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/pinboard_export', 'pinboard-read.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/pinboard_export', 'pinboard-read.json');
$data = [
'upload_import_file[file]' => $file,
@@ -192,7 +192,7 @@ class PinboardControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/pinboard');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php b/tests/Controller/Import/PocketControllerTest.php
similarity index 96%
rename from tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
rename to tests/Controller/Import/PocketControllerTest.php
index 858689ddd..d77837e7f 100644
--- a/tests/Wallabag/ImportBundle/Controller/PocketControllerTest.php
+++ b/tests/Controller/Import/PocketControllerTest.php
@@ -1,11 +1,11 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/readability.json', 'readability.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/readability.json', 'readability.json');
$data = [
'upload_import_file[file]' => $file,
@@ -99,7 +99,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/readability.json', 'readability.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/readability.json', 'readability.json');
$data = [
'upload_import_file[file]' => $file,
@@ -143,7 +143,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/readability-read.json', 'readability-read.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/readability-read.json', 'readability-read.json');
$data = [
'upload_import_file[file]' => $file,
@@ -190,7 +190,7 @@ class ReadabilityControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/readability');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php b/tests/Controller/Import/WallabagV1ControllerTest.php
similarity index 93%
rename from tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
rename to tests/Controller/Import/WallabagV1ControllerTest.php
index 328cbc71c..fea6202f2 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV1ControllerTest.php
+++ b/tests/Controller/Import/WallabagV1ControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/wallabag-v1.json', 'wallabag-v1.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/wallabag-v1.json', 'wallabag-v1.json');
$data = [
'upload_import_file[file]' => $file,
@@ -100,7 +100,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/wallabag-v1.json', 'wallabag-v1.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/wallabag-v1.json', 'wallabag-v1.json');
$data = [
'upload_import_file[file]' => $file,
@@ -144,7 +144,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/wallabag-v1-read.json', 'wallabag-v1-read.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/wallabag-v1-read.json', 'wallabag-v1-read.json');
$data = [
'upload_import_file[file]' => $file,
@@ -191,7 +191,7 @@ class WallabagV1ControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/wallabag-v1');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php b/tests/Controller/Import/WallabagV2ControllerTest.php
similarity index 94%
rename from tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
rename to tests/Controller/Import/WallabagV2ControllerTest.php
index c12b0b3e9..47107ad14 100644
--- a/tests/Wallabag/ImportBundle/Controller/WallabagV2ControllerTest.php
+++ b/tests/Controller/Import/WallabagV2ControllerTest.php
@@ -1,13 +1,13 @@
filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/wallabag-v2.json', 'wallabag-v2.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/wallabag-v2.json', 'wallabag-v2.json');
$data = [
'upload_import_file[file]' => $file,
@@ -100,7 +100,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/wallabag-v2');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/wallabag-v2.json', 'wallabag-v2.json');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/wallabag-v2.json', 'wallabag-v2.json');
$data = [
'upload_import_file[file]' => $file,
@@ -166,7 +166,7 @@ class WallabagV2ControllerTest extends WallabagCoreTestCase
$crawler = $client->request('GET', '/import/wallabag-v2');
$form = $crawler->filter('form[name=upload_import_file] > button[type=submit]')->form();
- $file = new UploadedFile(__DIR__ . '/../fixtures/test.txt', 'test.txt');
+ $file = new UploadedFile(__DIR__ . '/../../fixtures/test.txt', 'test.txt');
$data = [
'upload_import_file[file]' => $file,
diff --git a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php b/tests/Controller/SecurityControllerTest.php
similarity index 95%
rename from tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
rename to tests/Controller/SecurityControllerTest.php
index cb33df278..63dc3f79b 100644
--- a/tests/Wallabag/CoreBundle/Controller/SecurityControllerTest.php
+++ b/tests/Controller/SecurityControllerTest.php
@@ -1,10 +1,10 @@
setPrimaryTable(['name' => 'entry']);
$metaClass->mapManyToMany([
'fieldName' => 'tags',
diff --git a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php b/tests/EventListener/AuthenticationFailureListenerTest.php
similarity index 94%
rename from tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php
rename to tests/EventListener/AuthenticationFailureListenerTest.php
index 519039faf..5127a6375 100644
--- a/tests/Wallabag/UserBundle/EventListener/AuthenticationFailureListenerTest.php
+++ b/tests/EventListener/AuthenticationFailureListenerTest.php
@@ -1,7 +1,8 @@
twig = new Environment(new ArrayLoader(['@WallabagUser/TwoFactor/email_auth_code.html.twig' => $twigTemplate]));
+ $this->twig = new Environment(new ArrayLoader(['TwoFactor/email_auth_code.html.twig' => $twigTemplate]));
}
public function testSendEmail()
diff --git a/tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php b/tests/ParamConverter/UsernameFeedTokenConverterTest.php
similarity index 97%
rename from tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php
rename to tests/ParamConverter/UsernameFeedTokenConverterTest.php
index 9c7a41731..924b8fea0 100644
--- a/tests/Wallabag/CoreBundle/ParamConverter/UsernameFeedTokenConverterTest.php
+++ b/tests/ParamConverter/UsernameFeedTokenConverterTest.php
@@ -1,7 +1,10 @@
handle($request);
-$response->send();
-$kernel->terminate($request, $response);
diff --git a/web/app_dev.php b/web/app_dev.php
deleted file mode 100644
index 57e1a433f..000000000
--- a/web/app_dev.php
+++ /dev/null
@@ -1,28 +0,0 @@
-handle($request);
-$response->send();
-$kernel->terminate($request, $response);
diff --git a/web/wallassets/public.css.map b/web/wallassets/public.css.map
deleted file mode 100644
index f8ba6c149..000000000
--- a/web/wallassets/public.css.map
+++ /dev/null
@@ -1 +0,0 @@
-{"version":3,"file":"public.css","mappings":"AAAA,2YAEA,QA8EE,UACA,SACA,eACA,wBACA,+EAGF,aAWE,MAGF,aACE,cAGF,WAEE,yDAGF,UAIE,aACA,OAGF,wBACE,iBACA,MAKF,qBACE,WACA,oBACA,gBACA,yBACA,mBACA,mBAGF,eAME,cACA,mEAGF,eAME,gBACA,IAGF,eACE,IAGF,eACE,OAGF,eAEE,OAGF,eAEE,GAGF,mBACE,UAGF,gBAEE,MAGF,iBAEE,GAGF,UACE,0BACA,kBAGF,SAEE,YAGF,iBAIE,OAGF,mBAEE,IAGF,mBACE,gBACA,kCAGF,oBAEE,mCAGF,gBAEE,cAGF,cAEE,YACA,MAGF,cACE,QAGF,oBACE,YAGF,iBACE,6BACA,kBACA,kBACA,mBACA,gBACA,iBAGF,wBACE,eACA,kBACA,yBAGF,WACE,kBACA,KAGF,aACE,YACA,mBACA,eACA,QAGF,QACE,mBAGF,aACE,gBACA,kBACA,eACA,QAGF,uBACE,IAGF,aACE,WACA,kBACA,qBACA,eACA,UACA,OAGF,cACE,IAGF,cACE,OAGF,UACE,cACA,gBACA,WACA,iBACA,uBACA,mBACA,iBACA,kBACA,OAGF,kBACE,kBACA,KAGF,qBACE,aACA,6BACA,WACA,YACA,+BACA,gBACA,cACA,UAGF,cACE,kBACA,qBACA,yBACA,YACA,UACA,uBACA,MAGF,qBACE,cACA,+BACA,eACA,gBACA,yBACA,cACA,aAGF,iBAEE,kBAGF,eAEE,WACA,CANA,iBAGF,eAEE,WACA,OAGF,wBACE,kBACA,WACA,OAGF,aAEE,gBACA,UAGF,wBACE,gBACA,mBACA,kCACA,gBACA,0BAGF,yBACE,OAGF,iBACE,mBACA,QAGF,iBACE,UAGF,aACE,QAGF,iBACE,YAGF,iBACE,0BAKF,+BACE,aAEE,2BAIJ,WACE,qBACE,oBACA,QAGF,eACE,QAGF,gBACE,kBACA,kBACA,iBACA,E","sources":["webpack://wallabag/./app/Resources/static/themes/_global/share.scss"],"sourcesContent":["/* -------------------------- Reset ------------------- */\n\nhtml,\nbody,\ndiv,\nspan,\napplet,\nobject,\niframe,\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np,\nblockquote,\npre,\na,\nabbr,\nacronym,\naddress,\nbig,\ncite,\ncode,\ndel,\ndfn,\nem,\nimg,\nins,\nkbd,\nq,\ns,\nsamp,\nsmall,\nstrike,\nstrong,\nsub,\nsup,\ntt,\nb,\nu,\ni,\ndl,\ndt,\ndd,\nol,\nul,\nli,\nfieldset,\nform,\nlabel,\nlegend,\ntable,\ncaption,\ntbody,\ntfoot,\nthead,\ntr,\nth,\ntd,\narticle,\naside,\ncanvas,\ndetails,\nembed,\nfigure,\nfigcaption,\nfooter,\nheader,\nhgroup,\nmenu,\nnav,\noutput,\nsection,\nsummary,\ntime,\nmark,\naudio,\nvideo {\n margin: 0;\n padding: 0;\n border: 0;\n font-size: 100%;\n vertical-align: baseline;\n}\n\narticle,\naside,\ndetails,\nfigcaption,\nfigure,\nfooter,\nheader,\nhgroup,\nmenu,\nnav,\nsection {\n display: block;\n}\n\nbody {\n line-height: 1;\n}\n\nblockquote,\nq {\n quotes: none;\n}\n\nblockquote::before,\nblockquote::after,\nq::before,\nq::after {\n content: \"\";\n content: none;\n}\n\ntable {\n border-collapse: collapse;\n border-spacing: 0;\n}\n\n/* -------------------------- General properties ------------------- */\n\nbody {\n background-color: white;\n color: #444;\n font-family: Georgia;\n line-height: 1.7;\n -ms-content-zooming: none;\n margin-bottom: 64px;\n}\n\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n font-weight: 600;\n margin: 0.2em 0;\n}\n\narticle h1,\narticle h2,\narticle h3,\narticle h4,\narticle h5,\narticle h6 {\n text-align: left;\n line-height: 1.3;\n}\n\nh1 {\n font-size: 1.4em;\n}\n\nh2 {\n font-size: 1.3em;\n}\n\nh3,\nh4 {\n font-size: 1.2em;\n}\n\nh5,\nh6 {\n font-size: 1.1em;\n}\n\np {\n margin-bottom: 0.75em;\n}\n\nb,\nstrong {\n font-weight: bold;\n}\n\ni,\nem {\n font-style: italic;\n}\n\na {\n color: #444;\n text-decoration: underline;\n}\n\na:active,\na:hover {\n outline: 0;\n}\n\np,\nul,\nol,\ndl {\n margin: 0 0 1.75em;\n}\n\nul,\nol {\n padding-left: 1.25em;\n}\n\nli {\n padding-bottom: 0.2em;\n line-height: 1.6;\n}\n\nli p:last-child,\nli li:last-child {\n margin-bottom: -0.2em;\n}\n\nul li:last-child,\nol li:last-child {\n padding-bottom: 0;\n}\n\niframe,\nvideo {\n max-width: 100%;\n height: auto;\n}\n\nmark {\n padding: 0 0.2em;\n}\n\nmark a {\n text-decoration: none;\n}\n\nblockquote {\n font-style: italic;\n border-left: 0.25em solid black;\n margin-left: -20px;\n padding-left: 17px;\n margin-bottom: 0.5em;\n margin-top: 0.5em;\n}\n\nblockquote cite {\n text-transform: uppercase;\n font-size: 0.8em;\n font-style: normal;\n}\n\nblockquote cite::before {\n content: \"—\";\n margin-right: 0.5em;\n}\n\nimg {\n display: block;\n height: auto;\n margin-bottom: 0.5em;\n max-width: 100%;\n}\n\nfigure {\n margin: 0;\n}\n\nfigure figcaption {\n display: block;\n margin-top: 0.3em;\n font-style: italic;\n font-size: 0.8em;\n}\n\nbutton {\n display: none !important;\n}\n\nhr {\n display: block;\n height: 1px;\n border: solid #666;\n border-width: 1px 0 0;\n margin: 1.6em 0;\n padding: 0;\n}\n\nsmall {\n font-size: 0.7em;\n}\n\ndl {\n margin: 1.6em 0;\n}\n\ndl dt {\n float: left;\n width: 11.25em;\n overflow: hidden;\n clear: left;\n text-align: right;\n text-overflow: ellipsis;\n white-space: nowrap;\n font-weight: bold;\n margin-bottom: 1em;\n}\n\ndl dd {\n margin-left: 12.5em;\n margin-bottom: 1em;\n}\n\npre {\n box-sizing: border-box;\n margin: 4em 0;\n border: 0.0625em solid #efefef;\n width: 100%;\n padding: 1em;\n font-family: Consolas, monospace;\n white-space: pre;\n overflow: auto;\n}\n\npre code {\n font-size: 0.8em;\n line-height: 1.6em;\n white-space: pre-wrap;\n background: transparent;\n border: none;\n padding: 0;\n vertical-align: inherit;\n}\n\ncode {\n padding: 0.125em 0.375em;\n margin: 0 0.2em;\n font-family: Consolas, monospace;\n font-size: 0.8em;\n white-space: pre;\n border: 1px solid lightgray;\n overflow: auto;\n}\n\naudio,\nvideo {\n max-width: 43.75em;\n}\n\n::selection,\nmark {\n background: #666;\n color: white;\n}\n\ntable {\n border-collapse: collapse;\n margin-bottom: 2em;\n width: 100%;\n}\n\nth,\ntd {\n padding: 0.25em;\n text-align: left;\n}\n\nthead tr {\n text-transform: uppercase;\n font-size: 0.85em;\n letter-spacing: 1px;\n font-family: \"Segoe UI\", sans-serif;\n font-weight: 600;\n}\n\ntbody tr:nth-child(2n+1) {\n background: rgb(0 0 0 / 10%);\n}\n\ntbody {\n border: solid #999;\n border-width: 1px 0;\n}\n\nfigure {\n text-align: center;\n}\n\nfigure > * {\n margin: 0 auto;\n}\n\nheader {\n text-align: center;\n}\n\n.shared-by {\n margin-bottom: 1em;\n}\n\n/* --------------------- Responsive design ------------------------- */\n\n@media (max-width: 719px) {\n header > *:not(.preview),\n article {\n padding: 0 1em;\n }\n}\n\n@media (min-width: 720px) {\n blockquote {\n margin-left: -1.4375em;\n padding-left: 1.25em;\n }\n\n header {\n margin-top: 32px;\n }\n\n .block {\n margin-left: auto;\n margin-right: auto;\n max-width: 43.75em;\n padding: 0 1.25em;\n }\n}\n"],"names":[],"sourceRoot":""}
\ No newline at end of file
diff --git a/webpack.config.js b/webpack.config.js
index 47f4551e1..7948a1a08 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -2,7 +2,7 @@ const path = require('path');
function buildConfig(options) {
const env = options.prod ? 'prod' : 'dev';
- return require(path.resolve(__dirname, `app/config/webpack/${env}.js`));
+ return require(path.resolve(__dirname, `scripts/webpack/${env}.js`));
}
module.exports = buildConfig;