Merge pull request #39 from PLGuerraDesigns/dev

Menu Improvements

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 2.7.0
+
+- NEW: Added a filter menu to the Personal Projects section.
+
+## 2.6.3
+
+- REVISED: Added a description to the Professional Experience and Personal Projects menu sections.
+
+## 2.6.2
+
+- REVISED: Added a confirmation dialog to the `Contact Me` button in the action menu.
+- REVISED: Added an `About` button to the action menu.
+
 ## 2.6.1
 
 - REVISED: Disabled the tilt effect on mobile devices.

assets/json/projects.json

@@ -214,6 +214,8 @@
       }
     ],
     "tags": [
+      "Academic",
+      "Software",
       "Flutter",
       "Dart",
       "Progressive Web App",
@@ -276,6 +278,7 @@
       }
     ],
     "tags": [
+      "Software",
       "Flutter",
       "Syncfusion",
       "Dart",
@@ -346,6 +349,8 @@
       }
     ],
     "tags": [
+      "Academic",
+      "Software",
       "Flutter",
       "Flame",
       "Supabase",
@@ -535,6 +540,8 @@
       }
     ],
     "tags": [
+      "Software",
+      "Electronics",
       "Adobe Photoshop",
       "Adobe Illustrator",
       "Autodesk Fusion 360",
@@ -644,6 +651,8 @@
       }
     ],
     "tags": [
+      "Academic",
+      "Software",
       "Adobe Photoshop",
       "Adobe Illustrator",
       "Adobe XD",
@@ -720,6 +729,7 @@
       }
     ],
     "tags": [
+      "Electronics",
       "Autodesk Fusion 360",
       "CAD Design",
       "3D Printing",
@@ -879,6 +889,8 @@
     ],
     "externalLinks": [],
     "tags": [
+      "Software",
+      "Electronics",
       "Fiberglass",
       "Painting",
       "DIY",
@@ -975,6 +987,8 @@
       }
     ],
     "tags": [
+      "Software",
+      "Electronics",
       "Autodesk Fusion 360",
       "CAD Design",
       "3D Printing",
@@ -1048,6 +1062,8 @@
       }
     ],
     "tags": [
+      "Software",
+      "Electronics",
       "Head Tracking",
       "Handicap",
       "MPU 6050",
@@ -1088,6 +1104,8 @@
       }
     ],
     "tags": [
+      "Academic",
+      "Software",
       "Adobe Photoshop",
       "Calculator",
       "UARK CSCE 4623",
@@ -1125,6 +1143,8 @@
       }
     ],
     "tags": [
+      "Software",
+      "Electronics",
       "Autodesk Fusion 360",
       "Cherry MX Switches",
       "3D Printing",
@@ -1163,6 +1183,8 @@
       }
     ],
     "tags": [
+      "Software",
+      "Electronics",
       "Autodesk Fusion 360",
       "3D Printing",
       "Internet of Things",
@@ -1253,6 +1275,9 @@
     ],
     "externalLinks": [],
     "tags": [
+      "Academic",
+      "Software",
+      "Electronics",
       "Highschool Science Fair",
       "Fiberglass",
       "Mechanical Arm",

lib/common/routing/app_router.dart

@@ -8,8 +8,8 @@ import '../../pages/details/details.screen.dart';
 import '../../pages/error.dart';
 import '../../pages/home/home.screen.dart';
 import '../../pages/loading.dart';
-import '../../pages/personal_projects/projects_menu.screen.dart';
-import '../../pages/professional_experiences/prof_exp_menu.screen.dart';
+import '../../pages/personal_projects/projects_menu.dart';
+import '../../pages/professional_exp_menu.dart';
 import 'routes.dart';
 
 /// A class that configures the app's routing.
@@ -61,7 +61,7 @@ class AppRouter {
             GoRoute(
               path: Routes.professional,
               builder: (BuildContext context, GoRouterState state) =>
-                  const ProfessionalExpMenuScreen(),
+                  const ProfessionalExperienceMenuScreen(),
               routes: <GoRoute>[
                 GoRoute(
                     path: '${Routes.details}/:title',

lib/common/strings.dart

@@ -4,6 +4,7 @@ class Strings {
 
   static const String currentLocation = 'VA, USA';
   static const String lastUpdated = 'Updated AUG 2024';
+  static const String contactEmail = 'plguerra@outlook.com';
 
   static const List<String> headerSubtitles = <String>[
     'Software Engineer  •  Innovator  •  Technologist',
@@ -36,11 +37,14 @@ class Strings {
   static const String prev = 'Prev.';
   static const String next = 'Next';
   static const String viewAllMedia = 'View all Media';
+  static const String about = 'About';
   static const String viewSourceCode = 'View Source Code';
   static const String professionalExperiences = 'Professional Experiences';
-  static const String previousProject = 'Previous Project';
-  static const String nextProject = 'Next Project';
+  static const String professionalExperiencesExplained =
+      'These are projects I have undertaken professionally, whether as a full-time, part-time employee, or contractor.';
   static const String personalProjects = 'Personal Projects';
+  static const String personalProjectsExplained =
+      'These are projects I’ve undertaken both in my free time and during my studies to explore new technologies, engineering principles, and artistic expressions.';
   static const String contactMe = 'Contact Me';
   static const String reportAnIssue = 'Report an Issue';
   static const String moreInfo = 'More Info';
@@ -55,4 +59,15 @@ class Strings {
   static const String selectACategoryToViewTheEntries =
       'Select a category to view the entries.';
   static const String expected = 'Expected';
+  static const String contactMeMessage =
+      'Thank you for your interest in contacting me, please feel free to reach out to me via email at:';
+  static const String copyToClipboard = 'Copy to Clipboard';
+  static const String emailCopied = 'Email copied to clipboard';
+  static const String openEmailApp = 'Open Email App';
+  static const String close = 'Close';
+
+  static const String software = 'Software';
+  static const String electronics = 'Electronics';
+  static const String threeDPrinting = '3D Printing';
+  static const String academic = 'Academic';
 }

lib/common/urls.dart

@@ -1,3 +1,5 @@
+import 'strings.dart';
+
 /// A class that contains all the urls used in the app.
 class Urls {
   Urls._();
@@ -6,19 +8,21 @@ class Urls {
 
   static const String portfolioBase =
       'https://plguerradesigns.github.io/portfolio/#';
-  static const String projectIssues =
-      'https://github.com/PLGuerraDesigns/portfolio/issues';
   static const String projectSourceCode =
       'https://github.com/PLGuerraDesigns/portfolio';
-  static const String changelog =
+  static const String projectReadme =
+      'https://github.com/PLGuerraDesigns/portfolio/blob/master/README.md';
+  static const String projectIssues =
+      'https://github.com/PLGuerraDesigns/portfolio/issues';
+  static const String projectChangelog =
       'https://github.com/PLGuerraDesigns/portfolio/blob/master/CHANGELOG.md';
 
   static const String github = 'https://github.com/PLGuerraDesigns';
   static const String thingiverse =
       'https://www.thingiverse.com/plg_designs/designs';
   static const String linkedin = 'https://www.linkedin.com/in/plguerra/';
   static const String youtube = 'https://www.youtube.com/@plguerra';
-  static const String contactEmail = 'mailto:plguerra@outlook.com';
+  static const String openEmail = 'mailto:${Strings.contactEmail}';
 
   static const String googleSearchBase = 'https://www.google.com/search?q=';
 

lib/models/app_state.dart

@@ -5,6 +5,7 @@ import 'package:flutter/services.dart';
 
 import '../common/asset_paths.dart';
 import '../common/routing/routes.dart';
+import '../common/strings.dart';
 import 'education.dart';
 import 'professional_experience.dart';
 import 'project.dart';
@@ -22,6 +23,37 @@ class AppState extends ChangeNotifier {
   final GlobalKey<NavigatorState> _navigatorKey = GlobalKey<NavigatorState>();
   GlobalKey<NavigatorState> get navigatorKey => _navigatorKey;
 
+  /// The list of project filter options.
+  final List<String> projectFilterOptions = <String>[
+    Strings.software,
+    Strings.electronics,
+    Strings.threeDPrinting,
+    Strings.academic,
+  ];
+
+  /// The list of selected project filters.
+  List<String> get selectedProjectFilters => _selectedProjectFilters;
+  final List<String> _selectedProjectFilters = <String>[
+    Strings.software,
+    Strings.electronics,
+    Strings.threeDPrinting,
+    Strings.academic,
+  ];
+
+  /// Toggles the selected project filter.
+  void toggleSelectedProjectFilter(String filter) {
+    if (selectedProjectFilters.length == projectFilterOptions.length) {
+      _selectedProjectFilters.clear();
+    }
+
+    if (_selectedProjectFilters.contains(filter)) {
+      _selectedProjectFilters.remove(filter);
+    } else {
+      _selectedProjectFilters.add(filter);
+    }
+    notifyListeners();
+  }
+
   /// Whether the project data has been loaded.
   bool _projectsLoaded = false;
   bool get projectsLoaded => _projectsLoaded;
@@ -30,6 +62,20 @@ class AppState extends ChangeNotifier {
   List<Project> get projects => _projects;
   List<Project> _projects = <Project>[];
 
+  /// The list of filtered projects.
+  List<Project> get filteredProjects {
+    final List<Project> filteredProjects = <Project>[];
+    for (final Project project in _projects) {
+      for (final String filter in selectedProjectFilters) {
+        if (project.tags.contains(filter)) {
+          filteredProjects.add(project);
+          break;
+        }
+      }
+    }
+    return filteredProjects;
+  }
+
   /// Returns the project for the given title in path format.
   Project getProjectByTitlePath(String titleAsPath) {
     for (final Project project in _projects) {
@@ -101,14 +147,16 @@ class AppState extends ChangeNotifier {
     await rootBundle.loadString(AssetPaths.projectsJsonData).then(
       (String data) {
         final dynamic jsonResult = json.decode(data);
-        for (final dynamic project in jsonResult as List<dynamic>) {
-          _projects.add(Project.fromJson(project as Map<String, dynamic>));
+        for (final dynamic projectAsJson in jsonResult as List<dynamic>) {
+          _projects
+              .add(Project.fromJson(projectAsJson as Map<String, dynamic>));
         }
       },
     );
     _projects.sort((Project a, Project b) {
       return b.startDate.compareTo(a.startDate);
     });
+
     _projectsLoaded = true;
   }