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.

Sign up for GitHub

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

Jump to bottom

feat: edit toolbar logic local #783

Draft
wants to merge 50 commits into
base: main
Choose a base branch
from
Draft

feat: edit toolbar logic local #783

wants to merge 50 commits into from

Conversation

aoltean-plenty
Copy link
Contributor

No description provided.

aoltean-plenty and others added 30 commits October 28, 2024 07:38
New Toolbar component
03a65b5
set session
5a0f13d
Editor component
e0e393f
Global editor state
573020c
useClass
6386925
Styling #2
63de844
Editor changes
e25d23a
Removed imports
97e5e5e
Split
d5ec172
Add working composable
282ee60
Final Editor
cf95667
Merge remote-tracking branch 'refs/remotes/origin/main' into customiz…
b2beab3 
…ation/edit-toolbar

# Conflicts:
#	apps/web/pages/index.vue
Put back isEditing
3d40614
Remove logo
8467a23
wip
52fe48f
wip2
a88c6b9
WIP
10fbe19
Wip(2)
556e5cf
State #1
72c1582
Homepage state
e4b5f6b
Edit toolbar logic local
bd18af6
WIP
8cbd822
Good progress
5a567b8
Code cleanup
13799a5
Merge branch 'refs/heads/main' into edit-toolbar-logic-local
164df04 
# Conflicts:
#	apps/web/components/Editor/Editor.vue
#	apps/web/components/ui/Toolbar/Toolbar.vue
#	apps/web/composables/useJsonEditor/useJsonEditor.ts
#	apps/web/layouts/default.vue
#	apps/web/pages/index.vue
wip2
6c8c2e6
wip2
e956748
wip2
d7a7c48
wip2
d701c65
Merge branch 'edit-toolbar-logic-local' of https://github.com/plentym…
ade8f10 
…arkets/plentyshop-pwa into edit-toolbar-logic-local2

# Conflicts:
#	apps/web/composables/useHomepageState/useHomepageState.ts
aoltean-plenty and others added 6 commits November 11, 2024 04:37
@clincu-plenty clincu-plenty changed the title Edit toolbar logic local feat: edit toolbar logic local Nov 13, 2024
@github-actions github-actions bot added the feature New feature or request label Nov 13, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 13, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 14, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 14, 2024
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 14, 2024
aoltean-plenty added 2 commits November 14, 2024 05:01
Merge remote-tracking branch 'refs/remotes/origin/edit-toolbar-logic-…
feb9738 
…local2' into edit-toolbar-logic-local

# Conflicts:
#	apps/web/composables/useHomepageData/useHomepageData.ts
Confilcts resolve #1
55964b4
@github-actions github-actions bot added feature New feature or request and removed feature New feature or request labels Nov 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
feature New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aoltean-plenty @ksted