Merge conflict

Kristianrosland · Oct 5, 2020 · 4798db4 · 4798db4
2 parents 3504b17 + 33aeafe
commit 4798db4
Show file tree

Hide file tree

Showing 31 changed files with 18 additions and 4 deletions.
diff --git a/src/BackOffice/AddEventButton.js → src/BackOffice/AddEventButton.jsx b/src/BackOffice/AddEventButton.js → src/BackOffice/AddEventButton.jsx
diff --git a/src/BackOffice/AddPost.jsx b/src/BackOffice/AddPost.jsx
@@ -56,6 +56,7 @@ const AddPost = ({
     ], 
   );
 
+
   const [errors, setErrors] = useState({
     address: false,
     googleMaps: false,

diff --git a/src/BackOffice/BackOffice.js → src/BackOffice/BackOffice.jsx b/src/BackOffice/BackOffice.js → src/BackOffice/BackOffice.jsx
diff --git a/src/BackOffice/CreateNewEvent.js → src/BackOffice/CreateNewEvent.jsx b/src/BackOffice/CreateNewEvent.js → src/BackOffice/CreateNewEvent.jsx
@@ -185,10 +185,23 @@ const CreateNewEvent = ({
   const readyForDatabase = () => {
     const isMentorBoard = availableGroups.indexOf("all") >= 0;
 
+    const getGroupOrder = () => {
+      const order = [];
+      posts.forEach(post => order.unshift(post.startGroup));
+      return order;
+    }
+
+    const assignGroupOrder = () => {
+      const groupOrder = getGroupOrder();
+      posts.forEach(post => {
+          while(groupOrder[0] !== post.startGroup) {
+            groupOrder.push(groupOrder.shift());
+          }
+          post.order = [...groupOrder];
+        });
+    }
 
-    posts.forEach(obj => {
-      obj.rekkefølge = [obj.startGroup];
-    });
+    assignGroupOrder();
 
     const event = {
       title_NO: titleNO,

diff --git a/src/BackOffice/CreateSubevents.js → src/BackOffice/CreateSubevents.jsx b/src/BackOffice/CreateSubevents.js → src/BackOffice/CreateSubevents.jsx
diff --git a/src/BackOffice/DeleteModal.js → src/BackOffice/DeleteModal.jsx b/src/BackOffice/DeleteModal.js → src/BackOffice/DeleteModal.jsx
diff --git a/src/BackOffice/EditableEvent.js → src/BackOffice/EditableEvent.jsx b/src/BackOffice/EditableEvent.js → src/BackOffice/EditableEvent.jsx
diff --git a/src/BackOffice/ErrorLabel.js → src/BackOffice/ErrorLabel.jsx b/src/BackOffice/ErrorLabel.js → src/BackOffice/ErrorLabel.jsx
diff --git a/src/BackOffice/EventManager.js → src/BackOffice/EventManager.jsx b/src/BackOffice/EventManager.js → src/BackOffice/EventManager.jsx
diff --git a/src/BackOffice/LoginScreen.js → src/BackOffice/LoginScreen.jsx b/src/BackOffice/LoginScreen.js → src/BackOffice/LoginScreen.jsx
diff --git a/src/BackOffice/form-fields/DayPicker.js → src/BackOffice/form-fields/DayPicker.jsx b/src/BackOffice/form-fields/DayPicker.js → src/BackOffice/form-fields/DayPicker.jsx
diff --git a/...ckOffice/form-fields/DescriptionFields.js → ...kOffice/form-fields/DescriptionFields.jsx b/...ckOffice/form-fields/DescriptionFields.js → ...kOffice/form-fields/DescriptionFields.jsx
diff --git a/src/BackOffice/form-fields/GroupPicker.js → src/BackOffice/form-fields/GroupPicker.jsx b/src/BackOffice/form-fields/GroupPicker.js → src/BackOffice/form-fields/GroupPicker.jsx
diff --git a/src/BackOffice/form-fields/LinkFields.js → src/BackOffice/form-fields/LinkFields.jsx b/src/BackOffice/form-fields/LinkFields.js → src/BackOffice/form-fields/LinkFields.jsx
diff --git a/src/BackOffice/form-fields/LocationFields.js → ...BackOffice/form-fields/LocationFields.jsx b/src/BackOffice/form-fields/LocationFields.js → ...BackOffice/form-fields/LocationFields.jsx
diff --git a/src/BackOffice/form-fields/TimeFields.js → src/BackOffice/form-fields/TimeFields.jsx b/src/BackOffice/form-fields/TimeFields.js → src/BackOffice/form-fields/TimeFields.jsx
diff --git a/src/BackOffice/form-fields/TimeInput.js → src/BackOffice/form-fields/TimeInput.jsx b/src/BackOffice/form-fields/TimeInput.js → src/BackOffice/form-fields/TimeInput.jsx
diff --git a/src/BackOffice/form-fields/TitleFields.js → src/BackOffice/form-fields/TitleFields.jsx b/src/BackOffice/form-fields/TitleFields.js → src/BackOffice/form-fields/TitleFields.jsx
diff --git a/src/BackOffice/utils.js → src/BackOffice/utils.jsx b/src/BackOffice/utils.js → src/BackOffice/utils.jsx
diff --git a/src/Firestore.js → src/Firestore.jsx b/src/Firestore.js → src/Firestore.jsx
diff --git a/src/Frontend/App.js → src/Frontend/App.jsx b/src/Frontend/App.js → src/Frontend/App.jsx
@@ -37,7 +37,7 @@ function App(props) {
     subEvents: subEvents.filter((s) => s.parent_event_id === e.id),
   }));
 
-  const coronaClosed = true;
+  const coronaClosed = false;
 
   return (
     <AppContext.Provider value={[state, setState]}>

diff --git a/src/Frontend/Mainscreen/Event.js → src/Frontend/Mainscreen/Event.jsx b/src/Frontend/Mainscreen/Event.js → src/Frontend/Mainscreen/Event.jsx
diff --git a/src/Frontend/Mainscreen/IconLabel.js → src/Frontend/Mainscreen/IconLabel.jsx b/src/Frontend/Mainscreen/IconLabel.js → src/Frontend/Mainscreen/IconLabel.jsx
diff --git a/src/Frontend/Mainscreen/MainScreen.js → src/Frontend/Mainscreen/MainScreen.jsx b/src/Frontend/Mainscreen/MainScreen.js → src/Frontend/Mainscreen/MainScreen.jsx
diff --git a/src/Frontend/Mainscreen/NavBarButton.js → src/Frontend/Mainscreen/NavBarButton.jsx b/src/Frontend/Mainscreen/NavBarButton.js → src/Frontend/Mainscreen/NavBarButton.jsx
diff --git a/src/Frontend/SelectLanguage.js → src/Frontend/SelectLanguage.jsx b/src/Frontend/SelectLanguage.js → src/Frontend/SelectLanguage.jsx
diff --git a/src/Frontend/WelcomeScreen.js → src/Frontend/WelcomeScreen.jsx b/src/Frontend/WelcomeScreen.js → src/Frontend/WelcomeScreen.jsx
diff --git a/src/Frontend/textResources.js → src/Frontend/textResources.jsx b/src/Frontend/textResources.js → src/Frontend/textResources.jsx
diff --git a/src/Frontend/utils.js → src/Frontend/utils.jsx b/src/Frontend/utils.js → src/Frontend/utils.jsx
diff --git a/src/index.js → src/index.jsx b/src/index.js → src/index.jsx
diff --git a/src/serviceWorker.js → src/serviceWorker.jsx b/src/serviceWorker.js → src/serviceWorker.jsx
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,6 +56,7 @@ const AddPost = ({ @@
         ],
       );
       const [errors, setErrors] = useState({
         address: false,
         googleMaps: false,
@@ Expand Down @@