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

build: upgrade ant design to v5 #145

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

build: upgrade ant design to v5 #145

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
82a4118
Migrate app
ruilopesm Feb 23, 2023
c03a199
Migrate web & fix moment errors
ruilopesm Feb 23, 2023
19d6946
Fix guardian register page (#147)
ruilopesm Feb 25, 2023
4c70e99
Major changes
ruilopesm Mar 1, 2023
b1b22aa
Merge with main
ruilopesm Mar 15, 2023
fcbf58c
Fix tailwind on app
ruilopesm Mar 15, 2023
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
2 changes: 1 addition & 1 deletion apps/app/layouts/AppLayout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function AppLayout({ children, hidePrimaryMenu = false }) {
setCollapsed(false);
return (
<Drawer
visible={drawerVisible}
open={drawerVisible}
placement="left"
bodyStyle={{ padding: 0 }}
onClose={() => setDrawerVisible(false)}
Expand Down
11 changes: 5 additions & 6 deletions apps/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
"version": "0.0.0",
"private": true,
"scripts": {
"dev": "npm run less:build && npm run next:dev",
"build": "npm run less:build && npm run next:build",
"dev": "npm run next:dev",
"build": "npm run next:build",
ruilopesm marked this conversation as resolved.
Show resolved Hide resolved
"start": "next start",
"lint": "npm run lint:fix",
"lint:fix": "next lint --fix",
"lint:check": "next lint",
"next": "next",
"next:build": "next build",
"next:dev": "next dev --port 3002",
"less:build": "lessc --js styles/antd.less styles/antd.css"
"next:dev": "next dev --port 3002"
},
"dependencies": {
"@ant-design/cssinjs": "^1.5.6",
"@ant-design/icons": "^4.7.0",
"@coderdojobraga/ui": "*",
"@netlify/plugin-nextjs": "^4.29.2",
"antd": "^4.22.8",
"antd": "^5.0.0",
"bokkenjs": "*",
"lodash-es": "^4.17.21",
"moment": "^2.29.4",
Expand All @@ -36,7 +36,6 @@
"autoprefixer": "^10.4.8",
"eslint": "^8.23.0",
"eslint-config-coderdojobraga": "*",
"less": "^4.1.3",
"next-transpile-modules": "9.0.0",
"tailwind-config-coderdojobraga": "*",
"tsconfig": "*",
Expand Down
22 changes: 15 additions & 7 deletions apps/app/pages/_app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,27 @@ function Shuriken({ Component, pageProps }: AppProps) {
};

return (
<ThemeProvider>
<QueryClientProvider client={queryClient}>
<ConfigProvider form={{ validateMessages }} locale={ptPT}>
<ConfigProvider
form={{ validateMessages }}
locale={ptPT}
theme={{
token: {
colorPrimary: "#722ed1",
},
}}
>
<ThemeProvider>
<QueryClientProvider client={queryClient}>
<AuthProvider>
<Head>
<title>CoderDojo Braga</title>
</Head>
<Component {...pageProps} />
<ReactQueryDevtools position="bottom-right" />
</AuthProvider>
</ConfigProvider>
<ReactQueryDevtools position="bottom-right" />
</QueryClientProvider>
</ThemeProvider>
</QueryClientProvider>
</ThemeProvider>
</ConfigProvider>
);
}

Expand Down
4 changes: 0 additions & 4 deletions apps/app/styles/antd.less
View file
Open in desktop

This file was deleted.

Loading