Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dashboard additions removals #354

Merged
merged 39 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
feb738b
Purge mentions of Astro Studio
TheOtterlord Oct 8, 2024
2286708
Add UI docs (getting started & button)
louisescher Oct 8, 2024
a80503d
Update packages/studiocms/src/index.ts
louisescher Oct 8, 2024
ffb1a5e
Fix border rounding
TheOtterlord Oct 8, 2024
5062b40
Shrink hero
TheOtterlord Oct 8, 2024
690fd26
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 8, 2024
26e06a2
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 10, 2024
f4232a5
Update www/docs/astro.config.mts
louisescher Oct 10, 2024
207d00e
Merge branch 'issue-0351' into dashboard-additions-removals
louisescher Oct 10, 2024
f7423fd
Finish button docs, fix merge conflicts
louisescher Oct 10, 2024
e653adb
Add more UI lib docs, adjust UI package
louisescher Oct 11, 2024
2131989
Update button.mdx
louisescher Oct 11, 2024
722b62f
Adjust wording
louisescher Oct 11, 2024
c71c185
Update dropdown.mdx
louisescher Oct 11, 2024
ea6d147
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 12, 2024
58d5350
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 12, 2024
87d3a08
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 12, 2024
71c2ee4
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 13, 2024
5be0593
Add more UI docs, fix UI lib css
louisescher Oct 13, 2024
44f974b
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 13, 2024
056e8ba
Adjust sponsors css, add more UI lib docs
louisescher Oct 13, 2024
2cf4b8f
Improve code snippets
TheOtterlord Oct 13, 2024
1456d14
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 13, 2024
ee6226f
Document textarea, toggle, and user
TheOtterlord Oct 13, 2024
45eeae1
Changes to UI lib, new UI lib docs
louisescher Oct 13, 2024
02a530b
Merge branch 'issue-0351' into dashboard-additions-removals
louisescher Oct 13, 2024
84b2ad7
Fix missing comma
louisescher Oct 13, 2024
78cfc0a
Update custom.css
louisescher Oct 13, 2024
e69e1de
mention include styles
TheOtterlord Oct 13, 2024
7d4f464
Merge branch 'dashboard-additions-removals' of https://github.com/ast…
TheOtterlord Oct 13, 2024
1f5ff7a
Adjustments for twoslash
louisescher Oct 13, 2024
e4148fa
Merge branch 'dashboard-additions-removals' of https://github.com/ast…
louisescher Oct 13, 2024
a8b0caf
Update custom.css
louisescher Oct 13, 2024
c2bc645
Twoslash more like twobitch
louisescher Oct 13, 2024
14fd063
Funny markdown support :)
louisescher Oct 13, 2024
5899e8f
Made twoslash appear correctly
louisescher Oct 13, 2024
ad2ae7c
Add changesets
louisescher Oct 13, 2024
c1a5c38
Add explicitTrigger for twoslash
louisescher Oct 13, 2024
6305a57
Merge branch 'issue-0351' into dashboard-additions-removals
Adammatthiesen Oct 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .changeset/curvy-mirrors-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
"@studiocms/ui": patch
---

Applied various changes and fixes to different parts of the UI libary.

- Fixed a CSS leak caused by importing css files instead of having scoped styles
- Adjusted dropdown helper API for better DX
- Adjusted modal helper API for better DX
- Various CSS fixes for different components
7 changes: 7 additions & 0 deletions .changeset/thin-hounds-happen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@studiocms/dashboard": patch
"@studiocms/core": patch
"studiocms": patch
---

Adjusted strings to account for Astro Studio sunsetting
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,8 @@
"quickfix.biome": "explicit",
"source.organizeImports.biome": "explicit"
},
"editor.defaultFormatter": "biomejs.biome"
"editor.defaultFormatter": "biomejs.biome",
"[mdx]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ Steps to get a running playground should be the following:
Commands to run:

- `pnpm playground:login` - Login your CLI to Astro Studio
- `pnpm playground:link` - Link to Astro Studio and Create a new DB for your CMS Installation
- `pnpm playground:push` - Creates the base tables on the remote database.
- `pnpm playground:dev` - Starts the Dev server connected to the linked database

Expand Down
5 changes: 4 additions & 1 deletion biome.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@
"linter": {
"enabled": true,
"rules": {
"recommended": true
"recommended": true,
"suspicious": {
"noExplicitAny": "warn"
}
}
},
"overrides": [
Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms/src/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { StudioCMSPluginOptions } from '@studiocms/core/types';
import type { AstroIntegration } from 'astro';

/**
* # Astro Studio CMS Integration
* **Astro Studio CMS Integration**
*
* A CMS built for Astro by the Astro Community for the Astro Community.
*
Expand Down
12 changes: 0 additions & 12 deletions packages/studiocms/src/index.ts
louisescher marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,6 @@ import { defineStudioCMSConfig, defineStudioCMSPlugin } from '@studiocms/core/li
import type { StudioCMSPluginOptions } from '@studiocms/core/types';
import integration from './integration';

/**
* # Astro Studio CMS Integration
*
* A CMS built for Astro by the Astro Community for the Astro Community.
*
* Checkout our [GitHub Repo `@astrolicious/studiocms`](https://github.com/astrolicious/studiocms)
*
* Check out [Astro-StudioCMS.xyz](https://astro-studiocms.xyz) or the Built-in JSDocs *(Hover Docs like this)* for more information.
*
* > **Note: Astro SSR adapters that are configured for Image Optimization will automatically take full control of the Image Optimization Service. Making the `imageService` option in this integration not have any effect.**
*
*/
export const studioCMS = integration;

export default studioCMS;
Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms_core/src/components/Avatar.astro
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const { isLoggedIn, dbUser: userProfile } = Astro.locals;
))
}
{ enabled === false && (
<a href="#" aria-disabled="true" title="Please Edit your Database through your Studio Dashboard">
<a href="#" aria-disabled="true" title="Please Edit your database through your provider's dashboard">
<img
src={profileImg.src}
alt="Authentication Disabled"
Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms_core/src/schemas/config/dashboard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { unocssConfigSchema } from './unocss';
export const dashboardConfigSchema = z
.object({
/**
* OPTIONAL - This allows the user to enable or disable the Astro Studio CMS Dashboard but still provide all the helper's and utilities to those who are customizing their setup, doing so will disable the dashboard and you will need to manage your content via the Astro Studio Dashboard at http://studio.astro.build
* OPTIONAL - This allows the user to enable or disable the Astro StudioCMS dashboard but still provide all the helper's and utilities to those who are customizing their setup, doing so will disable the dashboard and you will need to manage your content via your database
*
* @default true
*/
Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms_core/src/schemas/config/developer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const developerConfigSchema = z
/**
* Enable Testing and Demo Mode
*
* This will enable the testing and demo mode for the Astro Studio CMS Dashboard, this will allow you to test the dashboard without having to authenticate. This is useful for testing and demo purposes as it will allow you to see how the dashboard works and looks but disable any changes to the database.
* This will enable the testing and demo mode for the Astro StudioCMS dashboard, this will allow you to test the dashboard without having to authenticate. This is useful for testing and demo purposes as it will allow you to see how the dashboard works and looks but disable any changes to the database.
*
* @default false
*/
Expand Down
8 changes: 4 additions & 4 deletions packages/studiocms_core/src/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ export const CoreStrings = {
};

export const DbErrors = {
AstroConfigOutput: "Astro Studio CMS is only supported in 'Output: server' SSR mode.",
AstroConfigOutput: "Astro StudioCMS is only supported in 'Output: server' SSR mode.",
AstroConfigSiteURL:
"Astro Studio CMS requires a 'site' configuration in your Astro Config. This can be your domain ( 'https://example.com' ) or localhost ( 'http://localhost:4321' - localhost should only be used during development and should not be used in production).",
"Astro StudioCMS requires a 'site' configuration in your Astro Config. This can be your domain ( 'https://example.com' ) or localhost ( 'http://localhost:4321' - localhost should only be used during development and should not be used in production).",
DbStartPage:
'Start Page is Enabled. This will be the only page available until you initialize your database and disable the config option forcing this page to be displayed. To get started, visit http://localhost:4321/start/ in your browser to initialize your database. And Setup your installation.',
astroDbMissingMessage: 'Astro DB Integration not found in Astro Config',
Expand Down Expand Up @@ -39,10 +39,10 @@ export const DashboardStrings = {
Setup: 'Setting up StudioCMS Dashboard...',
AddIntegrations: 'Adding Dashboard Integrations...',
TestAndDemo:
'Testing and Demo Mode is Enabled, Authentication will not be required to access dashboard pages. But you will only be able to edit the database from the Astro Studio Dashboard, https://studio.astro.build/',
'Testing and Demo Mode is Enabled, Authentication will not be required to access dashboard pages. But you will only be able to edit the database directly',
AuthEnabled: 'Auth is Enabled, Setting Up...',
AuthDisabled:
'Auth is Disabled by the User Configuration. You will only be able to edit the database from the Astro Studio Dashboard, https://studio.astro.build/',
'Auth is Disabled by the User Configuration. You will only be able to edit the database directly',
AuthRoutes: 'Setting up Auth Routes...',
DashboardEnabled: 'Dashboard is Enabled.',
DashboardDisabled:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if (permissionLevel !== 'admin') {

<div class="py-2">
<span>
Note: To delete admins you can do this from your Astro Studio Dashboard.
Note: To delete admins you can do this from your database.
</span>
</div>

Expand Down
2 changes: 1 addition & 1 deletion packages/studiocms_robotstxt/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export interface PolicyOptions {
* [ Optional ] Indicates to the robot that the page URL contains parameters (like UTM tags) that should be ignored when indexing it.
*
* @example
* ```hash
* ```bash
* # for URLs like:
* www.example2.com/index.php?page=1&sid=2564126ebdec301c607e5df
* www.example2.com/index.php?page=1&sid=974017dcd170d6c4a5d76ae
Expand Down
Loading