use index.sql to make urls nicer

rest/pyapi.py

@@ -122,14 +122,10 @@ def normalize(route):
 def send_static(filename):
     return static_file(filename, root='rest/static')
 
-@route('/<route:re:(clip|goto|upload|code)>', method=['GET', 'POST'])
-def clip(route):
-    return redirect(f'/{route}.sql')
-
 @route(f'/<route:re:(clip|goto|code)>/<hash:re:{B32REGEX}{{1,5}}>', method='GET')
 def get_clip(route, hash):
     hash = hash and normalize_base32(hash)
-    return redirect(f'/{route}.sql?hash={hash}&go=true')
+    return redirect(f'/{route}/?hash={hash}&go=true')
 
 
 @route(f'/upload/<hash:re:{B32REGEX}{{1,5}}>', method='GET')

util-sqlpage/clip/form.sql

@@ -2,16 +2,16 @@ SET ":view" = COALESCE(:content, '') <> '' AND COALESCE(:action, '') <> 'Edit as
 SELECT 'button' AS component;
 SELECT 'Open' AS title
 , 1 AS width
-, '/clip.sql?action=open' AS link
+, '/clip?action=open' AS link
 ;
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/clip.sql' AS link
+, '/clip' AS link
 ;
 
 SELECT 'form' AS component
-, '/clip.sql' AS action
+, '/clip/' AS action
 , CASE :view WHEN TRUE THEN 'Edit as New' ELSE 'Paste' END AS validate
 , :tabler_color AS validate_color
 , 'post' AS method

util-sqlpage/code/form.sql

@@ -25,7 +25,7 @@ SET ":filter_options" = (
 );
 
 SELECT 'form' AS component
-, '/code.sql' AS action
+, '/code/' AS action
 , :validate AS validate
 , :tabler_color AS validate_color
 , :method AS method

util-sqlpage/code.sql → util-sqlpage/code/index.sql

@@ -7,7 +7,7 @@ SET ":title" = 'Code';
 SET ":tool" = 'code';
 SET ":hash" = COALESCE($hash, '');
 SET ":hash" = sqlpage.url_encode(:hash);
-SET ":link" = '/code.sql';
+SET ":link" = '/code';
 SET ":color" = '#f59f00';
 SET ":tabler_color" = 'azure';
 SET ":image" = '/static/code/qr.svg';

util-sqlpage/code/recent.sql

@@ -29,7 +29,7 @@ SELECT 'dynamic' AS component, sqlpage.run_sql('code/form.sql') AS properties;
 SELECT 'list' AS component;
 SELECT COALESCE(type||' ','') || COALESCE(store||' ', '') || COALESCE(expiry, created) AS title
 , COALESCE(content->>'content'||' ', '') || COALESCE(content->>'type', '') AS description
-, '/code.sql?hash='||c.hash AS link
+, '/code?hash='||c.hash AS link
 FROM code c
 LEFT JOIN code_detail cd
 ON c.hash = cd.hash

util-sqlpage/code/update.sql

@@ -9,4 +9,4 @@ UPDATE SET
   used = excluded.used
 WHERE TRUE
 ;
-SELECT 'redirect' AS component, '/code.sql' AS link;
+SELECT 'redirect' AS component, '/code' AS link;

util-sqlpage/goto/form.sql

@@ -2,16 +2,16 @@ SET ":view" = COALESCE(:content, '') <> '';
 SELECT 'button' AS component;
 SELECT 'Open' AS title
 , 1 AS width
-, '/goto.sql?action=open' AS link
+, '/goto?action=open' AS link
 ;
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/goto.sql' AS link
+, '/goto' AS link
 ;
 
 SELECT 'form' AS component
-, '/goto.sql' AS action
+, '/goto/' AS action
 , 'Shrtn It!' AS validate
 , :tabler_color AS validate_color
 , 'post' AS method

util-sqlpage/sqlpage/Open.sql

@@ -19,11 +19,11 @@ SELECT 'button' AS component
 SELECT 'New '||$title AS title
 , 2 AS width
 , 'gray-500' AS color
-, '/'||$tool||'.sql' AS link
+, '/'||$tool AS link
 ;
 SELECT 'form' AS component
 , $tool||'-open' AS id
-, '/'||$tool||'.sql' AS action
+, '/'||$tool||'/' AS action
 , '' AS validate
 , 'get' AS method
 ;
@@ -42,6 +42,5 @@ SELECT 'button' AS component
 SELECT 'Submit' AS title
 , 1 AS width
 , $tabler_color AS color
-, '/'||$tool||'.sql' AS link
 , $tool||'-open' AS form
 ;

util-sqlpage/sqlpage/theme.sql

@@ -13,7 +13,7 @@ SELECT 'shell' AS component
 , json(CASE :tool
   WHEN 'clip' THEN NULL
   ELSE '{
-            "link": "/clip.sql",
+            "link": "/clip",
             "title": "Clip and Paste",
             "icon": "clipboard"
         }'
@@ -21,7 +21,7 @@ SELECT 'shell' AS component
 , json(CASE :tool
   WHEN 'goto' THEN NULL
   ELSE '{
-            "link": "/goto.sql",
+            "link": "/goto",
             "title": "GotTo Tiny URL",
             "icon": "link"
         }'
@@ -29,7 +29,7 @@ SELECT 'shell' AS component
 , json(CASE :tool
   WHEN 'upload' THEN NULL
   ELSE '{
-            "link": "/upload.sql",
+            "link": "/upload",
             "title": "Share File",
             "icon": "cloud-share"
         }'
@@ -37,7 +37,7 @@ SELECT 'shell' AS component
 , json(CASE :tool
   WHEN 'code' THEN NULL
   ELSE '{
-            "link": "/code.sql",
+            "link": "/code",
             "title": "Vouchers",
             "icon": "barcode"
         }'

util-sqlpage/upload/form.sql

@@ -2,12 +2,12 @@ SET ":view" = COALESCE(:content, '') <> '';
 SELECT 'button' AS component;
 SELECT 'Open' AS title
 , 1 AS width
-, '/upload.sql?action=open' AS link
+, '/upload?action=open' AS link
 ;
 SELECT 'New' AS title
 , 1 AS width
 , 'gray-500' AS color
-, '/upload.sql' AS link
+, '/upload' AS link
 ;
 SELECT 'Download' AS title
 , 2 AS width
@@ -17,7 +17,7 @@ WHERE :hash <> ''
 ;
 
 SELECT 'form' AS component
-, '/upload.sql' AS action
+, '/upload/' AS action
 , 'Upload' AS validate
 , 'post' AS method
 , :tabler_color AS validate_color

util-sqlpage/upload/save.sql

@@ -14,7 +14,7 @@ WHERE excluded.created > upload.created;
 
 DELETE FROM upload_temp WHERE rowid = :rowid;
 
---SELECT 'redirect' AS component, '/upload.sql?hash='||:hash AS link
+--SELECT 'redirect' AS component, '/upload?hash='||:hash AS link
 --WHERE :rowid IS NOT NULL;
 
 SELECT 'loader-stop' AS component

util-sqlpage/upload/temp.sql

@@ -1,3 +1,3 @@
 DELETE FROM upload_temp WHERE name IS NULL OR mime IS NULL;
 INSERT INTO upload_temp(name, mime, content) VALUES (:file_name, :mime_type, :content)
-RETURNING 'redirect' AS component, '/upload.sql?rowid='||rowid AS link;
+RETURNING 'redirect' AS component, '/upload?rowid='||rowid AS link;