Merge pull request #14 from SimonB50/main

Librusek v0.4.3
SimonB50 · Dec 6, 2024 · b75c8d0 · b75c8d0
2 parents 053b7bf + e151e14
commit b75c8d0
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "librusek",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/pages/grades.js b/pages/grades.js
@@ -511,8 +511,8 @@ const Grades = () => {
                     .map((grade) => (
                       <button
                         key={grade.Id}
-                        className={`bg-${
-                          grade.IsConstituent ? "primary" : "secondary"
+                        className={`${
+                          grade.IsConstituent ? "bg-primary" : "bg-secondary"
                         } text-primary-content w-fit p-2 font-semibold rounded-md text-center aspect-square`}
                         onClick={() => {
                           setFocusedGrade(`g-${grade.Id.toString()}`);
@@ -612,8 +612,10 @@ const Grades = () => {
                         .map((grade) => (
                           <button
                             key={grade.Id}
-                            className={`bg-${
-                              grade.IsConstituent ? "primary" : "secondary"
+                            className={`${
+                              grade.IsConstituent
+                                ? "bg-primary"
+                                : "bg-secondary"
                             } text-primary-content w-fit p-2 font-semibold rounded-md text-center aspect-square`}
                             onClick={() => {
                               setFocusedGrade(`g-${grade.Id.toString()}`);
@@ -803,12 +805,12 @@ const Grades = () => {
                   <div className="flex flex-col gap-2 mt-2 bg-base-100 p-3 rounded-md">
                     <div className="flex flex-row gap-2 items-center">
                       <span
-                        class={`text-4xl font-semibold bg-${
+                        class={`text-4xl font-semibold ${
                           (!editMode ? gradesData.Grades : tmpGrades).find(
                             (x) => x.Id == focusedGrade.slice(2)
                           ).IsConstituent
-                            ? "primary"
-                            : "secondary"
+                            ? "bg-primary"
+                            : "bg-secondary"
                         } w-20 h-20 flex items-center justify-center text-primary-content rounded-md`}
                       >
                         {
@@ -969,9 +971,14 @@ const Grades = () => {
                   {upperFirst(textGrade.Grade)}
                 </span>
                 <span className="text-lg">
-                  {upperFirst(!subjectsLoading && !subjectsError && subjectsData.Subjects.find(
-                    (x) => x.Id == textGrade.Subject.Id
-                  ).Name)} - {textGrade.Date}
+                  {upperFirst(
+                    !subjectsLoading &&
+                      !subjectsError &&
+                      subjectsData.Subjects.find(
+                        (x) => x.Id == textGrade.Subject.Id
+                      ).Name
+                  )}{" "}
+                  - {textGrade.Date}
                 </span>
               </div>
             </div>

diff --git a/pages/profile.js b/pages/profile.js
@@ -72,7 +72,7 @@ const Profile = () => {
         <div className="flex flex-col mt-4">
           <span className="text-3xl font-semibold">Behaviour</span>
           {behaviourGradesData.Grades.length > 0 ? (
-            <div className="grid grid-cols-2 gap-4 mt-4">
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-4">
               {behaviourGradesData.Grades.sort(
                 (a, b) => new Date(b.AddDate) - new Date(a.AddDate)
               ).map((grade) => (
@@ -97,7 +97,7 @@ const Profile = () => {
               ))}
               {behaviourGradesData.Grades.length % 2 == 1 && (
                 <div className="flex rounded-box p-4 bg-base-200 justify-center items-center">
-                  <span className="text-lg text-primary">
+                  <span className="text-lg text-primary text-center">
                     Awaiting final grade
                   </span>
                 </div>

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.4.2"
+version = "0.4.3"
 description = "Librusek app"
 authors = ["SimonB50"]
 license = "AGPL-3.0"

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
   "productName": "Librusek",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "identifier": "com.librusek.dev",
   "build": {
     "frontendDist": "../out",