Merge branch 'main' into sprint-1

This commit is contained in:
d7hernan 2022-11-08 15:44:37 -08:00
commit 07dac10012
8 changed files with 294 additions and 109 deletions

33
.eslintrc.json Normal file
View File

@ -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
}
}

25
.github/workflows/js-linting.yml vendored Normal file
View File

@ -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

View File

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

View File

@ -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

View File

@ -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"
}
}

82
static/reset.css Normal file
View File

@ -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
}

View File

@ -1,6 +1,7 @@
const {environment} = require("./testenv.js");
var assert = require('assert');
var {saveToLocal, getFromLocal, removeFromLocal, clearLocal} = require('./testenv_helpers');
var assert = require("assert");
var {describe, it, beforeEach} = require("mocha");
var {saveToLocal, getFromLocal, removeFromLocal, clearLocal} = require("./testenv_helpers");
beforeEach(() => {
window = environment();