M2 - Added new texts and pages #377
Conversation
|
Ich habe die Texte bereit am Mittwoch an Herrn Busch versendet, aber leider keine Antwort bekommen. Der Inhalt der Texte ist aber grundsätzlich schon Gegenstand unserer Gespräche geworden. Daher gehe ich von einem okay aus. |
There was a problem hiding this comment.
Ich werde Carsten Busch selbst nochmal dran erinnern, allerdings
haben Sie keine URL angegeben und unter
https://gerritbehrens.github.io/showtime-website gibts nen 404.
(einfach den workflow anstellen)
was mich ärgert, ist, dass Sie einfach Ihre alte Version mit den großen Bildern
wieder so drübergedübelt haben, dass git das nicht mehr von alleine auflöst:
(3eaf05e ist der letzte commit bevor ich in c4f3436 Ihre Bilder verkleinert habe:
git l | grep c4f3436
- | | | | | | | | | c4f3436 - (13 days ago) M2 reduce image sizes 1,1M->228K - Barne Kleinen
Noch ärgerlicher ist, dass Sie auch Ihr komisches Submodul wieder drüberkopiert haben, das hat Fehler verursacht, nach deren Ursache ich ne ganze Weile gesucht habe. Daher gibt es jetzt ein Script, das überprüft, ob Dateien ausserhalb des projekt-folders geändert wurden, dass ich das nicht nochmal übersehe...
git submodule status
9a86b17ae80a5222962395d503921e4efe61e636 project-archive (heads/main)
fatal: no submodule mapping found in .gitmodules for path 'showtime-website'
error 141 ([email protected] @ m2_main√)showtime/website/showtime-website-2024-two>git diff 3eaf05e -- content/ss24/master/m2-food4future/team_gerrit.jpg
ok ([email protected] @ m2_main√)showtime/website/showtime-website-2024-two>for f in content/ss24/master/m2-food4future/.jpg; do git diff 3eaf05e -- $f ; done
ok ([email protected] @ m2_main√)showtime/website/showtime-website-2024-two>for f in content/ss24/master/m2-food4future/.jpg; do git diff c4f3436 -- $f ; done
diff --git a/content/ss24/master/m2-food4future/team_diro.jpg b/content/ss24/master/m2-food4future/team_diro.jpg
index 64d1aa9..88eb282 100644
Binary files a/content/ss24/master/m2-food4future/team_diro.jpg and b/content/ss24/master/m2-food4future/team_diro.jpg differ
diff --git a/content/ss24/master/m2-food4future/team_gerrit.jpg b/content/ss24/master/m2-food4future/team_gerrit.jpg
index 895085b..512c50c 100644
Binary files a/content/ss24/master/m2-food4future/team_gerrit.jpg and b/content/ss24/master/m2-food4future/team_gerrit.jpg differ
diff --git a/content/ss24/master/m2-food4future/team_hasan.jpg b/content/ss24/master/m2-food4future/team_hasan.jpg
index 231fdb9..185b78d 100644
Binary files a/content/ss24/master/m2-food4future/team_hasan.jpg and b/content/ss24/master/m2-food4future/team_hasan.jpg differ
diff --git a/content/ss24/master/m2-food4future/team_yosua.jpg b/content/ss24/master/m2-food4future/team_yosua.jpg
index 483b6c9..1d3ef19 100644
Binary files a/content/ss24/master/m2-food4future/team_yosua.jpg and b/content/ss24/master/m2-food4future/team_yosua.jpg differ
ok ([email protected] @ m2_main√)showtime/website/showtime-website-2024-two>git merge main
Already up to date.
|
Ich habe das Projekt jetzt neu geforked und habe dabei jetzt einen Builderror. Was kann ich tun, damit der verschwindet? Außerdem hat das Tutorial https://about-hugo.github.io/hugo/quick/ auch nicht funktioniert, da das manuelle Auslösen einer Action nicht zum Erstellen eines Branches geführt hat. Wenn es schneller gehen würde, das Thema zu besprechen, schreiben Sie mir gern einen Kommentar oder eine Mail und eröffne fix einen Zoomraum o.ä.. Vielen Dank und viele Grüße |
Opening a Pull Request to Update your Project
I've started a documentation on how we should use the forking workflow here:
https://github.com/htw-imi-showtime/showtime-website/blob/documentation/doc/forking-workflow/index.md
(will not be merged to main due to file sizes)
Please follow these Steps & Guidelines for your Pull Request:
Before you Request a Review Check and Tick these Boxes:
[] make sure that the hugo site build works and check the result visually.
[] merge your local branch with upstream/main (see update doc)
[] Deploy the Site on your github pages by activating the "Deploy Page using GH-Actions" Workflow in "gh-pages-action.yml"
[] make sure that your PR contains only files / file changes within your project subdirectory.
[] make sure that all your file names consist only of lower case letters, numbers, or [-_.] - with only one . for the file extension
[] delete all unnecessary files from your PR (including cat.jpg and kitty.jpg)
[] check the image file sizes. All Images have to be as small as possible. See ./doc/disk_usage.md about this issues, there's a script: ./bin/images-smaller.sh
Note that if you fail to do so, I may simply reduce the file sizes brute force using
the script above - WITHOUT CHECKING THE QUALITY
[] if everythings seems fine, request a review by bkleinen on github. (on the upper right)
Fill out this Information:
Change the PR Title to: (e.g. B0 - update techstack.md) and describe your changes:
URL of your Preview Site Containing the Changes:
When did your Project Supervisor review your changes? (Date/Note or require review for PR):
If your disk usage exceeds 500K, provide a reason while you want to include so many images or why certain images need to be that big:
IMPORTANT: if you run into trouble / If the checks fail...
if you cannot figure out why a check fails or you think that it may be wrong,
don't hesitate to contact me! (e.g. by requesting a review and commenting in the pr)
run the checks locally with:
./bin/check-project-update-pr/run-all.sh <project_id>
All good?
If all checks run successfully the PR will be reviewed and, if no
further changes are requested, merged and closed.
(this is the time to update and start a new branch!)
More Information
We are using the Forking Workflow.