Merge pull request #1609 from SimonRothUCF/react/dark-mode

Dark Mode
ucfopen · Dec 5, 2024 · 5769e93 · 5769e93
2 parents 1f269bf + e9dff02
commit 5769e93
Show file tree

Hide file tree

Showing 66 changed files with 3,638 additions and 322 deletions.
diff --git a/fuel/app/classes/controller/api/user.php b/fuel/app/classes/controller/api/user.php
@@ -26,6 +26,7 @@ public function post_settings()
 		$set_meta  = [
 			'useGravatar' => Input::json('useGravatar', null),
 			'notify'      => Input::json('notify', null),
+			'darkMode'	  => Input::json('darkMode', null)
 		];
 
 		$success = Materia\Api::user_update_meta($set_meta);

diff --git a/fuel/app/classes/controller/qsets.php b/fuel/app/classes/controller/qsets.php
@@ -6,6 +6,7 @@
 
 class Controller_Qsets extends Controller
 {
+	use Trait_CommonControllerTemplate;
 
 	public function action_import()
 	{

diff --git a/fuel/app/classes/controller/questions.php b/fuel/app/classes/controller/questions.php
@@ -6,6 +6,8 @@
 
 class Controller_Questions extends Controller
 {
+	use Trait_CommonControllerTemplate;
+
 	public function get_import()
 	{
 		// Validate Logged in

diff --git a/fuel/app/classes/model/user.php b/fuel/app/classes/model/user.php
@@ -5,7 +5,8 @@ class Model_User extends Orm\Model
 
 	protected static $_default_profile_fields = [
 		'useGravatar' => true,
-		'notify'      => true
+		'notify'      => true,
+		'darkMode'	  => false
 	];
 
 	protected static $_properties = [

diff --git a/fuel/app/classes/trait/commoncontrollertemplate.php b/fuel/app/classes/trait/commoncontrollertemplate.php
@@ -7,6 +7,7 @@
 trait Trait_CommonControllerTemplate
 {
 	use Trait_Analytics;
+	use Trait_DarkMode;
 
 	protected $_disable_browser_cache = false;
 
@@ -32,6 +33,11 @@ public function after($response)
 
 		$this->inject_common_js_constants();
 
+		if ($this->is_using_darkmode())
+		{
+			$this->theme->get_template()->set('darkmode', true);
+		}
+
 		return parent::after($response);
 	}
 

diff --git a/fuel/app/classes/trait/darkmode.php b/fuel/app/classes/trait/darkmode.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Materia
+ * License outlined in licenses folder
+ */
+
+trait Trait_DarkMode
+{
+	protected function is_using_darkmode()
+	{
+		if (\Service_User::verify_session() == true)
+		{
+			$meta = \Model_User::find_current()->profile_fields;
+			$darkmode = ! empty($meta['darkMode']) && $meta['darkMode'];
+			return $darkmode;
+		}
+		else return false;
+	}
+}
diff --git a/fuel/app/themes/default/layouts/react.php b/fuel/app/themes/default/layouts/react.php
@@ -14,7 +14,7 @@
 		<?= Css::render() ?>
 		<?=  $partials['google_analytics'] ?? '' ?>
 	</head>
-	<body class="<?= (isset($page_type) ? $page_type : '') ?>">
+	<body class="<?= (isset($page_type) ? $page_type : '') ?> <?= (isset($darkmode) ? 'darkMode' : '') ?>">
 		<div id="app"></div>
 		<div id="modal"></div>
 		<?= Js::render() ?>

diff --git a/public/img/404_beachandocean_dark.png b/public/img/404_beachandocean_dark.png
diff --git a/public/img/404_insand_dark.png b/public/img/404_insand_dark.png
diff --git a/public/img/404_logo_balls_dark.png b/public/img/404_logo_balls_dark.png
diff --git a/public/img/banner_dark.png b/public/img/banner_dark.png
diff --git a/public/img/kogneato_metal_detecting_dark.png b/public/img/kogneato_metal_detecting_dark.png
diff --git a/public/img/kogneato_metal_detecting_dark.svg b/public/img/kogneato_metal_detecting_dark.svg
diff --git a/public/img/kogneato_mywidgets_dark.svg b/public/img/kogneato_mywidgets_dark.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,7 @@ @@
     class Controller_Qsets extends Controller
     {
+    	use Trait_CommonControllerTemplate;
     	public function action_import()
     	{
@@ Expand Down @@