Pi пре 3 месеци
родитељ
комит
95c3e91819

+ 14 - 1
util-sqlpage/clip.sql

@@ -7,10 +7,23 @@ SET ":tabler_color" = 'green';
 SET ":image" = '/static/clip/clip-favicon_square.svg';
 SET ":favicon" = :image;
 SET ":manifest" = '/static/clip/manifest.json';
-SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties;
 SET ":action" = COALESCE(:action, $action, '');
 SET ":inner" = (CASE :action
   WHEN 'open' THEN 'sqlpage/Open.sql'
   ELSE 'clip/Index.sql'
 END);
+SET ":spinner" = COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Paste';
+SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties;
+SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties;
+SELECT 'loader-start' AS component
+, 'lg' AS size
+, :tabler_color AS color
+, '' AS spinner
+WHERE :spinner
+;
+SELECT 'progress' AS component
+, 'lg' AS size
+, :tabler_color AS color
+WHERE :spinner
+;
 SELECT 'dynamic' AS component, sqlpage.run_sql(:inner) AS properties;

+ 0 - 1
util-sqlpage/clip/Index.sql

@@ -1,4 +1,3 @@
-SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties;
 SET ":inner" = CASE COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Paste'
   WHEN TRUE THEN 'sqlpage/save.sql'
   ELSE CASE COALESCE(:hash, '')

+ 3 - 0
util-sqlpage/clip/save.sql

@@ -5,4 +5,7 @@ UPDATE SET
   created = excluded.created,
   qr = excluded.qr
 WHERE excluded.created > clip.created;
+SELECT 'loader-stop' AS component
+WHERE :spinner
+;
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/link.sql') AS properties;

+ 4 - 2
util-sqlpage/goto.sql

@@ -18,14 +18,16 @@ WHERE (:go = 'true' AND :hash <> '');
 
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties;
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties;
+SET ":spinner" = COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Shrtn It!';
 SELECT 'loader-start' AS component
 , 'lg' AS size
 , :tabler_color AS color
-WHERE COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Shrtn It!'
+, '' AS spinner
+WHERE :spinner
 ;
 SELECT 'progress' AS component
 , 'lg' AS size
 , :tabler_color AS color
-WHERE COALESCE(:content,'') <> '' AND COALESCE(:action, '') = 'Shrtn It!'
+WHERE :spinner
 ;
 SELECT 'dynamic' AS component, sqlpage.run_sql(:inner) AS properties;

+ 3 - 1
util-sqlpage/goto/save.sql

@@ -6,5 +6,7 @@ UPDATE SET
   qr = excluded.qr,
   preview = excluded.preview
 WHERE excluded.created > goto.created;
-SELECT 'loader-stop' AS component;
+SELECT 'loader-stop' AS component
+WHERE :spinner
+;
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/link.sql') AS properties;

+ 17 - 1
util-sqlpage/upload.sql

@@ -26,5 +26,21 @@ SET ":mime_type" = (SELECT mime FROM upload_temp WHERE rowid = $rowid);
 SET ":content" = CAST($rowid AS INTEGER);
 
 SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/theme.sql') AS properties
-WHERE $rowid IS NULL;
+--WHERE $rowid IS NULL
+;
+SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties
+--WHERE $rowid IS NULL
+;
+SET ":spinner" = :content IS NOT NULL OR $rowid IS NOT NULL; --COALESCE($rowid, '') <> '';
+SELECT 'loader-start' AS component
+, 'lg' AS size
+, :tabler_color AS color
+, '' AS spinner
+WHERE :spinner
+;
+SELECT 'progress' AS component
+, 'lg' AS size
+, :tabler_color AS color
+WHERE :spinner
+;
 SELECT 'dynamic' AS component, sqlpage.run_sql(:inner) AS properties;

+ 0 - 2
util-sqlpage/upload/Index.sql

@@ -1,5 +1,3 @@
-SELECT 'dynamic' AS component, sqlpage.run_sql('sqlpage/Style.sql') AS properties
-WHERE $rowid IS NULL;
 SET ":inner" = CASE COALESCE($rowid, '') <> ''
   WHEN TRUE THEN 'sqlpage/save.sql'
   ELSE CASE COALESCE(:hash, '')

+ 5 - 2
util-sqlpage/upload/save.sql

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