From 2c8c8017e2b7eac30c7984add0f337aa305974e4 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 09:34:16 +0200 Subject: [PATCH 01/24] =?UTF-8?q?Update=20Collection=20=E2=80=9C5c71e48d-f?= =?UTF-8?q?2a2-498c-9860-3b617f792416=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collections/5c71e48d-f2a2-498c-9860-3b617f792416.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json b/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json index 16b67c33fc..0232aef06c 100644 --- a/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json +++ b/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json @@ -1,7 +1,7 @@ { "en": { "hidden": true, - "locked": false, + "locked": true, "name": "Part I - Discover yourself", "published": true, "card": { @@ -27,7 +27,7 @@ "pt": { "published": false, "hidden": false, - "locked": false, + "locked": true, "id": "5c71e48d-f2a2-498c-9860-3b617f792416", "tags": [ "8da0534a-5da9-430a-bdf3-242ace6460fb", @@ -45,7 +45,7 @@ }, "sv": { "hidden": true, - "locked": false, + "locked": true, "name": "Del 1 - Utforska dig själv", "published": true, "card": { @@ -71,7 +71,7 @@ "ja": { "published": false, "hidden": false, - "locked": false, + "locked": true, "id": "5c71e48d-f2a2-498c-9860-3b617f792416", "tags": [ "8da0534a-5da9-430a-bdf3-242ace6460fb", From b153a90a750fe80df83d4cc839fa9cc9eb8390c4 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 09:34:37 +0200 Subject: [PATCH 02/24] =?UTF-8?q?Update=20Collection=20=E2=80=9C5c71e48d-f?= =?UTF-8?q?2a2-498c-9860-3b617f792416=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 50668a8df939d508bda7f2122e31e8cc5404c720 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 09:34:48 +0200 Subject: [PATCH 03/24] =?UTF-8?q?Update=20Collection=20=E2=80=9C5c71e48d-f?= =?UTF-8?q?2a2-498c-9860-3b617f792416=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 59df2fb0044efc84b31bade2544bb661c89e8895 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 09:52:03 +0200 Subject: [PATCH 04/24] =?UTF-8?q?Update=20Collection=20=E2=80=9C5c71e48d-f?= =?UTF-8?q?2a2-498c-9860-3b617f792416=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collections/5c71e48d-f2a2-498c-9860-3b617f792416.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json b/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json index 0232aef06c..1c8367354b 100644 --- a/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json +++ b/content/src/collections/5c71e48d-f2a2-498c-9860-3b617f792416.json @@ -15,6 +15,7 @@ "566aeb1b-1649-4f5a-96a2-0c80be27efc0", "cfc00217-f65b-4a4d-8b82-8ccc8f852dd6" ], + "link": "https://aware.29k.org/Part1-DiscoverYourself", "id": "5c71e48d-f2a2-498c-9860-3b617f792416", "exercises": [ "095f9642-73b6-4c9a-ae9a-ea7dea7363f5", @@ -41,7 +42,8 @@ "5b0dea9f-c665-41ce-a779-601d0cfa433d", "c1c4da35-87af-4e10-a8d9-e6c58571f724" ], - "card": {} + "card": {}, + "link": "https://aware.29k.org/Part1-DiscoverYourself" }, "sv": { "hidden": true, @@ -59,6 +61,7 @@ "566aeb1b-1649-4f5a-96a2-0c80be27efc0", "cfc00217-f65b-4a4d-8b82-8ccc8f852dd6" ], + "link": "https://aware.29k.org/Part1-DiscoverYourself", "id": "5c71e48d-f2a2-498c-9860-3b617f792416", "exercises": [ "095f9642-73b6-4c9a-ae9a-ea7dea7363f5", @@ -85,6 +88,7 @@ "5b0dea9f-c665-41ce-a779-601d0cfa433d", "c1c4da35-87af-4e10-a8d9-e6c58571f724" ], - "card": {} + "card": {}, + "link": "https://aware.29k.org/Part1-DiscoverYourself" } } From e12704febc0e5ec29d6b28d141c59f6911b9867a Mon Sep 17 00:00:00 2001 From: Jenny29k <113593919+jrrjenny@users.noreply.github.com> Date: Tue, 14 May 2024 09:59:21 +0200 Subject: [PATCH 05/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C54b9accd-f90?= =?UTF-8?q?4-4a0f-b7b6-91948bd2c7c8=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/src/exercises/54b9accd-f904-4a0f-b7b6-91948bd2c7c8.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/src/exercises/54b9accd-f904-4a0f-b7b6-91948bd2c7c8.json b/content/src/exercises/54b9accd-f904-4a0f-b7b6-91948bd2c7c8.json index 8089baec9c..40a0551eb8 100644 --- a/content/src/exercises/54b9accd-f904-4a0f-b7b6-91948bd2c7c8.json +++ b/content/src/exercises/54b9accd-f904-4a0f-b7b6-91948bd2c7c8.json @@ -72,7 +72,7 @@ }, "hidden": true, "locked": false, - "name": "The inner friend", + "name": "New one with a nice title to come", "live": true, "published": true, "duration": 30, From 55d4df293712b8da5d18d184d8f73299cf928062 Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 11:25:49 +0100 Subject: [PATCH 06/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1e96f73b-8193-4aa6-a52c-31355eac3c08.json | 110 +++++++++++++++--- 1 file changed, 95 insertions(+), 15 deletions(-) diff --git a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json index 8355e842a1..c03fe704a6 100644 --- a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json +++ b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json @@ -176,26 +176,57 @@ "type": "host", "hostNotes": [ { - "text": "Welcome. I am X and today we will work for around 30 minutes on xx\n\nWe’ll be doing xx ex. meditation followed by time for reflection and sharing with each other." + "text": "Welcome. I am X and today we will work for around 30 minutes on acceptance and willingness.\n\nWe’ll be doing a short introduction, listen to a meditation, followed by time for reflection and sharing with each other." }, { - "text": "Let’s start with a mini check-in. How are you feeling right now? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s get started." + "text": "Let’s start with a mini check-in. What brought you here today? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s get started." } - ] + ], + "video": { + "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1678967008/Video/The_way_out_is_through_intro_rnvvyx.mp4", + "preview": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1678967010/Images/The_way_out_is_through_thumb_fxakco.png" + } }, { - "type": "content" + "type": "content", + "hostNotes": [ + { + "text": "Running into obstacles is a natural part of life. With the things we want in life – like loving relationships, interesting work or becoming parents – the risk of being hurt is always present. Even though we seldom acknowledge it. And often try to avoid it." + }, + { + "text": "In the following exercise we’ll be practising experiencing challenging or difficult emotions. Just as they are. As a way to spend less energy trying to avoid the uncomfortable, and more on what matters to us in the long run." + } + ], + "content": { + "video": { + "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1678801763/Audio/meditation_The_way_out_is_through_ao5qq6.mp3" + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676977421/Lottie/audio_meditation_default_black_default_omemwt.json", + "durationTimer": true, + "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1678801763/Audio/meditation_The_way_out_is_through_ao5qq6.mp3", + "subtitles": "https://res.cloudinary.com/cupcake-29k/raw/upload/q_auto,t_global/v1689602010/SRT%20(captions)%20files/The_way_out_is_through_s7rnfi.srt" + } + } }, { "type": "reflection", "hostNotes": [ { - "text": "Now we’ll take 1 minute to reflect on our own.\n\nxxMain question\n\nxxFurther explanations of main question if needed" + "text": "Now we’ll take 1 minute to reflect on our own.\n\nWhat would be different in your life if you practised moving through your difficulties instead of trying to avoid them?" }, { "text": "You can take notes on a piece of paper or just mental notes in your head. And there is no right or wrong here, our answers are our own. 1 minute starting now.\n\n> Press play to start the timer.\n\nThat’s 1 minute and it’s time to move on." } - ] + ], + "content": { + "heading": "What would be different if you moved through difficulties?", + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_black_rosi2l.json", + "durationTimer": true, + "duration": 60 + } + } }, { "type": "sharing", @@ -209,35 +240,82 @@ { "text": "Who would like to start?\n\n> Let everyone (or as many as you got time for) share one by one. Press play to start the timer. Re-start for each new sharing.\n\nThank you so much everyone." } - ] + ], + "content": { + "heading": "What would be different if you moved through difficulties?", + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_black_o6egey.json", + "durationTimer": true, + "duration": 120 + } + }, + "id": "sharing1" }, { "type": "host", "hostNotes": [ { - "text": "Well done. if you’re up for it, you can continue what we started here today with a mission to bring this into your everyday life.\n\nxx mission description" + "text": "Well done.\n\nWe’ve just practised moving through difficulties instead of trying to avoid them. This technique can help us live more in line with our values and lead more meaningful lives." }, { - "text": "Before we leave this space let’s do a mini check-out. \n\nHow are you feeling right now? Has anything shifted? Please answer in two-three words." + "text": "Before we leave this space let’s do a mini check-out.\n\nWhat can you bring from this for the rest of your day? Please answer in two-three words." }, { "text": "Who would like to start?\n\n> Let everyone in the session check out one by one.\n\nThank you all for checking out and for joining this session today.\n\n> Finish session to send everyone off to the exit experience." } - ] + ], + "video": { + "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1678967008/Video/The_way_out_is_through_outro_waudnc.mp4", + "preview": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1678967010/Images/The_way_out_is_through_thumb_fxakco.png" + } + }, + { + "type": "instruction", + "content": { + "heading": "Well done", + "text": "We’ve just practised moving through difficulties instead of trying to avoid them. This technique can help us live more in line with our values and lead more meaningful lives.", + "image": { + "source": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1687406076/Images/card_image_way_out_is_through_qjpv4m.png" + } + } } ], "theme": { - "textColor": "#2AE2D7" + "textColor": "#2E2E2E" }, - "hidden": false, - "published": false, + "hidden": true, + "name": "Ultrapassar os desafios", + "live": true, + "published": true, + "card": { + "image": { + "source": "https://res.cloudinary.com/cupcake-29k/image/upload/t_card_image/v1687406076/Images/card_image_way_out_is_through_qjpv4m.png" + } + }, + "coCreators": [], "duration": 30, + "outroPortal": { + "video": { + "source": "", + "audio": "" + } + }, "introPortal": { "hostNotes": [ { "text": "> Start the session when you're ready to go" } - ] + ], + "videoLoop": { + "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1687856251/Video/way_out_is_through_portal1_rpqnfr.mp4", + "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1687418774/Audio/way_out_is_through_portal_audio_doduhc.mp3", + "p5JsScript": { + "lang": "javascript" + } + }, + "videoEnd": { + "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1687856193/Video/way_out_is_through_portal_end_erxgxh.mp4" + } }, "tags": [ "34100e43-2eb8-4d35-8eb0-9fa9f78e4935", @@ -245,7 +323,8 @@ ], "link": "https://aware.29k.org/the-way-out-is-through", "id": "1e96f73b-8193-4aa6-a52c-31355eac3c08", - "async": false + "async": true, + "description": "In this meditation exercise we’ll practise moving through our difficulties instead of trying to avoid them. Letting ourselves experience the full spectrum of emotions can help us lead more meaningful and fulfilled lives." }, "sv": { "slides": [ @@ -467,6 +546,7 @@ }, "hidden": false, "published": false, + "card": {}, "duration": 30, "introPortal": { "hostNotes": [ From 32ec435cb874afa134b6a16b44e185deac15d5c7 Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 11:39:05 +0100 Subject: [PATCH 07/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1e96f73b-8193-4aa6-a52c-31355eac3c08.json | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json index c03fe704a6..b8714bc40a 100644 --- a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json +++ b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json @@ -176,10 +176,10 @@ "type": "host", "hostNotes": [ { - "text": "Welcome. I am X and today we will work for around 30 minutes on acceptance and willingness.\n\nWe’ll be doing a short introduction, listen to a meditation, followed by time for reflection and sharing with each other." + "text": "Bem-vindos. Sou X e hoje vamos dedicar cerca de 30 minutos à aceitação e disposição para enfrentar desafios. \n\nFaremos uma breve introdução, ouviremos uma meditação e, depois, haverá tempo para reflexão e partilha." }, { - "text": "Let’s start with a mini check-in. What brought you here today? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s get started." + "text": "Vamos começar com um mini check-in. O que vos trouxe aqui hoje? Por favor, respondam em duas ou três palavras. X, queres começar?\n\n> Deixa que cada um faça o seu check-in individualmente. Faz também o teu.\n\nObrigada/o a todos por participarem. Vamos começar." } ], "video": { @@ -191,15 +191,15 @@ "type": "content", "hostNotes": [ { - "text": "Running into obstacles is a natural part of life. With the things we want in life – like loving relationships, interesting work or becoming parents – the risk of being hurt is always present. Even though we seldom acknowledge it. And often try to avoid it." + "text": "Encontrar obstáculos é uma parte natural da nossa vida. Nas coisas que desejamos – como relações amorosas felizes, um trabalho interessante ou sermos pais – o risco de sofrermos está sempre presente, embora raramente o reconheçamos e muitas vezes tentemos evitá-lo." }, { - "text": "In the following exercise we’ll be practising experiencing challenging or difficult emotions. Just as they are. As a way to spend less energy trying to avoid the uncomfortable, and more on what matters to us in the long run." + "text": "No próximo exercício, vamos praticar como enfrentar estas emoções desafiadoras ou difíceis. Tal como elas são. Como forma de gastar menos energia a tentar fugir do desconforto e gastar mais energia no que é importante para nós a longo prazo." } ], "content": { "video": { - "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1678801763/Audio/meditation_The_way_out_is_through_ao5qq6.mp3" + "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1715249408/FJN/Meditations/Pedro_-_The_way_out_is_through_b7j3pt_fzkdcc.mp3" }, "lottie": { "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676977421/Lottie/audio_meditation_default_black_default_omemwt.json", @@ -213,14 +213,14 @@ "type": "reflection", "hostNotes": [ { - "text": "Now we’ll take 1 minute to reflect on our own.\n\nWhat would be different in your life if you practised moving through your difficulties instead of trying to avoid them?" + "text": "Agora vamos refletir sozinhos durante 1 minuto. \n\nO que mudarias na tua vida se enfrentasses as dificuldades em vez de as evitares?" }, { - "text": "You can take notes on a piece of paper or just mental notes in your head. And there is no right or wrong here, our answers are our own. 1 minute starting now.\n\n> Press play to start the timer.\n\nThat’s 1 minute and it’s time to move on." + "text": "Podes tomar notas num papel ou simplesmente fazer notas mentais. Não há respostas certas ou erradas, as respostas são nossas. 1 minuto a começar agora.\n\n> Pressiona play para iniciar o cronómetro.\n\nPassou 1 minuto e é hora de seguir em frente." } ], "content": { - "heading": "What would be different if you moved through difficulties?", + "heading": "O que seria diferente se enfrentasses as dificuldades?", "lottie": { "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_black_rosi2l.json", "durationTimer": true, @@ -232,13 +232,13 @@ "type": "sharing", "hostNotes": [ { - "text": "Now we are getting into the sharing part. We have three rules for sharing:\n\n1. **What is said in here, stays in here.**\n2. **All you need to do is listen.** There is no fixing, helping or advice-giving needed. We are just showing up and exploring what ourselves and others are going through." + "text": "Agora vamos à parte da partilha. Temos três regras para a partilha: \n\n1. **O que é dito aqui, fica aqui.**\n2. **Basta ouvir.** Não é necessário ajudar ou dar conselhos. Estamos apenas a partilhar e a explorar o que nós e os outros estamos a passar e sentir." }, { - "text": "3. **Everything on the inside is okay.** Anger, love, hatred, sadness. Whatever shows up. No wrongs, no rights. It is what it is.\n\nThere will be a timer set for 2 minutes as an indicator. If you don’t want to share you can always say ‘pass’." + "text": "3. **Tudo o que sentires por dentro está bem.** Raiva, amor, ódio, tristeza. O que aparecer. Não há erros, nem acertos. É o que é.\n\nTeremos um cronómetro de 2 minutos como indicador. Se não quiseres partilhar, podes sempre dizer \"passo\"." }, { - "text": "Who would like to start?\n\n> Let everyone (or as many as you got time for) share one by one. Press play to start the timer. Re-start for each new sharing.\n\nThank you so much everyone." + "text": "Quem gostaria de começar? \n\n> Deixa que cada um partilhe individualmente. Pressiona play para iniciar o cronómetro. Reinicia para cada nova partilha. \n\nMuito obrigada/o a todos." } ], "content": { @@ -303,7 +303,7 @@ "introPortal": { "hostNotes": [ { - "text": "> Start the session when you're ready to go" + "text": "> Começa a sessão quando estiveres pronta/o" } ], "videoLoop": { From 3054e15d0d67070cc5f2bf07f54f24bbc8219c1c Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 11:42:51 +0100 Subject: [PATCH 08/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../1e96f73b-8193-4aa6-a52c-31355eac3c08.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json index b8714bc40a..8e3e160a39 100644 --- a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json +++ b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json @@ -242,7 +242,7 @@ } ], "content": { - "heading": "What would be different if you moved through difficulties?", + "heading": "O que seria diferente se enfrentasses as dificuldades?", "lottie": { "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_black_o6egey.json", "durationTimer": true, @@ -255,13 +255,13 @@ "type": "host", "hostNotes": [ { - "text": "Well done.\n\nWe’ve just practised moving through difficulties instead of trying to avoid them. This technique can help us live more in line with our values and lead more meaningful lives." + "text": "Muito bem.\n\nAcabamos de praticar enfrentar as dificuldades em vez de as evitar. Esta técnica pode ajudar-nos a viver mais de acordo com os nossos valores e a ter vidas com mais significado." }, { - "text": "Before we leave this space let’s do a mini check-out.\n\nWhat can you bring from this for the rest of your day? Please answer in two-three words." + "text": "Antes de deixarmos este espaço, façamos um mini check-out.\n\nO que podes levar daqui para o resto do teu dia? Por favor, responde em duas ou três palavras." }, { - "text": "Who would like to start?\n\n> Let everyone in the session check out one by one.\n\nThank you all for checking out and for joining this session today.\n\n> Finish session to send everyone off to the exit experience." + "text": "Quem gostaria de começar?\n\n> Deixa que cada um faça o seu check-out individualmente. \n\nObrigada/o a todos por participarem e por se juntarem a esta sessão hoje.\n\n> Termina a sessão para que todos possam seguir para a experiência de saída." } ], "video": { @@ -272,8 +272,8 @@ { "type": "instruction", "content": { - "heading": "Well done", - "text": "We’ve just practised moving through difficulties instead of trying to avoid them. This technique can help us live more in line with our values and lead more meaningful lives.", + "heading": "Parabéns", + "text": "Acabamos de praticar enfrentar as dificuldades em vez de as evitar. Esta técnica pode ajudar-nos a viver mais de acordo com os nossos valores e a ter vidas com mais significado.", "image": { "source": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1687406076/Images/card_image_way_out_is_through_qjpv4m.png" } From cc0a82590b4853c1f286b7f86c5ee885a1a01c1e Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 12:49:01 +0100 Subject: [PATCH 09/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json index 8e3e160a39..5ad0b72754 100644 --- a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json +++ b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json @@ -324,7 +324,7 @@ "link": "https://aware.29k.org/the-way-out-is-through", "id": "1e96f73b-8193-4aa6-a52c-31355eac3c08", "async": true, - "description": "In this meditation exercise we’ll practise moving through our difficulties instead of trying to avoid them. Letting ourselves experience the full spectrum of emotions can help us lead more meaningful and fulfilled lives." + "description": "Neste exercício de meditação, vamos aprender a lidar com as dificuldades em vez de tentar evitá-las. Permitir-nos sentir o espectro completo de emoções pode ajudar-nos a ter vidas com mais significado e sentido de realização." }, "sv": { "slides": [ From 998b25d7dae026ad3e86527b80c3662abee1db8d Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 12:51:18 +0100 Subject: [PATCH 10/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From c23efdeefda57c594fe1c4071e734f9beb802754 Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Tue, 14 May 2024 12:51:58 +0100 Subject: [PATCH 11/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 770cd497905b898b20a4db34ea46441a3cdf316d Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 14:31:02 +0200 Subject: [PATCH 12/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5b0dea9f-c665-41ce-a779-601d0cfa433d.json | 69 +++++++++---------- 1 file changed, 33 insertions(+), 36 deletions(-) diff --git a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json index 8eaeb12b38..7333708338 100644 --- a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json +++ b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json @@ -8,10 +8,7 @@ "text": "Welcome. I am X and today we will work for around 30 minutes on acceptance and letting go of control.\\\n\\\nWe’ll be listening to a short audio file together, then we’ll take a two rounds to reflect on our own, and two rounds to share with each other." }, { - "text": "Before moving on into the exercise, let's ground ourselves in the here and now with 3 cycles of breathing.\n\n> Inhale and exhale slowly x 3" - }, - { - "text": "Let’s do a mini check-in. How are you feeling right now? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s move on." + "text": "Before moving on into the exercise, let’s do a mini check-in. How are you feeling right now? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s move on." } ], "video": { @@ -391,7 +388,10 @@ ], "videoLoop": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1667919733/Video/portal1_letting_go_of_control_g0izpw.mp4", - "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1667915462/Audio/portal_letting_go_of_controlmp3_eintur.mp3" + "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1667915462/Audio/portal_letting_go_of_controlmp3_eintur.mp3", + "p5JsScript": { + "lang": "javascript" + } }, "videoEnd": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1668093279/Video/portal2_letting_go_of_control_bnzxxr.mp4", @@ -413,13 +413,10 @@ "type": "host", "hostNotes": [ { - "text": "Welcome. I am X and today we will work for around 30 minutes on acceptance and letting go of control.\\\n\\\nWe’ll be listening to a short audio file together, then we’ll take a two rounds to reflect on our own, and two rounds to share with each other." - }, - { - "text": "Before moving on into the exercise, let's ground ourselves in the here and now with 3 cycles of breathing.\n\n> Inhale and exhale slowly x 3" + "text": "Välkommen. Jag heter X och vi kommer att jobba tillsammans i ungefär 30 minuter med acceptans och att släppa på kontrollen.\n\nVi kommer att lyssna på en ljudövning tillsammans, reflektera en stund för oss själva och sedan finns det möjlighet att dela sina erfarenheter." }, { - "text": "Let’s do a mini check-in. How are you feeling right now? Please answer in two-three words. X, would you like to start?\n\n> Let everyone in the session, including yourself, check in one by one.\n\nThank you all for checking in. Let’s move on." + "text": "Vi börjar med en mini-check-in. Hur känner du dig just nu? Svara gärna med två-tre ord. X, skulle du vilja börja?\n\n> Låt alla deltagare, inklusive dig själv, checka in en och en. \n\nTack för att ni checkade in. Då kör vi igång." } ], "video": { @@ -431,7 +428,7 @@ "type": "content", "hostNotes": [ { - "text": "When difficult feelings arise, many of us have a natural tendency to try to control them. The **impulse to control things can make us feel in charge**. But science shows that this is just an **illusion.**\n\nFind a comfortable position, relax your shoulders. Let's listen to this story together. \n\n> Press play to start." + "text": "\nNär svåra känslor uppstår har många av oss en naturlig tendens att försöka kontrollera dem. Det kan skapa en känsla av kontroll, men vetenskapen visar att detta bara är en illusion.\n\nHitta en bekväm position och slappna av i axlarna, så startar vi den här övningen tillsammans. \n\n> Tryck på play för att starta." } ], "content": { @@ -448,14 +445,14 @@ "type": "reflection", "hostNotes": [ { - "text": "Now we’ll take a minute to reflect on our own.\n\nWhat's in your own beach ball? What is it that you are pushing below the surface?" + "text": "Nästa steg är att tyst reflektera i en minut.\n\nVad finns i din badboll? Vad är det du försöker dölja under ytan?" }, { - "text": "You can take notes on a piece of paper or just mental notes in your head. And there is no right or wrong here, our answers are our own. 1 minute starting now.\n\n> Press play to start the timer.\n\nOkay, that’s 1 minute. Let’s move on." + "text": "Om du vill kan du skriva ner dina funderingar på ett papper, eller bara tänka fritt. Det finns inga svar som är rätt eller fel här – vad som än dyker upp är okej.\n\n> Tryck på play för att starta timern.\n\nDå har det gått en minut och det är dags att gå vidare." } ], "content": { - "heading": "What's in your beach ball?", + "heading": "Vad finns i din badboll?", "video": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", "durationTimer": true @@ -465,7 +462,7 @@ { "type": "sharing", "content": { - "heading": "What's in your beach ball?", + "heading": "Vad finns i din badboll?", "video": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", "durationTimer": true @@ -473,13 +470,13 @@ }, "hostNotes": [ { - "text": "Now we are getting into the sharing part. We have three rules for sharing:\n\n1. **What is said in here, stays in here.**\n2. **All you need to do is listen.** There is no fixing, helping or advice-giving needed. We are just showing up and exploring what ourselves and others are going through." + "text": "Det här steget handlar om att dela med sig av sin upplevelse och lyssna på andras. Vi har tre regler:\n\n1. **Det som sägs här, stannar här.**\n2. **Allt som behövs är att vi lyssnar på varandra.** Inget fixande, ingen rådgivning eller annan hjälp behövs. Vi är bara här för att utforska våra egna och andras upplevelser." }, { - "text": "3. **Everything on the inside is okay.** Anger, love, hatred, sadness. Whatever shows up. No wrongs, no rights. It is what it is.\n\nThere will be a timer set for 2 minutes as an indicator. If you don’t want to share you can always say ‘pass’." + "text": "3. **Allt som händer på insidan är okej.** Ilska, kärlek, smärta, glädje. Vad som än dyker upp, det finns inget rätt eller fel. Det bara är som det är.\n\nDet finns en timer på två minuter att hålla sig efter på ett ungefär. Om du inte vill dela med dig är det bara att säga 'pass'." }, { - "text": "Who would like to start?\n\n> Let everyone (or as many as you got time for) share one by one. Push play to start the timer. Re-start for each new sharing.\n\nThank you so much everyone." + "text": "Vem vill börja?\n\n> Låt alla, eller så många som det finns tid för, dela en efter en. Tryck på play för att starta timern. Starta om för varje person.\n\nTack så mycket för att ni lyssnar och delar med er." } ], "id": "sharing-1" @@ -488,20 +485,20 @@ "type": "reflection", "hostNotes": [ { - "text": "The more time and effort we spend trying to control our feelings, the more they tend to dictate our lives. The same goes for a lot of things in life. Sometimes we believe that the **more** **control** we have, the **closer** we will get to reaching our **goals**.\n\nThat can be true in some instances..." + "text": "Ju mer tid och energi vi lägger på att försöka kontrollera våra känslor, desto mer tenderar de att diktera våra liv. Samma sak gäller för många saker i livet. Ibland tror vi att ju mer kontroll vi har, desto enklare vi att nå våra mål.\n\nDet kan vara sant i vissa fall..." }, { - "text": "But when we get stuck in a loop of trying to control ourselves and the events around us, we often end up **diverging** **from our values.** Or miss out on participating in important occasions that actually matter to us." + "text": "Men när vi fastnar i en loop av att försöka kontrollera oss själva och händelserna runt omkring oss, hamnar vi ofta på avvägar från våra värderingar. Eller så går vi miste om upplevelser som faktiskt betyder något för oss." }, { - "text": "Now we’ll take a minute to reflect on our own again.\n\nWhat if you let go of your beachball? What would that mean to you? What would you do differently?" + "text": "Nu ska vi ta en minut för att reflektera igen.\n\nVad skulle det innebära för dig om du släppte taget om din badboll? Vad skulle du göra annorlunda?" }, { - "text": "1 minute starting now.\n\n> Press play to start the timer.\n\nOkay, that’s 1 minute. Let’s move on." + "text": "1 minut startar nu.\n\n> Tryck på play för att starta timern.\n\nDå har det gått en minut och det är dags att gå vidare." } ], "content": { - "heading": "What if you let go of your beach ball?", + "heading": "Vad skulle hända om du släppte taget om din badboll?", "video": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", "durationTimer": true @@ -511,7 +508,7 @@ { "type": "instruction", "content": { - "text": "The more time and effort we spend trying to control our feelings, the more they tend to dictate our lives. The same goes for a lot of things in life. Sometimes we believe that the more control we have, the closer we will get to reaching our goals.\n\nThat can be true in some instances... But when we get stuck in a loop of trying to control ourselves and the events around us, we often end up diverging from our values. Or miss out on participating in important occasions that actually matter to us.", + "text": "Ju mer tid och energi vi lägger på att försöka kontrollera våra känslor, desto mer tenderar de att diktera våra liv. Samma sak gäller för många saker i livet. Ibland tror vi att ju mer kontroll vi har, desto enklare vi att nå våra mål.\n\nDet kan vara sant i vissa fall... Men när vi fastnar i en loop av att försöka kontrollera oss själva och händelserna runt omkring oss, hamnar vi ofta på avvägar från våra värderingar. Eller så går vi miste om upplevelser som faktiskt betyder något för oss.", "image": { "source": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1668092579/Images/cover_letting_go_of_control_t5fi5i.png" } @@ -520,7 +517,7 @@ { "type": "sharing", "content": { - "heading": "What if you let go of your beach ball?", + "heading": "Vad skulle hända om du släppte taget om din badboll?", "video": { "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", "durationTimer": true @@ -528,10 +525,10 @@ }, "hostNotes": [ { - "text": "Time for a next round of sharing.\n\nWhat if you let go of your beachball? What would that mean to you? What would you do differently?\n\nThere will be a timer set for 2 minutes as an indicator. If you don’t want to share you can always say ‘pass’." + "text": "Dags att dela våra tankar igen.\n\nVad skulle hända om du släppte taget om din badboll? Vad skulle det innebära för dig? Vad skulle du göra annorlunda?\n\nPrecis som förra gången är timern på 2 minuter, och du delar bara om du känner att du vill." }, { - "text": "Who would like to start?\n\n> Let everyone (or as many as you got time for) share one by one. Press play to start the timer. Re-start for each new sharing.\n\nThank you so much everyone." + "text": "Vem vill börja?\n\n> Låt alla, eller så många som det finns tid för, dela en efter en. Tryck på play för att starta timern. Starta om för varje person.\n\nTack så mycket för att ni lyssnar och delar med er." } ], "id": "sharing-2" @@ -540,16 +537,16 @@ "type": "host", "hostNotes": [ { - "text": "Letting go of control may seem scary, risky and very uncomfortable. By practicing acceptance, we can learn how to make room for a range of feelings and experiences, without trying to escape, numb or fight the ones we don’t want or like. This allows us to redirect our focus and instead spend our energy on all things that are important to us." + "text": "Att släppa kontrollen kan verka skrämmande, riskabelt och väldigt obekvämt. Genom att öva på acceptans kan vi lära oss att skapa plats för en rad olika känslor och upplevelser, utan att försöka fly, bedöva eller bekämpa dem vi inte gillar. Då kan vi istället använda vår energi till alla de saker som är viktiga för oss." }, { - "text": "If you’re up for it, you can continue what we started here today with a mission to bring this into your everyday life.\n\nFor the rest of today and tomorrow, see if you can notice when you have difficult feelings and are trying to push them away. Then re-focus and see if welcoming them, or just letting them be there with you, can help you act differently. Do more of what’s important to you and bring your feelings along." + "text": "Om du vill kan du fortsätta det vi började här idag med ett litet uppdrag. \n\nUnder resten av idag och imorgon, försök att observera när du har svåra känslor och försöker skjuta bort dem. \n\nFörsök att istället välkomna dem eller bara låta dem vara där med dig. Se om det kan hjälpa dig att agera annorlunda och göra mer av det som är viktigt för dig." }, { - "text": "Before we leave this space let’s do a mini check-out. \n\nHow are you feeling right now? Has anything shifted? Please answer in two-three words." + "text": "Innan vi avslutar så gör vi en mini-utcheckning.\nHur känner du dig nu? Har något ändrats? Svara med två-tre ord.\n\nVem vill börja?" }, { - "text": "Who would like to start?\n\n> Let everyone in the session check out one by one.\n\nThank you all for checking out and for joining this session today.\n\n> Finish session to send everyone off to the exit experience." + "text": "> Låt alla checka ut en efter en.\n\nTack så mycket för era utcheckningar, och för att ni deltog i den här sessionen.\n\n> Avsluta sessionen för att skicka deltagarna till exit-upplevelsen." } ], "video": { @@ -563,8 +560,8 @@ "image": { "source": "https://res.cloudinary.com/cupcake-29k/image/upload/q_auto,t_global/v1668092579/Images/cover_letting_go_of_control_t5fi5i.png" }, - "heading": "Well done", - "text": "If you’re up for it, you can continue with this mission:\n\nFor the rest of today and tomorrow, see if you can notice when you have difficult feelings and are trying to push them away. Then re-focus and see if welcoming them, or just letting them be there with you, can help you act differently. Maybe do more of what’s important to you and bring your feelings along." + "heading": "Bra jobbat", + "text": "Om du vill kan du fortsätta det vi började här idag med ett uppdrag. \n\nUnder resten av idag och imorgon, försök att observera när du har svåra känslor och försöker skjuta bort dem. \n\nFörsök att istället välkomna dem eller bara låta dem vara där med dig. Se om det kan hjälpa dig att agera annorlunda och göra mer av det som är viktigt för dig." } } ], @@ -572,7 +569,7 @@ "textColor": "#F9F8F4", "backgroundColor": "#b9535f" }, - "hidden": true, + "hidden": false, "name": "Badbollen", "live": true, "published": true, @@ -607,7 +604,7 @@ "introPortal": { "hostNotes": [ { - "text": "> Start the session when you're ready to go." + "text": "> Starta sessionen när ni är redo" } ], "videoLoop": { @@ -629,7 +626,7 @@ "link": "https://aware.29k.org/letting-go-of-control", "id": "5b0dea9f-c665-41ce-a779-601d0cfa433d", "async": true, - "description": "Trying to control what we feel or think tends to backfire. In this exercise we practice letting go of a futile struggle, and instead use our energy for what matters." + "description": "Att försöka kontrollera vad vi känner eller tänker tenderar att slå tillbaka. I den här övningen övar vi på att släppa taget om en meningslös kamp, och istället använda vår energi till det som verkligen betyder något." }, "ja": { "id": "5b0dea9f-c665-41ce-a779-601d0cfa433d", From ec487819094a7aa85275e4748f02f8f812ed84df Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 14:31:16 +0200 Subject: [PATCH 13/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From fe34a009a76d5557010d35d6a5983e9dea590305 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Tue, 14 May 2024 14:36:20 +0200 Subject: [PATCH 14/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5b0dea9f-c665-41ce-a779-601d0cfa433d.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json index 7333708338..0f235eddd7 100644 --- a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json +++ b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json @@ -177,9 +177,9 @@ "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1665414181/Contributors/Agnes%20Branny.png" }, { - "name": "Ints Ivanovskis, art works", - "url": "https://www.linkedin.com/in/ints-ivanovskis-46ab0311a/", - "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1665413436/Contributors/Ints%20Ivanovskis.jpg" + "name": "Alexandra Söderlund, art works", + "url": "www.29k.org", + "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1669213656/Contributors/Alexandra%20S%C3%B6derlund.jpg" }, { "name": "Jenny Rickardsson, editor", @@ -585,9 +585,9 @@ "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1665414232/Contributors/Jacqueline%20Levi.png" }, { - "name": "Ints Ivanovskis, art works", - "url": "https://www.linkedin.com/in/ints-ivanovskis-46ab0311a/", - "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1665413436/Contributors/Ints%20Ivanovskis.jpg" + "name": "Alexandra Söderlund, art works", + "url": "www.29k.org", + "image": "https://res.cloudinary.com/cupcake-29k/image/upload/t_cocreator_image/v1669213656/Contributors/Alexandra%20S%C3%B6derlund.jpg" }, { "name": "Jenny Rickardsson, redaktör", From f5dfe52ee18d129881e3120001f333a65cbdc6f0 Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Wed, 15 May 2024 10:15:32 +0100 Subject: [PATCH 15/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json index 5ad0b72754..23ea317e2c 100644 --- a/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json +++ b/content/src/exercises/1e96f73b-8193-4aa6-a52c-31355eac3c08.json @@ -283,7 +283,7 @@ "theme": { "textColor": "#2E2E2E" }, - "hidden": true, + "hidden": false, "name": "Ultrapassar os desafios", "live": true, "published": true, From a88338ab5914ce7a47ae0fb056bb3e15b0ccb2f4 Mon Sep 17 00:00:00 2001 From: JorgeRS67 <117824150+JorgeRS67@users.noreply.github.com> Date: Wed, 15 May 2024 10:16:08 +0100 Subject: [PATCH 16/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C1e96f73b-819?= =?UTF-8?q?3-4aa6-a52c-31355eac3c08=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From cf36c09119ff4dc0e32b53ce01b94b5f28945a8b Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Thu, 16 May 2024 09:52:32 +0200 Subject: [PATCH 17/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5b0dea9f-c665-41ce-a779-601d0cfa433d.json | 88 +++++++++++++++---- 1 file changed, 70 insertions(+), 18 deletions(-) diff --git a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json index 0f235eddd7..18c7cf9100 100644 --- a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json +++ b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json @@ -25,11 +25,17 @@ ], "content": { "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673871362/Video/meditation_letting_go_of_control_mplxsm.mp4", + "source": "", "autoPlayLoop": false, + "audio": "", + "durationTimer": false, + "subtitles": "" + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_audio_white_sufmbz.json", + "subtitles": "https://res.cloudinary.com/cupcake-29k/raw/upload/q_auto,t_global/v1689679219/SRT%20(captions)%20files/letting_go_of_control_nhnnwa.srt", "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1668093018/Audio/meditation_letting_go_of_control_becb1s.mp3", - "durationTimer": true, - "subtitles": "https://res.cloudinary.com/cupcake-29k/raw/upload/q_auto,t_global/v1689679219/SRT%20(captions)%20files/letting_go_of_control_nhnnwa.srt" + "durationTimer": true } } }, @@ -46,8 +52,13 @@ "content": { "heading": "What's in your beach ball?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", - "durationTimer": true + "source": "", + "durationTimer": false + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_white_wvgwma.json", + "durationTimer": true, + "duration": 60 } } }, @@ -56,7 +67,12 @@ "content": { "heading": "What's in your beach ball?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", + "source": "", + "durationTimer": false + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_white_arvrf2.json", + "duration": 120, "durationTimer": true } }, @@ -92,8 +108,13 @@ "content": { "heading": "What if you let go of your beach ball?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", + "source": "", "durationTimer": true + }, + "lottie": { + "durationTimer": true, + "duration": 60, + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_white_wvgwma.json" } } }, @@ -111,8 +132,13 @@ "content": { "heading": "What if you let go of your beach ball?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", - "durationTimer": true + "source": "", + "durationTimer": false + }, + "lottie": { + "durationTimer": true, + "duration": 60, + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_white_arvrf2.json" } }, "hostNotes": [ @@ -433,11 +459,17 @@ ], "content": { "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673871362/Video/meditation_letting_go_of_control_mplxsm.mp4", + "source": "", "autoPlayLoop": false, + "audio": "", + "durationTimer": false, + "subtitles": "" + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_audio_white_sufmbz.json", + "subtitles": "https://res.cloudinary.com/cupcake-29k/raw/upload/q_auto,t_global/v1715606230/SRT%20(captions)%20files/The_beach_ball_Swe_Jackie_ceu9lk.srt", "audio": "https://res.cloudinary.com/cupcake-29k/video/upload/v1715606290/Audio/The_beach_ball_Swe_Jackie_oin9je.mp3", - "durationTimer": true, - "subtitles": "https://res.cloudinary.com/cupcake-29k/raw/upload/q_auto,t_global/v1715606230/SRT%20(captions)%20files/The_beach_ball_Swe_Jackie_ceu9lk.srt" + "durationTimer": true } } }, @@ -454,8 +486,13 @@ "content": { "heading": "Vad finns i din badboll?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", - "durationTimer": true + "source": "", + "durationTimer": false + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_white_wvgwma.json", + "durationTimer": true, + "duration": 60 } } }, @@ -464,7 +501,12 @@ "content": { "heading": "Vad finns i din badboll?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", + "source": "", + "durationTimer": false + }, + "lottie": { + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_white_arvrf2.json", + "duration": 120, "durationTimer": true } }, @@ -500,8 +542,13 @@ "content": { "heading": "Vad skulle hända om du släppte taget om din badboll?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673875921/Video/timer1_letting_go_of_control_z1x47a.mp4", + "source": "", "durationTimer": true + }, + "lottie": { + "durationTimer": true, + "duration": 60, + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676642915/Lottie/default_1min_white_wvgwma.json" } } }, @@ -519,8 +566,13 @@ "content": { "heading": "Vad skulle hända om du släppte taget om din badboll?", "video": { - "source": "https://res.cloudinary.com/cupcake-29k/video/upload/q_auto/v1673879667/Video/timer2_letting_go_of_control_nxhgat.mp4", - "durationTimer": true + "source": "", + "durationTimer": false + }, + "lottie": { + "durationTimer": true, + "duration": 60, + "source": "https://res.cloudinary.com/cupcake-29k/raw/upload/v1676639253/Lottie/default_2min_white_arvrf2.json" } }, "hostNotes": [ From 4f511a7863cee95c54cb75826daf78c6c0a525a7 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Thu, 16 May 2024 09:52:59 +0200 Subject: [PATCH 18/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 3a75d04b302555350a85d08d57bf917c0ae54346 Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Fri, 17 May 2024 09:40:21 +0200 Subject: [PATCH 19/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json index 18c7cf9100..18dfa025e2 100644 --- a/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json +++ b/content/src/exercises/5b0dea9f-c665-41ce-a779-601d0cfa433d.json @@ -678,7 +678,7 @@ "link": "https://aware.29k.org/letting-go-of-control", "id": "5b0dea9f-c665-41ce-a779-601d0cfa433d", "async": true, - "description": "Att försöka kontrollera vad vi känner eller tänker tenderar att slå tillbaka. I den här övningen övar vi på att släppa taget om en meningslös kamp, och istället använda vår energi till det som verkligen betyder något." + "description": "Att försöka kontrollera vad vi känner eller tänker tenderar att slå tillbaka. I den här övningen övar vi på att släppa taget om en meningslös kamp för att istället använda vår energi till det som verkligen betyder något." }, "ja": { "id": "5b0dea9f-c665-41ce-a779-601d0cfa433d", From fae477657ac58cc33328c9fca17a1ea5816d3cad Mon Sep 17 00:00:00 2001 From: Lisa29k <113595061+Lisa29k@users.noreply.github.com> Date: Fri, 17 May 2024 09:40:36 +0200 Subject: [PATCH 20/24] =?UTF-8?q?Update=20Exercise=20=E2=80=9C5b0dea9f-c66?= =?UTF-8?q?5-41ce-a779-601d0cfa433d=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From c7d755771783d40e3d37249cafa094e7b6957c33 Mon Sep 17 00:00:00 2001 From: gewfy Date: Fri, 17 May 2024 15:57:02 +0200 Subject: [PATCH 21/24] Reset to correct color after hasError --- client/src/lib/components/Typography/TextInput/TextInput.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/lib/components/Typography/TextInput/TextInput.tsx b/client/src/lib/components/Typography/TextInput/TextInput.tsx index 2747134d46..cf75abf922 100644 --- a/client/src/lib/components/Typography/TextInput/TextInput.tsx +++ b/client/src/lib/components/Typography/TextInput/TextInput.tsx @@ -16,7 +16,7 @@ const style = ({hasError = false}) => ({ ...textStyles.Body16, backgroundColor: COLORS.PURE_WHITE, borderRadius: 16, - color: hasError ? COLORS.ERROR : undefined, + color: hasError ? COLORS.ERROR : textStyles.Body16.color, }); const TextInput = styled.TextInput(style); From 6f99fbcc393d8ba51131a12e49d64216a80e32bc Mon Sep 17 00:00:00 2001 From: gewfy Date: Fri, 17 May 2024 15:58:04 +0200 Subject: [PATCH 22/24] Auto focus on fields correctly --- .../lib/components/VerificationCode/VerificationCode.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/client/src/lib/components/VerificationCode/VerificationCode.tsx b/client/src/lib/components/VerificationCode/VerificationCode.tsx index 2a00f1e721..b4edcb4089 100644 --- a/client/src/lib/components/VerificationCode/VerificationCode.tsx +++ b/client/src/lib/components/VerificationCode/VerificationCode.tsx @@ -36,10 +36,14 @@ type CellComponentProps = { onCellPress: () => void; onChangeText: (text: string) => void; hasError?: boolean; + autoFocus?: boolean; }; const CellComponent = React.forwardRef( - ({value, onCellPress, onKeyPress, onChangeText, hasError}, ref) => ( + ( + {value, onCellPress, onKeyPress, onChangeText, hasError, autoFocus}, + ref, + ) => ( ( onKeyPress={onKeyPress} selectTextOnFocus hasError={hasError} + autoFocus={autoFocus} /> ), @@ -113,6 +118,7 @@ const VerificationCode: React.FC = ({ id = setTimeout(() => { setCode([]); setShowError(false); + setFocusCells(true); cells[0].current?.focus(); }, 300); } @@ -167,6 +173,7 @@ const VerificationCode: React.FC = ({ onChangeText={updateCode(index)} onKeyPress={onKeyPress(index)} hasError={showError} + autoFocus={currentCell === index && prefillCode.length !== 6} /> ))} From 67797f825a2a2fe45e23c597147cc5f53515b37e Mon Sep 17 00:00:00 2001 From: gewfy Date: Fri, 17 May 2024 15:59:37 +0200 Subject: [PATCH 23/24] Fix issue with card modals being closed on keyboard focus --- client/src/lib/navigation/ModalStack.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/client/src/lib/navigation/ModalStack.tsx b/client/src/lib/navigation/ModalStack.tsx index ccd739e094..7433f5d558 100644 --- a/client/src/lib/navigation/ModalStack.tsx +++ b/client/src/lib/navigation/ModalStack.tsx @@ -153,7 +153,11 @@ const ModalStack = () => { const cardModalScreenOptions: BottomSheetNavigationOptions = useMemo( () => ({ ...modalScreenOptions, - snapPoints: [200], + /* + A smaller snapPoint number would cause an issue where keyboard animation closes the modal + https://github.com/gorhom/react-native-bottom-sheet/issues/1602 + */ + snapPoints: [300], detached: true, bottomInset: 10, style: { From 2cbcf61ab7451cffe3c9aeb01816162b6d1ce176 Mon Sep 17 00:00:00 2001 From: gewfy Date: Fri, 17 May 2024 16:00:03 +0200 Subject: [PATCH 24/24] Minor style fixes --- .../AddSessionByInviteModal.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/routes/modals/AddSessionByInviteModal/AddSessionByInviteModal.tsx b/client/src/routes/modals/AddSessionByInviteModal/AddSessionByInviteModal.tsx index 00f319b5c4..091025f6d9 100644 --- a/client/src/routes/modals/AddSessionByInviteModal/AddSessionByInviteModal.tsx +++ b/client/src/routes/modals/AddSessionByInviteModal/AddSessionByInviteModal.tsx @@ -7,11 +7,7 @@ import styled from 'styled-components/native'; import {JoinSessionError} from '../../../../../shared/src/errors/Session'; import {COLORS} from '../../../../../shared/src/constants/colors'; import Gutters from '../../../lib/components/Gutters/Gutters'; -import { - Spacer16, - Spacer24, - Spacer8, -} from '../../../lib/components/Spacers/Spacer'; +import {Spacer16, Spacer32} from '../../../lib/components/Spacers/Spacer'; import {Body16} from '../../../lib/components/Typography/Body/Body'; import VerificationCode from '../../../lib/components/VerificationCode/VerificationCode'; import {ModalStackProps} from '../../../lib/navigation/constants/routes'; @@ -24,6 +20,11 @@ import useLogSessionMetricEvents from '../../../lib/sessions/hooks/useLogSession const ErrorText = styled(Body16)({color: COLORS.ERROR, textAlign: 'center'}); +const Container = styled(Gutters)({ + flex: 1, + justifyContent: 'center', +}); + const AddSessionModal = () => { const {t} = useTranslation('Modal.JoinSession'); const {params: {inviteCode} = {}} = @@ -69,8 +70,7 @@ const AddSessionModal = () => { return ( - - + {errorString ? ( {errorString} ) : ( @@ -83,8 +83,8 @@ const AddSessionModal = () => { onCodeType={onCodeType} onCodeCompleted={onCodeCompleted} /> - - + + ); };