Skip to content

Ml management merge ready #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 131 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
eeb278c
chore: install setup for react, electron, and vite
Howard-GitHub Nov 9, 2024
32f406b
chore: setup pages directory
Howard-GitHub Nov 9, 2024
7c2b801
initial commit
vliu36 Nov 12, 2024
1fe08e9
reorganized repo
vliu36 Nov 12, 2024
a47721a
sets up general structure of backend files
PattyCakesxD Nov 17, 2024
0af2245
Merge pull request #2 from cppsea/patrick/db-setup
PattyCakesxD Nov 17, 2024
3462102
added schemas and controller imports
vliu36 Nov 19, 2024
526fd03
Update README.md
vliu36 Nov 19, 2024
db56a7e
start the server after connecting to db cluster
MansonLQ Nov 19, 2024
509a65e
configure db connection
MansonLQ Nov 19, 2024
d2da88b
reformatting page update 1
callistabudiman16 Nov 19, 2024
d5b92e1
added markup functionality (bold, italicize, underline)
jaroonl Nov 19, 2024
9d7a703
organize models into functions usable by backend API
StevePatpatyan Nov 19, 2024
900840b
added interface call
vliu36 Nov 19, 2024
5c452a4
Merge branch 'schemas' of https://github.com/cppsea/InkWave into schemas
vliu36 Nov 19, 2024
9de1edd
added backend documentation readme
vliu36 Nov 19, 2024
d3af1ad
Merge branch 'backend' of https://github.com/cppsea/InkWave into schemas
vliu36 Nov 19, 2024
678ada8
Merge pull request #3 from cppsea/schemas
vliu36 Nov 19, 2024
b0de3e9
Create page that allows user to take photos
Howard-GitHub Nov 21, 2024
6431375
Merge remote-tracking branch 'origin/frontend' into frontend
Howard-GitHub Nov 21, 2024
5c9c9e0
updated explicit type definitions
vliu36 Nov 22, 2024
9a80b3e
split NLP model into 2 functions, add exception handling for no text,…
StevePatpatyan Dec 1, 2024
277eecb
add requirements.txt
StevePatpatyan Dec 1, 2024
8e52c95
Update Camera component and index.html
Howard-GitHub Dec 2, 2024
0d543bd
rewrote app definition to typescript
vliu36 Dec 6, 2024
5b4b448
added tsconfig
vliu36 Dec 6, 2024
4b04a8c
updated backend docs to include schema info
vliu36 Dec 6, 2024
ce8e419
fixed bugs with bolding interactions and saving user text
jaroonl Dec 6, 2024
149c31e
Merge branch 'frontend' of https://github.com/cppsea/InkWave into fro…
jaroonl Dec 6, 2024
ffb8180
moved package.json and gitignore into server folder
PattyCakesxD Dec 7, 2024
9a14d59
a lot of refactoring
PattyCakesxD Dec 7, 2024
8cadf56
renaming files
PattyCakesxD Dec 7, 2024
062b1a2
remove unused app.js
PattyCakesxD Dec 7, 2024
44e9c91
fix more typos
PattyCakesxD Dec 7, 2024
de5b436
fix api route typos
PattyCakesxD Dec 7, 2024
9d01cd5
adds auth router for login/signup
PattyCakesxD Dec 7, 2024
9c1c51e
adds template for notes routes
PattyCakesxD Dec 7, 2024
0698bdd
adds proper javadoc for forgot-password
PattyCakesxD Dec 7, 2024
6a1fc6c
capitalize Id to ID
PattyCakesxD Dec 7, 2024
a1d7c61
changed id to be more specific in notes routes
PattyCakesxD Dec 7, 2024
4b94596
fixed name of route
PattyCakesxD Dec 7, 2024
96a42ac
organized controller and routes files
PattyCakesxD Dec 7, 2024
6425672
fixed controllers
PattyCakesxD Dec 7, 2024
819e06a
fix encoding issue
StevePatpatyan Dec 7, 2024
c4619d0
Updated preview page to have functioning arrow keys to view taken photos
Howard-GitHub Dec 21, 2024
04d3525
Re-organize code into separate components and files into separate files
Howard-GitHub Dec 21, 2024
d94911f
Fix capture photo button bug and organize Photo.jsx and Photo.css fil…
Howard-GitHub Dec 21, 2024
c4ff8c5
created dashboard and home pages, routed between main pages on figma,…
jaroonl Dec 23, 2024
210e3b0
Merge branch 'frontend' of https://github.com/cppsea/InkWave into fro…
jaroonl Dec 23, 2024
38838e0
Handle Key events
callistabudiman16 Dec 28, 2024
4105985
Create components folder for shared components between pages
Howard-GitHub Dec 29, 2024
0818c21
Merge remote-tracking branch 'origin/frontend' into frontend
Howard-GitHub Dec 29, 2024
068a1e4
Add photo upload page
lucastlr Dec 30, 2024
f20988a
login/signup routes
MansonLQ Jan 4, 2025
d82b0fc
Change to resizeable contenteditable div
callistabudiman16 Jan 5, 2025
d25f32b
Update
Howard-GitHub Jan 5, 2025
e8ce3d2
Merge remote-tracking branch 'origin/frontend' into frontend
Howard-GitHub Jan 5, 2025
d9d7d9c
Fix routing bug between camera and home page
Howard-GitHub Jan 5, 2025
0075e3b
new route (update), new popup button to upload, updated look/user int…
jaroonl Jan 6, 2025
ea8567d
Merge branch 'backend' into frontend-backend
Howard-GitHub Jan 6, 2025
bb835ef
Create login and sign-up pages
Howard-GitHub Jan 10, 2025
ed39d63
moved gitignore to root
vliu36 Jan 10, 2025
8a406ce
added gitignore
vliu36 Jan 10, 2025
0e7eb10
added gitignore in root
vliu36 Jan 10, 2025
5535a7f
Update documentation
Howard-GitHub Jan 10, 2025
1920b77
Merge remote-tracking branch 'origin/frontend-backend' into frontend-…
Howard-GitHub Jan 10, 2025
5bdc649
Update sign up and home page
Howard-GitHub Jan 15, 2025
c025e68
handle invalid cases for auth routes
MansonLQ Jan 15, 2025
bc63f3d
Merge branch 'backend' of https://github.com/cppsea/InkWave into backend
MansonLQ Jan 15, 2025
a5135f7
fix merge conflicts
MansonLQ Jan 15, 2025
10cedb7
add preprocessing (needs fix)
StevePatpatyan Jan 15, 2025
aa28af9
Update models.py
crystalle77 Jan 18, 2025
5e3ed45
Update models.py
crystalle77 Jan 18, 2025
8774752
add scripts for backend use (call with node.js)
StevePatpatyan Jan 20, 2025
4fdfeb1
Update sign-in page, login page, and index.html
Howard-GitHub Jan 22, 2025
cd12880
Fix sign-up page bug
Howard-GitHub Jan 22, 2025
7845e16
fix auth routes
MansonLQ Jan 22, 2025
489068d
Fix toolbar
callistabudiman16 Jan 22, 2025
69934a9
Fix small frontend error and testing fetch statement in SignUp.jsx
Howard-GitHub Jan 23, 2025
a361647
enabled cors on backend
MansonLQ Jan 24, 2025
c9cf225
Update SignUp.jsx to be compatible with backend
Howard-GitHub Jan 24, 2025
c9f2a81
Merge remote-tracking branch 'origin/frontend-backend' into frontend-…
Howard-GitHub Jan 24, 2025
5507813
rename 'pdf' field in Note to 'md'
PattyCakesxD Jan 24, 2025
5c8509f
adds endpoints for notes (except summary) and some schema updates
PattyCakesxD Jan 24, 2025
819fdfb
remove unnecessary import
PattyCakesxD Jan 24, 2025
d2106dd
change llm output to markdown, change variable names to make more sen…
StevePatpatyan Jan 24, 2025
dbf5602
adds most recent note endpoint and sorts getAllNotes
PattyCakesxD Jan 25, 2025
93b68e2
adds test router (dev uses)
PattyCakesxD Jan 29, 2025
68201c0
return user object on login
MansonLQ Jan 31, 2025
86f3a80
Update login and sign-up page
Howard-GitHub Feb 2, 2025
2416e5b
Merge remote-tracking branch 'origin/frontend-backend' into frontend-…
Howard-GitHub Feb 2, 2025
7616be2
Encountering bug with invalid email format
Howard-GitHub Feb 3, 2025
547c9a1
Add navigation for successful login and register
Howard-GitHub Feb 15, 2025
01c3f9e
Add log out functionality on home page
Howard-GitHub Feb 15, 2025
348cbc6
Update code
Howard-GitHub Feb 15, 2025
41ec883
updated fetching process in dashboard
jaroonl Feb 18, 2025
3401665
Merge branch 'frontend-backend' of https://github.com/cppsea/InkWave …
jaroonl Feb 18, 2025
998fcba
Open Recent
callistabudiman16 Feb 18, 2025
c60f63e
Merge branch 'frontend-backend' of https://github.com/cppsea/InkWave …
callistabudiman16 Feb 18, 2025
fd292df
Handle open recent
callistabudiman16 Feb 18, 2025
a3bf122
adds an endpoint to create a note, changed NoteSchema md type to String
PattyCakesxD Feb 19, 2025
72106ec
Fix undefined method for handleClickLogOut
Howard-GitHub Feb 19, 2025
9d8c7c3
Update code
Howard-GitHub Feb 20, 2025
38cf783
dashboard delete button created (functionality still being tested so …
jaroonl Feb 28, 2025
15696c2
Merge branch 'frontend-backend' of https://github.com/cppsea/InkWave …
jaroonl Feb 28, 2025
741f435
update llm output to be txt rather than md
StevePatpatyan Mar 3, 2025
c8d0b77
Updated reformatting notes page to have functioning save button for a…
Howard-GitHub Mar 16, 2025
18e429f
Merge remote-tracking branch 'origin/frontend-backend' into frontend-…
Howard-GitHub Mar 16, 2025
7d0f343
finished testing delete functionalities (deletes backend with fronten…
jaroonl Mar 16, 2025
bbf8bb7
Merge branch 'frontend-backend' of https://github.com/cppsea/InkWave …
jaroonl Mar 16, 2025
39de31f
added test files
vliu36 Mar 30, 2025
c937b61
Merge branch 'frontend-backend' of https://github.com/cppsea/InkWave …
vliu36 Mar 30, 2025
e9f3492
Trying to fix InkWave Cv Model Preprocessing
crystalle77 Apr 2, 2025
8c61162
try new cv model, the temp image shows how the image looks after prep…
StevePatpatyan Apr 3, 2025
55be06a
Map clicking on note displayed on dashboard to its id
Howard-GitHub Apr 4, 2025
8d21dda
Merge remote-tracking branch 'origin/frontend-backend' into frontend-…
Howard-GitHub Apr 4, 2025
691c3be
Map clicking on note on dashboard to its content which is displayed i…
Howard-GitHub Apr 4, 2025
5e60cc2
Merge branch 'ML-Management' into temp-ML-frontend-backend
Howard-GitHub Apr 8, 2025
3d879fe
Prevent pages from scrolling beyond their display
Howard-GitHub Apr 8, 2025
aedf78d
Update code to ignore console.log statements in frontend
Howard-GitHub Apr 8, 2025
842772d
Initial Commit with only the original ML model state and its dependen…
StevePatpatyan Apr 8, 2025
c61e15d
New OCR Processor
crystalle77 Apr 16, 2025
6168007
Merging Fix Preprocessing to ML Management
crystalle77 Apr 16, 2025
ff58950
basic edit ignore
crystalle77 Apr 16, 2025
d25550a
Finished CV_LLM
crystalle77 Apr 17, 2025
a960bea
Update .gitignore
crystalle77 Apr 17, 2025
0d9e986
Merge branch 'ML-Management-Merge-Ready' of https://github.com/cppsea…
crystalle77 Apr 17, 2025
c411a10
Merging ML to temp Frontend Backend Branch
crystalle77 Apr 17, 2025
1f12b72
both things still functioning correctly by themselves
crystalle77 Apr 17, 2025
34e61f9
Update ModelForGenerateNotes.py
crystalle77 Jun 2, 2025
8820a20
Update ModelForGenerateNotes.py
crystalle77 Jun 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.env
ML Models/.env
ML Models/Test Images/
ML Models/__pycache__/
Test Images
# dependencies
/node_modules
/Frontend/node_modules
/server/node_modules

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
.venv
/ML Models/.env
9 changes: 9 additions & 0 deletions Frontend/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[*]
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
4 changes: 4 additions & 0 deletions Frontend/.eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
node_modules
dist
out
.gitignore
9 changes: 9 additions & 0 deletions Frontend/.eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
module.exports = {
extends: [
'eslint:recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'@electron-toolkit',
'@electron-toolkit/eslint-config-prettier'
]
}
5 changes: 5 additions & 0 deletions Frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules
dist
out
.DS_Store
*.log*
6 changes: 6 additions & 0 deletions Frontend/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
out
dist
pnpm-lock.yaml
LICENSE.md
tsconfig.json
tsconfig.*.json
4 changes: 4 additions & 0 deletions Frontend/.prettierrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
singleQuote: true
semi: false
printWidth: 100
trailingComma: none
3 changes: 3 additions & 0 deletions Frontend/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"recommendations": ["dbaeumer.vscode-eslint"]
}
39 changes: 39 additions & 0 deletions Frontend/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Debug Main Process",
"type": "node",
"request": "launch",
"cwd": "${workspaceRoot}",
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
"windows": {
"runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
},
"runtimeArgs": ["--sourcemap"],
"env": {
"REMOTE_DEBUGGING_PORT": "9222"
}
},
{
"name": "Debug Renderer Process",
"port": 9222,
"request": "attach",
"type": "chrome",
"webRoot": "${workspaceFolder}/src/renderer",
"timeout": 60000,
"presentation": {
"hidden": true
}
}
],
"compounds": [
{
"name": "Debug All",
"configurations": ["Debug Main Process", "Debug Renderer Process"],
"presentation": {
"order": 1
}
}
]
}
11 changes: 11 additions & 0 deletions Frontend/.vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
36 changes: 36 additions & 0 deletions Frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# frontend

An Electron application with React

## Recommended IDE Setup

- [VSCode](https://code.visualstudio.com/) + [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) + [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)

## Project Setup

### Install

Make sure to run this command before running the frontend application.

```bash
$ npm install
```

### Development

```bash
$ npm run dev
```

### Build

```bash
# For windows
$ npm run build:win

# For macOS
$ npm run build:mac

# For Linux
$ npm run build:linux
```
12 changes: 12 additions & 0 deletions Frontend/build/entitlements.mac.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
<true/>
</dict>
</plist>
Binary file added Frontend/build/icon.icns
Binary file not shown.
Binary file added Frontend/build/icon.ico
Binary file not shown.
Binary file added Frontend/build/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions Frontend/electron-builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
appId: com.electron.app
productName: frontend
directories:
buildResources: build
files:
- '!**/.vscode/*'
- '!src/*'
- '!electron.vite.config.{js,ts,mjs,cjs}'
- '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
- '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
asarUnpack:
- resources/**
win:
executableName: frontend
nsis:
artifactName: ${name}-${version}-setup.${ext}
shortcutName: ${productName}
uninstallDisplayName: ${productName}
createDesktopShortcut: always
mac:
entitlementsInherit: build/entitlements.mac.plist
extendInfo:
- NSCameraUsageDescription: Application requests access to the device's camera.
- NSMicrophoneUsageDescription: Application requests access to the device's microphone.
- NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
- NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
notarize: false
dmg:
artifactName: ${name}-${version}.${ext}
linux:
target:
- AppImage
- snap
- deb
maintainer: electronjs.org
category: Utility
appImage:
artifactName: ${name}-${version}.${ext}
npmRebuild: false
publish:
provider: generic
url: https://example.com/auto-updates
20 changes: 20 additions & 0 deletions Frontend/electron.vite.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { resolve } from 'path'
import { defineConfig, externalizeDepsPlugin } from 'electron-vite'
import react from '@vitejs/plugin-react'

export default defineConfig({
main: {
plugins: [externalizeDepsPlugin()]
},
preload: {
plugins: [externalizeDepsPlugin()]
},
renderer: {
resolve: {
alias: {
'@renderer': resolve('src/renderer/src')
}
},
plugins: [react()]
}
})
24 changes: 24 additions & 0 deletions Frontend/inkwave-frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
8 changes: 8 additions & 0 deletions Frontend/inkwave-frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# React + Vite

This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.

Currently, two official plugins are available:

- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react/README.md) uses [Babel](https://babeljs.io/) for Fast Refresh
- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
38 changes: 38 additions & 0 deletions Frontend/inkwave-frontend/eslint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import js from '@eslint/js'
import globals from 'globals'
import react from 'eslint-plugin-react'
import reactHooks from 'eslint-plugin-react-hooks'
import reactRefresh from 'eslint-plugin-react-refresh'

export default [
{ ignores: ['dist'] },
{
files: ['**/*.{js,jsx}'],
languageOptions: {
ecmaVersion: 2020,
globals: globals.browser,
parserOptions: {
ecmaVersion: 'latest',
ecmaFeatures: { jsx: true },
sourceType: 'module',
},
},
settings: { react: { version: '18.3' } },
plugins: {
react,
'react-hooks': reactHooks,
'react-refresh': reactRefresh,
},
rules: {
...js.configs.recommended.rules,
...react.configs.recommended.rules,
...react.configs['jsx-runtime'].rules,
...reactHooks.configs.recommended.rules,
'react/jsx-no-target-blank': 'off',
'react-refresh/only-export-components': [
'warn',
{ allowConstantExport: true },
],
},
},
]
13 changes: 13 additions & 0 deletions Frontend/inkwave-frontend/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.jsx"></script>
</body>
</html>
Loading