+
+ What
') $$, + 'Should be able to add a surroundings highlight to the first company' +); + +select lives_ok( + $$ select add_surroundings_highlight(2, 4, 'Highlight B', '') $$, + 'Should be able to add a surroundings highlight to the second company' +); + +select bag_eq( + $$ select company_id, media_id, name, description::text from surroundings_highlight $$, + $$ values (1, 3, 'Highlight A', 'What
') + , (2, 4, 'Highlight B', '') + $$, + 'Should have added all two surroundings highlight' +); + + +select * +from finish(); + +rollback; diff --git a/test/edit_surroundings_highlight.sql b/test/edit_surroundings_highlight.sql new file mode 100644 index 0000000..e9d7292 --- /dev/null +++ b/test/edit_surroundings_highlight.sql @@ -0,0 +1,74 @@ +-- Test edit_surroundings_highlight +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(12); + +set search_path to camper, public; + +select has_function('camper', 'edit_surroundings_highlight', array['integer', 'integer', 'text', 'text']); +select function_lang_is('camper', 'edit_surroundings_highlight', array['integer', 'integer', 'text', 'text'], 'sql'); +select function_returns('camper', 'edit_surroundings_highlight', array['integer', 'integer', 'text', 'text'], 'integer'); +select isnt_definer('camper', 'edit_surroundings_highlight', array['integer', 'integer', 'text', 'text']); +select volatility_is('camper', 'edit_surroundings_highlight', array['integer', 'integer', 'text', 'text'], 'volatile'); +select function_privs_are('camper', 'edit_surroundings_highlight', array ['integer', 'integer', 'text', 'text'], 'guest', array[]::text[]); +select function_privs_are('camper', 'edit_surroundings_highlight', array ['integer', 'integer', 'text', 'text'], 'employee', array[]::text[]); +select function_privs_are('camper', 'edit_surroundings_highlight', array ['integer', 'integer', 'text', 'text'], 'admin', array['EXECUTE']); +select function_privs_are('camper', 'edit_surroundings_highlight', array ['integer', 'integer', 'text', 'text'], 'authenticator', array[]::text[]); + + +set client_min_messages to warning; +truncate surroundings_highlight cascade; +truncate media cascade; +truncate media_content cascade; +truncate company cascade; +reset client_min_messages; + + +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') +; + +insert into media_content (media_type, bytes) +values ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffffff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ff00ff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffff00","a"};') +; + +insert into media (media_id, company_id, original_filename, content_hash) +values (2, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) + , (3, 1, 'cover3.xpm', sha256('static char *s[]={"1 1 1 1","a c #ff00ff","a"};')) + , (4, 1, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffff00","a"};')) +; + +insert into surroundings_highlight (surroundings_highlight_id, company_id, media_id, name, description) +values (8, 1, 2, 'Highlight A', '1
') + , (9, 1, 3, 'Highlight B', '2
') +; + +select lives_ok( + $$ select edit_surroundings_highlight(8, 4, 'Highlight 1', 'A
') $$, + 'Should be able to edit the first highlight' +); + +select lives_ok( + $$ select edit_surroundings_highlight(9, null, 'Highlight 2', 'B
') $$, + 'Should be able to edit the second highlight' +); + +select bag_eq( + $$ select surroundings_highlight_id, media_id, name, description::text from surroundings_highlight $$, + $$ values (8, 4, 'Highlight 1', 'A
') + , (9, 3, 'Highlight 2', 'B
') + $$, + 'Should have updated all surroundings highlights.' +); + + +select * +from finish(); + +rollback; diff --git a/test/order_surroundings_highlights.sql b/test/order_surroundings_highlights.sql new file mode 100644 index 0000000..3932469 --- /dev/null +++ b/test/order_surroundings_highlights.sql @@ -0,0 +1,71 @@ +-- Test order_surroundings_highlights +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(11); + +set search_path to camper, public; + +select has_function('camper', 'order_surroundings_highlights', array['integer[]']); +select function_lang_is('camper', 'order_surroundings_highlights', array['integer[]'], 'sql'); +select function_returns('camper', 'order_surroundings_highlights', array['integer[]'], 'void'); +select isnt_definer('camper', 'order_surroundings_highlights', array['integer[]']); +select volatility_is('camper', 'order_surroundings_highlights', array['integer[]'], 'volatile'); +select function_privs_are('camper', 'order_surroundings_highlights', array ['integer[]'], 'guest', array[]::text[]); +select function_privs_are('camper', 'order_surroundings_highlights', array ['integer[]'], 'employee', array[]::text[]); +select function_privs_are('camper', 'order_surroundings_highlights', array ['integer[]'], 'admin', array['EXECUTE']); +select function_privs_are('camper', 'order_surroundings_highlights', array ['integer[]'], 'authenticator', array[]::text[]); + + +set client_min_messages to warning; +truncate surroundings_highlight cascade; +truncate media cascade; +truncate media_content cascade; +truncate company cascade; +reset client_min_messages; + + +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') +; + +insert into media_content (media_type, bytes) +values ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffffff","a"};') +; + +insert into media (media_id, company_id, original_filename, content_hash) +values (2, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) +; + +insert into surroundings_highlight (surroundings_highlight_id, company_id, media_id, name, description) +values (3, 1, 2, 'A', '') + , (4, 1, 2, 'B', '') + , (5, 1, 2, 'C', '') + , (6, 1, 2, 'D', '') + , (7, 1, 2, 'E', '') +; + +select lives_ok( + $$ select order_surroundings_highlights('{5,7,6,3,4}') $$, + 'Should be able to sort surroundings highlights using their ids' +); + +select bag_eq( + $$ select surroundings_highlight_id, position from surroundings_highlight $$, + $$ values (5, 1) + , (7, 2) + , (6, 3) + , (3, 4) + , (4, 5) + $$, + 'Should have sorted all surroundings highlights.' +); + + +select * +from finish(); + +rollback; diff --git a/test/remove_surroundings_highlight.sql b/test/remove_surroundings_highlight.sql new file mode 100644 index 0000000..52fe578 --- /dev/null +++ b/test/remove_surroundings_highlight.sql @@ -0,0 +1,87 @@ +-- Test remove_surroundings_highlight +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(12); + +set search_path to camper, public; + +select has_function('camper', 'remove_surroundings_highlight', array['integer']); +select function_lang_is('camper', 'remove_surroundings_highlight', array['integer'], 'sql'); +select function_returns('camper', 'remove_surroundings_highlight', array['integer'], 'void'); +select isnt_definer('camper', 'remove_surroundings_highlight', array['integer']); +select volatility_is('camper', 'remove_surroundings_highlight', array['integer'], 'volatile'); +select function_privs_are('camper', 'remove_surroundings_highlight', array['integer'], 'guest', array[]::text[]); +select function_privs_are('camper', 'remove_surroundings_highlight', array['integer'], 'employee', array[]::text[]); +select function_privs_are('camper', 'remove_surroundings_highlight', array['integer'], 'admin', array['EXECUTE']); +select function_privs_are('camper', 'remove_surroundings_highlight', array['integer'], 'authenticator', array[]::text[]); + + +set client_min_messages to warning; +truncate surroundings_highlight cascade; +truncate media cascade; +truncate media_content cascade; +truncate company cascade; +reset client_min_messages; + +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') +; + +insert into media_content (media_type, bytes) +values ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffffff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ff00ff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffff00","a"};') +; + +insert into media (media_id, company_id, original_filename, content_hash) +values (2, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) + , (3, 1, 'cover3.xpm', sha256('static char *s[]={"1 1 1 1","a c #ff00ff","a"};')) + , (4, 1, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffff00","a"};')) +; + +insert into surroundings_highlight (surroundings_highlight_id, company_id, media_id, name, description) +values (7, 1, 2, 'Highlight A', 'One
') + , (8, 1, 3, 'Highlight B', 'Two
') + , (9, 1, 3, 'Highlight C', 'Three
') +; + +insert into surroundings_highlight_i18n (surroundings_highlight_id, lang_tag, name, description) +values (7, 'ca', 'Destacat A', '') + , (7, 'es', 'Destacado A', '') + , (8, 'ca', 'Destacat B', '') + , (8, 'es', 'Destacado B', '') + , (9, 'ca', 'Destacat C', '') + , (9, 'es', 'Destacado C', '') +; + +select lives_ok( + $$ select remove_surroundings_highlight(8) $$, + 'Should be able to delete a service' +); + +select bag_eq( + $$ select surroundings_highlight_id, name from surroundings_highlight $$, + $$ values (7, 'Highlight A') + , (9, 'Highlight C') + $$, + 'Should have removed the highlight' +); + +select bag_eq( + $$ select surroundings_highlight_id, lang_tag, name from surroundings_highlight_i18n $$, + $$ values (7, 'ca', 'Destacat A') + , (7, 'es', 'Destacado A') + , (9, 'ca', 'Destacat C') + , (9, 'es', 'Destacado C') + $$, + 'Should have removed the highlight’s translations' +); + +select * +from finish(); + +rollback; diff --git a/test/surroundings_highlight.sql b/test/surroundings_highlight.sql new file mode 100644 index 0000000..f122e72 --- /dev/null +++ b/test/surroundings_highlight.sql @@ -0,0 +1,210 @@ +-- Test surroundings_highlight +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(50); + +set search_path to camper, public; + +select has_table('surroundings_highlight'); +select has_pk('surroundings_highlight'); +select table_privs_are('surroundings_highlight', 'guest', array['SELECT']); +select table_privs_are('surroundings_highlight', 'employee', array['SELECT']); +select table_privs_are('surroundings_highlight', 'admin', array['SELECT', 'INSERT', 'UPDATE', 'DELETE']); +select table_privs_are('surroundings_highlight', 'authenticator', array[]::text[]); + +select has_column('surroundings_highlight', 'surroundings_highlight_id'); +select col_is_pk('surroundings_highlight', 'surroundings_highlight_id'); +select col_type_is('surroundings_highlight', 'surroundings_highlight_id', 'integer'); +select col_not_null('surroundings_highlight', 'surroundings_highlight_id'); +select col_hasnt_default('surroundings_highlight', 'surroundings_highlight_id'); + +select has_column('surroundings_highlight', 'company_id'); +select col_is_fk('surroundings_highlight', 'company_id'); +select fk_ok('surroundings_highlight', 'company_id', 'company', 'company_id'); +select col_type_is('surroundings_highlight', 'company_id', 'integer'); +select col_not_null('surroundings_highlight', 'company_id'); +select col_hasnt_default('surroundings_highlight', 'company_id'); + +select has_column('surroundings_highlight', 'media_id'); +select col_type_is('surroundings_highlight', 'media_id', 'integer'); +select col_not_null('surroundings_highlight', 'media_id'); +select col_hasnt_default('surroundings_highlight', 'media_id'); + +select has_column('surroundings_highlight', 'name'); +select col_is_fk('surroundings_highlight', 'media_id'); +select fk_ok('surroundings_highlight', 'media_id', 'media', 'media_id'); +select col_type_is('surroundings_highlight', 'name', 'text'); +select col_not_null('surroundings_highlight', 'name'); +select col_hasnt_default('surroundings_highlight', 'name'); + +select has_column('surroundings_highlight', 'description'); +select col_type_is('surroundings_highlight', 'description', 'xml'); +select col_not_null('surroundings_highlight', 'description'); +select col_hasnt_default('surroundings_highlight', 'description'); + +select has_column('surroundings_highlight', 'position'); +select col_type_is('surroundings_highlight', 'position', 'integer'); +select col_not_null('surroundings_highlight', 'position'); +select col_has_default('surroundings_highlight', 'position'); +select col_default_is('surroundings_highlight', 'position', '2147483647'); + + +set client_min_messages to warning; +truncate surroundings_highlight cascade; +truncate media cascade; +truncate media_content cascade; +truncate company_host cascade; +truncate company_user cascade; +truncate company cascade; +truncate auth."user" cascade; +reset client_min_messages; + +insert into auth."user" (user_id, email, name, password, cookie, cookie_expires_at) +values (1, 'demo@tandem.blog', 'Demo', 'test', '44facbb30d8a419dfd4bfbc44a4b5539d4970148dfc84bed0e', current_timestamp + interval '1 month') + , (5, 'admin@tandem.blog', 'Demo', 'test', '12af4c88b528c2ad4222e3740496ecbc58e76e26f087657524', current_timestamp + interval '1 month') +; + +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (2, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') + , (4, 'Company 4', 'XX234', '', '666-666-666', 'b@b', '', '', '', '', '', '', 60, 'FR', 'USD', 'ca') +; + +insert into company_user (company_id, user_id, role) +values (2, 1, 'admin') + , (4, 5, 'admin') +; + +insert into company_host (company_id, host) +values (2, 'co2') + , (4, 'co4') +; + +insert into media_content (media_type, bytes) +values ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffffff","a"};') +; + +insert into media (media_id, company_id, original_filename, content_hash) +values (6, 2, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) + , (8, 4, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) +; + +insert into surroundings_highlight (company_id, media_id, name, description) +values (2, 6, 'Girona', 'Beautiful
') + , (4, 8, 'Barcelona', 'Shit
') +; + +prepare surroundings_highlight_data as +select company_id, name +from surroundings_highlight +order by company_id, name; + +set role guest; +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (4, 'Barcelona') + $$, + 'Everyone should be able to list all surroundings highlights across all companies' +); +reset role; + +select set_cookie('44facbb30d8a419dfd4bfbc44a4b5539d4970148dfc84bed0e/demo@tandem.blog', 'co2'); + +select lives_ok( + $$ insert into surroundings_highlight(company_id, media_id, name, description) values (2, 6, 'Another highlight', '') $$, + 'Admin from company 2 should be able to insert a new surroundings highlights to that company.' +); + +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (2, 'Another highlight') + , (4, 'Barcelona') + $$, + 'The new row should have been added' +); + +select lives_ok( + $$ update surroundings_highlight set name = 'Another' where company_id = 2 and name = 'Another highlight' $$, + 'Admin from company 2 should be able to update surroundings highlights of that company.' +); + +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (2, 'Another') + , (4, 'Barcelona') + $$, + 'The row should have been updated.' +); + +select lives_ok( + $$ delete from surroundings_highlight where company_id = 2 and name = 'Another' $$, + 'Admin from company 2 should be able to delete surroundings highlights from that company.' +); + +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (4, 'Barcelona') + $$, + 'The row should have been deleted.' +); + +select throws_ok( + $$ insert into surroundings_highlight (company_id, media_id, name, description) values (4, 8, 'Another highlight', '') $$, + '42501', 'new row violates row-level security policy for table "surroundings_highlight"', + 'Admin from company 2 should NOT be able to insert new surroundings highlights to company 4.' +); + +select lives_ok( + $$ update surroundings_highlight set name = 'Nope' where company_id = 4 $$, + 'Admin from company 2 should not be able to update new surroundings highlights of company 4, but no error if company_id is not changed.' +); + +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (4, 'Barcelona') + $$, + 'No row should have been changed.' +); + +select throws_ok( + $$ update surroundings_highlight set company_id = 4 where company_id = 2 $$, + '42501', 'new row violates row-level security policy for table "surroundings_highlight"', + 'Admin from company 2 should NOT be able to move surroundings highlights to company 4' +); + +select lives_ok( + $$ delete from surroundings_highlight where company_id = 4 $$, + 'Admin from company 2 should NOT be able to delete surroundings highlights from company 4, but not error is thrown' +); + +select bag_eq( + 'surroundings_highlight_data', + $$ values (2, 'Girona') + , (4, 'Barcelona') + $$, + 'No row should have been changed' +); + +select throws_ok( + $$ insert into surroundings_highlight (company_id, media_id, name, description) values (2, 6, ' ', '') $$, + '23514', 'new row for relation "surroundings_highlight" violates check constraint "name_not_empty"', + 'Should not be able to insert surroundings highlights with a blank name.' +); + + +reset role; + + +select * +from finish(); + +rollback; + diff --git a/test/surroundings_highlight_i18n.sql b/test/surroundings_highlight_i18n.sql new file mode 100644 index 0000000..2d2f318 --- /dev/null +++ b/test/surroundings_highlight_i18n.sql @@ -0,0 +1,49 @@ +-- Test surroundings_highlight_i18n +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(27); + +set search_path to camper, public; + +select has_table('surroundings_highlight_i18n'); +select has_pk('surroundings_highlight_i18n'); +select col_is_pk('surroundings_highlight_i18n', array['surroundings_highlight_id', 'lang_tag']); +select table_privs_are('surroundings_highlight_i18n', 'guest', array['SELECT']); +select table_privs_are('surroundings_highlight_i18n', 'employee', array['SELECT']); +select table_privs_are('surroundings_highlight_i18n', 'admin', array['SELECT', 'INSERT', 'UPDATE', 'DELETE']); +select table_privs_are('surroundings_highlight_i18n', 'authenticator', array[]::text[]); + +select has_column('surroundings_highlight_i18n', 'surroundings_highlight_id'); +select col_is_fk('surroundings_highlight_i18n', 'surroundings_highlight_id'); +select fk_ok('surroundings_highlight_i18n', 'surroundings_highlight_id', 'surroundings_highlight', 'surroundings_highlight_id'); +select col_type_is('surroundings_highlight_i18n', 'surroundings_highlight_id', 'integer'); +select col_not_null('surroundings_highlight_i18n', 'surroundings_highlight_id'); +select col_hasnt_default('surroundings_highlight_i18n', 'surroundings_highlight_id'); + +select has_column('surroundings_highlight_i18n', 'lang_tag'); +select col_is_fk('surroundings_highlight_i18n', 'lang_tag'); +select fk_ok('surroundings_highlight_i18n', 'lang_tag', 'language', 'lang_tag'); +select col_type_is('surroundings_highlight_i18n', 'lang_tag', 'text'); +select col_not_null('surroundings_highlight_i18n', 'lang_tag'); +select col_hasnt_default('surroundings_highlight_i18n', 'lang_tag'); + +select has_column('surroundings_highlight_i18n', 'name'); +select col_type_is('surroundings_highlight_i18n', 'name', 'text'); +select col_not_null('surroundings_highlight_i18n', 'name'); +select col_hasnt_default('surroundings_highlight_i18n', 'name'); + +select has_column('surroundings_highlight_i18n', 'description'); +select col_type_is('surroundings_highlight_i18n', 'description', 'xml'); +select col_not_null('surroundings_highlight_i18n', 'description'); +select col_hasnt_default('surroundings_highlight_i18n', 'description'); + + +select * +from finish(); + +rollback; + diff --git a/test/translate_surroundings_highlight.sql b/test/translate_surroundings_highlight.sql new file mode 100644 index 0000000..a3f80b7 --- /dev/null +++ b/test/translate_surroundings_highlight.sql @@ -0,0 +1,83 @@ +-- Test translate_surroundings_highlight +set client_min_messages to warning; +create extension if not exists pgtap; +reset client_min_messages; + +begin; + +select plan(13); + +set search_path to camper, public; + +select has_function('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text']); +select function_lang_is('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'sql'); +select function_returns('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'void'); +select isnt_definer('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text']); +select volatility_is('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'volatile'); +select function_privs_are('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'guest', array[]::text[]); +select function_privs_are('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'employee', array[]::text[]); +select function_privs_are('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'admin', array['EXECUTE']); +select function_privs_are('camper', 'translate_surroundings_highlight', array['integer', 'text', 'text', 'text'], 'authenticator', array[]::text[]); + + +set client_min_messages to warning; +truncate surroundings_highlight cascade; +truncate media cascade; +truncate media_content cascade; +truncate company cascade; +reset client_min_messages; + +insert into company (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, rtc_number, tourist_tax, country_code, currency_code, default_lang_tag) +values (1, 'Company 2', 'XX123', '', '555-555-555', 'a@a', '', '', '', '', '', '', 60, 'ES', 'EUR', 'ca') +; + +insert into media_content (media_type, bytes) +values ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffffff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ff00ff","a"};') + , ('image/x-xpixmap', 'static char *s[]={"1 1 1 1","a c #ffff00","a"};') +; + +insert into media (media_id, company_id, original_filename, content_hash) +values (2, 1, 'cover2.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffffff","a"};')) + , (3, 1, 'cover3.xpm', sha256('static char *s[]={"1 1 1 1","a c #ff00ff","a"};')) + , (4, 1, 'cover4.xpm', sha256('static char *s[]={"1 1 1 1","a c #ffff00","a"};')) +; + +insert into surroundings_highlight (surroundings_highlight_id, company_id, media_id, name, description) +values (8, 1, 2, 'Highlight A', 'One
') + , (9, 1, 3, 'Highlight B', 'Two
') +; + +insert into surroundings_highlight_i18n (surroundings_highlight_id, lang_tag, name, description) +values (9, 'ca', 'destacatb', 'dos
') +; + +select lives_ok( + $$ select translate_surroundings_highlight(8, 'ca', 'Destacat A', null) $$, + 'Should be able to translate the first highlight' +); + +select lives_ok( + $$ select translate_surroundings_highlight(9, 'es', 'Destacado B', 'Dos
') $$, + 'Should be able to translate the second highlight' +); + +select lives_ok( + $$ select translate_surroundings_highlight(9, 'ca', 'Destacat B', 'I dos
') $$, + 'Should be able to overwrite the catalan translation of the second highlight' +); + +select bag_eq( + $$ select surroundings_highlight_id, lang_tag, i18n.name, i18n.description::text from surroundings_highlight_i18n as i18n join surroundings_highlight using (surroundings_highlight_id) $$, + $$ values (8, 'ca', 'Destacat A', '') + , (9, 'ca', 'Destacat B', 'I dos
') + , (9, 'es', 'Destacado B', 'Dos
') + $$, + 'Should have added and updated all translations.' +); + + +select * +from finish(); + +rollback; diff --git a/verify/add_surroundings_highlight.sql b/verify/add_surroundings_highlight.sql new file mode 100644 index 0000000..c74bd82 --- /dev/null +++ b/verify/add_surroundings_highlight.sql @@ -0,0 +1,7 @@ +-- Verify camper:add_surroundings_highlight on pg + +begin; + +select has_function_privilege('camper.add_surroundings_highlight(integer, integer, text, text)', 'execute'); + +rollback; diff --git a/verify/edit_surroundings_highlight.sql b/verify/edit_surroundings_highlight.sql new file mode 100644 index 0000000..ad4d1fd --- /dev/null +++ b/verify/edit_surroundings_highlight.sql @@ -0,0 +1,7 @@ +-- Verify camper:edit_surroundings_highlight on pg + +begin; + +select has_function_privilege('camper.edit_surroundings_highlight(integer, integer, text, text)', 'execute'); + +rollback; diff --git a/verify/order_surroundings_highlights.sql b/verify/order_surroundings_highlights.sql new file mode 100644 index 0000000..4632815 --- /dev/null +++ b/verify/order_surroundings_highlights.sql @@ -0,0 +1,7 @@ +-- Verify camper:order_surroundings_highlights on pg + +begin; + +select has_function_privilege('camper.order_surroundings_highlights(integer[])', 'execute'); + +rollback; diff --git a/verify/remove_surroundings_highlight.sql b/verify/remove_surroundings_highlight.sql new file mode 100644 index 0000000..403875a --- /dev/null +++ b/verify/remove_surroundings_highlight.sql @@ -0,0 +1,7 @@ +-- Verify camper:remove_surroundings_highlight on pg + +begin; + +select has_function_privilege('camper.remove_surroundings_highlight(integer)', 'execute'); + +rollback; diff --git a/verify/surroundings_highlight.sql b/verify/surroundings_highlight.sql new file mode 100644 index 0000000..fa098db --- /dev/null +++ b/verify/surroundings_highlight.sql @@ -0,0 +1,21 @@ +-- Verify camper:surroundings_highlight on pg + +begin; + +select surroundings_highlight_id + , company_id + , media_id + , name + , description + , position +from camper.surroundings_highlight +where false; + +select 1 / count(*) from pg_class where oid = 'camper.surroundings_highlight'::regclass and relrowsecurity; +select 1 / count(*) from pg_policy where polname = 'guest_ok' and polrelid = 'camper.surroundings_highlight'::regclass; +select 1 / count(*) from pg_policy where polname = 'insert_to_company' and polrelid = 'camper.surroundings_highlight'::regclass; +select 1 / count(*) from pg_policy where polname = 'update_company' and polrelid = 'camper.surroundings_highlight'::regclass; +select 1 / count(*) from pg_policy where polname = 'delete_from_company' and polrelid = 'camper.surroundings_highlight'::regclass; + + +rollback; diff --git a/verify/surroundings_highlight_i18n.sql b/verify/surroundings_highlight_i18n.sql new file mode 100644 index 0000000..17aa501 --- /dev/null +++ b/verify/surroundings_highlight_i18n.sql @@ -0,0 +1,12 @@ +-- Verify camper:surroundings_highlight_i18n on pg + +begin; + +select surroundings_highlight_id + , lang_tag + , name + , description +from camper.surroundings_highlight_i18n +where false; + +rollback; diff --git a/verify/translate_surroundings_highlight.sql b/verify/translate_surroundings_highlight.sql new file mode 100644 index 0000000..fb01b7d --- /dev/null +++ b/verify/translate_surroundings_highlight.sql @@ -0,0 +1,7 @@ +-- Verify camper:translate_surroundings_highlight on pg + +begin; + +select has_function_privilege('camper.translate_surroundings_highlight(integer, text, text, text)', 'execute'); + +rollback; diff --git a/web/static/images/caiac_mar.webp b/web/static/images/caiac_mar.webp deleted file mode 100644 index 865f362..0000000 Binary files a/web/static/images/caiac_mar.webp and /dev/null differ diff --git a/web/static/images/calella_de_palafrugell.webp b/web/static/images/calella_de_palafrugell.webp deleted file mode 100644 index bcec100..0000000 Binary files a/web/static/images/calella_de_palafrugell.webp and /dev/null differ diff --git a/web/static/images/escalada_sadernes.webp b/web/static/images/escalada_sadernes.webp deleted file mode 100644 index 75237e0..0000000 Binary files a/web/static/images/escalada_sadernes.webp and /dev/null differ diff --git a/web/static/images/excusions.webp b/web/static/images/excusions.webp deleted file mode 100644 index 585a7d1..0000000 Binary files a/web/static/images/excusions.webp and /dev/null differ diff --git a/web/static/images/gastronomia.webp b/web/static/images/gastronomia.webp deleted file mode 100644 index 0194f1f..0000000 Binary files a/web/static/images/gastronomia.webp and /dev/null differ diff --git a/web/static/images/museu_dali_figueres.webp b/web/static/images/museu_dali_figueres.webp deleted file mode 100644 index bb44cbc..0000000 Binary files a/web/static/images/museu_dali_figueres.webp and /dev/null differ diff --git a/web/static/images/rutes_amb_bicicleta.webp b/web/static/images/rutes_amb_bicicleta.webp deleted file mode 100644 index 9fe9bc2..0000000 Binary files a/web/static/images/rutes_amb_bicicleta.webp and /dev/null differ diff --git a/web/static/public.css b/web/static/public.css index 9abed80..c124d74 100644 --- a/web/static/public.css +++ b/web/static/public.css @@ -282,7 +282,7 @@ h1 a .name { left: -9999em; } -nav ul, .campsite_type_features ul { +nav ul, .campsite_type_features ul, .outside_activities > ul { list-style: none; padding-left: 0; display: flex; @@ -666,27 +666,6 @@ dt { } } -/* autside-activities tablet & mobile */ -@media (max-width: 64rem) { - - dl, .nature div + div, .outside_activities > div { - flex-direction: column; - } - - .outside_activities > div:first-of-type p { - width: 100% !important; - margin-top: 0 !important; - } - - .outside_activities > div:first-of-type img:last-child { - width: 100% !important; - margin-top: 0 !important; - } - -} - -/* end autside-activities tablet & mobile */ - .outside_activities { margin-top: 2rem; } @@ -701,64 +680,52 @@ dt { margin-bottom: 10rem; } -.outside_activities img { - border-radius: 5px; +.outside_activities > ul { + max-width: 108rem; + margin: 0 auto; + flex-direction: column; + gap: 2.7rem; } -.outside_activities > div { - align-items: start; +.outside_activities article { + display: flex; + gap: 5.5%; + justify-content: space-between; } -.outside_activities > div:first-of-type { - margin-bottom: 5rem; +.outside_activities > ul > li:nth-child(2n) article { + flex-direction: row-reverse; } -.outside_activities > div:first-of-type p { - width: 25%; - margin-top: 12rem; +.outside_activities article h4 { + font-size: 2.3rem; } -.outside_activities > div:first-of-type img { - width: 40%; +.outside_activities article > div { + width: 29.5%; } -.outside_activities > div:first-of-type img:last-child { - width: 35%; - margin-top: 22rem; +.outside_activities article > img { + width: 64%; + aspect-ratio: 16/9; + object-fit: cover; } -.outside_activities > div:nth-of-type(2) > img { - width: 35%; +@media (max-width: 64rem) { + .outside_activities > ul { + gap: 5rem; + } + + .outside_activities article, .outside_activities > ul > li:nth-child(2n) article { + flex-direction: column; + gap: 1rem; + } + + .outside_activities article > div, .outside_activities article > img { + width: 100%; + } } -.outside_activities > div:nth-of-type(2) > div { - width: 30%; - margin-top: 10rem; -} - -.outside_activities > div:nth-of-type(2) > div img { - margin-top: 20rem; -} - -.outside_activities > div:nth-of-type(2) > img:last-child { - margin-top: 22rem; -} - -.outside_activities > div:last-child img { - width: 40%; -} - -.outside_activities > div:last-child img:first-child { - margin-top: 10rem; -} - -.outside_activities > div:last-child img:nth-child(2) { - margin-top: 22rem; -} - -.outside_activities > div:last-child div { - width: 20%; -} .campsite_activities { margin-top: 10rem; @@ -1283,7 +1250,7 @@ input[type="checkbox"]:focus { grid-template-columns: repeat(2, 1fr); } -#booking a { +#booking a, .outside_activities a { color: var(--accent); text-decoration: var(--accent) wavy underline; } diff --git a/web/templates/admin/layout.gohtml b/web/templates/admin/layout.gohtml index 1fd623a..f30f580 100644 --- a/web/templates/admin/layout.gohtml +++ b/web/templates/admin/layout.gohtml @@ -60,6 +60,9 @@{{( pgettext "Highlights" "title" )}}
+ {{( pgettext "Add highlight" "action" )}} + {{ if .Highlights -}} + + {{ else -}} +{{( gettext "No highlights added yet." )}}
+ {{- end }} +{{- end }} diff --git a/web/templates/public/surroundings.gohtml b/web/templates/public/surroundings.gohtml index 3d432fe..7f1acef 100644 --- a/web/templates/public/surroundings.gohtml +++ b/web/templates/public/surroundings.gohtml @@ -7,47 +7,44 @@ {{- end }} {{ define "content" -}} + {{- /*gotype: dev.tandem.ws/tandem/camper/pkg/surroundings.surroundingsPage*/ -}}{{( pgettext "Surroundings" "title" )}}
-
-
-
-
-
-
-
-
-Vine a fer barranquisme per Sadernes!
- Reserva el teu dia - -
+
+
+
+
+ Vine a fer barranquisme per Sadernes!
+ Reserva el teu dia + +{{( pgettext "What to Do Outside the Campsite?" "title" )}}
-
- 
- 
-
- {{( gettext "Campsite Montagut is an ideal starting point for quiet outings, climbing, swimming in the river and gorges, volcanoes, the Fageda d’en Jordà, cycle tours for all ages…." )}}
-
-
-
- 
- 
-
-
-
- 
-
- {{( gettext "Get to the Costa Brava and enjoy the beaches, the gastronomy or go kayaking….")}}
-
-
-
- 
- 
-
+ {{ with .Highlights -}}
+
-
-
-
- {{( gettext "You will also find museums in Olot, Figures, Girona.")}}
-{{( gettext "As well as music festivals, dance, theater…." )}}
--
+ {{ range . -}}
+
-
+
+ ++
+ {{- end }}
+