Migrate web & fix moment errors

coderdojobraga · Feb 23, 2023 · c03a199 · c03a199
1 parent 82a4118
commit c03a199
Show file tree

Hide file tree

Showing 12 changed files with 5,085 additions and 4,275 deletions.
diff --git a/apps/app/components/NinjaForm/index.js b/apps/app/components/NinjaForm/index.js
@@ -14,7 +14,7 @@ import {
   Typography,
   notification,
 } from "antd";
-import moment from "moment";
+import dayjs from "dayjs";
 import { CloseOutlined, SaveOutlined } from "@ant-design/icons";
 import * as api from "bokkenjs";
 import { notifyError, notifyInfo } from "~/components/Notification";
@@ -191,7 +191,7 @@ export default function NinjaForm({ id }) {
               name="ninja[birthday]"
               rules={[{ required: true }]}
               initialValue={
-                id && ninja ? moment(ninja.birthday, "YYYY-MM-DD") : null
+                id && ninja ? dayjs(ninja.birthday, "YYYY-MM-DD") : null
               }
             >
               <DatePicker />

diff --git a/apps/app/components/Profile/index.tsx b/apps/app/components/Profile/index.tsx
@@ -12,8 +12,6 @@ import {
   notification,
 } from "antd";
 import { ClockCircleOutlined, UserOutlined } from "@ant-design/icons";
-import moment from "moment";
-import "moment/locale/pt";
 import Badge from "~/components/Badge";
 import Belt from "~/components/Belt";
 import Document from "~/components/Document";
@@ -23,6 +21,11 @@ import { notifyError, notifyInfo } from "~/components/Notification";
 import styles from "./style.module.css";
 import { EUser } from "bokkenjs";
 
+import dayjs from "dayjs";
+import relativeTime from "dayjs/plugin/relativeTime";
+dayjs.extend(relativeTime);
+import "dayjs/locale/pt";
+
 import { BsFileEarmarkPersonFill } from "react-icons/bs";
 
 import { getIcon } from "~/lib/utils";
@@ -97,7 +100,7 @@ function Profile({ id, role }: Props) {
   }, [id, role]);
 
   useEffect(() => {
-    setDate(moment(info.since).format("DD/MM/YYYY"));
+    setDate(dayjs(info.since).format("DD/MM/YYYY"));
   }, [info]);
 
   return (
@@ -175,7 +178,7 @@ function Profile({ id, role }: Props) {
           <Timeline mode="alternate">
             <Timeline.Item dot={<ClockCircleOutlined />}>
               Registou-se na plataforma{" "}
-              {moment(info.since).locale("pt").fromNow()}
+              {dayjs(info.since).locale("pt").fromNow()}
             </Timeline.Item>
           </Timeline>
         </TabPane>

diff --git a/apps/app/package.json b/apps/app/package.json
@@ -20,8 +20,8 @@
     "@netlify/plugin-nextjs": "^4.29.2",
     "antd": "^5.0.0",
     "bokkenjs": "*",
+    "dayjs": "^1.11.7",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.4",
     "next": "^12.3.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/apps/app/pages/_app.tsx b/apps/app/pages/_app.tsx
@@ -62,27 +62,19 @@ function Shuriken({ Component, pageProps }: AppProps) {
   };
 
   return (
-    <ConfigProvider
-      form={{ validateMessages }}
-      locale={ptPT}
-      theme={{
-        token: {
-          colorPrimary: "#722ed1",
-        },
-      }}
-    >
-      <ThemeProvider>
-        <QueryClientProvider client={queryClient}>
+    <ThemeProvider>
+      <QueryClientProvider client={queryClient}>
+        <ConfigProvider form={{ validateMessages }} locale={ptPT}>
           <AuthProvider>
             <Head>
               <title>CoderDojo Braga</title>
             </Head>
             <Component {...pageProps} />
-            <ReactQueryDevtools position="bottom-right" />
           </AuthProvider>
-        </QueryClientProvider>
-      </ThemeProvider>
-    </ConfigProvider>
+        </ConfigProvider>
+        <ReactQueryDevtools position="bottom-right" />
+      </QueryClientProvider>
+    </ThemeProvider>
   );
 }
 

diff --git a/apps/app/pages/index.tsx b/apps/app/pages/index.tsx
@@ -11,7 +11,7 @@ import { useEvents } from "~/hooks/events";
 import { notifyError } from "~/components/Notification";
 
 import styles from "~/styles/Dashboard.module.css";
-import moment from "moment";
+import dayjs from "dayjs";
 
 const { Title } = Typography;
 
@@ -24,7 +24,7 @@ function Dashboard() {
   const { data: badges, isLoading: isLoadingBadges } = useBadges();
 
   const nextEvent = () => {
-    const cur = moment();
+    const cur = dayjs();
 
     const sorted_events = events
       .filter((e: any) => cur.diff(e.start_time) < 0)

diff --git a/apps/app/pages/lecture/[id].tsx b/apps/app/pages/lecture/[id].tsx
@@ -16,7 +16,7 @@ import * as api from "bokkenjs";
 import { useAuth } from "@coderdojobraga/ui";
 import { withAuth } from "~/components/Auth";
 import AppLayout from "~/layouts/AppLayout";
-import moment from "moment";
+import dayjs from "dayjs";
 import { EUser } from "bokkenjs";
 import { notifyError, notifyInfo } from "~/components/Notification";
 
@@ -115,7 +115,7 @@ function Lectures() {
           <Col>
             <Text>
               {!lecture.event ||
-                moment(new Date(lecture.event.start_time)).format("DD/MM/YYYY")}
+                dayjs(new Date(lecture.event.start_time)).format("DD/MM/YYYY")}
             </Text>
           </Col>
         </Row>

diff --git a/apps/app/pages/lectures/[role]/[id].tsx b/apps/app/pages/lectures/[role]/[id].tsx
@@ -6,7 +6,7 @@ import { CalendarOutlined, EditOutlined } from "@ant-design/icons";
 import { withAuth } from "~/components/Auth";
 import AppLayout from "~/layouts/AppLayout";
 import * as api from "bokkenjs";
-import moment from "moment";
+import dayjs from "dayjs";
 import { EUser } from "bokkenjs";
 import { notifyError } from "~/components/Notification";
 
@@ -94,7 +94,7 @@ function Lectures() {
               </Col>
               <Col>
                 <Text>
-                  {moment(new Date(lecture.event.start_time)).format(
+                  {dayjs(new Date(lecture.event.start_time)).format(
                     "DD/MM/YYYY"
                   )}
                 </Text>

diff --git a/apps/app/pages/settings.tsx b/apps/app/pages/settings.tsx
@@ -14,7 +14,7 @@ import {
   Upload,
   notification,
 } from "antd";
-import moment from "moment";
+import dayjs from "dayjs";
 import {
   MinusCircleOutlined,
   PlusOutlined,
@@ -291,8 +291,8 @@ function Settings() {
               <DatePicker
                 showToday={false}
                 defaultValue={
-                  (user?.birthday && moment(user.birthday, "YYYY-MM-DD")) ||
-                  moment()
+                  (user?.birthday && dayjs(user.birthday, "YYYY-MM-DD")) ||
+                  dayjs()
                 }
               />
             </Form.Item>

diff --git a/apps/blog/package.json b/apps/blog/package.json
@@ -17,6 +17,7 @@
     "antd": "^4.23.1",
     "gray-matter": "^4.0.3",
     "lodash-es": "^4.17.21",
+    "moment": "^2.29.4",
     "next": "^12.3.4",
     "react": "17.0.2",
     "react-dom": "17.0.2",

diff --git a/apps/web/package.json b/apps/web/package.json
@@ -3,23 +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",
     "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",
-    "less:build": "lessc --js styles/antd.less styles/antd.css"
+    "next:dev": "next dev"
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
     "@coderdojobraga/ui": "*",
     "@heroicons/react": "^2.0.8",
     "@netlify/plugin-nextjs": "^4.29.2",
-    "antd": "^4.23.1",
+    "antd": "^5.0.0",
     "next": "^12.3.4",
     "react": "17.0.2",
     "react-dom": "17.0.2"
@@ -31,7 +30,6 @@
     "autoprefixer": "^10.4.8",
     "eslint": "^8.23.0",
     "eslint-config-coderdojobraga": "*",
-    "less": "^4.1.3",
     "next-transpile-modules": "9.0.0",
     "postcss": "^8.4.16",
     "tailwind-config-coderdojobraga": "*",

diff --git a/apps/web/styles/antd.less b/apps/web/styles/antd.less