Post meeting chore

.gitattributes

@@ -1 +1 @@
-dissertation/* linguist-vendored
+*.example linguist-detectable=false

dissertation/README.md

@@ -1,14 +1,14 @@
-<!-- PROJECT LOGO -->
-<br />
-<div align="center">
-<p align="center">
-  <img alt="Portion Mate logo" src="https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png" height="250px">
-
-  <h3 align="center">Portion Mate</h3>
-  <h5 align="center">Dissertation</h5>
-
-  <p align="center">
-    <!-- BADGES / SHIELDS -->
-  </p>
-</p>
-</div>
+<!-- PROJECT LOGO -->
+<br />
+<div align="center">
+<p align="center">
+  <img alt="Portion Mate logo" src="https://portion-mate.readthedocs.io/en/latest/assets/logo.png" height="250px">
+
+  <h3 align="center">Portion Mate</h3>
+  <h5 align="center">Dissertation</h5>
+
+  <p align="center">
+    <!-- BADGES / SHIELDS -->
+  </p>
+</p>
+</div>

docs/.wikignore

@@ -8,4 +8,6 @@ README.md
 *.json
 *.toml
 *.txt
-node_modules
+node_modules
+navigation
+GetStarted.md

docs/index.md

@@ -1,7 +1,7 @@
 <br />
 <div align="center">
 <p align="center">
-  <img alt="Portion Mate logo" src="https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png" height="250px">
+  <img alt="Portion Mate logo" src="https://portion-mate.readthedocs.io/en/latest/assets/logo.png" height="250px">
 
   <h3 align="center">Portion Mate</h3>
   <h5 align="center">Documentation</h5>

docs/meetings/2022-02-11.json

@@ -0,0 +1,35 @@
+{
+  "datetime": "11-02-2021 11:00",
+  "purpose": "Catchup",
+  "location": "Zoom",
+  "attendees": ["ineshbose", "oanaandrei"],
+  "agenda": [
+    {
+      "item": "Evaluation questions",
+      "description": ["Plans", "Feedback"]
+    },
+    {
+      "item": "App deployment",
+      "description": ["Research", "Progress"]
+    }
+  ],
+  "discussion": [
+    {
+      "item": "Evaluation",
+      "who": ["ineshbose", "oanaandrei"],
+      "notes": "Some question may seem redundant. The last part makes it tricky for how participants may feel. The interface section is good - inverting scale was not required since the questions themselves are inverted, however there can be a table with feedback for features."
+    },
+    {
+      "item": "Deployment",
+      "who": ["ineshbose"],
+      "notes": "As of now, DigitalOcean seems a good plan - and could make use of GitHub education pack. Something should come in place."
+    },
+    {
+      "item": "Following week plan",
+      "who": "oanaandrei",
+      "notes": "No meeting next week, however communication can happen over email if required. Deployment and evaluation should make good progress."
+    }
+  ],
+  "actions": [],
+  "notes": ""
+}

docs/meetings/2022-02-25.json

@@ -0,0 +1,44 @@
+{
+  "datetime": "25-02-2021 11:00",
+  "purpose": "Catchup",
+  "location": "Zoom",
+  "attendees": ["ineshbose", "oanaandrei"],
+  "agenda": [
+    {
+      "item": "Evaluation",
+      "description": ["Final evaluation"]
+    },
+    {
+      "item": "Deployment",
+      "description": ["Progress"]
+    },
+    {
+      "item": "Dissertation",
+      "description": ["Plans", "First draft review"]
+    }
+  ],
+  "discussion": [
+    {
+      "item": "Code changes",
+      "who": "ineshbose",
+      "notes": "Code was refactored and polished up - this includes updating dependencies, with some breakthrough practices like Bootstrap styles and ngrok activation."
+    },
+    {
+      "item": "Evaluation",
+      "who": "ineshbose",
+      "notes": "Sections were polished based on feedback and all seems good to go. Few opinions on taken for feature questions being replaced with the suggested table format. The app documentation is also ready to compliment that."
+    },
+    {
+      "item": "Deployment",
+      "who": "ineshbose",
+      "notes": "Deployment had hiccups, but committed to finish it this weekend so that evaluations can start on Monday."
+    },
+    {
+      "item": "Dissertation",
+      "who": ["oanaandrei", "ineshbose"],
+      "notes": "The first draft should be turned in on 11 March, and the last meeting would be on 16 March. Next week, there should be a skeleton of the dissertation at the very least."
+    }
+  ],
+  "actions": [],
+  "notes": ""
+}

mkdocs.yml

@@ -1,5 +1,5 @@
 site_name: Portion Mate
-site_url: https://portion-mate-glasgow.readthedocs.io/en/latest/
+site_url: https://portion-mate.readthedocs.io/en/latest/
 site_author: Inesh Bose
 site_description: >-
   Portion Mate is your mate for your daily portion intake.

src/app/navigation/BottomTabNavigator.tsx

@@ -103,7 +103,7 @@ export default function BottomTabNavigator({
         // @ts-ignore
         style={styles.appIcon}
         source={{
-          uri: 'https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png',
+          uri: 'https://portion-mate.readthedocs.io/en/latest/assets/logo.png',
         }}
       />
       <Text category="s2">Portion Mate</Text>

src/app/screens/Auth/FormStyle.tsx

@@ -27,6 +27,9 @@ const formStyle = createStyle({
   agreedSpacing: {
     marginVertical: 10,
   },
+  agreedTextSpacing: {
+    marginHorizontal: 4,
+  },
 });
 
 const pwAccessoryIcon = (

src/app/screens/Auth/Logo.tsx

@@ -8,7 +8,7 @@ export default function Logo() {
     <>
       <Image
         source={{
-          uri: 'https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png',
+          uri: 'https://portion-mate.readthedocs.io/en/latest/assets/logo.png',
         }}
         // @ts-ignore
         style={styles.appLogo}

src/app/screens/Auth/RegisterForm.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Linking } from 'react-native';
 import { Button, CheckBox, Input, Text } from '@ui-kitten/components';
 import { RootAuthScreenProps } from '../../types/navigation';
 import { useAppContext } from '../../contexts';
@@ -78,7 +79,20 @@ export default function RegisterForm({
         status={error?.agreedTerms && !agreedTerms ? 'danger' : 'primary'}
         style={styles.agreedSpacing}
       >
-        <Text>{'I read and agree to the Terms & Conditions'}</Text>
+        <>
+          <Text style={styles.agreedTextSpacing}>
+            {'I read and agree to the'}
+          </Text>
+          <Text
+            onPress={() =>
+              Linking.openURL(
+                'https://portion-mate.readthedocs.io/en/latest/Terms/'
+              )
+            }
+          >
+            {'Terms & Conditions'}
+          </Text>
+        </>
       </CheckBox>
       <Button
         onPress={() =>

src/manual.md

@@ -2,7 +2,7 @@
 <br />
 <div align="center">
 <p align="center">
-  <img alt="Portion Mate logo" src="https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png" height="250px">
+  <img alt="Portion Mate logo" src="https://portion-mate.readthedocs.io/en/latest/assets/logo.png" height="250px">
 
   <h3 align="center">Portion Mate</h3>
   <h5 align="center">Source Code Manual</h5>
@@ -13,8 +13,6 @@
 </p>
 </div>
 
-
-
 <!-- GETTING STARTED -->
 ## Getting Started
 
@@ -25,36 +23,41 @@ To get a local copy up and running follow these simple example steps.
 This is an example of how to list things you need to use the software and how to install them.
 
 * **`git`** *(optional)*: To have a copy of this code, you can clone it using [Git](https://git-scm.com/), however you can also [download a ZIP](https://github.com/ineshbose/portion-mate/archive/develop.zip) of the repository.
+
 ```sh
-$ git clone https://github.com/ineshbose/portion-mate
-$ cd portion-mate/src   # treat src as root
+git clone https://github.com/ineshbose/portion-mate
+cd portion-mate/src   # treat src as root
 ```
 
 * **`poetry` / `pip`**: The backend uses Django, and therefore dependencies can be installed using either [`pip`](https://packaging.python.org/tutorials/installing-packages/) or [`poetry`](https://python-poetry.org/docs/basic-usage/#installing-dependencies) (preferred).
+
 ```sh
-$ python3 -m venv env               # optional
-$ source ./env/scripts/activate     # activate environment
-$ poetry install
-$ pip install .                     # if you don't use poetry
+python3 -m venv env               # optional
+source ./env/scripts/activate     # activate environment
+poetry install
+pip install .                     # if you don't use poetry
 ```
 
 * **`yarn` / `npm`**: The frontend uses React Native, and therefore dependencies can be handled using either [`npm`](https://www.npmjs.com/) or [`yarn`](https://yarnpkg.com/) (preferred).
+
 ```sh
-$ yarn install
-$ npm install    # if you don't use yarn
+yarn install
+npm install    # if you don't use yarn
 ```
 
 ### Running
 
 This will require you to run backend and frontend separately using two terminals.
 
 * Backend
+
 ```sh
-$ python manage.py
+python manage.py
 ```
 
 * Frontend
+
 ```sh
-$ yarn start
-$ npm start      # if you don't use yarn
+yarn start
+npm start      # if you don't use yarn
 ```

src/server/templates/admin/base_site.html

@@ -1,20 +1,22 @@
-{% extends 'admin/base.html' %}
-
-{% block extrastyle %}
-{{ block.super }}
+{% extends 'admin/base.html' %} {% block extrastyle %} {{ block.super }}
 <style>
   :root {
     --primary: #fd7e14;
     --secondary: #ac560e;
   }
 </style>
-{% endblock %}
-
-{% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{ title }} | Portion Mate Django Admin{% endblock %}
-
-{% block branding %}
-<h1 id="site-name"><a href="{% url 'admin:index' %}" style="color:#ffffff;">
-  <img src="https://portion-mate-glasgow.readthedocs.io/en/latest/assets/logo.png" width="30" height="30" style="display: inline-block!important;" alt="">
-  Portion Mate
-</a></h1>
+{% endblock %} {% block title %}{% if subtitle %}{{ subtitle }} | {% endif %}{{
+title }} | Portion Mate Django Admin{% endblock %} {% block branding %}
+<h1 id="site-name">
+  <a href="{% url 'admin:index' %}" style="color: #ffffff">
+    <img
+      src="https://portion-mate.readthedocs.io/en/latest/assets/logo.png"
+      width="30"
+      height="30"
+      style="display: inline-block !important"
+      alt=""
+    />
+    Portion Mate
+  </a>
+</h1>
 {% endblock %}