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

[pull] master from epicmaxco:master #24

Open
wants to merge 105 commits into
base: master
Choose a base branch
from
Open

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 11, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

OxSama and others added 30 commits August 31, 2023 15:35
close #946, close #948
- set redirect root -> dashboard
- set max width for pages content
- it's showing now, some deps problem ¯\_(ツ)_/¯
* sync tailwind with vuestic

* add vuestic-tailwind dep

* auth page wip

* wip: login page almost done

other auth pages are untouched, fonts are half-attached

* feat: login finished

* feat: signup page

* feat: finalize auth

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* feat: FAQ page, bump vuestic-ui, added  material symbols  (#935)

close #935
- added material symbols, different from material icons
-  button is round in CTA (not intentionally), bug or feature?
- max close to figma design but probably with some small deviations

* fix: updated the discussed design changes

- line heights, icon size, weight for top categories
- accordion content, paddings
- email submit on enter
- bottom navigation section adapt for medium size screens

* fix: update modal, update columns responsiveness

* feat: email validation for login

* feat: faq page polish

* fix shados

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* feat(404): init page

* fix(404): add route link to logo

* Update src/router/index.ts

---------

Co-authored-by: Yauheni Prakopchyk <ontrew@gmail.com>
* feat: add storybook

* feat: payment cards wip

* wip: payments

* finalize payments

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* wip: half done logo

* feat: update logo

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* pricing-plans page

* small fix

* small fix

* add va-button-select component

* feat: add month switch + notification

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* preference page

* small adjustments

* feat: add preferences page to navigation

* fix modals and style

* fix button

* add refs for modals toggle

* fixed password modal and add toasts

* last fixes

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
they had conflicts
* new sidebar

* new sidebar

* minor

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* wip

* lint

* feat: billing updates

* chore: lint

* lint fix

* pr fixes

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* add select plan confirmation modal

* small fixes

* remove title
* - add avatar as in Figma

* - updated vuestic-ui

* - improve add red color for `Disable 2fa `

* - fix modal sizing

* minor

---------

Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
* settings page

* fix

* fix

* remove translation
* - add more invoices
- add `show more/less` button

* - add paymentPlan modal
- updated PaymentInfo.vue

* - clean payment-cards.ts store

* - chore:rename Change card -> Payment preferences

* - chore: fix modal message
* feat: init app layout

* chore: fix eslint and prettier conflict

* fix: sidebar icon jump in animation

* fix: improve breadcrums text

* - add redirect ro breadcrumbs

* - add GitHub button

* - rework NotificationDropdown

* - rework ProfileDropdown.vue

* - add SearchDropdown

* - Add new translations

* - Apply new style to AppNavbar
- smaller improvements

* - fix: notification,profile styles for mobile

* - fix: ProdileDdropdown use the same focus color as AppSidebar

* - chore: remove unsed files

* - fix: margin to dropdowns

* - fix: AppLayoutNavigation, no redirect to route with children

* - fix: mobile preview
- feat: add new menu button for mobile version

---------

Co-authored-by: Maksim Nedoshev <m0ksem1337@gmail.com>
Co-authored-by: Yauheni Prakopchyk <yauheni.prakopchyk@epicmax.co>
@pull pull bot added ⤵️ pull merge-conflict Resolve conflicts manually labels Feb 11, 2024
asvae and others added 11 commits February 12, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
⤵️ pull merge-conflict Resolve conflicts manually
Projects
None yet
7 participants