From a796184e3702c0fcf80df834b2731df168c894aa Mon Sep 17 00:00:00 2001 From: yuichitamiya <y2miyacatsfab@gmail.com> Date: Wed, 20 Apr 2022 13:37:58 +0900 Subject: [PATCH] fix machine building page --- docs/index.md | 4 ++-- .../images/kannai/3dprint_ver.jpg | Bin .../images/kannai/3dprint_ver2.jpg | Bin .../images/kannai/alminium_ver.JPG | Bin .../images/kannai/capstan.jpg | Bin .../images/kannai/control_board.jpg | Bin .../images/kannai/kannai_member1.jpg | Bin .../images/kannai/kannai_member2.jpg | Bin .../images/kannai/logo2022-yoko-w-trans.gif | Bin .../images/kannai/machine_frame.jpg | Bin .../images/kannai/machine_frame2.jpg | Bin .../images/kannai/mechanical_sand_timer.jpg | Bin .../images/kannai/members.png | Bin .../images/kannai/student.jpg | Bin .../images/mechanism_presentation.mp4 | Bin .../images/presentation.mp4 | Bin .../images/presentation.png | Bin .../machine-building.md | 21 +++++++++++------- 18 files changed, 15 insertions(+), 10 deletions(-) rename docs/{Machine_Building_Project => project}/images/kannai/3dprint_ver.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/3dprint_ver2.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/alminium_ver.JPG (100%) rename docs/{Machine_Building_Project => project}/images/kannai/capstan.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/control_board.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/kannai_member1.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/kannai_member2.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/logo2022-yoko-w-trans.gif (100%) rename docs/{Machine_Building_Project => project}/images/kannai/machine_frame.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/machine_frame2.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/mechanical_sand_timer.jpg (100%) rename docs/{Machine_Building_Project => project}/images/kannai/members.png (100%) rename docs/{Machine_Building_Project => project}/images/kannai/student.jpg (100%) rename docs/{Machine_Building_Project => project}/images/mechanism_presentation.mp4 (100%) rename docs/{Machine_Building_Project => project}/images/presentation.mp4 (100%) rename docs/{Machine_Building_Project => project}/images/presentation.png (100%) rename docs/{Machine_Building_Project => project}/machine-building.md (90%) diff --git a/docs/index.md b/docs/index.md index fe48498..3d8adb1 100644 --- a/docs/index.md +++ b/docs/index.md @@ -11,8 +11,8 @@ ## [**Machine Building**]() - [<ins>**FabLab Armenia Dilijan and Fablab Kannai Official Group Page**</ins>](https://fabacademy.org/2022/labs/dilijan/projects/machine_building/) -- [Assignment page](./Weekly_Group_Assignments/week11.md) -- [Kannai Team page](./Machine_Building_Project/machine-building.md) +- [Kannai Assignment Page](./Weekly_Group_Assignments/week11.md) +- [Kannai Team Page](./project/machine-building.md) ## Students diff --git a/docs/Machine_Building_Project/images/kannai/3dprint_ver.jpg b/docs/project/images/kannai/3dprint_ver.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/3dprint_ver.jpg rename to docs/project/images/kannai/3dprint_ver.jpg diff --git a/docs/Machine_Building_Project/images/kannai/3dprint_ver2.jpg b/docs/project/images/kannai/3dprint_ver2.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/3dprint_ver2.jpg rename to docs/project/images/kannai/3dprint_ver2.jpg diff --git a/docs/Machine_Building_Project/images/kannai/alminium_ver.JPG b/docs/project/images/kannai/alminium_ver.JPG similarity index 100% rename from docs/Machine_Building_Project/images/kannai/alminium_ver.JPG rename to docs/project/images/kannai/alminium_ver.JPG diff --git a/docs/Machine_Building_Project/images/kannai/capstan.jpg b/docs/project/images/kannai/capstan.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/capstan.jpg rename to docs/project/images/kannai/capstan.jpg diff --git a/docs/Machine_Building_Project/images/kannai/control_board.jpg b/docs/project/images/kannai/control_board.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/control_board.jpg rename to docs/project/images/kannai/control_board.jpg diff --git a/docs/Machine_Building_Project/images/kannai/kannai_member1.jpg b/docs/project/images/kannai/kannai_member1.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/kannai_member1.jpg rename to docs/project/images/kannai/kannai_member1.jpg diff --git a/docs/Machine_Building_Project/images/kannai/kannai_member2.jpg b/docs/project/images/kannai/kannai_member2.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/kannai_member2.jpg rename to docs/project/images/kannai/kannai_member2.jpg diff --git a/docs/Machine_Building_Project/images/kannai/logo2022-yoko-w-trans.gif b/docs/project/images/kannai/logo2022-yoko-w-trans.gif similarity index 100% rename from docs/Machine_Building_Project/images/kannai/logo2022-yoko-w-trans.gif rename to docs/project/images/kannai/logo2022-yoko-w-trans.gif diff --git a/docs/Machine_Building_Project/images/kannai/machine_frame.jpg b/docs/project/images/kannai/machine_frame.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/machine_frame.jpg rename to docs/project/images/kannai/machine_frame.jpg diff --git a/docs/Machine_Building_Project/images/kannai/machine_frame2.jpg b/docs/project/images/kannai/machine_frame2.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/machine_frame2.jpg rename to docs/project/images/kannai/machine_frame2.jpg diff --git a/docs/Machine_Building_Project/images/kannai/mechanical_sand_timer.jpg b/docs/project/images/kannai/mechanical_sand_timer.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/mechanical_sand_timer.jpg rename to docs/project/images/kannai/mechanical_sand_timer.jpg diff --git a/docs/Machine_Building_Project/images/kannai/members.png b/docs/project/images/kannai/members.png similarity index 100% rename from docs/Machine_Building_Project/images/kannai/members.png rename to docs/project/images/kannai/members.png diff --git a/docs/Machine_Building_Project/images/kannai/student.jpg b/docs/project/images/kannai/student.jpg similarity index 100% rename from docs/Machine_Building_Project/images/kannai/student.jpg rename to docs/project/images/kannai/student.jpg diff --git a/docs/Machine_Building_Project/images/mechanism_presentation.mp4 b/docs/project/images/mechanism_presentation.mp4 similarity index 100% rename from docs/Machine_Building_Project/images/mechanism_presentation.mp4 rename to docs/project/images/mechanism_presentation.mp4 diff --git a/docs/Machine_Building_Project/images/presentation.mp4 b/docs/project/images/presentation.mp4 similarity index 100% rename from docs/Machine_Building_Project/images/presentation.mp4 rename to docs/project/images/presentation.mp4 diff --git a/docs/Machine_Building_Project/images/presentation.png b/docs/project/images/presentation.png similarity index 100% rename from docs/Machine_Building_Project/images/presentation.png rename to docs/project/images/presentation.png diff --git a/docs/Machine_Building_Project/machine-building.md b/docs/project/machine-building.md similarity index 90% rename from docs/Machine_Building_Project/machine-building.md rename to docs/project/machine-building.md index d884a6f..547b981 100644 --- a/docs/Machine_Building_Project/machine-building.md +++ b/docs/project/machine-building.md @@ -1,4 +1,4 @@ -## <span style="color:white">Machine Building 2022</span> +## <span style="color:white">Machine Building 2022 Kannai Team</span> # <span style="color:white"><b>Mechanical Sand Timer</b></span> {width=300} @@ -62,7 +62,7 @@ body { </video> ## <span style="color:white">Kannai Team Members</span> -{width=600} +<!--{width=600} --> {width=600} <br/> |<br/> |<br/> @@ -71,11 +71,16 @@ body { || || - - - - - +<br /> +<br /> +<br /> +<br /> +<br /> +<br /> +<br /> +<br /> +<br /> +<br /> <br /> <br /> <br /> @@ -88,7 +93,7 @@ body { <br /> # <span style="color:white">**FabLab Armenia Dilijan** and **Fablab Kannai**</span> -# <span style="color:white">**FabAcademy Group project**</span> +# <span style="color:white">**Machine Building Group Project**</span> ## [<span style="color:white"><ins>Link to Official Group Site</ins>](https://fabacademy.org/2022/labs/dilijan/projects/machine_building/)</span> ## <span style="color:white">Presentation Slide</span> -- GitLab