Skip to content

Feature/view mentor mentee on tv #2

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

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open

Feature/view mentor mentee on tv #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2012c03
changed env to deno env
imadibrahimk Nov 14, 2023
9590de2
Merge branch 'feature/view-mentor-mentee-on-tv' of https://github.com…
imadibrahimk Nov 14, 2023
63aa3e5
changed port
imadibrahimk Nov 14, 2023
d049d68
added deno API to react app
imadibrahimk Nov 14, 2023
757a217
added gh pages
imadibrahimk Nov 14, 2023
10466f2
changed images in public_url
imadibrahimk Nov 15, 2023
7630607
added some changes in frontend
imadibrahimk Nov 15, 2023
c95d7b7
truncated some texts
imadibrahimk Nov 16, 2023
daf7b5a
Fix crash when name field is deleted in Airtable
imadibrahimk Nov 16, 2023
c541eae
Added welcome page
imadibrahimk Nov 17, 2023
de3ee4b
added Not Specified tag for name
imadibrahimk Nov 22, 2023
d94c9dc
Added image on welcome page
imadibrahimk Nov 22, 2023
13a1a67
aaded republic animation
imadibrahimk Jan 16, 2024
3245e59
API changed
imadibrahimk Jul 9, 2024
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
Prev Previous commit
Next Next commit
changed images in public_url
  • Loading branch information
@imadibrahimk
imadibrahimk committed Nov 15, 2023
commit 10466f2f14d785ab70f213eb0b947a8ca87acc2f
2 changes: 2 additions & 0 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
"scripts": {
"start:backend": "cd backend && deno run --allow-net --allow-read --watch src/server.ts",
"start:frontend": "react-scripts start",
"predeploy": "npm run build",
"deploy": "gh-pages -d build",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/Cards/Cards.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ function Cards(props) {
<div key={data.id}>
<div className="w-[178px] h-auto p-1 rounded-[15px] bg-yellow-200 space-y-4" style={{background: 'linear-gradient(160.58deg, rgba(231, 231, 231, 0) 1.42%, #FFE297 98.11%)'}}>
<div className="w-[170px] h-auto p-3 rounded-[12px] space-y-3" style={{background: 'linear-gradient(332.32deg, #FFCD4B 1.92%, #FFFFFF 83.83%)'}}>
<img className="w-[150px] h-[150px] object-cover rounded-[4px]" src={url ? url : "/images/alt.jpg"} alt="Profile" />
{/* <img className="w-[150px] h-[150px] object-cover rounded-[4px]" src={url ? url : "/images/alt.jpg"} alt="Profile" /> */}
<img className="w-[150px] h-[150px] object-cover rounded-[4px]" src={url ? url : `${process.env.PUBLIC_URL}/images/alt.jpg`} alt="Profile" />
<h2 className="w-[150px] h-[24px] text-[20px] font-bold">{truncate(data.fields['First name (from Your name)'][0], 11)}</h2>
<hr className=' border-t-[2px]' style={{borderColor: '#876100'}} />
<p className="w-[150px] h-[22px] text-[18px]">{data.fields["Enter the domain that you will be working on."] ? data.fields["Enter the domain that you will be working on."] : 'Undefined' }</p>
Expand All @@ -86,7 +87,8 @@ const renderCardMentee = (data) => {
<div key={data.id}>
<div className="w-[140px] h-[225.66px] ml-[13px] mb-12 rounded-[11.77px] border" style={{borderColor: '#AEAEAE',background: 'linear-gradient(160.58deg, rgba(231, 231, 231, 0) 1.42%, rgba(255, 226, 151, 0.2) 98.11%, rgba(255, 215, 75, 0.2) 98.11%)'}}>
<div className="w-[133.35px] h-[217.39px] p-2 rounded-[9.41px] space-y-3 " style={{background: 'linear-gradient(332.32deg, #F7F7F7 1.92%, #FFFFFF 83.83%)'}}>
<img className="w-[117.66px] h-[117.66px] object-cover rounded-[4px]" src={url ? url : "/images/alt.jpg"} alt="Profile" />
{/* <img className="w-[117.66px] h-[117.66px] object-cover rounded-[4px]" src={url ? url : "/images/alt.jpg"} alt="Profile" /> */}
<img className="w-[117.66px] h-[117.66px] object-cover rounded-[4px]" src={url ? url : `${process.env.PUBLIC_URL}/images/alt.jpg`} alt="Profile" />
<h2 className="w-[117.66px] h-[13px] text-[15.69px] font-bold">{truncate(data.fields['First name (from Your name)'][0], 11)}</h2>
<hr className=' border-t-[1px]' style={{borderColor: '#876100'}} />
<p className="w-[117.66px] h-[8px] text-[14.12px]">{data.fields["Enter the domain that you will be working on."] ? data.fields["Enter the domain that you will be working on."] : 'Undefined' }</p>
Expand Down
6 changes: 4 additions & 2 deletions frontend/src/components/Navbar/Navbar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ function Navbarr() {
</div>

<div className='w-1/3 min-h-fit flex flex-col items-end justify-center pt-[79px] pr-[125px]'>
<img className='w-1/3' src={"/images/TKS1.jpg"} alt='TinkerSpace' />
<img className='w-1/4' src={"/images/TKS2.jpg"} alt='TinkerHub' />
{/* <img className='w-1/3' src={"/images/TKS1.jpg"} alt='TinkerSpace' />
<img className='w-1/4' src={"/images/TKS2.jpg"} alt='TinkerHub' /> */}
<img className='w-1/3' src={process.env.PUBLIC_URL + '/images/TKS1.jpg'} alt='TinkerSpace' />
<img className='w-1/4' src={process.env.PUBLIC_URL + '/images/TKS2.jpg'} alt='TinkerHub' />
</div>
</div>
);
Expand Down