♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) #79

create-issue-branch · 2024-05-11T08:48:54Z

Original issue description

Step one of #77

closes #78

[skip ci]

studiocms-deployment-helper · 2024-05-11T08:48:59Z

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2024-05-11 08:50:38 CET

studiocms-deployment-helper · 2024-05-11T08:48:59Z

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2024-05-11 08:50:25 CET

studiocms-deployment-helper · 2024-05-11T08:49:00Z

The preview deployment is ready. 🟢

Open Preview | Open Build Logs

Last updated at: 2024-05-11 08:50:18 CET

… batch transactions (#76) * Create draft PR for #71 [skip ci] * Update - New setup page and done page implemented. as well as some OptionsSchema cleanup * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/done.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/setup.ts Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/setup.ts Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/setup.ts Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/setup.ts Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/setup.ts Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Paul Valladares <[email protected]> * update as per dreyfus's comment * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Jacob Jenkins <[email protected]> * Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro Co-authored-by: Jacob Jenkins <[email protected]> --------- Co-authored-by: create-issue-branch[bot] <53036503+create-issue-branch[bot]@users.noreply.github.com> Co-authored-by: Adam Matthiesen <[email protected]> Co-authored-by: Adam Matthiesen <[email protected]> Co-authored-by: Paul Valladares <[email protected]> Co-authored-by: Jacob Jenkins <[email protected]>

[skip ci]

…totype into issue-0078

…h and start the process of converting the dashboad edit pages to utilitze HTMX based server rendering

…ved old page schema

…s now

… module for retrieving user data from the Astro Studio's Database.

…ing a new user and use it to generate a gravatar avatar for local users without oAuth

dreyfus92

Amazing work @Adammatthiesen, just left a couple of comments.

packages/studioCMS/src/components/exports/Navigation.astro

dreyfus92 · 2024-05-17T18:57:32Z

packages/studioCMS/src/components/exports/Navigation.astro

+import "./navigation.css";
+
+type Props = {
+ topLevelLinkCount?: number;


What's topLevelLinkCount?

it creates a navigation map of any page with the showOnNav option on the table as true as such:

topLevelLinkCount: 3

{ Page1, Page2, Page3, More: { Page4, Page5 } }

This is for a front-end Navigation component to replace the old front-end header :)

dreyfus92 · 2024-05-17T19:47:40Z

...tudioCMS/src/integrations/studioCMSDashboard/routes/dashboard/components/SideBarFooter.astro


+type Props = { studioCMSSocials: StudioCMSSocials };
+const { studioCMSSocials: { github: githubURL } } = Astro.props as Props;


The type assertion shouldn't be needed, it should be infered without it.

Suggested change

const { studioCMSSocials: { github: githubURL } } = Astro.props as Props;

const { studioCMSSocials: { github: githubURL } } = Astro.props;

Huh does it? I always do as Props ... 👀

it does infer... but i noticed this also helps when the language server crashes... so i've been adding it in when i needed it instead of restarting the Language server

jdtjenkins

Just a few comments @Adammatthiesen !

Great work though, this is looking siiiiiiiiiiick

.github/workflows/firsttimepr.yml

jdtjenkins · 2024-05-17T23:05:33Z

packages/studioCMS/src/components/exports/Navigation.astro

+ <div class="navigation">
+ <div class="title"><a href={baseSiteURL}>{title}</a></div>
+ { 
+ links.slice(0, topLevelLinkCount).map(({ text, href }) => (


Is there any way to just either not push these links into the array, or remove them before we get to the template? Feels weird to be modifying this array inside the template

jdtjenkins · 2024-05-17T23:06:20Z

packages/studioCMS/src/components/exports/Navigation.astro

+ <div class="dropdown">
+ <button>More ▼</button>
+ <div class="dropdown-content">
+ { links.slice(topLevelLinkCount).map(({ text, href }) => (


Same here with the slicing! Also, this one doesn't have a count... So I actually don't know what happens but I feel nothing good

its just a using the count as a starting point in this situation. i'm using Slice to get the first 3 links and then throwing the rest into a dropdown for the front-end stuff with it all being controlled by a true/false variable on the PageData table

packages/studioCMS/src/components/exports/Navigation.astro

jdtjenkins · 2024-05-17T23:08:55Z

packages/studioCMS/src/components/exports/navigation.css

+
+.navigation .title {
+ font-size: xx-large;
+ color: black;


Don't mind for now since we don't have official branding. But this should probably be an off-black

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/done.astro

jdtjenkins · 2024-05-17T23:52:40Z

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro

+ <text class="text-lg py-2">
+ <text class="font-bold">What is StudioCMS?</text> 
+ <br />
+ StudioCMS is a simple, easy to use, and fast CMS for Astro. It's built with the latest technologies and is designed to be as simple as possible. It's also open source and free to use. 


This should eventually just be a link to the docs 😂

This was created before this was even much more than a thought... Its kinda just placeholder information till we have docs and everything setup

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro

jdtjenkins · 2024-05-17T23:56:12Z

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro

+ //@ts-expect-error - show is not a standard method on HTMLElement it comes from `Shoelace.syle`
+ localAdmin.show();
+ //@ts-expect-error - hide is not a standard method on HTMLElement it comes from `Shoelace.syle`
+ oauthAdmin.hide();


Hmmmmmmmmmmmm wonder if we should make like custom types for these things.. I really hate all these ts expect errors.

Something like

type SLHTMLElement = HTMLElement & { show: () => void; hide: () => void; etc }

jdtjenkins · 2024-05-17T23:56:56Z

packages/studioCMS/src/integrations/studioCMSDashboard/routes/databaseSetup/main.astro

+ }
+ });
+
+ document.forms[0]?.addEventListener("submit", async (e) => {


I see cheeky. Can this form reference be a document.getElemenyById in case we ever introduce more forms we don't need to fix this

In this case, atleast for now i think it should be fine, since this is only the First time setup page, and primarily used only to setup the tables with some dummy data to get started as well as the permission setup

Co-authored-by: Jacob Jenkins <[email protected]>

…databaseSetup/done.astro Co-authored-by: Jacob Jenkins <[email protected]>

Co-authored-by: Paul Valladares <[email protected]>

dreyfus92

Let's ship this, looks good to me! 🚢

jdtjenkins

I think is so cool! I love it all! Lets ship it fam 🚢

BryceRussell · 2024-05-25T12:35:48Z

Looks like this covers everything we talked about, ship it! 🚢🚀

Adammatthiesen · 2024-05-25T12:37:24Z

!coauthor

github-actions · 2024-05-25T12:37:35Z

Co-authored-by: Bryce Russell <[email protected]>
Co-authored-by: Adam Matthiesen <[email protected]>
Co-authored-by: Jacob Jenkins <[email protected]>
Co-authored-by: Paul Valladares <[email protected]>

Create draft PR for #78

8936f51

[skip ci]

create-issue-branch bot added the chore label May 11, 2024

create-issue-branch bot assigned Adammatthiesen May 11, 2024

create-issue-branch bot changed the title ~~Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers)~~ ♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) May 11, 2024

Adammatthiesen changed the base branch from main to issue-0050 May 11, 2024 08:49

Adammatthiesen added this to the ATP Migration milestone May 11, 2024

Adammatthiesen added feat refactor breaking labels May 11, 2024

Adammatthiesen and others added 18 commits May 12, 2024 02:33

add new workflows to send messages for first time contributors

1406b3f

Update firsttimepr.yml

4983812

Update firsttimepr.yml

7434215

Create draft PR for #78

a3e057d

[skip ci]

Merge branch 'issue-0078' of github.com:Adammatthiesen/studio-cms-pro…

03203e9

…totype into issue-0078

Chore: Update Security implementation for local username/password aut…

1d93e8b

…h and start the process of converting the dashboad edit pages to utilitze HTMX based server rendering

new schema is working! Woo! This will give tons of future options!

035a667

more progress updates

3f702df

dashboard update progress checkpoint

1f9589f

another progress checkpoint... dashboard is coming along nicely

870c4eb

fix old reference about page being a post

3754b10

new helper function to get content

234e09a

update so frontend doesn't cry about new schema

1e2d949

progress update - updated frontend to use new content helper and remo…

9904b00

…ved old page schema

chore: Update astro:db:setup hook in studioCMS.ts

8829c3b

I think everything is updated and working properly. just running test…

e4356e9

…s now

Add getUserById and getUserList helper functions to the contentHelper…

d8d93a4

… module for retrieving user data from the Astro Studio's Database.

Adammatthiesen added 7 commits May 16, 2024 04:47

chore: Update registration API to validate email address before creat…

013af50

…ing a new user and use it to generate a gravatar avatar for local users without oAuth

more cleanup

2e9e1c2

chore: Update StudioCMS config handling and error messages

6b5b97a

update config and admin pages to reflect new UI changes

d701162

Update types and fix typos created from that

9dff295

new navbar component working and can be customized

c340ff3

update navigation

6f8367f

Adammatthiesen marked this pull request as ready for review May 17, 2024 09:05

Adammatthiesen requested a review from a team May 17, 2024 09:08

dreyfus92 reviewed May 17, 2024

View reviewed changes

jdtjenkins reviewed May 18, 2024

View reviewed changes

Adammatthiesen and others added 8 commits May 17, 2024 17:29

Update .github/workflows/firsttimepr.yml

8460ae4

Co-authored-by: Jacob Jenkins <[email protected]>

Update packages/studioCMS/src/integrations/studioCMSDashboard/index.ts

d216731

Co-authored-by: Jacob Jenkins <[email protected]>

Update packages/studioCMS/src/integrations/studioCMSDashboard/routes/…

56f43b4

…databaseSetup/done.astro Co-authored-by: Jacob Jenkins <[email protected]>

Update packages/studioCMS/src/components/exports/Navigation.astro

c8b65ac

Co-authored-by: Paul Valladares <[email protected]>

Update packages/studioCMS/src/components/exports/Navigation.astro

a7740e4

Co-authored-by: Paul Valladares <[email protected]>

update helptext on admins page

b7d3a1e

Update close button ID in Header component

6212751

chore: Update optionsSchema in studioCMS.ts

53cc4f8

Adammatthiesen requested review from dreyfus92, jdtjenkins and Adammatthiesen May 19, 2024 10:58

dreyfus92 approved these changes May 20, 2024

View reviewed changes

jdtjenkins approved these changes May 24, 2024

View reviewed changes

Adammatthiesen merged commit 4bce343 into issue-0050 May 25, 2024
1 check passed

Adammatthiesen deleted the issue-0078 branch May 25, 2024 12:38

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) #79

♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) #79

create-issue-branch bot commented May 11, 2024

studiocms-deployment-helper bot commented May 11, 2024 •

edited

studiocms-deployment-helper bot commented May 11, 2024 •

edited

studiocms-deployment-helper bot commented May 11, 2024 •

edited

dreyfus92 left a comment

dreyfus92 May 17, 2024

Adammatthiesen May 17, 2024

dreyfus92 May 17, 2024

jdtjenkins May 17, 2024

Adammatthiesen May 18, 2024

jdtjenkins left a comment

jdtjenkins May 17, 2024

jdtjenkins May 17, 2024

Adammatthiesen May 18, 2024

jdtjenkins May 17, 2024

jdtjenkins May 17, 2024

Adammatthiesen May 18, 2024

jdtjenkins May 17, 2024

jdtjenkins May 17, 2024

Adammatthiesen May 18, 2024

dreyfus92 left a comment

jdtjenkins left a comment

BryceRussell commented May 25, 2024

Adammatthiesen commented May 25, 2024

github-actions bot commented May 25, 2024


		type Props = { studioCMSSocials: StudioCMSSocials };
		const { studioCMSSocials: { github: githubURL } } = Astro.props as Props;

♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) #79

♻️ Chore: Setup new Table Schemas, and Implement Helpers (component and function helpers) #79

Conversation

create-issue-branch bot commented May 11, 2024

studiocms-deployment-helper bot commented May 11, 2024 • edited

studiocms-deployment-helper bot commented May 11, 2024 • edited

studiocms-deployment-helper bot commented May 11, 2024 • edited

dreyfus92 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jdtjenkins left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dreyfus92 left a comment

Choose a reason for hiding this comment

jdtjenkins left a comment

Choose a reason for hiding this comment

BryceRussell commented May 25, 2024

Adammatthiesen commented May 25, 2024

github-actions bot commented May 25, 2024

studiocms-deployment-helper bot commented May 11, 2024 •

edited

studiocms-deployment-helper bot commented May 11, 2024 •

edited

studiocms-deployment-helper bot commented May 11, 2024 •

edited