Skip to content

Commit 6b6a242

Browse files
committed
Update welcome email
1 parent 4c26e36 commit 6b6a242

File tree

5 files changed

+7
-89
lines changed

5 files changed

+7
-89
lines changed

Diff for: app/dashboard/sign-up/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,8 @@ passwordForm.post(parse, csrf, function (req, res, next) {
214214
sameSite: "Lax"
215215
});
216216

217+
Email.WELCOME(user.uid);
218+
217219
req.session.uid = user.uid;
218220
res.redirect("/sites/account/create-site");
219221
}

Diff for: app/scheduler/index.js

-5
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ const freeDiskSpace = require("./free-disk-space");
1111
const os = require("os");
1212
const fs = require("fs-extra");
1313
const exec = require("child_process").exec;
14-
const fix = require("sync/fix/all");
1514
const zombies = require("./zombies");
1615
const checkCardTesters = require("./check-card-testers");
17-
const welcomeEmail = require("./welcome-email");
1816

1917
// If any disk has less than 2GB of space, we should notify the admin
2018
const MINIMUM_DISK_SPACE_IN_K = 2 * 1024 * 1024;
@@ -119,9 +117,6 @@ module.exports = function () {
119117
console.log(clfdate(), "Scheduled entries for future publication");
120118
});
121119

122-
// Schedule welcome emails for new users
123-
welcomeEmail();
124-
125120
// Warn users about impending subscriptions
126121
User.getAllIds(function (err, uids) {
127122
async.each(uids, User.scheduleSubscriptionEmail, function (err) {

Diff for: app/scheduler/welcome-email.js

-69
This file was deleted.

Diff for: app/setup.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,8 @@ function main(callback) {
104104

105105
// Run any initialization that clients need
106106
// Google Drive will renew any webhooks, e.g.
107-
for (const { init, display_name } of Object.values(
108-
require("clients")
109-
)) {
107+
const clients = Object.values(require("clients"));
108+
for (const { init, display_name } of clients) {
110109
if (init) {
111110
console.log(clfdate(), display_name + " client:", "Initializing");
112111
init();
@@ -118,13 +117,14 @@ function main(callback) {
118117
function (callback) {
119118
// Flush the cache of the public site and documentation
120119
flush();
121-
122120
callback();
123121
},
124122

125123
function (callback) {
126124
if (config.environment !== "development") return callback();
125+
127126
configureLocalBlogs();
127+
callback();
128128
},
129129
],
130130
callback

Diff for: todo.txt

+1-11
Original file line numberDiff line numberDiff line change
@@ -49,26 +49,18 @@ Speed up templates.build
4949

5050
Create a folder{watch} equivalent so we don't have to run a seperate process for development
5151

52-
Run documentation build on github actions
53-
5452
Worried about depending on Bunny – can we work out a plan to move away from them if needed?
5553

56-
Work out why the mac server is restarting and resolve the issue
57-
- every time it restarts, add the debug command to the email notification
58-
5954
Containerize the proxy (openresty/nginx)
6055
- add varnish afterwards to handle the load balancing and caching
6156
- get rid of openrestycache
6257

63-
Work out why the main server is restarting and resolve the issue
64-
- every time it restarts
65-
6658
Fix image profile retention not working in production and tell [Simon](https://mail.google.com/mail/u/0/#inbox/FMfcgzGwJchvfhDcWNkrZtNJqlLmLfsx)
6759
- maybe a caching issue and actually works?
6860

6961
Improve production image build time for fast bug fixes and deploys
7062
- When should folder zipping happen?
71-
- Can we move documentation building and folder zipping into dockerfile? improve build speed by removing github actions cache?
63+
- Can we improve build speed by removing github actions cache and using some base image with dependencies?
7264

7365
Use tinify free api to compress some of the folder images
7466
- maybe consider building this into the main product? it might pay for itself
@@ -78,8 +70,6 @@ Fix bug with first edit on forked template on template editor:
7870
- 2. change the text color
7971
- 3. nothing happens (due to the inital fork) until you reload the page
8072

81-
Move welcome email to send after user creation
82-
8373
Add asset library / file upload to template editor and share files across templates
8474
- use this to help implement a favicon feature which minifies the favicon
8575

0 commit comments

Comments
 (0)