Merge pull request #50 from meshhq/taylorhalliday/fix-bugs

Fixed urls and links
meshhq · Jul 28, 2019 · 1dafa8a · 1dafa8a
2 parents a1ad65f + 2676349
commit 1dafa8a
Show file tree

Hide file tree

Showing 25 changed files with 2,057 additions and 2,383 deletions.
diff --git a/Makefile b/Makefile
@@ -11,18 +11,18 @@ export NODE_ENV = test
 # Shell command to find all .ts files.
 src_files = $(shell find . -name '*.ts' ! -path '*/node_modules/*')
 
-deps: 
+build: $(src_files) deps
+	@eval $(GULP) build --production
+	@echo "Re-Transpiling Project..."
+	@eval $(TSC)
+
+deps: package.json
 	npm install --global foundation-cli
 	npm install 
 
 start: 
 	@eval $(GULP)
 
-build: $(src_files)
-	@eval $(GULP) build --production
-	@echo "Re-Transpiling Project..."
-	@eval $(TSC)
-
 build-test: $(src_files)
 	@eval $(GULP) build --production --test
 	@echo "Re-Transpiling Project..."

diff --git a/dist/clubs/dc-otto/mailer/templates/index.js b/dist/clubs/dc-otto/mailer/templates/index.js
@@ -166,9 +166,7 @@ const membershipInquiryTemplate = (memberInfo, club) => {
 };
 exports.MembershipInquiryTemplate = membershipInquiryTemplate;
 const membershipInquiryResponseTemplate = (memberFormInfo, club, url) => {
-    const defaultDomain = `${club.domain}.tryclubhub.com`;
-    const domain = ts_optchain_1.oc(club).clubSettings.customDomain(defaultDomain);
-    const applicationURL = `https://${domain}/forms/application`;
+    const applicationURL = `${club.baseURL}/forms/application`;
     const admin = (club.name === core.Constants.Clubs.DRIVERS_CLUB) ? 'Amanda Friedman' : 'Eli Kogan';
     const message = `
 		<p>Dear ${memberFormInfo.firstName},</p>
@@ -412,7 +410,7 @@ const bulletLine = (boldText, text) => {
     return `<p style='font-weight:bold; display:inline;'>${boldText}</p> <p style='display:inline;'>${text}</p>`;
 };
 const linkLine = (boldText, shortLink, club) => {
-    return `<p style='font-weight:bold; display:inline;'>${boldText}</p> <a href="${club.domain}.tryclubhub.com/events/${shortLink}" style='display:inline;'>Event Link</a>`;
+    return `<p style='font-weight:bold; display:inline;'>${boldText}</p> <a href="${club.baseURL}/event/${shortLink}" style='display:inline;'>Event Link</a>`;
 };
 const regularText = (text) => {
     return `<p>${text}</p>`;

diff --git a/dist/models/club.d.ts b/dist/models/club.d.ts
@@ -1,7 +1,7 @@
 export interface ClubInfo {
     name: string;
     shortName: string;
-    domain: string;
+    baseURL: string;
     website: string;
     logoURL: string;
     twitterURL?: string;

diff --git a/dist/templates/confirmation.html b/dist/templates/confirmation.html
diff --git a/dist/templates/event.html b/dist/templates/event.html
diff --git a/dist/templates/generic.html b/dist/templates/generic.html
diff --git a/dist/templates/post.html b/dist/templates/post.html
diff --git a/dist/templates/welcome.html b/dist/templates/welcome.html
diff --git a/dist/transform/transform.js b/dist/transform/transform.js
@@ -31,14 +31,13 @@ exports.BuildEventContent = (event, club, link) => {
     return richContent;
 };
 exports.BuildWelcomeContent = (user, club, inviteLink) => {
-    const loginURL = ts_optchain_1.oc(club).clubSettings.customDomain(`https://${club.domain}.tryclubhub.com`);
     const iosAppURL = ts_optchain_1.oc(club).clubSettings.iosAppURL(constants.iOSAppURL);
     const androidAppURL = ts_optchain_1.oc(club).clubSettings.androidAppURL(constants.AndroidAppURL);
-    const unsubscribeURL = `${club.domain}/tryclubhub.com/user/me`;
+    const unsubscribeURL = `${club.baseURL}/user/me`;
     const welcomeContent = {
         firstName: user.firstName,
         inviteLink: inviteLink,
-        loginURL: loginURL,
+        loginURL: club.baseURL,
         iosAppURL: iosAppURL,
         androidAppURL: androidAppURL,
         iosBadgeURL: constants.iOSBadgeURL,
@@ -108,18 +107,17 @@ exports.BuildConfirmationContent = (reservation, event, group, club, url) => {
     return confirmationInfo;
 };
 exports.BuildClubInfo = (club) => {
-    const loginURL = ts_optchain_1.oc(club).clubSettings.customDomain(`https://${club.domain}.tryclubhub.com`);
     const clubInfo = {
         name: club.name,
-        website: loginURL,
+        website: club.baseURL,
         shortName: club.shortName,
-        domain: club.domain,
+        baseURL: club.baseURL,
         logoURL: club.image.md,
         street: club.locations[0].address1,
         city: club.locations[0].city,
         state: club.locations[0].state,
         zip: club.locations[0].zip,
-        unsubscribeURL: `${loginURL}/user/me`
+        unsubscribeURL: `${club.baseURL}/user/me`
     };
     return clubInfo;
 };