KatchUp w/ upstream

.travis.yml

@@ -4,17 +4,23 @@ cache:
   directories:
     - '$HOME/.npm'
 before_install:
-  - if [ "$TRAVIS_BRANCH" = "master" ]; then git remote set-branches --add origin web; git fetch origin web; git checkout web; fi
-script: npm run build
-deploy:
-  provider: s3
-  access_key_id: ztDf0fCxr0eCgSIi
-  secret_access_key:
-    secure:
-      pqtYVC6ztu5Nowklu5vjXY8LUyQZ/8kGj7Dds9eWxNuDJbxrC8FGaTZRkRTEakbFtDTU78jiaaIn8FXYEyeGW7AmkU+V20Nc2TV5HWPVIiHyodfRul6PYZT6ad5iSCsNeU7xRr+aI4UtFGxwbox+aVEDB9+j9Nnbt0wagE+sOsQnY2Pzwgf9/AepBjgjg3owcJ1fYTw0IMlejfR1yQIriel9WzrQNWC/QFunihAAPZRNyvNui33YP3m49+HXzk1a/tKtP1U/twI4/ygqGWQG2e8UvxIIew0Jt+Io84AgP5koAGAZIr4s8Yl+6BvnOKA73n4gjHYYo/ASfmnzQ6yUIS2OkKPEqwHf3kx4fWYU3wzDoB+BpH8LxgcLVoKWZKa7HVXMY/3yyGDcOfKBS78R8zqRqut0OfMuSAg4/rocp1jtUFOg0Cw0/F69wo2yQVCfZu5JWPfpKtF8iiLyuJcNOB9oTirXNcSFriNMG+T2QmqemG6XxlBzj+ZFIJqOMOcHgUiEF6z4/rwly17/m5gNUSbSoUpvpTSu/ioqzj9RT1Z6EpfqEGvkdpOna7/tdCQBpqFqy+ofjQLzuurKSCDeNx9gOHh6oQJ8ozj6G+KHWR25GpL96/ZscTl9UqTyqypnwtgjEgDR29viKGEFVWpf70uigi2w0lMYDC4Lop4FOuQ=
-  bucket: satori
-  skip_cleanup: true
-  local-dir: dist/dress
-  endpoint: https://minio.moecube.com/satori
-  on:
-    all_branches: true
+  - 'if [ "$TRAVIS_BRANCH" = "master" ]; then git remote set-branches --add origin web; git fetch origin web; git checkout web; fi'
+script:
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/getGHPage.sh; fi'
+  - 'npm run build'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/pushGHPage.sh; fi'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/getGHPage_drsrel.sh; fi'
+  - 'npm run build'
+  - 'if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then bash ./deploy/pushGHPage.sh; fi'
+# deploy:
+#   provider: s3
+#   access_key_id: ztDf0fCxr0eCgSIi
+#   secret_access_key:
+#     secure:
+#       pqtYVC6ztu5Nowklu5vjXY8LUyQZ/8kGj7Dds9eWxNuDJbxrC8FGaTZRkRTEakbFtDTU78jiaaIn8FXYEyeGW7AmkU+V20Nc2TV5HWPVIiHyodfRul6PYZT6ad5iSCsNeU7xRr+aI4UtFGxwbox+aVEDB9+j9Nnbt0wagE+sOsQnY2Pzwgf9/AepBjgjg3owcJ1fYTw0IMlejfR1yQIriel9WzrQNWC/QFunihAAPZRNyvNui33YP3m49+HXzk1a/tKtP1U/twI4/ygqGWQG2e8UvxIIew0Jt+Io84AgP5koAGAZIr4s8Yl+6BvnOKA73n4gjHYYo/ASfmnzQ6yUIS2OkKPEqwHf3kx4fWYU3wzDoB+BpH8LxgcLVoKWZKa7HVXMY/3yyGDcOfKBS78R8zqRqut0OfMuSAg4/rocp1jtUFOg0Cw0/F69wo2yQVCfZu5JWPfpKtF8iiLyuJcNOB9oTirXNcSFriNMG+T2QmqemG6XxlBzj+ZFIJqOMOcHgUiEF6z4/rwly17/m5gNUSbSoUpvpTSu/ioqzj9RT1Z6EpfqEGvkdpOna7/tdCQBpqFqy+ofjQLzuurKSCDeNx9gOHh6oQJ8ozj6G+KHWR25GpL96/ZscTl9UqTyqypnwtgjEgDR29viKGEFVWpf70uigi2w0lMYDC4Lop4FOuQ=
+#   bucket: satori
+#   skip_cleanup: true
+#   local-dir: dist/dress
+#   endpoint: https://minio.moecube.com/satori
+#   on:
+#     all_branches: true

1.Tamakin/README.md

@@ -0,0 +1,4 @@
+萌就是正义
+我就是萌的代言人（无耻）
+
+欢迎勾搭，但是我就是不留联系方式，啊哈哈哈哈 QWQ

447f.Misaka/.gitkeep

@@ -0,0 +1 @@
+

Bio-punk/.gitignore

@@ -0,0 +1,2 @@
+/*.bmp
+/*.png

Bio-punk/zipPhoto.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*- 
+
+import cv2
+from os import listdir
+from re import match
+from re import I as flag
+import numpy as np
+
+def resize_width(image, width=1200):
+	power = width * 1.0 / image.shape[1]
+	dim = (width, int(image.shape[0] * power))
+	resized = cv2.resize(image, dim, interpolation=cv2.INTER_AREA)
+	return resized
+
+def zip_photo(filepath):
+	targetWidth = 1366
+	image = cv2.imread(filepath)
+	if image.shape[0] > targetWidth:
+		image = resize_width(image=image, width = targetWidth)
+	cv2.imwrite("{}.jpg".format(filepath), image)
+
+dirpath = "."
+for filename in listdir(dirpath):
+	ans = match("^(.*)[.]((png)|(bmp)|(jpg)|(jpeg))$", filename, flag)
+	if ans is not None:
+		print (filename)
+		zip_photo("{}/{}".format(dirpath, filename))

CONTRIBUTING.md

@@ -3,7 +3,12 @@
 - 萌即正义
 - 性别不限
 
-## 隐私提醒 Privacy Notice
+### 隐私提醒
 
-照片中有 EXIF 数据，会存储地理位置、拍照设备等信息。如果你不想公开这些信息，可以删除 EXIF。  
-删除方法参考 https://forums.adobe.com/thread/890607
+### Privacy Notice
+
+照片中有 EXIF 数据，会存储地理位置、拍照设备等信息。请留意意外的个人信息泄漏，push照片前，请仔细检查照片的EXIF信息是否得到妥善处理。如果你不想公开这些信息，可以删除 EXIF。 
+
+删除方法参考 https://forums.adobe.com/thread/890607 
+
+Please pay attention to prevent the accidental leakage of personal information. Please check carefully whether the EXIF information is properly handled (such as GPS tags) before you push the photo(s). If you want to delete EXIF please refer to https://forums.adobe.com/thread/890607 

DoMiNeLa10/.gitkeep

@@ -0,0 +1 @@
+Hey, this is my first time creating commits directly from the web interface~