Merge branch 'main' into main

.github/workflows/build_without_archive.yml

@@ -0,0 +1,40 @@
+name: build without archive
+
+on:
+  push:
+    branches: [ main ]
+
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    if: github.repository == 'htw-imi-showtime/showtime-website'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: false
+    - name: Get Theme
+      run: |
+        git submodule update --init themes/showtime-theme-2021
+
+    - name: Hugo setup
+      uses: peaceiris/actions-hugo@v2
+      with:
+        hugo-version: '0.115.1'
+        extended: true
+
+    - name: Build
+      run: |
+        hugo \
+          --environment staging \
+          --baseURL "https://htw-imi-showtime.github.io/tryout/" \
+          --buildDrafts 
+   
+    - name: Deploy
+      if: false
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        deploy_key: ${{ secrets.TRYOUT_DEPLOY_KEY }}
+        external_repository: htw-imi-showtime/tryout
+        publish_branch: main

.github/workflows/deploy-development.yml

@@ -22,23 +22,21 @@ jobs:
     - name: Hugo setup
       uses: peaceiris/actions-hugo@v2
       with:
-        hugo-version: '0.114.1'
+        hugo-version: '0.115.1'
         extended: true
 
 
     - name: Build
       run: |
         hugo \
           --environment staging \
-          --minify \
           --baseURL "https://${{ github.repository_owner }}.github.io/${{ github.event.repository.name }}/" \
           --buildDrafts
 
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3
       with:
         github_token: ${{ secrets.GITHUB_TOKEN }}
-        publish_dir: ./public
 
 
 

.github/workflows/deploy-preview.yml

@@ -2,7 +2,7 @@ name: deploy preview (https://htw-imi-showtime.github.io/preview)
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, hugo-modules ]
 
   workflow_dispatch:
 
@@ -13,12 +13,15 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        submodules: true
+        submodules: false
+    - name: Get Theme
+      run: |
+        git submodule update --init themes/showtime-theme-2021
 
     - name: Hugo setup
       uses: peaceiris/actions-hugo@v2
       with:
-        hugo-version: '0.114.1'
+        hugo-version: '0.115.1'
         extended: true
 
     - name: Build
@@ -32,5 +35,5 @@ jobs:
       uses: peaceiris/actions-gh-pages@v3
       with:
         deploy_key: ${{ secrets.PRODUCTION_PREVIEW_DEPLOY_KEY }}
-        external_repository: htw-imi-showtime/production-preview
+        external_repository: htw-imi-showtime/preview
         publish_branch: main

.github/workflows/deploy-production.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Hugo setup
       uses: peaceiris/actions-hugo@v2
       with:
-        hugo-version: '0.114.1'
+        hugo-version: '0.115.1'
         extended: true
 
     - name: Build

.github/workflows/deploy-staging.yml

@@ -2,7 +2,7 @@ name: deploy staging (https://htw-imi-showtime.github.io/staging)
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, hugo-modules ]
 
   workflow_dispatch:
 
@@ -13,19 +13,21 @@ jobs:
     steps:
     - uses: actions/checkout@v3
       with:
-        submodules: true
+        submodules: false
+    - name: Get Theme
+      run: |
+        git submodule update --init themes/showtime-theme-2021
 
     - name: Hugo setup
       uses: peaceiris/actions-hugo@v2
       with:
-        hugo-version: '0.114.1'
+        hugo-version: '0.115.1'
         extended: true
 
     - name: Build
       run: |
         hugo \
           --environment staging \
-          --minify \
           --baseURL "https://htw-imi-showtime.github.io/staging/" \
           --buildDrafts 
 

.github/workflows/deploy-tryout.yml

@@ -0,0 +1,36 @@
+name: deploy tryout (https://htw-imi-showtime.github.io/staging)
+
+on:
+  push:
+    branches: [ main ]
+
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    if: github.repository == 'htw-imi-showtime/showtime-website'
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+
+    - name: Hugo setup
+      uses: peaceiris/actions-hugo@v2
+      with:
+        hugo-version: '0.115.1'
+        extended: true
+
+    - name: Build
+      run: |
+        hugo \
+          --environment staging \
+          --baseURL "https://htw-imi-showtime.github.io/tryout/" \
+          --buildDrafts 
+   
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        deploy_key: ${{ secrets.TRYOUT_DEPLOY_KEY }}
+        external_repository: htw-imi-showtime/tryout
+        publish_branch: main

.github/workflows/hugo-versions.yml

@@ -10,18 +10,21 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        hugo-version: [0.111.3, 0.114.1]
+        hugo-version: [0.111.3, 0.114.1, 0.115.1]
         hugo-environment: [staging, production]
     steps:
     - uses: actions/checkout@v3
       with:
-        submodules: true
-
+        submodules: false
+    - name: Get Theme
+      run: |
+        git submodule update --init themes/showtime-theme-2021
+  
     - name: Hugo Build
       uses: peaceiris/actions-hugo@v2
       with:
         hugo-version: ${{ matrix.hugo-version }}
         extended: true
 
     - name: Build
-      run: hugo --minify -e ${{ matrix.hugo-environment }}
+      run: hugo --minify -e ${{ matrix.hugo-environment }} --buildDrafts

.gitignore

@@ -14,3 +14,5 @@ Thumbs.db
 # Linkinator
 node_modules/
 .linkinator/
+hugo-temp/
+tmp/

.gitmodules

@@ -3,6 +3,6 @@
 	url = ../../htw-imi-showtime/showtime-theme-2021.git
 	branch = main
 [submodule "archive"]
-	path = content/archive
+	path = project-archive
 	url = ../../htw-imi-showtime/showtime-website-project-archive.git
 	branch = main

README.md

@@ -161,10 +161,16 @@ One week before the Showtime takes place, the website will be published to our p
 To get the updates on the central repository into your fork, do the following:
 (see [Github on Syncing a Fork](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/syncing-a-fork)
 )
+
+mit `git remote get-url upstream` überprüfen, ob upstream schon gesetzt ist (bei fork &clone ist das meist schon so), sonst:
+
+
+    git remote add upstream [email protected]:htw-imi-showtime/showtime-website.git   
+
 ```
-git remote add upstream [email protected]:htw-imi-showtime/showtime-website.git
-git fetch upstream
-git merge upstream/master
+git remote add upstream [email protected]:htw-imi-showtime/showtime-website.git   
+git fetch upstream main
+git merge --no-ff upstream/main
 ```
 
 To update the theme submodule, run

README_hugo_modules.md

@@ -0,0 +1 @@
+hugo mod init github.com/htw-imi-showtime/showtime-website-project-archive

config/_default/config.toml

@@ -6,8 +6,20 @@ theme = "showtime-theme-2021"
 [params]
     current_semester = "ss23"
     production_site = "https://showtime.f4.htw-berlin.de/"
+    archive_path = "ws22"
 
 [markup]
     [markup.goldmark]
         [markup.goldmark.renderer]
             unsafe = true
+
+[module]
+  private = '*.*'
+  proxy = 'direct'
+  workspace = 'off'
+  replacements = 'github.com/htw-imi-showtime/showtime-website-project-archive -> ../project-archive'
+[[module.imports]]
+  path = 'github.com/htw-imi-showtime/showtime-website-project-archive'
+[[module.mounts]]
+  source = "content"
+  target = "content"

config/staging/config.toml

@@ -1 +1 @@
-baseURL = "https://htw-imi-showtime.github.io/"
+baseURL = "https://htw-imi-showtime.github.io/staging"

content/_index.md

@@ -5,9 +5,10 @@ is_live = "false"
 zoom_link = "TBD"
 +++
 
-{{<teaser category="about showtime" title="Back in Presence">}}
+{{<teaser category="about showtime" title="Project Fair & Presentations">}}
 
-Showtime of Sommersemester 2023 will be held in presence.  It'll be great to see  you on 04/08 at 10:00 am in Room H001 on our campus Wilhelminenhof! 
+The Bachelor's and Master's International Media and Computing Study Programs present their Practice Projects with Presentations and a Project Fair.
+It'll be great to see  you on 04/08 at 10:00 am for the presentations or between 12:00 and 15:00 for the fair in Room H001 on our <a href="https://www.htw-berlin.de/campus/campus-wilhelminenhof/">Campus Wilhelminenhof!</a>
 [-> check_the_schedule](schedule)
 {{</teaser>}}
 

content/archive.md

@@ -0,0 +1,6 @@
++++
+title = "Project Overview"
+layout = "archive"
++++
+
+Complete Project Archive - under Construction:

content/dates.md

@@ -3,4 +3,4 @@ title = "Important Dates"
 layout = "dates"
 +++
 
-After Showtime is just before the next Showtime - upcoming dates
+After Showtime is just before the next Showtime - upcoming events:

content/projects.md

@@ -3,22 +3,6 @@ title = "Projects"
 layout = "projects_list"
 +++
 
-This term there are [5 bachelor's](#B2) and [5 master's](#M2) projects.
-Detailed Project descriptions will be added soon. To get an idea of the
-scope and characteristics of our projects, [visit the archive](../archive/ws22).
-
-<!-- this part below can be completely deleted as soon as the projects go online. -->
-<a name="B1"></a>
-- **B2 - Konzentrationstraining durch Minispiele**
-- **B3 - ShopGPT - an AI shopping assistant**
-- **B4 - The VisualAgenda**
-- **B5 - Versteh' mich doch! Texteingabe in Virtual Reality**
-- **B6 -  Entwicklung eines Chatbots für IT-Security Audits**
-
-<a name="B1"></a>
-- **M2 - Entwicklung eines Chatbots zur Erkennung vom Gesundheitszustand von chronisch kranken Menschen**
-- **M3 - Interactive Tutorials**
-- **M4 - ShopGPT - Domain-specific extension of GPT**
-- **M5 - Generierung von Quiz-Fragen für das E-Learning mit künstlicher Intelligenz**
-- **M6 - Entwicklung eines Frameworks zur Generierung und Auswertung von akustischer Manipulation von Stresssituationen in VR**
-
+This term there are [5 bachelor's](#B2) and [5 master's](#M2) projects. 
+To get an idea of the
+scope and characteristics of our projects, you may also want to [visit the archive](../{{< archive-path >}}).

content/ss23/bachelor/b2-Konzentrationstraining-durch-Minispiele/_index.md

@@ -1,3 +1,4 @@
+
 +++
 title = "I Can't C#"
 project_id = "B2"
@@ -21,4 +22,4 @@ The mini-games are deliberately designed to simulate the simplest tasks in combi
 
 It sounds easier than it is, so come to our booth and test it and your concentration yourself.
 {{<image src="ICCsharpCover.jpeg">}}
-{{</section>}}
+{{</section>}}