diff --git a/README.md b/README.md index 911ae97..cafe5c8 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,8 @@ ## Features -- Serverless auto GPA calculation +- Auto GPA calculation +- Credit and ECTS calculations - Import/Export your grades from/to files - Export/Share your grades with a URL - Dark and light themes @@ -51,6 +52,7 @@ - [react-sortablejs](https://github.com/SortableJS/react-sortablejs) - [base64-compressor](https://github.com/eliot-akira/base64-compressor) - [tailwind-scrollbar](https://github.com/adoxography/tailwind-scrollbar) +- [webpack-license-plugin](https://github.com/codepunkt/webpack-license-plugin) ## License diff --git a/package-lock.json b/package-lock.json index 9c885fb..b4f184d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,13 @@ { "name": "gradeful", - "version": "1.1.0", + "version": "1.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "gradeful", - "version": "1.1.0", + "version": "1.2.2", + "license": "MIT", "devDependencies": { "@babel/plugin-proposal-private-property-in-object": "^7.21.11", "base64-compressor": "^1.0.3", diff --git a/package.json b/package.json index 6e3d14c..88425bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gradeful", - "version": "1.2.1", + "version": "1.2.2", "description": "A grade tracker to monitor your progress throughout your university education.", "private": true, "homepage": ".", diff --git a/public/index.html b/public/index.html index eab8134..8ca2000 100644 --- a/public/index.html +++ b/public/index.html @@ -4,40 +4,17 @@ - + - - Gradeful
- diff --git a/public/manifest.json b/public/manifest.json index 080d6c7..9d22262 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { - "short_name": "React App", - "name": "Create React App Sample", + "short_name": "Gradeful", + "name": "Gradeful", "icons": [ { "src": "favicon.ico", diff --git a/src/components/Course.jsx b/src/components/Course.jsx index fa3a3b7..2a52c51 100644 --- a/src/components/Course.jsx +++ b/src/components/Course.jsx @@ -18,6 +18,7 @@ function CourseExport(props) { const [nameValue, setNameValue] = useState(props.name); const [creditValue, setCreditValue] = useState(props.credit); + const [ectsValue, setEctsValue] = useState(props.ects); const [scoreValue, setScoreValue] = useState(props.score); const [gradeValue, setGradeValue] = useState(props.grade); const [autoCalcScoreValue, setAutoCalcScoreValue] = useState(props.autoCalcScore); @@ -141,6 +142,7 @@ function CourseExport(props) { course.name = nameValue; course.credit = creditValue; + course.ects = ectsValue; course.autoCalcGrade = autoCalcGradeValue; course.autoCalcScore = autoCalcScoreValue; course.includeCalc = includeCalcValue; @@ -150,26 +152,27 @@ function CourseExport(props) { setEditJSON({ ...editJSON, [idRef.current]: course }); } // eslint-disable-next-line react-hooks/exhaustive-deps - }, [nameValue, creditValue, autoCalcGradeValue, autoCalcScoreValue, includeCalcValue, scoreValue, gradeValue]); + }, [nameValue, creditValue, ectsValue, autoCalcGradeValue, autoCalcScoreValue, includeCalcValue, scoreValue, gradeValue]); // Update editable values useEffect(() => { setNameValue(props.name); setCreditValue(props.credit); + setEctsValue(props.ects); setAutoCalcGradeValue(props.autoCalcGrade); setAutoCalcScoreValue(props.autoCalcScore); setIncludeCalcValue(props.includeCalc); setScoreValue(props.score); setGradeValue(props.grade); - }, [editing, props.name, props.credit, props.autoCalcGrade, props.autoCalcScore, props.includeCalc, props.score, props.grade]); + }, [editing, props.name, props.credit, props.ects, props.autoCalcGrade, props.autoCalcScore, props.includeCalc, props.score, props.grade]); // <--- Effects end ---> // Render return ( -
+
-
+
@@ -192,7 +195,7 @@ function CourseExport(props) { + +
@@ -319,7 +334,7 @@ function CourseExport(props) {
@@ -354,6 +369,7 @@ CourseExport.propTypes = { termId: PropTypes.string, name: PropTypes.string, credit: PropTypes.string, + ects: PropTypes.string, score: PropTypes.string, grade: PropTypes.string, autoCalcScore: PropTypes.bool, diff --git a/src/components/ExportToFileWindow.jsx b/src/components/ExportToFileWindow.jsx index 5440bfe..de2e76d 100644 --- a/src/components/ExportToFileWindow.jsx +++ b/src/components/ExportToFileWindow.jsx @@ -28,19 +28,15 @@ function ExportToFileWindow(props) { title={'Export to file'} showWindow={props.showExportFilePopup} setShowWindow={props.setShowExportFilePopup} > -
-
+
+
File name