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 113 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
401e53a
Refactor router configuration to remove 'admin' from URL paths (#930)
OxSama Aug 31, 2023
cc226b4
chore: swap font. Source Pro -> Inter (#940) (#941)
Stars22 Sep 6, 2023
15232de
chore: root redirect, content width (#946, #948) (#949)
Stars22 Sep 15, 2023
77ea2f2
fix: magical navbar disappearance (#951) (#953)
Stars22 Sep 18, 2023
0f4cd69
Auth pages (#956)
asvae Oct 12, 2023
333c186
feat: FAQ page (#935) (#942)
Stars22 Oct 16, 2023
dcb0bde
minor
asvae Oct 16, 2023
5e41cc8
minor
asvae Oct 16, 2023
4ba6f7d
feat(404): init page (#962)
m0ksem Oct 23, 2023
669427b
feat: remove unimportant pages
asvae Oct 23, 2023
136237a
fix: 404 github link
asvae Oct 24, 2023
9655e48
Payments page (#965)
asvae Oct 25, 2023
69f9d48
fix: payment fixes
asvae Oct 25, 2023
43aceb9
feat: update deps
asvae Nov 14, 2023
80bfa1a
Update logo to new design (#958)
asvae Nov 14, 2023
8d2a366
ui fixes
asvae Nov 14, 2023
8b9cb8f
minor
asvae Nov 14, 2023
c857b1c
pricing-plans page (#967)
Roman4437 Nov 15, 2023
702c4d8
preference page (#966)
Roman4437 Nov 15, 2023
9e404dc
chore: refresh locks
asvae Nov 15, 2023
18e2ddc
New sidebar (#974)
Roman4437 Nov 17, 2023
c07deb5
Billing page (#972)
asvae Nov 17, 2023
b629d7f
minor
asvae Nov 17, 2023
93fae3e
minor
asvae Nov 17, 2023
75ab2f1
remove config folder
asvae Nov 21, 2023
9baa0bd
add select plan confirmation modal (#980)
Roman4437 Nov 21, 2023
694b8bc
Improve Preferences page (#988)
VasylHryha Dec 4, 2023
a264ab9
Settings page (#987)
Roman4437 Dec 4, 2023
be528c4
Update Billing Page (#989)
VasylHryha Dec 4, 2023
a0f15b4
feat: Header rework (#986)
VasylHryha Dec 4, 2023
7ae4f3c
Projects page (#985)
m0ksem Dec 21, 2023
95c43a2
- remove UI elements. Leave only Typography (#981)
VasylHryha Dec 22, 2023
98cfa78
Settings page fixes (#998)
Roman4437 Dec 27, 2023
fdc71a6
Issues QA salad (#1002)
raichev-dima Jan 3, 2024
6ec66ac
Header tweaks (#1006)
VasylHryha Jan 10, 2024
1447d56
Layout tweaks (#1007)
VasylHryha Jan 10, 2024
950603a
feat(sidebar): remove top padding
asvae Jan 10, 2024
a90aa4b
revert breadcrumb change (#1010)
VasylHryha Jan 17, 2024
c7ccdb3
Fix#997/projects users followup (#1008)
m0ksem Jan 23, 2024
77383bd
Add part of dashboard (#1012)
VasylHryha Jan 23, 2024
d84f50c
feat: bunch of fixes
asvae Jan 24, 2024
a594df9
feat: another batch of fixes + experimental vuestic-ui
asvae Jan 24, 2024
d314ee4
feat: some more fixes
asvae Jan 25, 2024
592e640
minor
asvae Jan 25, 2024
67250ea
fix: incorrect route name used (#1019)
m0ksem Jan 25, 2024
295b30c
fix: build types error
m0ksem Jan 25, 2024
30fcb3e
fix(settings): fix overflow
asvae Jan 25, 2024
f099a2a
fix: small fixes
asvae Jan 25, 2024
724bf40
small fixes
asvae Jan 25, 2024
39ad70b
small tweaks
asvae Jan 25, 2024
4fa8882
minor
asvae Jan 25, 2024
58873a8
feat(dashboard): improve design
m0ksem Jan 26, 2024
ccc6191
fix: eslint fixes
m0ksem Jan 26, 2024
e490f74
fix: minor fixes
m0ksem Jan 26, 2024
179ed72
fix(map): make map chart
m0ksem Jan 26, 2024
661d24f
chore: improve minor design
m0ksem Jan 26, 2024
c2cb0b6
minor
asvae Jan 26, 2024
7138b65
fix: button toogle color
asvae Jan 26, 2024
3c788f3
feat: 2fa button color
asvae Jan 26, 2024
9b92f85
chore: upgrade vuestic
m0ksem Jan 29, 2024
a203e70
fix(build): ts types in i18n
m0ksem Jan 29, 2024
07527e1
fix(modal): show close button by default
m0ksem Jan 29, 2024
9a06e02
fix(projects): re-order modal buttons and remove default value for pr…
m0ksem Jan 29, 2024
4b7c682
fix(payments): hide credits card digits
m0ksem Jan 29, 2024
f8ed652
fix(navbar): notification expand on mobile
m0ksem Jan 29, 2024
0e4b65f
chore(dashboard): update styles and icons
m0ksem Jan 29, 2024
69d4cb3
chore: delete VaButtonSelect component and related files
m0ksem Jan 29, 2024
5557bd8
fix(dashboard): month select
m0ksem Jan 29, 2024
4e21124
fix(dashboard): prevent map from jumping when quickly reload page
m0ksem Jan 29, 2024
3ea1aeb
fix(dashboard): mobile title
m0ksem Jan 29, 2024
eaa6a08
fix: make pagination active button use primary preset
m0ksem Jan 29, 2024
f2f7b71
feat: closing modals
asvae Jan 29, 2024
900845e
chore: bump yarn lock
asvae Jan 30, 2024
3ec3ae1
fix: dashboard charts tooltips
m0ksem Jan 31, 2024
dd734b2
fix: correct colors
m0ksem Jan 31, 2024
ddf44f9
fix(modals): remove close-button from confirms
m0ksem Jan 31, 2024
b8c0693
fix: navbar profile menu
m0ksem Jan 31, 2024
2dc50ca
fix(dashboard): doughnut chart correct total clip
m0ksem Jan 31, 2024
6591e3e
fix(dashboard): show tooltips in line chart
m0ksem Jan 31, 2024
3cbd4d9
fix: edit modals
m0ksem Jan 31, 2024
03a6365
fix: too small modal paddings with close button
m0ksem Jan 31, 2024
75b7137
fix(accessibility): add aria-labels and correct headings
m0ksem Feb 1, 2024
0f138c0
chore: eslint fixes
m0ksem Feb 1, 2024
f8fe93f
Update README.md
m0ksem Feb 2, 2024
6eaaf14
chore: remove icon deps, upgrade chartjs
m0ksem Feb 5, 2024
860b808
chore: add admin-landing page to navbar
m0ksem Feb 5, 2024
e9947a2
chore: minor fixes
m0ksem Feb 7, 2024
2caae7b
chore: upgrade to latest vuestic
m0ksem Feb 7, 2024
cf54ff9
chore: update favicon
m0ksem Feb 8, 2024
9fda34f
fix(users): modal window
m0ksem Feb 8, 2024
6ba04cb
chore: upgrade vuestic to latest version
m0ksem Feb 9, 2024
a9f41ca
chore: bump licence
asvae Feb 11, 2024
88546b9
feat: update links
asvae Feb 11, 2024
90a311f
fix: translation error
asvae Feb 11, 2024
eefaec5
chore: update github image
asvae Feb 12, 2024
24d940a
chore: upgrade to latest vuestic
m0ksem Feb 12, 2024
72ef375
chore: upgrade vuestic to 1.9.0.
m0ksem Feb 12, 2024
7a6b9c7
chore: update readme (#1026)
m0ksem Feb 14, 2024
a264b7c
fix(projects): sort by creation date by default
m0ksem Feb 14, 2024
ac9337d
chore(eslint): minor eslint fixes in readme
m0ksem Feb 14, 2024
6777eeb
feat: remove circleci
asvae Feb 14, 2024
0da976a
Update README.md
asvae Feb 20, 2024
4e95672
chore(deps): bump ip from 2.0.0 to 2.0.1
dependabot[bot] Feb 21, 2024
0693ead
Update README.md
asvae Feb 21, 2024
67301a4
Update README.md
asvae Feb 21, 2024
3c5de28
Add "support & consulting" link to the app navigation bar (#1042)
raichev-dima Aug 22, 2024
bd9cdae
Update readme with "Support & Consulting" page info (#1043)
raichev-dima Aug 22, 2024
3b7f70a
chore: add netlify.toml to the repo
raichev-dima Sep 2, 2024
eced0ff
chore: add netlify.toml to the repo
raichev-dima Sep 2, 2024
6415ec8
chore(netlify): add add rewrite rule to serve the index.html
raichev-dima Sep 4, 2024
8c01fdc
chore(netlify): add add rewrite rule to serve the index.html
raichev-dima Sep 4, 2024
de4746c
Merge remote-tracking branch 'epicmaxco/master' into develop
asvae Sep 4, 2024
2fd2e5f
Add compiler and devtools (#1047)
m0ksem Sep 27, 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
Prev Previous commit
Next Next commit
Add "support & consulting" link to the app navigation bar (epicmaxco#…
  • Loading branch information
raichev-dima committed Aug 22, 2024
commit 3c5de2822d0f263e3c61a2add5094cca296f1a33
15 changes: 15 additions & 0 deletions src/components/icons/VaIconDiscord.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<template>
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
<g clip-path="url(#clip0_1086_1040)">
<path
d="M16.9308 3.64152C15.6342 3.04632 14.2658 2.62189 12.8599 2.37886C12.8471 2.37647 12.834 2.37818 12.8222 2.38373C12.8105 2.38928 12.8008 2.39839 12.7945 2.40977C12.6187 2.72252 12.4239 3.13044 12.2876 3.45102C10.7503 3.22086 9.22092 3.22086 7.71525 3.45102C7.57892 3.12327 7.37709 2.72252 7.2005 2.40977C7.19396 2.39865 7.18422 2.38976 7.17255 2.38426C7.16088 2.37876 7.14783 2.37691 7.13509 2.37894C5.72907 2.62141 4.36058 3.04581 3.06409 3.64144C3.05299 3.64618 3.04365 3.65424 3.03734 3.66452C0.444503 7.53819 -0.26583 11.3166 0.08267 15.0482C0.0836554 15.0573 0.0864643 15.0662 0.0909303 15.0742C0.0953964 15.0822 0.101429 15.0893 0.10867 15.0949C1.81934 16.3513 3.47642 17.1139 5.10275 17.6194C5.1154 17.6232 5.1289 17.623 5.14144 17.6189C5.15398 17.6148 5.16496 17.607 5.17292 17.5964C5.55759 17.0711 5.9005 16.5171 6.19459 15.9346C6.19863 15.9266 6.20094 15.9179 6.20136 15.909C6.20178 15.9 6.2003 15.8911 6.19703 15.8828C6.19375 15.8745 6.18875 15.8669 6.18236 15.8607C6.17596 15.8544 6.16831 15.8496 6.15992 15.8465C5.61592 15.6402 5.098 15.3886 4.59975 15.1029C4.59067 15.0976 4.58303 15.0901 4.57753 15.0811C4.57203 15.0721 4.56882 15.0619 4.56819 15.0514C4.56757 15.0409 4.56954 15.0304 4.57394 15.0208C4.57834 15.0112 4.58503 15.0029 4.59342 14.9965C4.69825 14.9179 4.80317 14.8363 4.90325 14.7537C4.91215 14.7464 4.92291 14.7416 4.93434 14.7401C4.94577 14.7386 4.9574 14.7402 4.96792 14.7449C8.24109 16.2394 11.7846 16.2394 15.0191 14.7449C15.0296 14.7399 15.0414 14.738 15.0529 14.7394C15.0645 14.7408 15.0755 14.7455 15.0845 14.7529C15.1847 14.8354 15.2895 14.9179 15.3952 14.9965C15.4036 15.0028 15.4103 15.0111 15.4148 15.0206C15.4192 15.0302 15.4213 15.0406 15.4207 15.0512C15.4202 15.0617 15.4171 15.0719 15.4117 15.0809C15.4062 15.0899 15.3987 15.0974 15.3897 15.1029C14.8912 15.394 14.3691 15.6425 13.8288 15.8457C13.8204 15.8489 13.8128 15.8538 13.8065 15.8602C13.8001 15.8665 13.7952 15.8742 13.792 15.8826C13.7888 15.891 13.7874 15.8999 13.7879 15.9089C13.7884 15.9179 13.7908 15.9266 13.7949 15.9346C14.0953 16.5163 14.4382 17.0703 14.8158 17.5956C14.8235 17.6064 14.8344 17.6146 14.847 17.6189C14.8596 17.6231 14.8732 17.6233 14.8859 17.6194C16.5201 17.1139 18.1772 16.3512 19.8878 15.0949C19.8952 15.0896 19.9013 15.0827 19.9058 15.0747C19.9103 15.0668 19.9131 15.058 19.9139 15.0489C20.3309 10.7348 19.2154 6.98736 16.9568 3.66527C16.9513 3.65448 16.9421 3.64611 16.9308 3.64152ZM6.68334 12.776C5.69792 12.776 4.88592 11.8713 4.88592 10.7602C4.88592 9.64919 5.68217 8.74444 6.68342 8.74444C7.69242 8.74444 8.4965 9.6571 8.48075 10.7603C8.48075 11.8713 7.6845 12.776 6.68334 12.776ZM13.329 12.776C12.3436 12.776 11.5316 11.8713 11.5316 10.7602C11.5316 9.64919 12.3278 8.74444 13.329 8.74444C14.338 8.74444 15.1421 9.6571 15.1263 10.7603C15.1263 11.8713 14.338 12.776 13.329 12.776Z"
fill="currentColor"
/>
</g>
<defs>
<clipPath id="clip0_1086_1040">
<rect width="20" height="20" fill="white" />
</clipPath>
</defs>
</svg>
</template>
17 changes: 15 additions & 2 deletions src/components/navbar/components/AppNavbarActions.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<template>
<div class="app-navbar-actions">
<GithubButton v-if="!isMobile" class="app-navbar-actions__item" />
<VaButton
v-if="!isMobile"
preset="secondary"
href="https://ui.vuestic.dev/support/consulting"
target="_blank"
color="textPrimary"
class="app-navbar-actions__item flex-shrink-0 mx-0"
>
<VaIcon size="large" class="material-symbols-outlined mr-1">support_agent</VaIcon>
{{ t('supportAndConsulting') }}
</VaButton>
<VaButton
v-if="!isMobile"
preset="secondary"
Expand All @@ -9,8 +19,10 @@
color="textPrimary"
class="app-navbar-actions__item flex-shrink-0 mx-0"
>
<VaIcon size="large" class="material-symbols-outlined mr-1">info</VaIcon>
{{ t('aboutVuesticAdmin') }}
</VaButton>
<GithubButton v-if="!isMobile" class="app-navbar-actions__item" />
<VaButton
v-if="!isMobile"
preset="secondary"
Expand All @@ -19,7 +31,7 @@
color="textPrimary"
class="app-navbar-actions__item flex-shrink-0 mx-0"
>
{{ t('helpAndSupport') }}
<VaIcon :component="VaIconDiscord" />
</VaButton>
<NotificationDropdown class="app-navbar-actions__item" />
<ProfileDropdown class="app-navbar-actions__item app-navbar-actions__item--profile mr-1" />
Expand All @@ -30,6 +42,7 @@
import ProfileDropdown from './dropdowns/ProfileDropdown.vue'
import NotificationDropdown from './dropdowns/NotificationDropdown.vue'
import GithubButton from './GitHubButton.vue'
import VaIconDiscord from '../../icons/VaIconDiscord.vue'

defineProps({
isMobile: { type: Boolean, default: false },
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/gb.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
},
"helpAndSupport": "Help & support",
"aboutVuesticAdmin": "About Vuestic Admin",
"supportAndConsulting": "Support & Consulting",
"search": {
"placeholder": "Search..."
},
Expand Down