diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..9bf4d12 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "editor.defaultFormatter": "esbenp.prettier-vscode", + "editor.formatOnSave": true +} diff --git a/src/lib/components/Newsletter.svelte b/src/lib/components/Newsletter.svelte index 9477587..0abb0c2 100644 --- a/src/lib/components/Newsletter.svelte +++ b/src/lib/components/Newsletter.svelte @@ -14,6 +14,9 @@ if (firstName == "" || lastName == "" || email == "" || grade == "" || !email.match(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/)) { alert("Please fill out all required fields"); return; + } else if (!email.match(/^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/)) { + alert("Please enter a valid email."); + return; } else { let formData = new FormData(); formData.append('FNAME', firstName); @@ -46,6 +49,7 @@
{show = !show; user.update((u) => (u = false));}}>
+<<<<<<< Updated upstream

Join Mustang Math Newsletter

Our Monthly Newsletter will include a lot of information about our various classes, competitions, and events, as well as interesting math tidbits and information about other cool opportunities! We use location information to help tell you about local math opportunities, and we highly recommend you join!

@@ -350,6 +354,312 @@
+======= +
+

Join Mustang Math Newsletter

+

Our Monthly Newsletter will include a lot of information about our various classes, competitions, and events, as well as interesting math tidbits and information about other cool opportunities! We use location information to help tell you about local math opportunities, and we highly recommend you join!

+
+
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+>>>>>>> Stashed changes
diff --git a/src/routes/resources.svelte b/src/routes/resources.svelte index 563d565..8b2d3a0 100644 --- a/src/routes/resources.svelte +++ b/src/routes/resources.svelte @@ -29,6 +29,7 @@ ], 2023: [ [["January"], ["PDF", "/newsletter/January2023.pdf"]], + [["February"], ["PDF", "/newsletter/February2023.pdf"]], ] }; diff --git a/static/newsletter/February2023.pdf b/static/newsletter/February2023.pdf new file mode 100644 index 0000000..9815c1c Binary files /dev/null and b/static/newsletter/February2023.pdf differ