Merge pull request #2 from src-r-r/jordan_2022WW22_migrate-to-medium

Jordan Hewitt · web-flow · commit de76365d5920 · 2022-10-21T14:31:08.000Z
Jordan 2022 ww22 migrate to medium
diff --git a/README.md b/README.md
@@ -113,10 +113,17 @@ services:
 5. Push your fix to your branch.
 6. Create a pull request, detailing your fixes.
 
+# Other Ways to Contribute
+
+- Donate money to the projecct <https://ko-fi.com/summary/c05d8728-c615-45f7-9f5d-5fe3b57895c9>.
+  Donors will be listed in the README. Minumum donation $1, **SUGGESTED: $10 OR MORE**
+- [Hire me!](https://damngood.tech) I'm a senior developer with over 10 years experience.
+  Currently open to clients tackling the impossible!
+
 # Customizations
 
 If you'd like customizations for your organization, I'd love to help you out.
-Please pick a time to chat at https://damngood.tech/schedule/60min/.
+Please pick a time to chat at <https://damngood.tech/schedule/60min/>.
 
 # Testing
 
diff --git a/src/email.py b/src/email.py
@@ -57,10 +57,11 @@ def get_format_kwargs(self):
             "organizer_cn": cfg.organizer_cn,
             "organizer_email": cfg.organizer_email,
             "organizer_role": cfg.organizer_role,
-            "organizer_timezone": cfg.my_timezone,
+            "organizer_timezone": str(cfg.my_timezone),
             "participant_timezone": str(self.start.tzinfo),
             "participant_cn": self.participant_name,
             "participant_email": self.participant_email,
+            "from_email": cfg.email_from,
             "human_start": self.start.format(cfg.ics_dt_format_start),
             "raw_start": self.start,
             "dtstart": self.start.to("UTC").format(ARROW_ICS_FORMAT),
@@ -195,7 +196,7 @@ def get_email_content_template(self):
         return TPL_EML_PARTICIPANT
     
     def get_email_to(self):
-        return cfg.organizer_email
+        return self.participant_email
     
     def get_subject_template(self):
-        return cfg.email_organizer_subject
+        return cfg.email_participant_subject
diff --git a/src/templates/email/organizer.txt b/src/templates/email/organizer.txt
@@ -6,7 +6,7 @@ Timezone: {{ organizer_timezone }}
 
 The meeting is at the following URL:
 
-            {{ meeting_link }}
+{{ meeting_link }}
 
 {% if notes %}
 ---
diff --git a/src/templates/email/participant.txt b/src/templates/email/participant.txt
@@ -6,7 +6,7 @@ Timezone: {{ participant_timezone }}
 
 The meeting is at the following URL:
 
-            {{ meeting_link }}
+{{ meeting_link }}
 
 ---
 
diff --git a/src/templates/iit/index/confirmation.html b/src/templates/iit/index/confirmation.html
@@ -7,8 +7,10 @@ <h1 class="title">An invitation is on its way!</h1>
 {% block main %}
 <div class="container">
     <div class="alert alert-success">
-        <p>An email has been sent to <strong> {{ request.form.email }}</strong> from <strong>{{ cfg.organizer_email }}</strong>.</p>
+        <p>An email has been sent to <strong> {{ request.form.email }}</strong> from <strong>{{ cfg.email_from }}</strong>.</p>
         <p>Please check the spam folder if you don't receive it within the next few minutes.</p>
+        <p>If it's not in the spam folder, please send an email to <strong>{{ cfg.organizer_email }}</strong> to verify the meeting.</p>
+        <p>The fine print: Ink-In Time is still in beta so you may encounter issues</p>
     </div>
 </div>
 
