From 7fcf02186ada1e06c2bffa365fcc9bb469d30d03 Mon Sep 17 00:00:00 2001 From: peters-rebecca Date: Sun, 29 Sep 2024 22:18:31 +0200 Subject: [PATCH] Corrections Term 1 Part 2 --- docs/2024-25/year-1/beyond-sessions/index.md | 7 +------ .../index.md | 0 .../index.md | 0 .../index.md | 0 .../index.md | 16 +++++++++++++--- .../mandatory-courses/thesis-project/index.md | 3 +-- mkdocs.yml | 10 +++++----- 7 files changed, 20 insertions(+), 16 deletions(-) rename docs/2024-25/year-2/elective-courses/applied-theory-workshops/{circular-matter => carbon-based-design}/index.md (100%) rename docs/2024-25/year-2/elective-courses/applied-theory-workshops/{additive-manufacturing => non-planar-bio-additive-manufacturing}/index.md (100%) rename docs/2024-25/year-2/elective-courses/applied-theory-workshops/{substractive-manufacturing => weaving-natural-materials}/index.md (100%) rename docs/2024-25/year-2/mandatory-courses/{emergent-economies => emerging-economies}/index.md (98%) diff --git a/docs/2024-25/year-1/beyond-sessions/index.md b/docs/2024-25/year-1/beyond-sessions/index.md index e0c5502d..3406d400 100644 --- a/docs/2024-25/year-1/beyond-sessions/index.md +++ b/docs/2024-25/year-1/beyond-sessions/index.md @@ -44,9 +44,4 @@ By the end of the Beyond Masterclass Series, students are expected to achieve th - Interactive Q&A Sessions - Cross-Disciplinary Group Discussions - Reflective Learning and Feedback -- Networking Opportunities - - -## Faculty - -{{ insert_faculty() }} +- Networking Opportunities diff --git a/docs/2024-25/year-2/elective-courses/applied-theory-workshops/circular-matter/index.md b/docs/2024-25/year-2/elective-courses/applied-theory-workshops/carbon-based-design/index.md similarity index 100% rename from docs/2024-25/year-2/elective-courses/applied-theory-workshops/circular-matter/index.md rename to docs/2024-25/year-2/elective-courses/applied-theory-workshops/carbon-based-design/index.md diff --git a/docs/2024-25/year-2/elective-courses/applied-theory-workshops/additive-manufacturing/index.md b/docs/2024-25/year-2/elective-courses/applied-theory-workshops/non-planar-bio-additive-manufacturing/index.md similarity index 100% rename from docs/2024-25/year-2/elective-courses/applied-theory-workshops/additive-manufacturing/index.md rename to docs/2024-25/year-2/elective-courses/applied-theory-workshops/non-planar-bio-additive-manufacturing/index.md diff --git a/docs/2024-25/year-2/elective-courses/applied-theory-workshops/substractive-manufacturing/index.md b/docs/2024-25/year-2/elective-courses/applied-theory-workshops/weaving-natural-materials/index.md similarity index 100% rename from docs/2024-25/year-2/elective-courses/applied-theory-workshops/substractive-manufacturing/index.md rename to docs/2024-25/year-2/elective-courses/applied-theory-workshops/weaving-natural-materials/index.md diff --git a/docs/2024-25/year-2/mandatory-courses/emergent-economies/index.md b/docs/2024-25/year-2/mandatory-courses/emerging-economies/index.md similarity index 98% rename from docs/2024-25/year-2/mandatory-courses/emergent-economies/index.md rename to docs/2024-25/year-2/mandatory-courses/emerging-economies/index.md index 899a884b..db7c24bc 100644 --- a/docs/2024-25/year-2/mandatory-courses/emergent-economies/index.md +++ b/docs/2024-25/year-2/mandatory-courses/emerging-economies/index.md @@ -31,38 +31,50 @@ The Emerging Economies seminar examines how design influences new economic model === "14/10" - **Circular Economies and Value Flows** + **Circular Economies and Value Flows** + [Marion Real](https://fablabbcn.org/team/marion-real) + Explore how design supports decentralised economic models and large-scale collaboration, leveraging digital platforms and local networks to democratise resources and promote resilient communities. === "28/10" **Distributed Economies and Massive Collaboration** + [Jessica Guy](https://fablabbcn.org/team/jessica-guy) + Explore how design supports decentralised economic models and large-scale collaboration, leveraging digital platforms and local networks to democratise resources and promote resilient communities. === "4/11" **Ecological Interactions and the Economies of Nature** + [Jonathan Minchin](https://blog.iaac.net/faculty/jonathan-minchin/) - External + Examine the complex relationship between ecological systems and economic models, focusing on regenerative practices that integrate natural processes and enhance environmental resilience. === "11/11" **Regenerative Economies and Social Sustainability** + [Milena Juarez](https://fablabbcn.org/team/milena-calvo-juarez) + Investigate how regenerative design fosters social sustainability and equitable economic development, emphasising community-driven initiatives that balance environmental goals with local empowerment. === "18/11" **Social Entrepreneurship and Impact Economies** + [Alessandra Schmidt](https://fablabbcn.org/team/alessandra-schmidt) + Analyse how social entrepreneurship drives impactful economic models, creating shared value and addressing societal challenges through innovative business approaches that prioritise purpose over profit. === "2/12" **Emerging Economies and the Future of Work** + [Albert Cañigueral](https://www.albertcanigueral.com/) - External + Uncover the evolving nature of work, shaped by automation and digital platforms, and explore how design can influence emerging economies, creating new opportunities for meaningful and resilient labour practices. @@ -79,5 +91,3 @@ The Emerging Economies seminar examines how design influences new economic model !!! ects "European Credit Transfer and Accumulation System (ECTS)" {{ ects }} ECTS - - diff --git a/docs/2024-25/year-2/mandatory-courses/thesis-project/index.md b/docs/2024-25/year-2/mandatory-courses/thesis-project/index.md index e290fa44..6b85f818 100644 --- a/docs/2024-25/year-2/mandatory-courses/thesis-project/index.md +++ b/docs/2024-25/year-2/mandatory-courses/thesis-project/index.md @@ -6,7 +6,7 @@ course_type: Workshop feature_img: /assets/images/2024-25/year-2/modules/thesis-project.jpg img_caption: faculty: - - alejandra-tothill + - jana-tothill - roger-guilemany ects: 17 --- @@ -67,7 +67,6 @@ The specific goals are the following: These are the points we are going to look at: - Relevance of the project in relation to students’ positionality, situated contexts, and emerging challenges. -- - Framing and documenting the design opportunity of the thesis Development and involvement of a community of practice diff --git a/mkdocs.yml b/mkdocs.yml index 2346a822..954d758f 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -7,7 +7,7 @@ repo_url: https://github.com/fablabbcn/mdef-docs edit_uri: edit/main/docs/ nav: - - Welcome!: 2024-25/index.md + - About: 2024-25/index.md - Faculty: faculty/index.md - Students: 2024-25/students/index.md - Year 1: @@ -54,7 +54,7 @@ nav: - 2024-25/year-2/mandatory-courses/index.md - Thesis Project: 2024-25/year-2/mandatory-courses/thesis-project/index.md - Research & Methods: 2024-25/year-2/mandatory-courses/research-methods/index.md - - Emergent Economies: 2024-25/year-2/mandatory-courses/emergent-economies/index.md + - Emerging Economies: 2024-25/year-2/mandatory-courses/emerging-economies/index.md - Emergent Technolgies: 2024-25/year-2/mandatory-courses/emergent-technologies/index.md - Elective Courses: - 2024-25/year-2/elective-courses/index.md @@ -64,14 +64,14 @@ nav: - ReCITYing: 2024-25/year-2/elective-courses/applied-research-seminars/recitying/index.md - Applied Theory Workshops: - 2024-25/year-2/elective-courses/applied-theory-workshops/index.md - - Circular Matter: 2024-25/year-2/elective-courses/applied-theory-workshops/circular-matter/index.md + - Carbon Based Design: 2024-25/year-2/elective-courses/applied-theory-workshops/carbon-based-design/index.md - Business Innovation: 2024-25/year-2/elective-courses/applied-theory-workshops/business-innovation/index.md - Theories of the Urban: 2024-25/year-2/elective-courses/applied-theory-workshops/theories-of-the-urban/index.md - Ecological Interactions: 2024-25/year-2/elective-courses/applied-theory-workshops/ecological-interactions/index.md - Co-Creating Public Space: 2024-25/year-2/elective-courses/applied-theory-workshops/co-creating-public-spaces/index.md - Designing for More than Humans: 2024-25/year-2/elective-courses/applied-theory-workshops/designing-for-more-than-humans/index.md - - Additive Manufacturing: 2024-25/year-2/elective-courses/applied-theory-workshops/additive-manufacturing/index.md - - Substractive Manufacturing: 2024-25/year-2/elective-courses/applied-theory-workshops/substractive-manufacturing/index.md + - Non-Planar Bio-Additive Manufacturing: 2024-25/year-2/elective-courses/applied-theory-workshops/non-planar-bio-additive-manufacturing/index.md + - Weaving Natural Materials: 2024-25/year-2/elective-courses/applied-theory-workshops/weaving-natural-materials/index.md - Serious Games: 2024-25/year-2/elective-courses/applied-theory-workshops/serious-games/index.md - Transitional Landscapes: 2024-25/year-2/elective-courses/applied-theory-workshops/transitional-landscapes/index.md - Sensing: 2024-25/year-2/elective-courses/applied-theory-workshops/sensing/index.md