Update version to 0.2.5

jxpeng98 · jxpeng98 · commit 8b971c3d9c31 · 2024-02-16T13:09:22.000Z
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,22 +26,17 @@ jobs:
               run: |
                   mkdir ${{ env.typst_cv }}
                   cp ./CV/typstcv.typ ./CV/example.typ ${{ env.typst_cv }}
-
                   zip -r ${{ env.typst_cv }}.zip ./${{ env.typst_cv }}
 
                   mkdir ${{ env.typst_cvs }}
                   cp ./CV/typstcv_single.typ ./CV/example_single.typ ${{ env.typst_cvs }}
                   zip -r ${{ env.typst_cvs }}.zip ./${{ env.typst_cvs }}
 
                   mkdir ${{ env.typst_cl }}
-
                   cp ./CoverLetter/typstcoverletter.typ ./CoverLetter/example_Coverletter.typ ${{ env.typst_cl }}
-
                   zip -r ${{ env.typst_cl }}.zip ./${{ env.typst_cl }}
 
-                  ls
-
-                  echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> "$GITHUB_OUTPUT"
+                  echo "tag_name=$(git tag --sort version:refname | tail -n 1)" >> "$GITHUB_ENV"
 
             - name: Create Release
               id: create_release
@@ -63,7 +58,7 @@ jobs:
               with:
                   upload_url: ${{ steps.create_release.outputs.upload_url }}
                   asset_path: ./${{ env.typst_cv }}.zip
-                  asset_name: ${{ env.typst_cv }}-${{ github.ref.tag_name }}.zip
+                  asset_name: ${{ env.typst_cv }}-${{ github.ref_name }}.zip
                   asset_content_type: application/zip
 
             - name: Upload CV Single zip
@@ -74,7 +69,7 @@ jobs:
               with:
                   upload_url: ${{ steps.create_release.outputs.upload_url }}
                   asset_path: ./${{ env.typst_cvs }}.zip
-                  asset_name: ${{ env.typst_cvs }}-${{ github.ref.tag_name }}.zip
+                  asset_name: ${{ env.typst_cvs }}-${{ github.ref_name }}.zip
                   asset_content_type: application/zip
 
             - name: Upload Cover Letter zip
@@ -85,7 +80,7 @@ jobs:
               with:
                   upload_url: ${{ steps.create_release.outputs.upload_url }}
                   asset_path: ./${{ env.typst_cl }}.zip
-                  asset_name: ${{ env.typst_cl }}-${{ github.ref.tag_name }}.zip
+                  asset_name: ${{ env.typst_cl }}-${{ github.ref_name }}.zip
                   asset_content_type: application/zip
 
             - name: Upload CV Single
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+my.secrets
diff --git a/CoverLetter/example_Coverletter.pdf b/CoverLetter/example_Coverletter.pdf
diff --git a/CoverLetter/example_Coverletter.typ b/CoverLetter/example_Coverletter.typ
@@ -11,25 +11,19 @@ contacts: (
 (text:"github.com",link:"https://www.github.com"),
 (text:"123@example.com",link:"mailto:123@example.com"),
   ),
+  recipient: (
+  starttitle: "Dear",
+  jobtitle: "Hiring Manager",
+  date: "",
+  department: [#lorem(2)],
+  university: [#lorem(2)],
+  address: [#lorem(4)],
+  postcode: [#lorem(1)]
+  ),
 mainbody,
 )
 
-#recepient[
-  #datetime.today(offset: auto).display("[day] [month repr:long] [year]") // display today in the format "day month year" or you can show the date directly
-  ][
-    Department
-    ][
-      Institution
-      ][
-        City, Country
-        ][
-          Postcode
-          ]
-#align(left, text(12pt,font: "Helvetica", fill: primary_colour,weight: "medium", )[#upper([Job Application for Research Fellow])])
-#v(0.1em)
-#set text(11pt,font: "Helvetica", fill: primary_colour, weight: "regular", )
-Dear Application Committee,
-#set par(justify: true,first-line-indent: 2em,) 
+
 
 #lorem(300)
 
diff --git a/CoverLetter/typstcoverletter.pdf b/CoverLetter/typstcoverletter.pdf
diff --git a/CoverLetter/typstcoverletter.typ b/CoverLetter/typstcoverletter.typ
@@ -53,22 +53,51 @@
 }
 
 
-#let recepient(date, department, university, address, postcode) = {
+#let recipientgenerate(starttitle, jobtitle, date, department, university, address, postcode) = {
     align(left,{
+        if department != [] {
         text(10pt,font: font_info, fill: subheadings_colour,weight: "bold", )[#department]
+        }
         h(1fr)
+        if date != "" {
         text(10pt,font: font_info, fill: primary_colour,weight: "light", )[#date\ ]
+        } else {
+        text(10pt,font: font_info, fill: primary_colour,weight: "light", )[ #datetime.today(offset: auto).display("[day] [month repr:long] [year]")\ ]
+        }
+        
+        if university != [] {
         text(10pt,font: font_info, fill: subheadings_colour,weight: "bold", )[#university\ ]
+        }
+
+        if address != [] {
         text(10pt,font: font_info, fill: headings_colour,weight: "light", )[#address\ ]
+        }
+        if postcode != [] {
         text(10pt,font: font_info, fill: headings_colour,weight: "light", )[#postcode ]
-    }
-    )
+        }
+    })
+
+    align(left, text(12pt,font: "Helvetica", fill: primary_colour,weight: "medium", )[#upper([Job Application for #jobtitle])])
+    v(0.1em)
+    set text(11pt,font: "Helvetica", fill: primary_colour, weight: "regular", )
+
+    [#starttitle]
+
 }
 
 #let main(
     name: "",
     address: "",
     contacts: (),
+    recipient: (
+        starttitle: "",
+        jobtitle: "",
+        date: "",
+        department: "",
+        university: "",
+        address: "",
+        postcode: ""
+    ),
     mainbody,
 ) = {
 // show contact details
@@ -100,6 +129,14 @@ set page(
     },
     header-ascent: 1em,
 )
+
+// Add recipient details
+recipientgenerate(recipient.starttitle, recipient.jobtitle, recipient.date, recipient.department, recipient.university, recipient.address, recipient.postcode)
+
+set par(justify: true,first-line-indent: 2em,) 
+
+set text(11pt,font: "Helvetica", fill: primary_colour, weight: "regular", )
+
 mainbody
 
 set text(11pt,font: font_info, fill: primary_colour, weight: "regular", )
diff --git a/README.md b/README.md
@@ -227,30 +227,25 @@ contacts: (
 (text:"github.com",link:"https://www.github.com"),
 (text:"123@example.com",link:"mailto:123@example.com"),
   ),
+  recipient: (
+  starttitle: "Dear",
+  jobtitle: "Hiring Manager",
+  date: "",
+  department: [#lorem(2)],
+  university: [#lorem(2)],
+  address: [#lorem(4)],
+  postcode: [#lorem(1)]
+  ),
 mainbody,
 )
 
-#recepient[
-  #datetime.today(offset: auto).display("[day] [month repr:long] [year]") // display today in the format "day month year" or you can show the date directly
-  ][
-    Department
-    ][
-      Institution
-      ][
-        City, Country
-        ][
-          Postcode
-          ]
-#align(left, text(12pt,font: "Helvetica", fill: primary_colour,weight: "medium", )[#upper([Job Application for Research Fellow])])
-#v(0.1em)
-#set text(11pt,font: "Helvetica", fill: primary_colour, weight: "regular", )
-Dear Application Committee,
-#set par(justify: true,first-line-indent: 2em,) 
+
 
 #lorem(300)
 
 #lorem(100)
 
+
 ```
 
 </details>
