Skip to content

Commit

Permalink
Merge pull request #3 from mdgspace/kitu
Browse files Browse the repository at this point in the history
Never Ending Bug Fixes
  • Loading branch information
yp969803 authored May 19, 2024
2 parents 96d6f6f + 5fb5aa2 commit 124c299
Show file tree
Hide file tree
Showing 33 changed files with 631 additions and 499 deletions.
1 change: 0 additions & 1 deletion frontend/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
href="https://fonts.googleapis.com/css?family=Poppins"
rel="stylesheet"
/>


<title>Tracer</title>
</head>
Expand Down
20 changes: 19 additions & 1 deletion frontend/public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1 +1,19 @@
{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
{
"name": "",
"short_name": "",
"icons": [
{
"src": "/android-chrome-192x192.png",
"sizes": "192x192",
"type": "image/png"
},
{
"src": "/android-chrome-512x512.png",
"sizes": "512x512",
"type": "image/png"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
16 changes: 0 additions & 16 deletions frontend/src/app/api/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,6 @@ export interface IconNameRes {
message: string;
}








export const uploadIcon = async (
authorizationToken: string,
orgName: string,
Expand All @@ -35,10 +28,6 @@ export const uploadIcon = async (
return respnse;
};





export const getIcon = async (authorizationToken: string, orgName: string) => {
const url = BACKEND_URL + '/api/protected/file/getIcon/' + orgName;
const response = await axios.get(
Expand All @@ -55,8 +44,6 @@ export const getIcon = async (authorizationToken: string, orgName: string) => {
return response;
};



export const deleteFile = async (
authorizationToken: string,
fileName: string
Expand All @@ -71,9 +58,6 @@ export const deleteFile = async (
return respnse;
};




export const getIconName = async (
authorizationToken: string,
orgName: string
Expand Down
1 change: 0 additions & 1 deletion frontend/src/app/api/githubData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export interface ProjectStats {
contributors: Contributors;
}


export interface OrgProjectGithubData {
projects: ProjectsGithubData;
}
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/app/assets/icons/cross.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion frontend/src/app/components/search/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import './index.scss';

const SearchBar = () => {
const dispatch = useDispatch();
const [search,setSearch] = useState('')
const [search, setSearch] = useState('');
const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
setSearch(e.target.value);
};
Expand Down
4 changes: 1 addition & 3 deletions frontend/src/app/components/timeRangeSwitch/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,7 @@ interface Props {
const TimeRangeSwitch: React.FC<Props> = ({ weekly, setWeekly }) => {
// const dispatch = useDispatch();
// const isWeekly = useSelector((state: timeRangeModel) => state.isWeekly.value);
useEffect(()=>{

},[weekly, setWeekly])
useEffect(() => {}, [weekly, setWeekly]);
return (
<div className='timerange-cont'>
<button
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/context/user/userState.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { FC, ReactNode, useState } from 'react';
import UserContext from './userContext';
import { UserOrgs } from 'app/api/user';
import { UserOrgs } from 'app/api/user';

interface Props {
children: ReactNode;
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/app/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ a:hover {
border: 1px solid white;
}


.pointer{
.pointer {
cursor: pointer;
}
}
1 change: 0 additions & 1 deletion frontend/src/app/routes/BasicRoutes.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

import { Routes, Route } from 'react-router-dom';
import ProjectPage from 'features/project';
import AddProject from 'features/AddProject';
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/envConstants.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
export const CLIENT_ID =process.env.REACT_APP_CLIENT_ID;
export const BACKEND_URL = process.env.REACT_APP_BACKEND_URL;
export const AVATAR_API = process.env.REACT_APP_AVATAR_API;

export const CLIENT_ID = process.env.CLIENT_ID;
export const BACKEND_URL = process.env.BACKEND_URL;
export const AVATAR_API = process.env.AVATAR_API;
56 changes: 31 additions & 25 deletions frontend/src/features/AddProject/index.scss
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
.add-project-container {
width: 70vw;
height: 76.5vh;
margin: 60px auto;
width: 80% !important;
margin: 60px auto !important;
background: linear-gradient(110.51deg, #141432 0.9%, #2a2a4b 101.51%);
border-radius: 20px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
max-height: 60vh;
}

.add-project-form {
width: 100%;
padding: 2rem 4rem;
height: 100%;
overflow-y: scroll;
}

.add-project-form input {
box-sizing: border-box;

width: 100%;
/* Auto layout */
border: 0.8px solid #402aa4;
border-radius: 14px;
Expand All @@ -29,7 +36,10 @@
line-height: 30px;
/* identical to box height */

color: rgba(173, 173, 255, 0.75);
color: rgba(173, 173, 255, 0.957);
}
.add-project-form input::placeholder {
color: rgba(173, 173, 255, 0.957);
}

.input-title {
Expand All @@ -43,33 +53,29 @@
color: #8181ff;
}

.add-project-btn {
.add-project-btnn {
position: absolute;
right: 66px;
bottom: 44px;
font-family: 'Poppins';
font-style: normal;
font-weight: 400;
font-size: 15px;
line-height: 22px;
/* identical to box height */

display: flex;
align-items: center;
display: flex;
flex-direction: row;
align-items: flex-start;
padding: 10px 16px;
gap: 2px;
flex: none;
order: 1;
flex-grow: 0;
bottom: 14px;
outline: none;
border: none;
padding: 1rem;
border-radius: 2rem;
font-size: 1rem;
padding: 1rem 2rem;
background: #402aa4;
border-radius: 14px;
color: #ffffff;
}

.add-project-btn img {
padding-top: 3px;
padding-right: 4px;
}

.form-error {
color: red;
font-size: 14px; /* Adjust as necessary */
word-wrap: break-word; /* Allows breaking long words */
white-space: normal; /* Ensures normal word wrapping */
margin-top: 5px; /* Adds some spacing above the error message */
}
Loading

0 comments on commit 124c299

Please sign in to comment.