diff options
Diffstat (limited to 'src/Wallabag/ImportBundle/Controller')
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/ImportController.php | 17 | ||||
-rw-r--r-- | src/Wallabag/ImportBundle/Controller/PocketController.php | 9 |
2 files changed, 21 insertions, 5 deletions
diff --git a/src/Wallabag/ImportBundle/Controller/ImportController.php b/src/Wallabag/ImportBundle/Controller/ImportController.php new file mode 100644 index 00000000..3569793b --- /dev/null +++ b/src/Wallabag/ImportBundle/Controller/ImportController.php | |||
@@ -0,0 +1,17 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Wallabag\ImportBundle\Controller; | ||
4 | |||
5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | ||
6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | ||
7 | |||
8 | class ImportController extends Controller | ||
9 | { | ||
10 | /** | ||
11 | * @Route("/import", name="import") | ||
12 | */ | ||
13 | public function importAction() | ||
14 | { | ||
15 | return $this->render('WallabagImportBundle:Import:index.html.twig', array()); | ||
16 | } | ||
17 | } | ||
diff --git a/src/Wallabag/ImportBundle/Controller/PocketController.php b/src/Wallabag/ImportBundle/Controller/PocketController.php index 9602c282..f851c81c 100644 --- a/src/Wallabag/ImportBundle/Controller/PocketController.php +++ b/src/Wallabag/ImportBundle/Controller/PocketController.php | |||
@@ -4,20 +4,19 @@ namespace Wallabag\ImportBundle\Controller; | |||
4 | 4 | ||
5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; | 5 | use Symfony\Bundle\FrameworkBundle\Controller\Controller; |
6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; | 6 | use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; |
7 | use Wallabag\ImportBundle\Import\PocketImport; | ||
8 | 7 | ||
9 | class PocketController extends Controller | 8 | class PocketController extends Controller |
10 | { | 9 | { |
11 | /** | 10 | /** |
12 | * @Route("/import", name="import") | 11 | * @Route("/import/pocket", name="pocket") |
13 | */ | 12 | */ |
14 | public function importAction() | 13 | public function indexAction() |
15 | { | 14 | { |
16 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', array()); | 15 | return $this->render('WallabagImportBundle:Pocket:index.html.twig', array()); |
17 | } | 16 | } |
18 | 17 | ||
19 | /** | 18 | /** |
20 | * @Route("/auth-pocket", name="authpocket") | 19 | * @Route("/import/pocket/auth", name="authpocket") |
21 | */ | 20 | */ |
22 | public function authAction() | 21 | public function authAction() |
23 | { | 22 | { |
@@ -28,7 +27,7 @@ class PocketController extends Controller | |||
28 | } | 27 | } |
29 | 28 | ||
30 | /** | 29 | /** |
31 | * @Route("/callback-pocket", name="callbackpocket") | 30 | * @Route("/import/pocket/callback", name="callbackpocket") |
32 | */ | 31 | */ |
33 | public function callbackAction() | 32 | public function callbackAction() |
34 | { | 33 | { |