Feedback

.circleci/config.yml

@@ -0,0 +1,49 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Define the jobs we want to run for this project
+jobs:
+  build-and-test-express-js:
+    docker:
+      - image: cimg/node:16.13.0 # latest stable node at the time of writing
+        # auth:
+        #   username: mydockerhub-user
+        #   password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+    steps:
+      - checkout
+      - run: echo "this is the build and test express.js job"
+      - run: |
+          cd back-end
+          pwd # for debugging: show current working directory
+          ls # for debugging: show sub-directories in here
+      - run: |
+          cd back-end
+          npm install # install all dependencies listed in package.json
+          npm test # run all unit tests
+  build-react-js:
+    docker:
+      - image: cimg/node:16.13.0 # latest stable node at the time of writing
+        # auth:
+        #   username: mydockerhub-user
+        #   password: $DOCKERHUB_PASSWORD  # context / project UI env-var reference
+    steps:
+      - checkout
+      - run: echo "this is the build react.js job"
+      - run: |
+          cd back-end
+          pwd # for debugging: show current working directory
+          ls # for debugging: show sub-directories in here
+      - run: |
+          cd front-end
+          npm install # install all dependencies listed in package.json
+          npm run build # have react build the stand-alone front-end code
+
+# Orchestrate our job run sequence
+workflows:
+  build-and-test-back-end:
+    jobs:
+      - build-and-test-express-js
+  build-front-end:
+    jobs:
+      - build-react-js

CONTRIBUTING.md

@@ -1,2 +1,28 @@
-# Guide to Contributing
-Delete the contents of this file and replace with the contents of a proper guide to contributing to this project, as described in the [instructions](./instructions.md)
+### Team Values:
+* Tasks are assigned on a weekly base. Everyone is supposed to complete their work on time. 
+* When one team member encounters problems or obstacles, others should help.
+* When a conflict occurs, we will vote. And we wil choose the plan which majority agree on.
+* If a group member misses deadline once, a warning will be given. If memeber misses 3 deadlines, we will report.
+* Respond to directed messages within a day
+
+### Sprint Cadence
+* 2 weeks/sprint, each sprint the whole team should contribute approximate 25 hours/week
+
+### Daily Standup
+* 2 standups of 15 mins: Tuesday evening, Friday evening
+* Members expected to be present synchronously
+
+### Coding standards
+* Use VScode.
+* Always push working code, if you break the pipeline/build then fix it.
+* Provide descriptive commit messages.
+* Write self documenting code. Use descriptive variable and function names. Avoid unnecessary name shortening
+
+## Git Workflow
+* Decentralized
+
+## Instructions for setting up the local development environment in order to work on this project
+TBD
+
+## Instructions for building and testing the project
+TBD

README.md

@@ -1,17 +1,25 @@
-# Project Repository
+# Life Note
 
-This repository will be used for team projects.
+# Live URL
+http://162.243.168.215:3000/
+# Description of project
+The project Life Notes is a web app the helps people to take four main types of records of their life altogether in one app, and also provides visualization and some intelligence features.
 
-Several sets of instructions are included in this repository. They should each be treated as separate assignments with their own due dates and sets of requirements.
+The minimum viable product would be a app that enables user to write their diaries and record their transactions. Additional features in diaries enable users to tag their diaries, and generate the most frequently used tags. For the part of account book, additional features include allowing users to search for their transactions, generating a chart pies based on the users' spendings, and sorting the spendings based on dates or amounts.
 
-1. Delete the contents of this file and replace with the contents of a proper README.md, as described in the [project setup instructions](./instructions-1a-project-setup.md)
+# Core team members
+[Zhuofeng Wang](https://github.com/zw2922), [Yaolin Zhang](https://github.com/YaolinZhang), [Tianle Ye](https://github.com/Cirrhosis233), [Susan Liu](https://github.com/Susan0223), [Yiming Yu](https://github.com/yym1928)
 
-1. See the [Sprint Planning instructions](instructions-1b-sprint-planning.md) for the requirements of Sprint Planning for each Sprint.
+# History of the Lifenote
+[Link to the contributing.md](https://github.com/software-students-fall2021/project-setup-nick-wang/blob/master/CONTRIBUTING.md)
 
-1. See the [Front-End Development instructions](./instructions-2-front-end.md) for the requirements of the initial Front-End Development.
+It's kind of too tedious to have so many different apps to manage in our life. Therefore, we had this idea to create an app to merge things like diary and account book into one.
+The project idea was proposed for the class Software Engineering in September 2021. 
 
-1. See the [Back-End Development instructions](./instructions-3-back-end.md) for the requirements of the initial Back-End Development.
+# Instructions for building and testing the project 
 
-1. See the [Database Integration instructions](./instructions-4-database.md) for the requirements of integrating a database into the back-end.
 
-1. See the [Deployment instructions](./instructions-5-deployment.md) for the requirements of deploying an app.
+# Links to any additional Markdown documents
+[Reading about how to build an online account book](https://vilmate.com/blog/how-to-create-accounting-custom-software)
+
+# Other important things

back-end/.eslintrc.json

@@ -0,0 +1,24 @@
+{
+    "env": {
+        "browser": true,
+        "javaScript": true,
+        "es2021": true
+    },
+    "extends": [
+        "plugin:react/recommended",
+        "airbnb",
+        "prettier"
+    ],
+    "parserOptions": {
+        "ecmaFeatures": {
+            "jsx": true
+        },
+        "ecmaVersion": 13
+    },
+    "plugins": [
+        "react",
+        "prettier"
+    ],
+    "rules": {
+    }
+}

back-end/.prettierrc

@@ -0,0 +1,5 @@
+{
+    "trailingComma": "es5",
+    "printWidth": 100,
+    "singleQuote": true
+}

back-end/README.md

@@ -0,0 +1,35 @@
+# LifeNote Back End
+
+### Contribution:
+
+Letian Ye: Basic framework and database setup, DiaryOverview(WordCloud), User Authentication
+
+Zhuofeng Wang: Account Book transaction page's GET and PUT request, Test For Account Book transaction
+
+Susan Liu: Diary Detail GET and PUT request - Detail.js , GET and PUT test file - DetailService.spec.js
+
+Yiming Yu: AccountBook summary charts, GET and PUT request for monthly budget value, and the corresponding test file.
+
+Yaolin Zhang: Account Book Main page's searching and adding functions - app.js. Get and Post unit test - AccBookMainTest.spec.js
+
+Product Owner: Yaolin Zhang
+
+Scrum Master: Yiming Yu
+
+# LifeNote DataBase
+
+### Contribution:
+
+Letian Ye: 
+
+Zhuofeng Wang: 
+
+Susan Liu: 
+
+Yiming Yu: 
+
+Yaolin Zhang: 
+
+Product Owner: Yiming Yu
+
+Scrum Master: Zhuofeng Wang

back-end/app.js

@@ -0,0 +1,162 @@
+const express = require("express"); // CommonJS import style!
+const app = express(); // instantiate an Express object
+const path = require("path");
+require("dotenv").config({ silent: true }); // Load env variables
+
+// BodyParser
+var bodyParser = require("body-parser");
+app.use(
+  bodyParser.urlencoded({
+    extended: true,
+  })
+);
+app.use(bodyParser.json());
+
+// import some useful middleware
+const multer = require("multer"); // middleware to handle HTTP POST requests with file uploads
+const axios = require("axios"); // middleware for making requests to APIs
+require("dotenv").config({ silent: true }); // load environmental variables from a hidden file named .env
+const morgan = require("morgan");
+// require cors
+const cors = require("cors")
+// require passport
+const passport = require("passport")
+
+// use the morgan middleware to log all incoming http requests
+app.use(morgan("dev")); // morgan has a few logging default styles - dev is a nice concise color-coded style
+// use express's builtin body-parser middleware to parse any data included in a request
+app.use(express.json()); // decode JSON-formatted incoming POST data
+app.use(express.urlencoded({ extended: true })); // decode url-encoded incoming POST data
+// make 'public' directory publicly readable with static content
+app.use("/static", express.static("public"));
+// use cors
+app.use(cors())
+// use passport
+app.use(passport.initialize())
+
+//Database
+require('dotenv').config()
+const mongoose = require("mongoose");
+mongoose.connect(process.env.DB_URL);
+
+// listens for any HTTP GET request for the / path,
+// and responds with the plain text, 'Hello!'
+// Api
+const diaryWordCloudRouter = require("./routes/Diary/Overview")
+const diaryDetailRouter = require("./routes/Diary/Detail")
+const accountSummaryRouter = require("./routes/Accountbook/Summary")
+const transactionRouter = require("./routes/Account_book_trancsaction/transaction_display");
+const internal = require("stream");
+
+// ==============================================================
+// Users function
+app.use("/users", require("./routes/users"));
+
+// router for HTTP GET requests to the root document
+app.use("/", diaryWordCloudRouter);
+
+app.use("/", diaryDetailRouter)
+
+app.use("/", accountSummaryRouter)
+
+app.use("/", transactionRouter)
+
+// Test
+app.get("/", (req, res) => {
+  res.send("Hello world!");
+});
+
+// database for accout book main page
+const db = mongoose.connection;
+db.on('error', console.error.bind(console, 'connection error:!!!'));
+db.once('open', function() {
+  // we're connected!
+  console.log("hi database conntected")
+});
+
+const transactionSchema = new mongoose.Schema({
+  username: String,
+  name: String,
+  date: Date,
+  amount: Number,
+  type: String
+});
+
+const Transaction = mongoose.model('Transactions', transactionSchema);
+
+let userNameForSearch;
+// get recent transactions from db and sent them back to front-end
+app.post("/recent-trsc", (req, res) => {
+  userNameForSearch = req.body.username
+  console.log("user in the backend: " +req.body.username)
+  console.log(JSON.stringify(req.body, null, 2))
+
+  Transaction.find({username: req.body.username}, (err, docs) => {
+    if(err) return console.error(err);
+
+    console.log(docs.length)
+
+    if (docs.length > 5)
+    {
+      console.log(docs[docs.length-1])
+      res.json([docs[docs.length-1], docs[docs.length-2], docs[docs.length-3], 
+        docs[docs.length-4], docs[docs.length-5]])
+    }
+    else
+      res.json(docs);
+  })
+})
+
+app.get("/transaction_data", (req, res) => {
+  Transaction.find({}, (err, docs) => {
+    if(err) return console.error(err);
+    res.json(docs);
+  })
+})
+
+// search transaction function; post from client
+app.post("/post-search", (req, res) => {
+  console.log(JSON.stringify(req.body, null, 2))
+
+  Transaction.find({name: req.body.search, username:userNameForSearch}, (err, result)=>{
+    if(err) return console.error(err);
+    if(result.length === 0){
+      res.json([])
+    }
+    else{
+      console.log(result)
+      res.json(result);
+    }
+  })
+
+})
+
+// add transaction function; post from client
+app.post("/post-add", (req, res) => {
+  console.log(`post data: ${JSON.stringify(req.body, null, 2)}`)
+
+  const today = new Date()
+  const newTrsc = new Transaction ({
+    //username added
+    username: req.body.username,
+    name: req.body.trscName,
+    date: today,
+    amount: req.body.trscAmount,
+    type: req.body.trscType,
+  })
+
+  console.log(newTrsc)
+  newTrsc.save().then(() => console.log("new transaction added"))
+  //res.json(data)
+  res.send();
+})
+
+// proxy requests to/from an API
+app.get("/proxy-example", (req, res, next) => {
+  // use axios to make a request to an API for animal data
+  axios
+    .get("http://localhost:9000/post-search")
+    .then(apiResponse => res.json(apiResponse.data)) // pass data along directly to client
+    .catch(err => next(err)) // pass any errors to express
+})
+module.exports = app

back-end/models/detail.js

@@ -0,0 +1,9 @@
+const mongoose = require('mongoose');
+
+const diarySchema = new mongoose.Schema({
+    username: String,
+    date: String,
+    content: String
+  });
+
+module.exports = mongoose.model('Diary', diarySchema);

back-end/models/summary.js

@@ -0,0 +1,9 @@
+const mongoose = require('mongoose');
+
+const summarySchema = new mongoose.Schema({
+    userID: String,
+    username: String,
+    monthlyLimit: Number
+});
+
+module.exports = mongoose.model('Summary', summarySchema);

back-end/models/transaction.js

@@ -0,0 +1,12 @@
+const mongoose = require('mongoose');
+
+const transactionsSchema = new mongoose.Schema({
+    userID: String,
+    username: String,
+    name: String,
+    date: Date,
+    amount: Number,
+    type: String
+  });
+
+module.exports = mongoose.model('transactions', transactionsSchema);