Merge branch 'dev' into early

# Conflicts: # release/app/package.json
EmuDeck · Dec 17, 2023 · 9bc7f14 · 9bc7f14
2 parents 06bbbaa + 1588889
commit 9bc7f14
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 10 deletions.
diff --git a/release/app/package.json b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "EmuDeck",
-  "version": "2.1.35",
+  "version": "2.2.0",
   "description": "Play all your RetroGames",
   "license": "MIT",
   "author": {

diff --git a/src/data/welcome.json b/src/data/welcome.json
@@ -0,0 +1,51 @@
+[
+  {
+    "type": "banner",
+    "title": "Game of the month: Sonic 3 & Knuckles",
+    "href": "early-access",
+    "target": "navigate",
+    "img": "https://www.retroplace.com/pics/gen/packshots/39058--sonic-knuckles.png",
+    "imgL": "0px",
+    "imgT": "-30px",
+    "imgR": "auto",
+    "imgB": "0px",
+    "col": "7",
+    "titleL": "auto",
+    "titleT": "auto",
+    "titleR": "16px",
+    "titleB": "12px",
+    "titleW": "220px",
+    "align": "right",
+    "bg": "linear-gradient(0deg, rgba(34,193,195,1) 0%, rgba(45,122,253,1) 100%)",
+    "color": "white"
+  },
+  {
+    "type": "banner",
+    "title": "New Decky Plugin: EmuDecky",
+    "href": "early-access",
+    "target": "navigate",
+    "img": "https://decky.xyz/static/hero-512fcea47af0ed876a437f080c02bbe3.png",
+    "imgL": "0px",
+    "imgT": "auto",
+    "imgR": "auto",
+    "imgB": "0px",
+    "col": "5",
+    "titleL": "12px",
+    "titleT": "8px",
+    "titleR": "auto",
+    "titleB": "0px",
+    "titleW": "80%",
+    "align": "left",
+    "bg": "linear-gradient(0deg, rgba(34,193,195,1) 0%, rgba(1,14,61,1) 100%)",
+    "color": "white"
+  },
+  {
+    "type": "text",
+    "title": "Introducing Early Access",
+    "description": "Interested in getting new features early? Support EmuDeck on Patreon for a sneak peek of the latest features like Synced Saves across different EmuDeck installation and even other platform like OnionOS, local multiplayer, interoperability with other platforms, and more things to come!",
+    "href": "early-access",
+    "target": "navigate",
+    "bg": "rgb(251, 225, 109)",
+    "color": "#444"
+  }
+]
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
@@ -334,7 +334,7 @@ export default function App() {
           <Route exact path="/check-updates" element={<CheckUpdatePage />} />
           <Route exact path="/patreon-login" element={<PatreonLoginPage />} />
 
-          <Route exact path="/welcome" element={<WelcomePage />} />
+          <Route exact path="/welcome" element={<SettingsPage />} />
           <Route
             exact
             path="/device-selector"

diff --git a/src/renderer/components b/src/renderer/components
diff --git a/src/renderer/pages/WelcomePage.jsx b/src/renderer/pages/WelcomePage.jsx
@@ -211,15 +211,9 @@ function WelcomePage() {
           <Header title={`Welcome to EmuDeck for ${systemName}`} />
         )}
 
-        {second === true && (
-          <Header title={`Welcome back to EmuDeck for ${systemName}`} />
-        )}
+        {second === true && <Header title="Welcome back to EmuDeck" />}
         {systemName !== 'ERROR' && (
           <Welcome
-            settingsCards={}
-            settingsCardsFeatured={}
-            functions={}
-            updates={updates}
             alert={
               second
                 ? ``
+9 −19		molecules/Aside/Aside.jsx
+30 −0		molecules/Banner/Banner.jsx
+66 −0		molecules/Banner/banner.scss
+87 −4		organisms/Wrappers/Welcome.jsx