- {title}
-
- {description}
-
-
- {author}
-
- {/* Normally `flex` */}
-
-
+
)
}
@@ -157,22 +174,20 @@ function ProjectTile(props: InternalProjectTileProps) {
/** Props for a {@link Samples}. */
export interface SamplesProps {
+ readonly groupName: string
readonly createProject: (templateId?: string | null, templateName?: string | null) => void
}
/** A list of sample projects. */
export default function Samples(props: SamplesProps) {
- const { createProject } = props
- const { getText } = textProvider.useText()
+ const { groupName, createProject } = props
return (
-
- {opens}
-
-
- {likes}
-
+
-
- {getText('sampleAndCommunityProjects')}
-
+
+ {groupName}
-
- {SAMPLES.map((sample) => (
+
{(opts) => (
+ {SAMPLES.filter((s) => s.group === groupName).map((sample) => (
diff --git a/app/dashboard/src/layouts/StartModal.tsx b/app/dashboard/src/layouts/StartModal.tsx
index b6ae5100bb7b..92ebacdb23fd 100644
--- a/app/dashboard/src/layouts/StartModal.tsx
+++ b/app/dashboard/src/layouts/StartModal.tsx
@@ -26,18 +26,26 @@ export default function StartModal(props: StartModalProps) {
-
- {getText('welcomeSubtitle')}
-
-
{
+ createProject(templateId, templateName)
+ opts.close()
+ }}
+ />
+
+ {
+ createProject(templateId, templateName)
+ opts.close()
+ }}
+ />
+
+ {
createProject(templateId, templateName)
opts.close()
diff --git a/app/dashboard/src/layouts/WhatsNew.tsx b/app/dashboard/src/layouts/WhatsNew.tsx
index 17f66ecec720..6b608e1a4733 100644
--- a/app/dashboard/src/layouts/WhatsNew.tsx
+++ b/app/dashboard/src/layouts/WhatsNew.tsx
@@ -1,15 +1,15 @@
/** @file Community updates for the app. */
import * as React from 'react'
-import DiscordIcon from '#/assets/discord.svg'
+import BookImage from '#/assets/book.png'
+import Logo from '#/assets/enso_logo_large.svg'
import IntegrationsImage from '#/assets/integrations.png'
import YoutubeIcon from '#/assets/youtube.svg'
+import { Button, Text } from '#/components/AriaComponents'
import * as textProvider from '#/providers/TextProvider'
-import * as aria from '#/components/aria'
-import FocusArea from '#/components/styled/FocusArea'
-import FocusRing from '#/components/styled/FocusRing'
+import SvgMask from '#/components/SvgMask'
// ================
// === WhatsNew ===
@@ -20,86 +20,108 @@ export default function WhatsNew() {
const { getText } = textProvider.useText()
return (
-
-
- {getText('discoverWhatsNew')}
-
-
-
- {(innerProps) => (
-
-
-
- )}
-
-
- {(innerProps) => (
-
-
- 
-
- )}
-
-
- {(innerProps) => (
-
-
- 
-
- )}
-
+ >::new();
diff --git a/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala b/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala
index 76b9418a6587..94bc9976e8c7 100644
--- a/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala
+++ b/lib/scala/pkg/src/main/scala/org/enso/pkg/Package.scala
@@ -381,97 +381,164 @@ class PackageManager[F](implicit val fileSystem: FileSystem[F]) {
private def copyResources(pkg: Package[F], template: Template): Unit =
template match {
case Template.Default =>
- val mainEnsoPath = new URI(s"/default/src/${Package.mainFileName}")
-
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
- )
+ copyTemplateFiles(pkg, "default", List(Package.mainFileName), List())
case Template.ColoradoCovid =>
- val metricsDataPath = new URI(
- "/colorado_covid/data/CDPHE_COVID19_County_Status_Metrics.csv"
- )
- val geoDataPath = new URI("/colorado_covid/data/ColoradoGeoData.db")
- val mainEnsoPath = new URI(
- s"/colorado_covid/src/${Package.mainFileName}"
- )
-
- pkg.root.getChild("data").createDirectories()
- copyResource(
- metricsDataPath,
- pkg.root
- .getChild("data")
- .getChild("CDPHE_COVID19_County_Status_Metrics.csv")
+ val srcFiles = List(
+ Package.mainFileName,
+ "eaep.png",
+ "map.png",
+ "table1.png",
+ "table2.png"
)
- copyResource(
- geoDataPath,
- pkg.root.getChild("data").getChild("ColoradoGeoData.db")
- )
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ val dataFiles = List(
+ "CDPHE_COVID19_County_Status_Metrics.csv",
+ "ColoradoGeoData.db"
)
+ copyTemplateFiles(pkg, "colorado_covid", srcFiles, dataFiles)
case Template.Kmeans =>
- val mainEnsoPath = new URI(s"/kmeans/src/${Package.mainFileName}")
+ copyTemplateFiles(pkg, "kmeans", List(Package.mainFileName), List())
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ case Template.NasdaqReturns =>
+ copyTemplateFiles(
+ pkg,
+ "nasdaqreturns",
+ List(Package.mainFileName),
+ List()
)
- case Template.NasdaqReturns =>
- val mainEnsoPath = new URI(
- s"/nasdaqreturns/src/${Package.mainFileName}"
+ case Template.Orders =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eaep.png",
+ "excel1.png",
+ "excel2.png",
+ "excel3.png",
+ "eyeball_viz.png"
+ )
+ val dataFiles = List(
+ "store_data.xlsx"
)
+ copyTemplateFiles(pkg, "orders", srcFiles, dataFiles)
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ case Template.Restaurants =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eaep.png",
+ "map1.png",
+ "map2.png",
+ "table1.png"
)
+ val dataFiles = List(
+ "la_districts.csv",
+ "mapcolors.json",
+ "restaurants.csv"
+ )
+ copyTemplateFiles(pkg, "restaurants", srcFiles, dataFiles)
- case Template.Orders =>
- val storeDataPath = new URI("/orders/data/store_data.xlsx")
- val mainEnsoPath = new URI(s"/orders/src/${Package.mainFileName}")
+ case Template.Stargazers =>
+ copyTemplateFiles(pkg, "stargazers", List(Package.mainFileName), List())
- pkg.root.getChild("data").createDirectories()
- copyResource(
- storeDataPath,
- pkg.root.getChild("data").getChild("store_data.xlsx")
+ case Template.MonthlySales =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eaep.png",
+ "excel1.png"
)
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ val dataFiles = List(
+ "Sales_Sample_Data.xlsx"
)
+ copyTemplateFiles(pkg, "monthly_sales", srcFiles, dataFiles)
- case Template.Restaurants =>
- val laDistrictsDataPath = new URI("/restaurants/data/la_districts.csv")
- val restaurantsDataPath = new URI("/restaurants/data/restaurants.csv")
- val mainEnsoPath = new URI(s"/restaurants/src/${Package.mainFileName}")
+ case Template.BankHolidayRain =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eaep.png",
+ "bankholiday.png"
+ )
+ copyTemplateFiles(pkg, "bank_holiday_rain", srcFiles, List())
+
+ case Template.GettingStartedReading =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eags.png",
+ "loadfile.gif",
+ "sheets.gif",
+ "showdata.gif",
+ "simpleexpression.gif",
+ "table_solution.png",
+ "table_viz.png"
+ )
+ copyTemplateFiles(pkg, "getting_started_reading", srcFiles, List())
+
+ case Template.GettingStartedAggregating =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "answer_table.png",
+ "eags.png",
+ "set.gif",
+ "table1.png"
+ )
+ val dataFiles = List(
+ "sample_bank_data.xlsx"
+ )
+ copyTemplateFiles(
+ pkg,
+ "getting_started_aggregating",
+ srcFiles,
+ dataFiles
+ )
- pkg.root.getChild("data").createDirectories()
- copyResource(
- laDistrictsDataPath,
- pkg.root.getChild("data").getChild("la_districts.csv")
+ case Template.GettingStartedCleansing =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eags.png"
)
- copyResource(
- restaurantsDataPath,
- pkg.root.getChild("data").getChild("restaurants.csv")
+ val dataFiles = List(
+ "crm_data.csv"
)
- copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ copyTemplateFiles(pkg, "getting_started_cleansing", srcFiles, dataFiles)
+
+ case Template.GettingStartedSelecting =>
+ val srcFiles = List(
+ Package.mainFileName,
+ "eags.png",
+ "table1.png",
+ "table2.png"
)
+ val dataFiles = List(
+ "crm_data.csv",
+ "Customer_Data.xlsx"
+ )
+ copyTemplateFiles(pkg, "getting_started_selecting", srcFiles, dataFiles)
+ }
- case Template.Stargazers =>
- val mainEnsoPath = new URI(s"/stargazers/src/${Package.mainFileName}")
+ private def copyTemplateFiles(
+ pkg: Package[F],
+ project_name: String,
+ srcFiles: List[String],
+ dataFiles: List[String]
+ ): Unit = {
+ srcFiles.foreach { file =>
+ val srcPath = new URI(s"/$project_name/src/$file")
+ copyResource(
+ srcPath,
+ pkg.sourceDir.getChild(file)
+ )
+ }
+ if (dataFiles.nonEmpty) {
+ pkg.root.getChild("data").createDirectories()
+ dataFiles.foreach { file =>
+ val dataPath = new URI(s"/$project_name/data/$file")
copyResource(
- mainEnsoPath,
- pkg.sourceDir.getChild(Package.mainFileName)
+ dataPath,
+ pkg.root.getChild("data").getChild(file)
)
+ }
}
+ }
/** Copy the resource to provided resource.
*
diff --git a/lib/scala/pkg/src/main/scala/org/enso/pkg/Template.scala b/lib/scala/pkg/src/main/scala/org/enso/pkg/Template.scala
index e063b093c243..87514323d767 100644
--- a/lib/scala/pkg/src/main/scala/org/enso/pkg/Template.scala
+++ b/lib/scala/pkg/src/main/scala/org/enso/pkg/Template.scala
@@ -45,6 +45,30 @@ object Template {
override val name = "stargazers"
}
+ case object MonthlySales extends Template {
+ override val name = "monthly_sales"
+ }
+
+ case object BankHolidayRain extends Template {
+ override val name = "bank_holiday_rain"
+ }
+
+ case object GettingStartedReading extends Template {
+ override val name = "getting_started_reading"
+ }
+
+ case object GettingStartedAggregating extends Template {
+ override val name = "getting_started_aggregating"
+ }
+
+ case object GettingStartedCleansing extends Template {
+ override val name = "getting_started_cleansing"
+ }
+
+ case object GettingStartedSelecting extends Template {
+ override val name = "getting_started_selecting"
+ }
+
val allTemplates = Seq(
Default,
Orders,
@@ -52,6 +76,12 @@ object Template {
Stargazers,
ColoradoCovid,
Kmeans,
- NasdaqReturns
+ NasdaqReturns,
+ MonthlySales,
+ BankHolidayRain,
+ GettingStartedReading,
+ GettingStartedAggregating,
+ GettingStartedCleansing,
+ GettingStartedSelecting
)
}
-
- {getText('newsItem3Beta')}
-
-
- {getText('newsItem3BetaDescription')}
-
-
-
-
-
- {getText('newsItemWeeklyTutorials')}
-
-
- {getText('newsItemWeeklyTutorialsDescription')}
-
-
-
-
-
- {getText('newsItemCommunityServer')}
-
-
- {getText('newsItemCommunityServerDescription')}
-
-
-
-
+ {getText('discoverWhatsNew')}
+
+
)
diff --git a/app/dashboard/src/tailwind.css b/app/dashboard/src/tailwind.css
index 59e2e98d942b..49aef979fa79 100644
--- a/app/dashboard/src/tailwind.css
+++ b/app/dashboard/src/tailwind.css
@@ -511,30 +511,26 @@
background-image: url('data:image/svg+xml;utf8,'),
url('data:image/svg+xml;utf8,'),
url('data:image/svg+xml;utf8,');
+ border-top-width: var(--scrollbar-offset-edge, 0);
+ border-bottom-width: var(--scrollbar-offset-edge, 0);
+ border-right-width: 4px;
+ border-left-width: 0;
/* Custom scrollbar for rounded corners */
:where(:is([class*='rounded-xl']))& {
- border-width: 8px;
- border-right-width: 4px;
- border-left-width: 0;
+ --scrollbar-offset-edge: 8px;
}
:where(:is([class*='rounded-2xl']))& {
- border-width: 16px;
- border-right-width: 4px;
- border-left-width: 0;
+ --scrollbar-offset-edge: 16px;
}
:where(:is([class*='rounded-3xl']))& {
- border-width: 24px;
- border-right-width: 4px;
- border-left-width: 0;
+ --scrollbar-offset-edge: 24px;
}
:where(:is([class*='rounded-4xl']))& {
- border-width: 28px;
- border-right-width: 4px;
- border-left-width: 0;
+ --scrollbar-offset-edge: 28px;
}
&:hover {
@@ -558,30 +554,26 @@
background-image: url('data:image/svg+xml;utf8,'),
url('data:image/svg+xml;utf8,'),
url('data:image/svg+xml;utf8,');
+ border-left-width: var(--scrollbar-offset-edge, 0);
+ border-right-width: var(--scrollbar-offset-edge, 0);
+ border-top-width: 0;
+ border-bottom-width: 4px;
/* Custom scrollbar for rounded corners */
:where(:is([class*='rounded-xl']))& {
- border-width: 8px;
- border-bottom-width: 4px;
- border-top-width: 0;
+ --scrollbar-offset-edge: 8px;
}
:where(:is([class*='rounded-2xl']))& {
- border-width: 16px;
- border-bottom-width: 4px;
- border-top-width: 0;
+ --scrollbar-offset-edge: 16px;
}
:where(:is([class*='rounded-3xl']))& {
- border-width: 24px;
- border-bottom-width: 4px;
- border-top-width: 0;
+ --scrollbar-offset-edge: 24px;
}
:where(:is([class*='rounded-4xl']))& {
- border-width: 28px;
- border-bottom-width: 4px;
- border-top-width: 0;
+ --scrollbar-offset-edge: 28px;
}
&:hover {
diff --git a/app/dashboard/tailwind.config.js b/app/dashboard/tailwind.config.js
index ec079f31a249..0bbf3cf7d9cc 100644
--- a/app/dashboard/tailwind.config.js
+++ b/app/dashboard/tailwind.config.js
@@ -491,6 +491,46 @@ inset 0 -36px 51px -51px #00000014`,
'@apply opacity-75 cursor-not-allowed': '',
},
+ '.scroll-offset-edge-s': {
+ '--scrollbar-offset-edge': '2px',
+ },
+ '.scroll-offset-edge-m': {
+ '--scrollbar-offset-edge': '4px',
+ },
+ '.scroll-offset-edge-l': {
+ '--scrollbar-offset-edge': '6px',
+ },
+ '.scroll-offset-edge-xl': {
+ '--scrollbar-offset-edge': '8px',
+ },
+ '.scroll-offset-edge-2xl': {
+ '--scrollbar-offset-edge': '16px',
+ },
+ '.scroll-offset-edge-3xl': {
+ '--scrollbar-offset-edge': '24px',
+ },
+ '.scroll-offset-edge-4xl': {
+ '--scrollbar-offset-edge': '28px',
+ },
+ '.scroll-offset-edge-5xl': {
+ '--scrollbar-offset-edge': '32px',
+ },
+ '.scroll-offset-edge-6xl': {
+ '--scrollbar-offset-edge': '36px',
+ },
+ '.scroll-offset-edge-7xl': {
+ '--scrollbar-offset-edge': '40px',
+ },
+ '.scroll-offset-edge-8xl': {
+ '--scrollbar-offset-edge': '44px',
+ },
+ '.scroll-offset-edge-9xl': {
+ '--scrollbar-offset-edge': '48px',
+ },
+ '.scroll-offset-edge-10xl': {
+ '--scrollbar-offset-edge': '52px',
+ },
+
// === Visbility classes ===
'.visibility-visible': {},
diff --git a/app/ide-desktop/common/src/text/english.json b/app/ide-desktop/common/src/text/english.json
index b01524dbc25e..c85abfc4a179 100644
--- a/app/ide-desktop/common/src/text/english.json
+++ b/app/ide-desktop/common/src/text/english.json
@@ -341,9 +341,9 @@
"loadingAppMessage": "Loading Enso...",
"appErroredMessage": "Enso encountered an unrecoverable error.",
"appErroredPrompt": "Please try refreshing or installing an updated version.",
- "discoverWhatsNew": "Discover what’s new",
+ "discoverWhatsNew": "Learn about Enso Analytics",
"sampleAndCommunityProjects": "Sample and community projects",
- "startWithATemplate": "Start with a template",
+ "startWithATemplate": "Discover",
"openInfoMenu": "Open info menu",
"noProjectIsCurrentlyOpen": "No project is currently open.",
"versionOutdatedTitle": "Upgrade Enso Now",
@@ -536,14 +536,16 @@
"confirmNewPasswordLabel": "Confirm new password",
"confirmNewPasswordPlaceholder": "Confirm your new password",
- "selectTemplate": "Select a template",
+ "selectTemplate": "Welcome",
"welcomeSubtitle": "Explore templates, plugins, and data sources to kickstart your next big idea.",
- "newsItem3Beta": "Read what’s new in Enso 3.0 Beta",
- "newsItem3BetaDescription": "Learn about Enso Cloud, new data libraries, and Enso AI.",
- "newsItemWeeklyTutorials": "Watch weekly Enso tutorials",
- "newsItemWeeklyTutorialsDescription": "Subscribe not to miss new weekly tutorials.",
- "newsItemCommunityServer": "Join our community server",
- "newsItemCommunityServerDescription": "Chat with our team and other Enso users.",
+ "newsItem3Beta": "Read what’s new in Enso",
+ "newsItem3BetaDescription": "Learn about new features and whats coming soon.",
+ "newsItemWeeklyTutorials": "Watch tutorials and webinars",
+ "newsItemWeeklyTutorialsDescription": "Subscribe not to miss new updates.",
+ "newsItemHelpServer": "Read the documentation",
+ "newsItemHelpServerDescription": "Learn how to use Enso.",
+ "newsItemCommunityServer": "Join the community",
+ "newsItemCommunityServerDescription": "Chat with Enso team and other users.",
"drivePageName": "Data Catalog",
"editorPageName": "Spatial Analysis",
diff --git a/build/build/src/engine.rs b/build/build/src/engine.rs
index 49088a7790b4..337c1bb537b0 100644
--- a/build/build/src/engine.rs
+++ b/build/build/src/engine.rs
@@ -42,16 +42,71 @@ pub async fn download_project_templates(client: reqwest::Client, enso_root: Path
let output_base = enso_root.join("lib/scala/pkg/src/main/resources/");
let url_base = Url::parse("https://github.com/enso-org/project-templates/raw/main/")?;
let to_handle = [
- ("Orders", vec!["data/store_data.xlsx", "src/Main.enso"]),
- ("Restaurants", vec!["data/la_districts.csv", "data/restaurants.csv", "src/Main.enso"]),
+ ("Orders", vec![
+ "data/store_data.xlsx",
+ "src/eaep.png",
+ "src/excel1.png",
+ "src/excel2.png",
+ "src/excel3.png",
+ "src/eyeball_viz.png",
+ "src/Main.enso",
+ ]),
+ ("Restaurants", vec![
+ "data/la_districts.csv",
+ "data/mapcolors.json",
+ "data/restaurants.csv",
+ "src/eaep.png",
+ "src/Main.enso",
+ "src/map1.png",
+ "src/map2.png",
+ "src/table1.png",
+ ]),
("Stargazers", vec!["src/Main.enso"]),
("Colorado_COVID", vec![
"data/CDPHE_COVID19_County_Status_Metrics.csv",
"data/ColoradoGeoData.db",
+ "src/eaep.png",
+ "src/Main.enso",
+ "src/map.png",
+ "src/table1.png",
+ "src/table2.png",
+ ]),
+ ("Monthly_Sales", vec![
+ "data/Sales_Sample_Data.xlsx",
+ "src/eaep.png",
+ "src/excel1.png",
"src/Main.enso",
]),
+ ("Bank_Holiday_Rain", vec!["src/bankholiday.png", "src/eaep.png", "src/Main.enso"]),
("KMeans", vec!["src/Main.enso"]),
("NASDAQReturns", vec!["src/Main.enso"]),
+ ("Getting_Started_Reading", vec![
+ "src/eags.png",
+ "src/loadfile.gif",
+ "src/Main.enso",
+ "src/sheets.gif",
+ "src/showdata.gif",
+ "src/simpleexpression.gif",
+ "src/table_solution.png",
+ "src/table_viz.png",
+ ]),
+ ("Getting_Started_Aggregating", vec![
+ "data/sample_bank_data.xlsx",
+ "src/answer_table.png",
+ "src/eags.png",
+ "src/Main.enso",
+ "src/set.gif",
+ "src/table1.png",
+ ]),
+ ("Getting_Started_Cleansing", vec!["data/crm_data.csv", "src/eags.png", "src/Main.enso"]),
+ ("Getting_Started_Selecting", vec![
+ "data/crm_data.csv",
+ "data/Customer_Data.xlsx",
+ "src/eags.png",
+ "src/Main.enso",
+ "src/table1.png",
+ "src/table2.png",
+ ]),
];
let mut futures = Vec::
+
+
+
+