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

feat: routes fix #286

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
"types": ["vitest/globals"],
"baseUrl": ".",
"paths": {
"@testing-library/vanilla": ["src/__tests__/index.js"]
"@testing-library/vanilla": ["src/__tests__/index.js"],
"~src/*": ["src/*"]
}
}
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@
"eslint": "^8.57.0",
"eslint-config-airbnb": "^19.0.4",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-alias": "1.1.2",
"eslint-import-resolver-jsconfig": "1.1.0",
"eslint-import-resolver-node": "0.3.9",
"eslint-plugin-import": "^2.29.1",
Expand Down
12 changes: 12 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 25 additions & 5 deletions src/layouts/app/components/SideMenu/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,32 @@ const html = `
<div class="side-menu-content__line"></div>
<div class="side-menu-content__itens" alt="itens-um">
<ul class="side-menu-content__ul" data-select="menuitens">
<li><a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/app/pets"><img src="${meusPets}" alt="Meus Pets">Meus Pets</a></li>
<li><a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/app/pet-dex"><img src="${petdex}" alt="Pet Dex">Pet Dex</a></li>
<li><a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/app/donates"><img src="${doacoes}" alt="Doacoes">Doações</a></li>
<li>
<a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/">
<img src="${meusPets}" alt="Meus Pets">Meus Pets
</a>
</li>
<li>
<a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/pet-dex">
<img src="${petdex}" alt="Pet Dex">Pet Dex
</a>
</li>
<li>
<a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/donates">
<img src="${doacoes}" alt="Doacoes">Doações
</a>
</li>
<hr class="side-menu-content__lineinside"/>
<li><a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/app/account"><img src="${conta}" alt="conta">Conta</a></li>
<li><a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/app/settings"><img src="${configuracoes}" alt="configuracoes">Configurações</a></li>
<li>
<a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/account">
<img src="${conta}" alt="conta">Conta
</a>
</li>
<li>
<a data-vanilla-route-link="spa" class="side-menu-content__menuitens" href="/settings">
<img src="${configuracoes}" alt="configuracoes">Configurações
</a>
</li>
</ul>
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions src/router/main-router.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { BrowserRoute } from 'vanilla-routing';
import addPet from './routes/add-pet/add-pet';
import mainRoutes from './routes/main-routes/main-routes';
import myPets from './routes/my-pets/my-pets';
import addPet from './routes/app/add-pet/add-pet';
import mainRoutes from './routes/app/main-routes/main-routes';
import myPets from './routes/app/my-pets/my-pets';
import account from './routes/create-account/account'; //

export default function mainRouter() {
const routes = [
...Object.values(mainRoutes),
...Object.values(myPets),
...Object.values(addPet),
...Object.values(account), //
];

BrowserRoute(routes);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-birthday',
pathname: '/pet-birthday',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-name',
pathname: '/pet-name',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-vet',
pathname: '/pet-vet',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-race',
pathname: '/pet-race',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-register',
pathname: '/pet-register',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-size',
pathname: '/pet-size',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-weight',
pathname: '/pet-weight',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/account',
pathname: '/account',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/donates',
pathname: '/donates',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '*',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/',
pathname: '/',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-dex',
pathname: '/pet-dex',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/settings',
pathname: '/settings',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pet-profile',
pathname: '/pet-profile',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import NoPetRegirestedPage from '../../../../layouts/app/pages/NoPetRegirested';
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/app/pets',
pathname: '/pets',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
Expand Down
5 changes: 5 additions & 0 deletions src/router/routes/create-account/account.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import createAccount from './create-account';

export default {
createAccount,
};
13 changes: 13 additions & 0 deletions src/router/routes/create-account/create-account.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import NoPetRegirestedPage from '~src/layouts/app/pages/NoPetRegirested';

export default {
pathname: '/account/create-account',
element: () => {
const $content = document.createElement('div');
$content.classList.add('home__content-page');
$content.style.backgroundColor = 'orange';
const noPetRegirestedPage = new NoPetRegirestedPage();
noPetRegirestedPage.mount($content);
return $content;
},
};
6 changes: 3 additions & 3 deletions vite.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import jsconfigPaths from 'vite-jsconfig-paths';
import { VitePWA } from 'vite-plugin-pwa';

export default defineConfig({
root: resolve(__dirname, 'src/layouts'),
root: resolve(__dirname, 'src/layouts/app'),
define: {
__isBrowser__: true,
},
Expand All @@ -33,14 +33,14 @@ export default defineConfig({
outDir: resolve(__dirname, 'dist'),
rollupOptions: {
input: {
index: resolve(__dirname, 'src/layouts/index.html'),
home: resolve(__dirname, 'src/layouts/app/index.html'),
index: resolve(__dirname, 'src/layouts/app/index.html'),
},
},
},
resolve: {
alias: {
'~styles': resolve(__dirname, 'src/styles'),
'~src': resolve(__dirname, 'src'),
},
},
plugins: [
Expand Down
Loading