Bump jquery from 2.2.4 to 3.5.0 in /public/portfolio

.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "next/babel",
+      {
+        "preset-env": { "targets": { "node": true } }
+      }
+    ]
+  ],
+  "plugins": []
+}

.gitignore

@@ -1,27 +1,36 @@
 ENV
-public/static/**/
-artworks/
-artworks-BAK/
+.env
 .env.development
 .env.production
-public/static/artworks
+
+.env.development
+.env.production
+
+artworks/*
+# public/artworks/*
+public/artworks/**/*.webp
+!public/artworks/json/**/*.json
+# public/static/**/
+public/cv/**/*.pdf
+public/~partytown/
+
 nexus/
+
 stat_aggregator/fetch_PCS.py
-src/img/artworks
-src/travel.json
-public/travel.json
-public/cv/cv-jonas-oppenlaender.pdf
-yarn.lock
+
+reading_list/tmp.pdf
 reading_list/unrecognized.csv
 reading_list/gephi*
 reading_list/cache.db
 reading_list/cache.db.BAK
+reading_list/cache.BAK.db
 reading_list/readlist-full.json
 reading_list/toreadlist-full.json
 reading_list/training-data-TODO.csv
 reading_list/keyword-*.json
-./yarn.lock
+
 venv
+
 *.BAK
 *.BAK.sh
 dist/*.tar.gz
@@ -87,5 +96,4 @@ typings/
 .env
 
 .cache/
-# public
 yarn-error.log

.gitmodules

@@ -1,6 +1,9 @@
-[submodule "libs/academicons"]
-	path = libs/academicons
-	url = git@github.com:jpswalsh/academicons.git
 [submodule "libs/bibtex2html"]
 	path = libs/bibtex2html
-	url = git@github.com:backtracking/bibtex2html.git
+	url = https://github.com/backtracking/bibtex2html.git
+[submodule "libs/academicons"]
+	path = libs/academicons
+	url = https://github.com/jpswalsh/academicons.git
+[submodule "static/portfolio"]
+	path = static/portfolio
+	url = git@github.com:joetm/jonaso.de-portfolio.git

Makefile

@@ -11,37 +11,103 @@ default:
 	##   make pre-build		pre-build actions
 	##   make post-build	post build actions
 	##   make fetch-cv		get the latex cv from overleaf/github and build it
-	##   make move-cv		move the finished cv and clean up directory
 	##   make dev			run the development version of the site
 	##   make refs			build the publication list from .bib file
-	##   make pubs			alias of make refs
 	##   make cv			build the cv pdf
 	##   make tests			run tests (TODO)
 	##   make push   		push to github
+	##   make publish  		push to s3
 	##
 
-pre-build:
-	# 	cd ./stat_aggregator; \
-	# 		./fetch_PCS.py
+build:
+	yarn build
 
+pre-build:
 	# academic-cv folder exists?
 	# [ -d "academic-cv" ] && rm -rf academic-cv
-
 	make fetch-cv
+	make fetch-pcs
 	make replace-cv
-	make bib-json
-	make build-cv
 
-bib-json:
+	# make bib-json
 	pandoc-citeproc --bib2json ./src/bibliography/publications.bib > ./src/bibliography/publications.json
+	python3 fix-publications-json.py
+
+	make build-cv
+
+
+fetch-pcs:
+	# PCS fetching
+	cd stat_aggregator; \
+		python3 fetch_PCS.py # $? -eq 0 || echo "failed PCS lookup (no internet?)"
+
+rename-artworks:
+	cd artworks; \
+		./rename-dalle.sh
+		./rename-midjourney.sh
+		./rename-stablediffusion.sh
+
+# copy-portfolio:
+# 	cp -Rf ../jonaso.de-portfolio ./public/portfolio
+# 	rm -rf ./public/portfolio/node_modules
+# 	rm -rf ./public/portfolio/.git
+# 	rm -rf ./public/portfolio/.gitignore
+# 	rm -rf ./public/portfolio/.babelrc
+# 	rm -rf ./public/portfolio/package.json
+# 	rm -rf ./public/portfolio/package-lock.json
+# 	rm -rf ./public/portfolio/yarn.lock
+# 	rm -rf ./public/portfolio/webpack.config.js
 
 post-build:
+	# move cv
+	mv academic-cv/cv.pdf "public/cv/oppenlaender-cv.pdf"
+	mv academic-cv/publications.pdf "public/cv/oppenlaender-publications.pdf"
+	# TODO # mv academic-cv/out.pdf "public/cv/cv-jonas-oppenlaender-`date '+%Y.%m.%d'`.pdf"
+	mv academic-cv/resume.pdf "public/cv/resume.pdf"
+	rm -rf academic-cv
+
+	# make refs
+	# _dir="$(pwd)/src/bibliography"
+	# create bibliography html
+	# --style "SIGCHI-Reference-Format"
+	# -- style "ACM-Reference-Format"
+	bibtex2html -noheader -nofooter --style "SIGCHI-Reference-Format-MOD" "src/bibliography/publications.bib"
+	# convert html to json
+	php ./parse.php
+	# move json file to public folder
+	mv "./references.json" ./public/static/
+	# copy bib file to public folder
+	cp "src/bibliography/publications.bib" ./public/static/
+	# create detailed references json
+	python3 ./pyparse.py
+	# move json file to public folder
+	# mv ./references-detail.json ./public/static/
+	php ./parsePerType.php
+	# move json file to public folder
+	# mv ./references-type.json ./public/static/
+	rm publications.html
+	# move bib.html file to public folder
+	mv ./publications_bib.html ./public/static/
+
+	# move other files
 	cp ./src/travel.json ./public/
 	cp ./src/projects.json ./public/static/
 	cp ./src/news.json ./public/
 	# cp -rf ./src/img/artworks ./public/static/
-	make move-cv
 	mv ./src/bibliography/publications.json ./public/static/publications.json
+	# copy fetched PCS data
+	cp ./stat_aggregator/peer-reviews.json ./public/peer-reviews.json
+
+	make process-artworks
+
+	# make copy-portfolio
+
+process-artworks:
+	python3 processImages.py
+	if [ -d "./artworks-json" ];then \
+		rm -rf ./artworks-json; \
+	fi
+
 
 fetch-cv:
 	if [ -d "./academic-cv" ];then \
@@ -115,7 +181,7 @@ replace-cv:
 	cd academic-cv; \
 		sed 's|\\excludefromprint{.*}||g' publication-list.tex | sponge publication-list.tex; \
 		sed 's|\\definenewtoggle{showpublicationsummary}{false}|\\definenewtoggle{showpublicationsummary}{true}|g' publication-list.tex | sponge publication-list.tex
-		sed 's|\\definenewtoggle{showmanuscripts}{false}|\\definenewtoggle{showmanuscripts}{true}|g' publication-list.tex | sponge publication-list.tex
+		sed 's|\\definenewtoggle{showmanuscripts}{true}|\\definenewtoggle{showmanuscripts}{false}|g' publication-list.tex | sponge publication-list.tex
 
 
 build-cv:
@@ -134,45 +200,18 @@ build-cv:
 		pdflatex -halt-on-error -synctex=1 -interaction=batchmode resume.tex; \
 		pdflatex -halt-on-error -synctex=1 -interaction=batchmode resume.tex
 
-
-move-cv:
-	mv academic-cv/cv.pdf "public/cv/oppenlaender-cv.pdf"
-	mv academic-cv/publications.pdf "public/cv/oppenlaender-publications.pdf"
-	# TODO # mv academic-cv/out.pdf "public/cv/cv-jonas-oppenlaender-`date '+%Y.%m.%d'`.pdf"
-	mv academic-cv/resume.pdf "public/cv/resume.pdf"
-	rm -rf academic-cv
-
-pubs:
-	make refs
-
-refs:
-	# _dir="$(pwd)/src/bibliography"
-	# create bibliography html
-	# --style "SIGCHI-Reference-Format"
-	# -- style "ACM-Reference-Format"
-	bibtex2html -noheader -nofooter --style "SIGCHI-Reference-Format-MOD" "src/bibliography/publications.bib"
-	# convert html to json
-	php ./parse.php
-	# move json file to public folder
-	mv "./references.json" ./public/static/
-	# copy bib file to public folder
-	cp "src/bibliography//publications.bib" ./public/static/
-
-	# create detailed references json
-	python3 ./pyparse.py
-	# move json file to public folder
-	# mv ./references-detail.json ./public/static/
-
-	php ./parsePerType.php
-	# move json file to public folder
-	# mv ./references-type.json ./public/static/
-	rm publications.html
-
-	# move bib.html file to public folder
-	mv ./publications_bib.html ./public/static/
-
 push:
 	# push to github
 	git add -A
 	git commit
 	git push
+
+
+invalidate:
+	aws cloudfront create-invalidation --distribution-id E1F8XE39H6VFRU --paths "/*"
+
+
+publish:
+	# push to s3
+	aws s3 sync --delete ./public/ s3://jonaso.de
+