diff --git a/deploy.sh b/deploy.sh index f4e9a3c..170733f 100755 --- a/deploy.sh +++ b/deploy.sh @@ -1,39 +1,30 @@ #!/bin/bash -echo "---> 'git fetch'" +#monitoring each command invokations (on) +set -x + git fetch -echo "---> 'git pull'" git pull -echo "---> 'rm data/.ignore'" rm data/.ignore -echo "---> 'cp test_data/.ignore data/'" cp test_data/.ignore data/ -echo "---> 'rm -r data/src'" rm -r data/src -echo "---> 'cp -r test_data/src/ data/'" cp -r test_data/src/ data/ -echo "---> 'rm data/about.html'" rm data/about.html -echo "---> 'cp test_data/about.html data/'" cp test_data/about.html data/ -echo "---> 'rm data/home.html'" rm data/home.html -echo "---> 'cp test_data/home.html data/'" cp test_data/home.html data/ -echo "---> 'rm data/participants.html'" rm data/participants.html -echo "---> 'cp test_data/participants.html data/'" cp test_data/participants.html data/ -echo "---> 'rm data/index.html'" rm data/index.html -echo "---> 'cp test_data/index.html data/'" cp test_data/index.html data/ -echo "---> 'python distribusi/test.py -t -d ./data/'" python distribusi/test.py -t -d ./data/ + +#monitoring each command invokations (off) +set +x diff --git a/distribusi/distribusi/page_template.py b/distribusi/distribusi/page_template.py index 9337901..f16d87b 100644 --- a/distribusi/distribusi/page_template.py +++ b/distribusi/distribusi/page_template.py @@ -1,12 +1,12 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- html_head = """ - + 환대의 조각들 Fragments of Hospitality - + %s diff --git a/distribusi/distribusi/page_template_event.py b/distribusi/distribusi/page_template_event.py index a089a7e..2daf372 100644 --- a/distribusi/distribusi/page_template_event.py +++ b/distribusi/distribusi/page_template_event.py @@ -1,19 +1,19 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # This template is used for generating each event pages # Please refer `event/0000/events_sample.html` html_head_event = """ - + - + - + 환대의 조각들 Fragments of Hospitality - + %s diff --git a/distribusi/distribusi/page_template_events.py b/distribusi/distribusi/page_template_events.py index 88a0d97..6aec4ed 100644 --- a/distribusi/distribusi/page_template_events.py +++ b/distribusi/distribusi/page_template_events.py @@ -1,4 +1,4 @@ -# -*- coding: utf-8 -*- +# -*- coding: utf-8 -*- # This template is used for generating the list of event # Each folders should be diplayed as `div` with className 'row_event' @@ -6,7 +6,7 @@ html_head_events = """ - + 환대의 조각들 Fragments of Hospitality diff --git a/test_data/about.html b/test_data/about.html index 5a56a2e..15eac16 100644 --- a/test_data/about.html +++ b/test_data/about.html @@ -1,5 +1,5 @@ - + 환대의 조각들 Fragments of Hospitality @@ -79,11 +79,11 @@ In an academic paper on “snow crystals”, Dr. Ukichiro Nakaya presents years of his observation pertaining to how and in what forms the snow crystals are formed. Contrary to the common understanding that they only take a couple of forms, snow crystals actually assume numerous forms depending on climate, temperature, and region. The fact that white snow crystals that come to us on a dark winter night as if they are giving us hospitality, in fact, reveal such diverse types and shapes, seems to fit right into our “fragments of hospitality” project. Like Dr. Nakaya, inspired by the work done by various artists and participants, we draw forms that have become abstract. Eventually, those fragments would diversify to have emotions, glitter like the snow crystals, or become mixed together and turn into water.

Methods of connection
- Individuals collecting fragments each have their own folder. When they put a story, picture, audio, or video file inside a folder, each fragment is assigned a serial number, and gets accumulated in the fragments of hospitality website.The fragments connect us. + Individuals collecting fragments each have their own folder. When they put a story, picture, audio, or video file inside a folder, each fragment is assigned a serial number, and gets accumulated in the fragments of hospitality website.The fragments connect us. We hope that we can choose the “nature and attitude” of the medium that mediates our connection.

- *We borrowed the method of exchange and sharing from distribusi, a project that proposes the form of publication that documents and updates communal project. + *We borrowed the method of exchange and sharing from distribusi, a project that proposes the form of publication that documents and updates communal project. 디스트리붓시

@@ -149,7 +149,7 @@ diff --git a/test_data/about_en.html b/test_data/about_en.html index 27fe6d7..395d760 100644 --- a/test_data/about_en.html +++ b/test_data/about_en.html @@ -1,5 +1,5 @@ - + 환대의 조각들 Fragments of Hospitality @@ -79,10 +79,10 @@ In an academic paper on “snow crystals”, Dr. Ukichiro Nakaya presents years of his observation pertaining to how and in what forms the snow crystals are formed. Contrary to the common understanding that they only take a couple of forms, snow crystals actually assume numerous forms depending on climate, temperature, and region. The fact that white snow crystals that come to us on a dark winter night as if they are giving us hospitality, in fact, reveal such diverse types and shapes, seems to fit right into our “fragments of hospitality” project. Like Dr. Nakaya, inspired by the work done by various artists and participants, we draw forms that have become abstract. Eventually, those fragments would diversify to have emotions, glitter like the snow crystals, or become mixed together and turn into water.

Methods of connection
- Individuals collecting fragments each have their own folder. When they put a story, picture, audio, or video file inside a folder, each fragment is assigned a serial number, and gets accumulated in the fragments of hospitality website.The fragments connect us. + Individuals collecting fragments each have their own folder. When they put a story, picture, audio, or video file inside a folder, each fragment is assigned a serial number, and gets accumulated in the fragments of hospitality website.The fragments connect us. We hope that we can choose the “nature and attitude” of the medium that mediates our connection.

- *We borrowed the method of exchange and sharing from distribusi, a project that proposes the form of publication that documents and updates communal project. + *We borrowed the method of exchange and sharing from distribusi, a project that proposes the form of publication that documents and updates communal project. 디스트리붓시

diff --git a/test_data/carrot/index.html b/test_data/carrot/index.html index b3b4c27..349fc75 100644 --- a/test_data/carrot/index.html +++ b/test_data/carrot/index.html @@ -1,17 +1,17 @@ - + - + - + - +
@@ -69,7 +69,7 @@

이런 저런 이야기를 써볼 수 있겠죠

md쓰기.md#0004
test002.txttest002.txt#0005
오늘은 11월입니다. 시간은 너무 빨라. -띄어쓰기보다는 +띄어쓰기보다는 탭 탭 탭
txt쓰기.txt#0006
꾸물꾸물.mov#0007
질주.mp4#0008
diff --git a/test_data/events/0000/index.html b/test_data/events/0000/index.html index 4aa35da..985a193 100644 --- a/test_data/events/0000/index.html +++ b/test_data/events/0000/index.html @@ -1,16 +1,16 @@ - + - + - + 환대의 조각들 Fragments of Hospitality - + - + @@ -67,19 +67,19 @@
Banana_closeup.jpeg
Banana_closeup.jpeg
#-1
Banana_humming.mp3#-1
- + 환대의 조각들 Fragments of Hospitality - + - + - +
diff --git a/test_data/events/0001/index.html b/test_data/events/0001/index.html index ac51a62..e90653e 100644 --- a/test_data/events/0001/index.html +++ b/test_data/events/0001/index.html @@ -1,16 +1,16 @@ - + - + - + 환대의 조각들 Fragments of Hospitality - + - + @@ -81,35 +81,35 @@
음성은 촉각적이다.
text 4.txt#-1
1. 나의 콧노래의 시작은 어디일까 -낮잠을 재우려는 엄마의 토닥임과 -낮은 흥얼거림에서 시작되었을 수도 있고 -맛이라는 것을 처음 알았을 때의 놀라움에서 -시작되었을지도 모르겠다. +낮잠을 재우려는 엄마의 토닥임과 +낮은 흥얼거림에서 시작되었을 수도 있고 +맛이라는 것을 처음 알았을 때의 놀라움에서 +시작되었을지도 모르겠다. 2. -콧노래는 온도와 맞닿아 있는지도 모르겠다. -어떤 콧노래는 뜨겁고 어떤 콧노래는 스산하다. +콧노래는 온도와 맞닿아 있는지도 모르겠다. +어떤 콧노래는 뜨겁고 어떤 콧노래는 스산하다. 3. -잘 부르는 콧노래와 못 부르는 콧노래를 -구분 지을 수 있을까? -우열이 없다는 게 안심이 된다. +잘 부르는 콧노래와 못 부르는 콧노래를 +구분 지을 수 있을까? +우열이 없다는 게 안심이 된다. 애쓰지 않아도 된다는 게 위로가 된다.
text 6.txt#-1
코와 입 사이 인중 어딘가 혹은 눈와 눈사이 -혹은 -양쪽 콧볼과 팔자주름이 만나는 지점에서 +혹은 +양쪽 콧볼과 팔자주름이 만나는 지점에서 시작되는 콧_노래
text 7.txt#-1
콧노래를 수집하면 -사람의 체온, 그날의 날씨, 공기가 같이 수집된다. -누군가의 콧노래는 축축하고 +사람의 체온, 그날의 날씨, 공기가 같이 수집된다. +누군가의 콧노래는 축축하고 누군가의 콧노래는 햇볕에 냄새가 나며 -누군가의 콧노래는 무겁게 내려앉은 새벽에 공기가 느껴진다. +누군가의 콧노래는 무겁게 내려앉은 새벽에 공기가 느껴진다.
text.txt#-1
diff --git a/test_data/events/0002/index.html b/test_data/events/0002/index.html index 95eb96b..b0ce5bc 100644 --- a/test_data/events/0002/index.html +++ b/test_data/events/0002/index.html @@ -1,16 +1,16 @@ - + - + - + 환대의 조각들 Fragments of Hospitality - + - + diff --git a/test_data/events/event_sample.html b/test_data/events/event_sample.html index 6c9f338..68fee85 100644 --- a/test_data/events/event_sample.html +++ b/test_data/events/event_sample.html @@ -1,17 +1,17 @@ - + 환대의 조각들 Fragments of Hospitality - + - + - +
@@ -76,4 +76,4 @@ - \ No newline at end of file + diff --git a/test_data/events/index.html___.html b/test_data/events/index.html___.html deleted file mode 100644 index 0b04298..0000000 --- a/test_data/events/index.html___.html +++ /dev/null @@ -1,244 +0,0 @@ - - - - - 환대의 조각들 Fragments of Hospitality - - - - - - - - - - - - -
- - -
- -
- -
-
-
-
-
-
- - -
- -
-
-
- -
-
-
data.jsondata.json#-1
-../ -
-
- - - 환대의 조각들 Fragments of Hospitality - - - - - - - - - - - - -
- - - - - -
- -
- -
-
-
-
-
- -
-
- -
-
- -
-
-
- -
-
- - -
-
-
- - - - - - - -
-#-1
-
-
Banana_closeup.jpeg
Banana_closeup.jpeg
-
Banana_humming.mp3
-
Humming_for_myself.jpeg
Humming_for_myself.jpeg
-
My_sister_family.MP4
-
flowing_humming.jpg
flowing_humming.jpg
-
flowing_humming_2.jpg
flowing_humming_2.jpg
-
humming1.mp3
-
humming_banana.jpg
humming_banana.jpg
-
허밍을 악보로 그리듯이 적어보았다.
humming_score.jpeg
-
humming_walk.MP4
-
lie_down_alone.jpg
lie_down_alone.jpg
-
shooting_stars.jpg
shooting_stars.jpg
-
tactile_voice.jpeg
tactile_voice.jpeg
-
콧- 노래 - 0. 입을 다문 채 코로 소리를 내어 부르는 노래 - 0. 코와 입 중간 인중 어딘가에서 나는 소리 혹은 울림 - 0. 스스로를 위로하기 위한 행동 - 0. 다른 사람에게 쉽게 전염시킬 수 있는 공명 -
text 3.txt
-
음성은 촉각적이다.
text 4.txt
-
1. -나의 콧노래의 시작은 어디일까 -낮잠을 재우려는 엄마의 토닥임과 -낮은 흥얼거림에서 시작되었을 수도 있고 -맛이라는 것을 처음 알았을 때의 놀라움에서 -시작되었을지도 모르겠다. - -2. -콧노래는 온도와 맞닿아 있는지도 모르겠다. -어떤 콧노래는 뜨겁고 어떤 콧노래는 스산하다. - -3. -잘 부르는 콧노래와 못 부르는 콧노래를 -구분 지을 수 있을까? -우열이 없다는 게 안심이 된다. -애쓰지 않아도 된다는 게 위로가 된다. - -
text 6.txt
-
코와 입 사이 인중 어딘가 -혹은 -눈와 눈사이 -혹은 -양쪽 콧볼과 팔자주름이 만나는 지점에서 -시작되는 콧_노래 - -
text 7.txt
-
콧노래를 수집하면 -사람의 체온, 그날의 날씨, 공기가 같이 수집된다. -누군가의 콧노래는 축축하고 -누군가의 콧노래는 햇볕에 냄새가 나며 -누군가의 콧노래는 무겁게 내려앉은 새벽에 공기가 느껴진다. - - -
text.txt
-
the_beginning_of_a_humming1.jpg
the_beginning_of_a_humming1.jpg
-
the_beginning_of_a_humming2.jpg
the_beginning_of_a_humming2.jpg
-
the_beginning_of_a_humming3.jpg
the_beginning_of_a_humming3.jpg
-
the_beginning_of_a_humming4.jpg
the_beginning_of_a_humming4.jpg
-
the_beginning_of_a_humming5.jpg
the_beginning_of_a_humming5.jpg
-
the_beginning_of_a_humming6.jpg
the_beginning_of_a_humming6.jpg
-
the_beginning_of_a_humming7.jpg
the_beginning_of_a_humming7.jpg
-
the_beginning_of_a_humming8.jpeg
the_beginning_of_a_humming8.jpeg
-
while_washing_the_dishes.jpg
while_washing_the_dishes.jpg
-
으므므움음.jpg
으므므움음.jpg
-
콧노래만스쳐도인연.jpg
콧노래만스쳐도인연.jpg
-#-1
-
-
하늘 - -하루에 하늘을 몇번이나 볼까요? -하늘은 누구에게나 열려있는 둘도 없는 공공재가 아닐까 합니다. -60여일간 각각 다른 하늘을 찍고 짧은 단상을 적어보려고 합니다.
1013.txt
-
E7D3E4F7-7D57-4F6A-A9F3-916E12461772.jpeg
E7D3E4F7-7D57-4F6A-A9F3-916E12461772.jpeg
-
지하철 플랫폼. -발 디딜틈 없이 수 많은 인파. -한명의 예외없이 모두 고개를 숙이고 각자의 세계에 몰입 중이다. -스마트폰이라는 세계. -각박한 현실에서 그나마 볼 수 있는 작은 꿈의 조각.
1014.txt
-
9D708FDE-5B8C-4812-9CCB-2ACDA9CC517F.jpeg
9D708FDE-5B8C-4812-9CCB-2ACDA9CC517F.jpeg
-
특별히 자주 보게 되는 하늘이 있다. -의도하지 않아도 늘 보게 되는 하늘. -출근길 지하철 출구를 올라오며 마주하는 하늘. -무심하게 스쳐 지나갔다. -
1015.txt
-
43D750DF-A8FD-462D-A05D-D00A8113D623.jpeg
43D750DF-A8FD-462D-A05D-D00A8113D623.jpeg
-#-1
- -
-
-
- - - - - - diff --git a/test_data/fig/20201020/index.html b/test_data/fig/20201020/index.html index 6159ad8..d9b52eb 100644 --- a/test_data/fig/20201020/index.html +++ b/test_data/fig/20201020/index.html @@ -1,17 +1,17 @@ - + - + - + - +
diff --git a/test_data/fig/20201022/index.html b/test_data/fig/20201022/index.html index 6159ad8..d9b52eb 100644 --- a/test_data/fig/20201022/index.html +++ b/test_data/fig/20201022/index.html @@ -1,17 +1,17 @@ - + - + - + - +
diff --git a/test_data/fig/20201029/index.html b/test_data/fig/20201029/index.html index 6159ad8..d9b52eb 100644 --- a/test_data/fig/20201029/index.html +++ b/test_data/fig/20201029/index.html @@ -1,17 +1,17 @@ - + - + - + - +
diff --git a/test_data/fig/index.html b/test_data/fig/index.html index 086e4da..ace0ff2 100644 --- a/test_data/fig/index.html +++ b/test_data/fig/index.html @@ -1,17 +1,17 @@ - + - + - + - +
diff --git a/test_data/fragment.html b/test_data/fragment.html index 4092721..cd2f1a4 100644 --- a/test_data/fragment.html +++ b/test_data/fragment.html @@ -1,16 +1,16 @@ - + 환대의 조각들 Fragments of Hospitality - + - + - +
@@ -85,4 +85,4 @@ - \ No newline at end of file + diff --git a/test_data/grape/index.html b/test_data/grape/index.html index 929cef6..e297d68 100644 --- a/test_data/grape/index.html +++ b/test_data/grape/index.html @@ -1,17 +1,17 @@ - + - + - + - +
diff --git a/test_data/home.html b/test_data/home.html index 5c5b3b4..b9e0f4d 100644 --- a/test_data/home.html +++ b/test_data/home.html @@ -2,11 +2,11 @@ - + 환대의 조각들 Fragments of Hospitality - + @@ -154,7 +154,7 @@ d="M136.37,98.36c-11.75.13-23.51.15-35.27.47a41.2,41.2,0,0,0-9.41,1.73,50.19,50.19,0,0,1-18.43,1.83,85.76,85.76,0,0,0-10.5-.52,43.45,43.45,0,0,1-13.65-2.3,95.47,95.47,0,0,0-17.79-4.06,66.72,66.72,0,0,0-10,.2c-2.08.09-4.15.37-6.22.53a4.16,4.16,0,0,1-1.31-.12c-1.42-.39-1.84-1.24-1.8-3.37.11-5.74.24-11.48.26-17.21,0-12,0-24,0-35.95,0-1.14,0-2.3,0-3.44.06-2.07.53-2.77,1.91-2.85,2-.11,3.93-.21,5.9-.25,3.74-.08,7.36-1.42,11-2.36,8.38-2.13,16.78-3.46,25.29-2.39a16.85,16.85,0,0,0,2.13.07c7.28,0,14.56.16,21.83-.05,5.08-.14,10.15-.77,15.23-1.18,2.18-.18,4.37-.33,6.55-.58,5.23-.59,10.45-1.25,15.68-1.83a43.66,43.66,0,0,1,4.43-.23c7,0,14-.1,21,0a50.41,50.41,0,0,0,12.22-1.69,128.25,128.25,0,0,1,17.87-3.34c6.66-.58,13.3-1.51,20-2,4.64-.36,9.3-.17,13.94-.41A27.24,27.24,0,0,0,215,16a12.93,12.93,0,0,1,5.1-.94c1.29.08,2.59.28,3.88.46.62.08.93.7,1.13,1.55.26,1.06.65,2.06.88,3.13A24.07,24.07,0,0,1,226.6,24a54,54,0,0,1-.68,10.48c-.34,2.39-.49,4.85-.59,7.29-.08,2,0,4.11,0,6.16.19,7.51-.68,14.86-1.48,22.23-.38,3.55-.59,7.15-.82,10.73-.16,2.66-.83,4-2.59,4.14-5.63.36-11.16,2.08-16.76,2.85-2.34.32-4.69.4-7,.56-5.63.38-11.26.56-16.88,1.14a108,108,0,0,0-18.95,4.09c-4.93,1.45-9.87,2.77-14.82,4A18.07,18.07,0,0,1,142,98c-1.86.05-3.72,0-5.58,0ZM220.26,81c.24-3.05.34-5.92.69-8.72A184.55,184.55,0,0,0,222.69,42a58.4,58.4,0,0,1,.75-9.73A69.23,69.23,0,0,0,224,24c0-3-1.66-5.14-3.45-4.83-2.54.45-5.08,1.06-7.63,1.27-5.35.44-10.71.68-16.06,1-1.64.09-3.29,0-4.92.12-5.78.57-11.55,1.35-17.33,1.83A125.9,125.9,0,0,0,156,26.72a50.69,50.69,0,0,1-12.55,1.73c-7.11-.14-14.23,0-21.34,0a26.47,26.47,0,0,0-3,.13c-5.29.61-10.57,1.28-15.85,1.87-2.18.25-4.37.36-6.55.56-4.53.42-9,1.19-13.58,1.23-10.28.09-20.57,0-30.85-.33a74.87,74.87,0,0,0-20.7,2.73C26.44,36,21.25,37.53,15.9,37.23a3.75,3.75,0,0,0-1,.21V92.2c1.87-.12,3.65-.3,5.44-.36,3.93-.12,7.88-.54,11.8-.18,5.94.56,11.78,2.33,17.63,4a52.6,52.6,0,0,0,9.55,2.08c4.69.48,9.4.49,14.1.65,5.41.18,10.81.22,16.17-1.4a41.11,41.11,0,0,1,10.21-2c14-.5,27.89-.66,41.84-1a16.72,16.72,0,0,0,3.93-.28c6.66-1.73,13.32-3.56,20-5.4a93.75,93.75,0,0,1,18.88-3.18c4.09-.28,8.2-.45,12.29-.7A62,62,0,0,0,203,84c4.61-.74,9.21-1.64,13.82-2.45C217.9,81.3,219.05,81.2,220.26,81Z" /> Grace Kim - + mooming @@ -222,7 +222,7 @@ - Song Soo + Song Soo