Merge branch 'main' into deliverable-6

.github/workflows/Native.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: Install dependencies
       run: |
-        yarn install --force
+        yarn install 
     - name: Run tests
       run: |
         yarn test

__tests__/LoginScreen.test.tsx

@@ -0,0 +1,15 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
+
+import React from 'react';
+import { shallow } from "enzyme";
+import LoginScreen from '../lib/screens/loginScreens/LoginScreen.tsx';
+
+describe("LoginScreen", () => {
+  it("renders without crashing", () => {
+    const wrapper = shallow(<LoginScreen />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

__tests__/NoteDetailModal.test.tsx

@@ -0,0 +1,15 @@
+import Enzyme from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+
+Enzyme.configure({ adapter: new Adapter() });
+
+import React from 'react';
+import { shallow } from "enzyme";
+import NoteDetailModal from '../lib/screens/mapPage/NoteDetailModal.tsx';
+
+describe("NoteDetailModal", () => {
+  it("renders without crashing", () => {
+    const wrapper = shallow(<NoteDetailModal />);
+    expect(wrapper).toMatchSnapshot();
+  });
+});

__tests__/__snapshots__/LoginScreen.test.tsx.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LoginScreen renders without crashing 1`] = `ShallowWrapper {}`;

__tests__/__snapshots__/NoteDetailModal.test.tsx.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`NoteDetailModal renders without crashing 1`] = `ShallowWrapper {}`;

app.json

@@ -2,7 +2,7 @@
   "expo": {
     "name": "Where's Religion?",
     "slug": "lrda_mobile",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "orientation": "portrait",
     "icon": "./assets/icon.png",
     "userInterfaceStyle": "light",
@@ -29,7 +29,7 @@
       },
       "config": {
         "googleMaps": {
-          "apiKey": ""
+          "apiKey": "AIzaSyBwi5lzjEmTzGZPRFwx6dIZK7EOwV6VEKw"
         }
       }
     },

lib/screens/mapPage/NoteDetailModal.tsx

@@ -325,6 +325,7 @@ const styles = StyleSheet.create({
     height: 360,
     marginBottom: 2,
     overflow: "hidden",
+    borderColor: '#e0e0e0'
   },
   image: {
     width: "100%",