Skip to content

fix: auth flow improvements #1274

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

Merged
merged 3 commits into from
Oct 18, 2024
Merged
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
56 changes: 28 additions & 28 deletions .github/workflows/prodtest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@ on:
- main

jobs:
cypress-run:
runs-on: ubuntu-latest

container: cypress/browsers:node18.12.0-chrome107

steps:
- name: Checkout
uses: actions/checkout@v3

- name: set environment variables
uses: allenevans/set-env@v2.0.0
with:
HUSKY: 0

- name: "Cypress Tests - Chrome"
uses: cypress-io/github-action@v4.2.0
with:
install: true
build: npm run build
start: npm run dev
wait-on: "http://localhost:3000"
wait-on-timeout: 120
browser: chrome
spec: cypress/e2e/*
env:
CI: "false"
# cypress-run:
# runs-on: ubuntu-latest

# container: cypress/browsers:node18.12.0-chrome107

# steps:
# - name: Checkout
# uses: actions/checkout@v3

# - name: set environment variables
# uses: allenevans/set-env@v2.0.0
# with:
# HUSKY: 0

# - name: "Cypress Tests - Chrome"
# uses: cypress-io/github-action@v4.2.0
# with:
# install: true
# build: npm run build
# start: npm run dev
# wait-on: "http://localhost:3000"
# wait-on-timeout: 120
# browser: chrome
# spec: cypress/e2e/*
# env:
# CI: "false"

Deploy-Production:
needs: cypress-run
if: success()
# needs: cypress-run
# if: success()
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
Expand Down
55 changes: 0 additions & 55 deletions .github/workflows/prodtestbeta.yml

This file was deleted.

82 changes: 0 additions & 82 deletions .github/workflows/prtestbeta.yml

This file was deleted.

54 changes: 27 additions & 27 deletions .github/workflows/prtests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,38 @@ on:
- main

jobs:
cypress-run:
runs-on: ubuntu-latest
# use docker container to run tests
container: cypress/browsers:node18.12.0-chrome107
steps:
- name: Checkout
uses: actions/checkout@v3
# cypress-run:
# runs-on: ubuntu-latest
# # use docker container to run tests
# container: cypress/browsers:node18.12.0-chrome107
# steps:
# - name: Checkout
# uses: actions/checkout@v3

- name: Install npm
run: npm install -g husky
# - name: Install npm
# run: npm install -g husky

- name: set environment variables
uses: allenevans/set-env@v2.0.0
with:
HUSKY: 0
# - name: set environment variables
# uses: allenevans/set-env@v2.0.0
# with:
# HUSKY: 0

- name: "Cypress Tests - Chrome"
uses: cypress-io/github-action@v4.2.0
with:
install: true
build: npm run build
start: npm run dev
wait-on: "http://localhost:3000"
wait-on-timeout: 120
browser: chrome
spec: cypress/e2e/*
env:
CI: "false"
# - name: "Cypress Tests - Chrome"
# uses: cypress-io/github-action@v4.2.0
# with:
# install: true
# build: npm run build
# start: npm run dev
# wait-on: "http://localhost:3000"
# wait-on-timeout: 120
# browser: chrome
# spec: cypress/e2e/*
# env:
# CI: "false"

Deploy-Preview:
needs: cypress-run
if: success()
# needs: cypress-run
# if: success()
runs-on: ubuntu-latest

steps:
Expand Down
28 changes: 15 additions & 13 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { LocalizationProvider } from "@mui/x-date-pickers";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import React from "react";
import { Suspense } from "react";
import { Route, BrowserRouter as Router, Routes } from "react-router-dom";
import { ToastContainer } from "react-toastify";
import { BacktoTop } from "./components/shared";
Expand All @@ -17,18 +17,20 @@ const App = () => {
<LocalizationProvider dateAdapter={AdapterDayjs}>
<div className="app">
<ToastContainer />
<Router>
<Routes>
{routesConfig.map((route, index) => (
<Route
key={index}
exact
path={route?.path}
element={route?.element}
/>
))}
</Routes>
</Router>
<Suspense fallback={"Loading . . ."}>
<Router>
<Routes>
{routesConfig.map((route, index) => (
<Route
key={index}
exact
path={route?.path}
element={route?.element}
/>
))}
</Routes>
</Router>
</Suspense>
<BacktoTop />
</div>
</LocalizationProvider>
Expand Down
11 changes: 2 additions & 9 deletions src/components/private/events/create/CreateEvents.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Select from "@mui/material/Select";
import { DatePicker } from "@mui/x-date-pickers/DatePicker";
import { TimePicker } from "@mui/x-date-pickers/TimePicker";
import dayjs from "dayjs";
import React, { useCallback, useState } from "react";
import { useCallback, useState } from "react";
import "react-calendar/dist/Calendar.css";
import "react-clock/dist/Clock.css";
import { IoMdCloseCircleOutline } from "react-icons/io";
Expand Down Expand Up @@ -51,7 +51,6 @@ const CreateEvents = ({ setshowCreateModal }) => {

const handleCreateBase64 = useCallback(async (e) => {
const base64 = await convertToBase64(e);
console.log("🚀 ~ handleCreateBase64 ~ base64:", base64);
setevent((prevEvent) => ({ ...prevEvent, coverImage: base64 }));
e.target.value = "";
}, []);
Expand All @@ -76,13 +75,7 @@ const CreateEvents = ({ setshowCreateModal }) => {
/>

<div className="createevent_header">
<h1
onClick={() => {
console.log(Object.keys(errors).length);
}}
>
Create
</h1>
<h1>Create</h1>
</div>

<div className="createevent_form">
Expand Down
4 changes: 2 additions & 2 deletions src/components/private/landing/Landing.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Cookies from "js-cookie";
import React, { useEffect, useState } from "react";
import { useEffect, useState } from "react";
import Vector from "../../../assets/pictures/Banner/Vector.png";
import { Button } from "../../shared";
import "./Landing.scss";
Expand Down Expand Up @@ -55,7 +55,7 @@ const Landing = () => {
</Button>
) : (
<Button to="/auth/signup" className="landing_signup">
<span>Intrested? Sign Up</span>
<span>Sign up Today !</span>
</Button>
)}

Expand Down
Loading
Loading