Merge branch 'main' into sprint-1

.eslintrc.json

@@ -0,0 +1,33 @@
+{
+    "env": {
+        "browser": true,
+        "es2021": true,
+        "node": true
+    },
+    "extends": "eslint:recommended",
+    "overrides": [
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+        "indent": [
+            "error",
+            "tab"
+        ],
+        "linebreak-style": [
+            "error",
+            "unix"
+        ],
+        "quotes": [
+            "error",
+            "double"
+        ],
+        "semi": [
+            "error",
+            "always"
+        ],
+        "no-global-assign": 0
+    }
+}

.github/workflows/js-linting.yml

@@ -0,0 +1,25 @@
+name: JS Linting
+
+on:
+  pull_request:
+    branches:
+    - main
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  # Single deploy job since we're just deploying
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install apt updates
+        run: sudo apt -y update; sudo apt -y upgrade;
+      - name: Install prerequisites
+        run: sudo apt install -y nodejs npm;
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Install dependencies
+        run: sudo npm install
+      - name: Run tests
+        run: sudo npm run lint

.github/workflows/js-unittest.yml

@@ -1,4 +1,4 @@
-name: Jest JS Unit Test
+name: JS Unit Test
 
 on:
   pull_request:

admin/meetings/11722-sprint1.md

@@ -0,0 +1,41 @@
+# Meeting Minutes (11/07/2022)
+## Team 29: Hackers1995
+## Meeting Topic: First Sprint
+Meeting notes for the first sprint
+
+## Attendance
+1. Rhea Bhutada
+2. George Dubinin
+3. Gavyn Ezell
+4. Henry Feng
+5. Kara Hoagland
+6. Marc Reta
+7. Sanjit Joseph
+8. Daniel Hernandez
+9. Arthur Lu
+
+## Absentees
+1. Isaac Otero
+
+## Meeting Details
+- When: 11/07/2022 at 6:00PM
+- Where: CSE Building Second Floor
+
+## Agenda:
+- ### Old/Unresolved Business
+  - N/A
+- ### New Business
+  - The first sprint:
+    - Create more Gitflows and automation. Verify current workflows and actions
+    - Determine interface details for the app (user experience)
+    - Start on the backend
+- ### Next Meeting's Business
+
+## Decisions Made
+- Linting details decided (TABS NOT SPACES)
+
+## End Time
+- 11/07/2022 at 8:00PM
+
+
+

package.json

@@ -2,9 +2,12 @@
   "name": "food-journal",
   "version": "1.0.0",
   "scripts": {
-    "test": "mocha --recursive **/*.test.js"
+    "test": "mocha --recursive **/*.test.js",
+    "lint": "eslint **/*.js",
+    "fix-style": "eslint --fix **/*.js"
   },
-  "dependencies": {
+  "devDependencies": {
+    "eslint": "^8.27.0",
     "mocha": "10"
   }
 }

static/reset.css

@@ -0,0 +1,82 @@
+/* This is a generic CSS file that sets preliminary rules for content that should be the same across pages */
+
+html, body, div, span, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+abbr, address, cite, code,
+del, dfn, em, img, ins, kbd, q, samp,
+small, strong, sub, sup, var,
+b, i,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section, summary,
+time, mark, audio, video {
+  margin: 0;
+  padding: 0;
+  border: 0;
+  outline: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  background: transparent;
+}
+
+body {
+  line-height: 1;
+}
+
+article,aside,details,figcaption,figure,
+footer,header,hgroup,menu,nav,section {
+  display: block;
+}
+
+nav ul {
+  list-style: none;
+}
+
+blockquote, q {
+  quotes: none;
+}
+
+blockquote:before, blockquote:after,
+q:before, q:after {
+  content: '';
+  content: none;
+}
+
+a {
+  margin: 0;
+  padding: 0;
+  font-size: 100%;
+  vertical-align: baseline;
+  background: transparent;
+}
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+input, select {
+  vertical-align :middle;
+}
+
+img, fieldset, object {
+  border:none;
+}
+
+*, *:after, *:before {
+  box-sizing:border-box;
+}
+
+button, label {
+  cursor:pointer;
+}
+
+html, body {
+  height:100%;
+}
+
+form {
+  border
+}

testenv/testenv.js

@@ -1,28 +1,28 @@
-module.exports = {environment};
+module.exports = {environment};
-
+
-function environment () {
+function environment () {
-	const localStorageMock = (function () {
+	const localStorageMock = (function () {
-		let store = {};
+		let store = {};
-		return {
+		return {
-			getItem(key) {
+			getItem(key) {
-				return store[key];
+				return store[key];
-			},
+			},
-			setItem(key, value) {
+			setItem(key, value) {
-				store[key] = value;
+				store[key] = value;
-			},
+			},
-			clear() {
+			clear() {
-				store = {};
+				store = {};
-			},
+			},
-			removeItem(key) {
+			removeItem(key) {
-				delete store[key];
+				delete store[key];
-			},
+			},
-			getAll() {
+			getAll() {
-				return store;
+				return store;
-			},
+			},
-		};
+		};
-	})();
+	})();
-
+
-	let window = {};
+	let window = {};
-	Object.defineProperty(window, "localStorage", { value: localStorageMock });
+	Object.defineProperty(window, "localStorage", { value: localStorageMock });
-	return window;
+	return window;
 }

testenv/testenv.test.js

@@ -1,80 +1,81 @@
-const {environment} = require("./testenv.js");
+const {environment} = require("./testenv.js");
-var assert = require('assert');
+var assert = require("assert");
-var {saveToLocal, getFromLocal, removeFromLocal, clearLocal} = require('./testenv_helpers');
+var {describe, it, beforeEach} = require("mocha");
-
+var {saveToLocal, getFromLocal, removeFromLocal, clearLocal} = require("./testenv_helpers");
-beforeEach(() => {
+
-	window = environment();
+beforeEach(() => {
-});
+	window = environment();
-
+});
-describe("test localStorage mock", () => {
+
-	it("test save and fetch", () => {
+describe("test localStorage mock", () => {
-		saveToLocal("testkey1", "testvalue1");
+	it("test save and fetch", () => {
-		saveToLocal("testkey2", "testvalue2");
+		saveToLocal("testkey1", "testvalue1");
-		saveToLocal("testkey3", "testvalue3");
+		saveToLocal("testkey2", "testvalue2");
-		saveToLocal("testkey4", "testvalue4");
+		saveToLocal("testkey3", "testvalue3");
-
+		saveToLocal("testkey4", "testvalue4");
-		assert.equal(getFromLocal("testkey1"), "testvalue1");
+
-		assert.equal(getFromLocal("testkey2"), "testvalue2");
+		assert.equal(getFromLocal("testkey1"), "testvalue1");
-		assert.equal(getFromLocal("testkey3"), "testvalue3");
+		assert.equal(getFromLocal("testkey2"), "testvalue2");
-		assert.equal(getFromLocal("testkey4"), "testvalue4");
+		assert.equal(getFromLocal("testkey3"), "testvalue3");
-
+		assert.equal(getFromLocal("testkey4"), "testvalue4");
-		saveToLocal("testkey6", "testvalue5");
+
-		assert.equal(getFromLocal("testkey6"), "testvalue5");
+		saveToLocal("testkey6", "testvalue5");
-	});
+		assert.equal(getFromLocal("testkey6"), "testvalue5");
-
+	});
-	it("test window locality", () => {
+
-		assert.equal(getFromLocal("testkey1"), null);
+	it("test window locality", () => {
-		assert.equal(getFromLocal("testkey2"), null);
+		assert.equal(getFromLocal("testkey1"), null);
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), null);
-		assert.equal(getFromLocal("testkey4"), null);
+		assert.equal(getFromLocal("testkey3"), null);
-	});
+		assert.equal(getFromLocal("testkey4"), null);
-
+	});
-	it("test delete and fetch", () => {
+
-		saveToLocal("testkey1", "testvalue1");
+	it("test delete and fetch", () => {
-		saveToLocal("testkey2", "testvalue2");
+		saveToLocal("testkey1", "testvalue1");
-		saveToLocal("testkey3", "testvalue3");
+		saveToLocal("testkey2", "testvalue2");
-		saveToLocal("testkey4", "testvalue4");
+		saveToLocal("testkey3", "testvalue3");
-
+		saveToLocal("testkey4", "testvalue4");
-		removeFromLocal("testkey3");
+
-
+		removeFromLocal("testkey3");
-		assert.equal(getFromLocal("testkey1"), "testvalue1");
+
-		assert.equal(getFromLocal("testkey2"), "testvalue2");
+		assert.equal(getFromLocal("testkey1"), "testvalue1");
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), "testvalue2");
-		assert.equal(getFromLocal("testkey4"), "testvalue4");
+		assert.equal(getFromLocal("testkey3"), null);
-
+		assert.equal(getFromLocal("testkey4"), "testvalue4");
-		removeFromLocal("testkey1");
+
-
+		removeFromLocal("testkey1");
-		assert.equal(getFromLocal("testkey1"), null);
+
-		assert.equal(getFromLocal("testkey2"), "testvalue2");
+		assert.equal(getFromLocal("testkey1"), null);
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), "testvalue2");
-		assert.equal(getFromLocal("testkey4"), "testvalue4");
+		assert.equal(getFromLocal("testkey3"), null);
-
+		assert.equal(getFromLocal("testkey4"), "testvalue4");
-		removeFromLocal("testkey4");
+
-		
+		removeFromLocal("testkey4");
-		assert.equal(getFromLocal("testkey1"), null);
+		
-		assert.equal(getFromLocal("testkey2"), "testvalue2");
+		assert.equal(getFromLocal("testkey1"), null);
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), "testvalue2");
-		assert.equal(getFromLocal("testkey4"), null);
+		assert.equal(getFromLocal("testkey3"), null);
-
+		assert.equal(getFromLocal("testkey4"), null);
-		removeFromLocal("testkey2");
+
-		
+		removeFromLocal("testkey2");
-		assert.equal(getFromLocal("testkey1"), null);
+		
-		assert.equal(getFromLocal("testkey2"), null);
+		assert.equal(getFromLocal("testkey1"), null);
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), null);
-		assert.equal(getFromLocal("testkey4"), null);
+		assert.equal(getFromLocal("testkey3"), null);
-	});
+		assert.equal(getFromLocal("testkey4"), null);
-
+	});
-	it("test clear and fetch", () => {
+
-		saveToLocal("testkey1", "testvalue1");
+	it("test clear and fetch", () => {
-		saveToLocal("testkey2", "testvalue2");
+		saveToLocal("testkey1", "testvalue1");
-		saveToLocal("testkey3", "testvalue3");
+		saveToLocal("testkey2", "testvalue2");
-		saveToLocal("testkey4", "testvalue4");
+		saveToLocal("testkey3", "testvalue3");
-
+		saveToLocal("testkey4", "testvalue4");
-		clearLocal();
+
-
+		clearLocal();
-		assert.equal(getFromLocal("testkey1"), null);
+
-		assert.equal(getFromLocal("testkey2"), null);
+		assert.equal(getFromLocal("testkey1"), null);
-		assert.equal(getFromLocal("testkey3"), null);
+		assert.equal(getFromLocal("testkey2"), null);
-		assert.equal(getFromLocal("testkey4"), null);
+		assert.equal(getFromLocal("testkey3"), null);
-	});
+		assert.equal(getFromLocal("testkey4"), null);
+	});
 });