From 33b15acbe925897aa1567593c3e1389d0e6cb1f1 Mon Sep 17 00:00:00 2001
From: Abdullah Mustapha <abdullahmlsu@gmail.com>
Date: Fri, 29 Dec 2023 10:55:04 +0100
Subject: [PATCH 1/3] Fix: Update sign up url to use org_id

---
 apps/web/app/orgs/[orgslug]/signup/signup.tsx | 1 +
 apps/web/services/auth/auth.ts                | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/web/app/orgs/[orgslug]/signup/signup.tsx b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
index b22454f0..1a7687a0 100644
--- a/apps/web/app/orgs/[orgslug]/signup/signup.tsx
+++ b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
@@ -61,6 +61,7 @@ function SignUpClient(props: SignUpClientProps) {
     const formik = useFormik({
         initialValues: {
             org_slug: props.org?.slug,
+            org_id: props.org?.id,
             email: '',
             password: '',
             username: '',
diff --git a/apps/web/services/auth/auth.ts b/apps/web/services/auth/auth.ts
index 623da877..7269f1a6 100644
--- a/apps/web/services/auth/auth.ts
+++ b/apps/web/services/auth/auth.ts
@@ -122,6 +122,7 @@ interface NewAccountBody {
   email: string;
   password: string;
   org_slug: string;
+  org_id:string;
 }
 
 export async function signup(body: NewAccountBody): Promise<any> {
@@ -134,6 +135,7 @@ export async function signup(body: NewAccountBody): Promise<any> {
     redirect: "follow",
   };
 
-  const res = await fetch(`${getAPIUrl()}users/?org_slug=${body.org_slug}`, requestOptions);
+  const res = await fetch(`${getAPIUrl()}users/${body.org_id}`, requestOptions);
+  
   return res;
 }

From 2fef6d7d45a379aba6bc30a63d60cfe353ba7c47 Mon Sep 17 00:00:00 2001
From: Abdullah Mustapha <abdullahmlsu@gmail.com>
Date: Fri, 29 Dec 2023 14:16:06 +0100
Subject: [PATCH 2/3] UX Fix: clear all existing messages and errors

---
 apps/api/.idea/.gitignore                     |  4 ++
 apps/api/.idea/api.iml                        | 15 ++++++
 .../inspectionProfiles/Project_Default.xml    | 48 +++++++++++++++++++
 .../inspectionProfiles/profiles_settings.xml  |  6 +++
 apps/api/.idea/misc.xml                       |  4 ++
 apps/api/.idea/modules.xml                    |  8 ++++
 apps/api/.idea/vcs.xml                        |  6 +++
 apps/web/app/orgs/[orgslug]/signup/signup.tsx |  3 ++
 8 files changed, 94 insertions(+)
 create mode 100644 apps/api/.idea/.gitignore
 create mode 100644 apps/api/.idea/api.iml
 create mode 100644 apps/api/.idea/inspectionProfiles/Project_Default.xml
 create mode 100644 apps/api/.idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 apps/api/.idea/misc.xml
 create mode 100644 apps/api/.idea/modules.xml
 create mode 100644 apps/api/.idea/vcs.xml

diff --git a/apps/api/.idea/.gitignore b/apps/api/.idea/.gitignore
new file mode 100644
index 00000000..fa9a2dee
--- /dev/null
+++ b/apps/api/.idea/.gitignore
@@ -0,0 +1,4 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+apps/api/.idea/
\ No newline at end of file
diff --git a/apps/api/.idea/api.iml b/apps/api/.idea/api.iml
new file mode 100644
index 00000000..5fdd65ba
--- /dev/null
+++ b/apps/api/.idea/api.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/apps/api/.idea/inspectionProfiles/Project_Default.xml b/apps/api/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 00000000..5bc6028c
--- /dev/null
+++ b/apps/api/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,48 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AlphaUnsortedPropertiesFile" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="DuplicatePropertyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="EmptyDirectory" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="IncorrectFormatting" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="LongLine" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyArgumentEqualDefaultInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyAugmentAssignmentInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyMandatoryEncodingInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyMissingOrEmptyDocstringInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="3">
+            <item index="0" class="java.lang.String" itemvalue="requests" />
+            <item index="1" class="java.lang.String" itemvalue="pydantic_core" />
+            <item index="2" class="java.lang.String" itemvalue="typing_extensions" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="ignoredErrors">
+        <list>
+          <option value="N802" />
+          <option value="N803" />
+          <option value="N806" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="ERROR" enabled_by_default="true" editorAttributes="ERRORS_ATTRIBUTES">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="firebase_admin.firestore" />
+          <option value="app.middlewares.user_information_processor.UserInformationProcessor.signUpUser" />
+        </list>
+      </option>
+    </inspection_tool>
+    <inspection_tool class="TodoComment" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="UseEllipsisInPropertyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/apps/api/.idea/inspectionProfiles/profiles_settings.xml b/apps/api/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/apps/api/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/apps/api/.idea/misc.xml b/apps/api/.idea/misc.xml
new file mode 100644
index 00000000..04dd6b31
--- /dev/null
+++ b/apps/api/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (api-ZF9drUvx)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/apps/api/.idea/modules.xml b/apps/api/.idea/modules.xml
new file mode 100644
index 00000000..d50cf45f
--- /dev/null
+++ b/apps/api/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/api.iml" filepath="$PROJECT_DIR$/.idea/api.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/apps/api/.idea/vcs.xml b/apps/api/.idea/vcs.xml
new file mode 100644
index 00000000..b2bdec2d
--- /dev/null
+++ b/apps/api/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/apps/web/app/orgs/[orgslug]/signup/signup.tsx b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
index 1a7687a0..c154b362 100644
--- a/apps/web/app/orgs/[orgslug]/signup/signup.tsx
+++ b/apps/web/app/orgs/[orgslug]/signup/signup.tsx
@@ -71,6 +71,8 @@ function SignUpClient(props: SignUpClientProps) {
         },
         validate,
         onSubmit: async values => {
+            setError('')
+            setMessage('')
             setIsSubmitting(true);
             let res = await signup(values);
             let message = await res.json();
@@ -82,6 +84,7 @@ function SignUpClient(props: SignUpClientProps) {
             else if (res.status == 401 || res.status == 400 || res.status == 404 || res.status == 409) {
                 setError(message.detail);
                 setIsSubmitting(false);
+                
             }
             else {
                 setError("Something went wrong");

From b07b4500fa5bd00b28b2b686c15f5a984db73277 Mon Sep 17 00:00:00 2001
From: Abdullah Mustapha <abdullahmlsu@gmail.com>
Date: Sat, 30 Dec 2023 17:05:16 +0100
Subject: [PATCH 3/3] Add: .idea file to gitignore and remove from tracking

---
 apps/api/.gitignore                           |  2 +-
 apps/api/.idea/.gitignore                     |  4 --
 apps/api/.idea/api.iml                        | 15 ------
 .../inspectionProfiles/Project_Default.xml    | 48 -------------------
 .../inspectionProfiles/profiles_settings.xml  |  6 ---
 apps/api/.idea/misc.xml                       |  4 --
 apps/api/.idea/modules.xml                    |  8 ----
 apps/api/.idea/vcs.xml                        |  6 ---
 8 files changed, 1 insertion(+), 92 deletions(-)
 delete mode 100644 apps/api/.idea/.gitignore
 delete mode 100644 apps/api/.idea/api.iml
 delete mode 100644 apps/api/.idea/inspectionProfiles/Project_Default.xml
 delete mode 100644 apps/api/.idea/inspectionProfiles/profiles_settings.xml
 delete mode 100644 apps/api/.idea/misc.xml
 delete mode 100644 apps/api/.idea/modules.xml
 delete mode 100644 apps/api/.idea/vcs.xml

diff --git a/apps/api/.gitignore b/apps/api/.gitignore
index d3de4f6f..07437551 100644
--- a/apps/api/.gitignore
+++ b/apps/api/.gitignore
@@ -162,7 +162,7 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
-
+.idea/
 # PyCharm
 #  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
diff --git a/apps/api/.idea/.gitignore b/apps/api/.idea/.gitignore
deleted file mode 100644
index fa9a2dee..00000000
--- a/apps/api/.idea/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-apps/api/.idea/
\ No newline at end of file
diff --git a/apps/api/.idea/api.iml b/apps/api/.idea/api.iml
deleted file mode 100644
index 5fdd65ba..00000000
--- a/apps/api/.idea/api.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="py.test" />
-  </component>
-</module>
\ No newline at end of file
diff --git a/apps/api/.idea/inspectionProfiles/Project_Default.xml b/apps/api/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 5bc6028c..00000000
--- a/apps/api/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="AlphaUnsortedPropertiesFile" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="DuplicatePropertyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="EmptyDirectory" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="InconsistentLineSeparators" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IncorrectFormatting" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="LongLine" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ProblematicWhitespace" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyArgumentEqualDefaultInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyAugmentAssignmentInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyMandatoryEncodingInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyMissingOrEmptyDocstringInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredPackages">
-        <value>
-          <list size="3">
-            <item index="0" class="java.lang.String" itemvalue="requests" />
-            <item index="1" class="java.lang.String" itemvalue="pydantic_core" />
-            <item index="2" class="java.lang.String" itemvalue="typing_extensions" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="N802" />
-          <option value="N803" />
-          <option value="N806" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="ERROR" enabled_by_default="true" editorAttributes="ERRORS_ATTRIBUTES">
-      <option name="ignoredIdentifiers">
-        <list>
-          <option value="firebase_admin.firestore" />
-          <option value="app.middlewares.user_information_processor.UserInformationProcessor.signUpUser" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="TodoComment" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UseEllipsisInPropertyInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>
\ No newline at end of file
diff --git a/apps/api/.idea/inspectionProfiles/profiles_settings.xml b/apps/api/.idea/inspectionProfiles/profiles_settings.xml
deleted file mode 100644
index 105ce2da..00000000
--- a/apps/api/.idea/inspectionProfiles/profiles_settings.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
\ No newline at end of file
diff --git a/apps/api/.idea/misc.xml b/apps/api/.idea/misc.xml
deleted file mode 100644
index 04dd6b31..00000000
--- a/apps/api/.idea/misc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.11 (api-ZF9drUvx)" project-jdk-type="Python SDK" />
-</project>
\ No newline at end of file
diff --git a/apps/api/.idea/modules.xml b/apps/api/.idea/modules.xml
deleted file mode 100644
index d50cf45f..00000000
--- a/apps/api/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/api.iml" filepath="$PROJECT_DIR$/.idea/api.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/apps/api/.idea/vcs.xml b/apps/api/.idea/vcs.xml
deleted file mode 100644
index b2bdec2d..00000000
--- a/apps/api/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file