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

Feat/major nextjs update #1008

Merged
merged 14 commits into from
Apr 29, 2022
Merged

Feat/major nextjs update #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
dee0cd1
feat(dev): wip decorators implementation
Apr 22, 2022
1f44cde
feat(dev): update build flow
Apr 22, 2022
72ac062
feat(dev): update build flow
Apr 22, 2022
6af4982
feat(dev): fix docker build
Apr 22, 2022
9f0cc48
feat(dev): merge updates
Apr 27, 2022
e038a75
feat(dev): fix assets url
Apr 27, 2022
2fc4995
Merge branch 'develop' into feat/major-nextjs-update
maxmagic-dev Apr 27, 2022
d30b29e
feat(dev): fix test
Apr 27, 2022
539afb2
Merge remote-tracking branch 'origin/feat/major-nextjs-update' into f…
Apr 27, 2022
568aedf
feat(dev): fix test
Apr 27, 2022
5533882
fix(build): fix fonts configuration
Apr 29, 2022
b4af12e
feat(dev): fix assets converting
Apr 29, 2022
eb4f6d0
Merge branch 'develop' of https://github.com/near-daos/astro-ui into …
Apr 29, 2022
20eec4b
Merge remote-tracking branch 'origin/fix/dao-version-upgr' into fix/d…
Apr 29, 2022
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: 0 additions & 3 deletions .babelrc
View file
Open in desktop

This file was deleted.

11 changes: 7 additions & 4 deletions astro_2.0/components/Accordion/tests/__snapshots__/Accordion.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
exports[`Accordion Should render component 1`] = `
<div>
<div
class=""
class="root"
>
<div
class="header"
data-testid="accordion-header"
role="button"
tabindex="0"
>
Hello
<button
class=""
class="iconButton medium icon"
type="button"
>
<svg>
Expand All @@ -23,11 +24,13 @@ exports[`Accordion Should render component 1`] = `
</button>
</div>
<div
class=""
class="contentContainer"
data-testid="accordion-container"
style="height: 0px;"
>
<div>
<div
class="content"
>
World
</div>
</div>
Expand Down
55 changes: 43 additions & 12 deletions astro_2.0/components/AppFooter/tests/__snapshots__/AppFooter.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,26 @@
exports[`App Footer Should render AppFooter component 1`] = `
<div>
<div
class=""
class="root"
role="button"
tabindex="0"
>
<div>
<div>
<div>
<div
class="side"
>
<div
class="wrapper"
>
<div
class="social"
>
<a
href="https://twitter.com/AstroDao"
rel="noopener noreferrer"
target="_blank"
>
<svg
class="icon"
width="24"
>
<use
Expand All @@ -29,6 +36,7 @@ exports[`App Footer Should render AppFooter component 1`] = `
target="_blank"
>
<svg
class="icon"
width="24"
>
<use
Expand All @@ -42,6 +50,7 @@ exports[`App Footer Should render AppFooter component 1`] = `
target="_blank"
>
<svg
class="icon"
width="24"
>
<use
Expand All @@ -51,72 +60,94 @@ exports[`App Footer Should render AppFooter component 1`] = `
</a>
</div>
<a
class="devLink"
href="https://github.com/near-daos/astro-ui/discussions"
rel="noreferrer noopener"
target="_blank"
>
components.appFooter.askQuestion
</a>
<div>
<div
class="version"
>
<a
class="devLink"
href="https://github.com/near-daos/astro-ui/issues"
rel="noreferrer noopener"
target="_blank"
>
reportAnIssue
</a>
</div>
<div>
<div
class="repo"
>
<a
class="devLink"
href="https://github.com/near-daos/astro-ui"
rel="noreferrer noopener"
target="_blank"
>
components.appFooter.githubRepo
</a>
<a
class="devLink"
href="https://testnet.app.astrodao.com/"
rel="noreferrer noopener"
target="_blank"
>
Testnet env
</a>
<a
class="devLink"
href="https://api.app.astrodao.com/docs/#/"
rel="noreferrer noopener"
target="_blank"
>
Swagger API
</a>
</div>
<div>
<div
class="copyright"
>
components.appFooter.opensourceAsIs
<br />
components.appFooter.communityDeveloped
</div>
<div>
<div
class="terms"
>
<a
class="devLink"
href="/terms-conditions"
>
termsAndConditions
</a>
</div>
<div>
<div
class="release"
>
<a
class="devLink"
href=""
rel="noreferrer noopener"
target="_blank"
>
releaseNotes
</a>
</div>
<div>
<div>
<div
class="locale"
>
<div
class="root"
>
<div>
<div
class=""
class="selector"
>
<img
class="flag"
data-testid="circle-country-flag"
height="100"
src="https://hatscripts.github.io/circle-flags/flags/us.svg"
Expand Down
10 changes: 7 additions & 3 deletions ...ountButton/components/AccountPopupItem/tests/__snapshots__/AccountPopupItem.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,22 @@
exports[`account popup item Should render component 1`] = `
<div>
<div
class=""
class="root"
role="button"
tabindex="0"
>
<div>
<div
class="icon"
>
<svg>
<use
href="/_next/undefined"
/>
</svg>
</div>
<div>
<div
class="content"
>
test
</div>
</div>
Expand Down
11 changes: 8 additions & 3 deletions ...ppHeader/components/NotificationsBell/tests/__snapshots__/NotificationsBell.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,26 @@
exports[`notifications bell Should render component if feature flag is true and account id available 1`] = `
<div>
<div
class=""
class="root"
href="/notifications"
>
<svg
class="bell"
data-testid="notifications-icon"
>
<use
href="/_next/undefined"
/>
</svg>
<div>
<div
class="notificationsCount"
>
5
</div>
</div>
<div />
<div
class="root"
/>
</div>
`;

Expand Down
17 changes: 12 additions & 5 deletions ...tion/components/SearchResultDaoCard/tests/__snapshots__/SearchResultDaoCard.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,15 @@
exports[`search result dao card Should render component 1`] = `
<div>
<div
class="root"
role="button"
tabindex="0"
>
<div>
<div
class="flagHolder"
>
<div
class="undefined"
class="root xs defaultBackground"
>
<svg
class="svg"
Expand Down Expand Up @@ -38,18 +41,22 @@ exports[`search result dao card Should render component 1`] = `
</clippath>
</svg>
<div
class=""
class="backgroundXS"
/>
<canvas
style="clip-path: path('M46.4118 0L9.74793 13.103V20.3722L0 23.856V52.5981L36.6639 39.4951V32.2259L46.4118 28.7421V0Z'); max-width: 47px; transform: none;"
/>
</div>
</div>
<div>
<div>
<div
class="header"
>
dao id
</div>
<div>
<div
class="sub"
>
dao id
</div>
</div>
Expand Down
13 changes: 9 additions & 4 deletions ...ts/SearchBar/components/DropdownResults/tests/__snapshots__/DropdownResults.spec.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,23 @@
exports[`search results dropdown Should render component 1`] = `
<div>
<div
class="root"
style="width: 100px;"
>
<div
class=""
class="root root"
>
<div
class=""
class="image image"
/>
<div>
<div
class="title"
>
No results for asd
</div>
<div>
<div
class="desc"
>
We couldn't find anything matching your search. Try again with a different term.
</div>
</div>
Expand Down
Loading