Skip to content

Commit

Permalink
feat: beta release
Browse files Browse the repository at this point in the history
Merge pull request #1212 from milancommunity/beta
  • Loading branch information
tamalCodes authored Feb 7, 2024
2 parents d38015d + 40297c0 commit 1f31db3
Show file tree
Hide file tree
Showing 77 changed files with 3,083 additions and 2,521 deletions.
25 changes: 2 additions & 23 deletions .github/labeler-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,13 @@ filters:
- /feat/i
events: [pull_request]
targets: [title]

- label: "💡 feature"
regexs:
- /feat/i
events: [pull_request]
targets: [title]

- label: "hacktoberfest-accepted"
regexs:
- /feat/i
events: [pull_request]
targets: [title]


- label: "status: todo ⏳"
regexs:
- /docs/i
Expand All @@ -30,14 +23,6 @@ filters:
events: [pull_request]
targets: [title]

- label: "hacktoberfest-accepted"
regexs:
- /docs/i
events: [pull_request]
targets: [title]



- label: "status: todo ⏳"
regexs:
- /fix/i
Expand All @@ -48,10 +33,4 @@ filters:
regexs:
- /fix/i
events: [pull_request]
targets: [title]

- label: "hacktoberfest-accepted"
regexs:
- /fix/i
events: [pull_request]
targets: [title]
targets: [title]
4 changes: 2 additions & 2 deletions cypress/e2e/milanTest.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ describe("Checking if the backend is working properly or not", () => {
describe("Auth checks", () => {
it("Checking Login", () => {
cy.visit("/auth/login");
cy.get('[ data-cy="email"]').type("[email protected]", {
cy.get('[data-cy="email"]').type("[email protected]", {
force: true,
});
cy.get('[ data-cy="password"]').type("tamaldas69", {
cy.get('[data-cy="password"]').type("tamaldas69", {
force: true,
});
cy.get('[data-cy="loginbutton"]').scrollIntoView();
Expand Down
18 changes: 9 additions & 9 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
<meta name="google-site-verification" content="ISkkPcMaQwANRR5_0CPjjxQJ3SyWzUt94nSP7wc1JdA" />

<!-- THEME with vendor prefix meta -->
<meta name="theme-color" content="#E26959" />
<meta name="msapplication-navbutton-color" content="#E26959" />
<meta name="msapplication-TileColor" content="#E26959">
<meta name="theme-color" content="#ff5b31" />
<meta name="msapplication-navbutton-color" content="#ff5b31" />
<meta name="msapplication-TileColor" content="#ff5b31">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="#E26959" />
<meta name="apple-mobile-web-app-status-bar-style" content="#ff5b31" />

<!-- Primary Meta Tags -->
<meta name="title" content="Milan" />
Expand Down Expand Up @@ -49,24 +49,24 @@

<link rel="manifest" href="/manifest.json" />

<!-- // CSS and Bootstrap -->

<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
<link rel="shortcut icon" href="./images/solidarity.png" type="image/x-icon" />

<!-- head fonts -->
<link rel="preconnect" href="https://fonts.googleapis.com" />
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@400;500;600;700;800;900&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Ubuntu&display=swap" rel="stylesheet" />
<link href="https://fonts.googleapis.com/css2?family=Open+Sans&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Montserrat:wght@600&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Poppins:wght@400;500;600;700;800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Mulish&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Sarabun&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Roboto&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Exo+2:ital@1&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@800&display=swap" rel="stylesheet">
<link href="https://fonts.googleapis.com/css2?family=Outfit:wght@300;400;500;600;700;800;900&display=swap" rel="stylesheet">

<title>Milan</title>
</head>
Expand Down
133 changes: 131 additions & 2 deletions package-lock.json

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

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
"dependencies": {
"@commitlint/cli": "^18.4.2",
"@commitlint/config-conventional": "^17.6.1",
"@hookform/resolvers": "^3.3.4",
"@reduxjs/toolkit": "^2.1.0",
"@testing-library/jest-dom": "^5.16.1",
"@testing-library/user-event": "^14.4.3",
"aos": "^2.3.4",
Expand All @@ -34,8 +36,11 @@
"js-cookie": "^3.0.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-fast-marquee": "^1.6.3",
"react-helmet-async": "^1.3.0",
"react-hook-form": "^7.49.3",
"react-icons": "^4.10.1",
"react-redux": "^9.1.0",
"react-router-dom": "^6.11.2",
"react-scripts": "^5.0.1",
"react-select": "^5.7.5",
Expand All @@ -46,6 +51,7 @@
"url": "^0.11.0",
"vite-plugin-svgr": "^2.2.2",
"web-vitals": "^3.3.1",
"zod": "^3.22.4",
"zustand": "^4.4.1"
},
"scripts": {
Expand Down
10 changes: 5 additions & 5 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React from "react";
import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
import { Route, BrowserRouter as Router, Routes } from "react-router-dom";
import { BacktoTop } from "./components/shared";
import "./styles/App.css";
import BacktoTop from "../src/components/Button/BacktoTop/BacktoTop.jsx";
import routesConfig from "./assets/data/routesConfig";
import routesConfig from "./utils/routesConfig.jsx";

const App = () => {
return (
<>
<div className="app">
<Router>
<Routes>
{routesConfig.map((route, index) => (
Expand All @@ -20,7 +20,7 @@ const App = () => {
</Routes>
</Router>
<BacktoTop />
</>
</div>
);
};

Expand Down
Loading

0 comments on commit 1f31db3

Please sign in to comment.