Skip to content
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

Development Complete #1

Open
wants to merge 53 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
7aac1b9
feat: router v6
AnkitaBagale Apr 5, 2021
34ccd1a
fix: warnings
AnkitaBagale Apr 5, 2021
8ad9d1b
fix: warning
AnkitaBagale Apr 5, 2021
104a47a
feat: category filter
AnkitaBagale Apr 5, 2021
eef4208
feat: add note
AnkitaBagale Apr 6, 2021
6fd4136
fix warning
AnkitaBagale Apr 7, 2021
7bde13a
feat: sidebar
AnkitaBagale Apr 9, 2021
a3fbd91
feat: homepage added
AnkitaBagale Apr 11, 2021
b5f2475
fix: warnings
AnkitaBagale Apr 11, 2021
e434470
refactor: explore filter
AnkitaBagale Apr 13, 2021
7a86268
refactor: review comments
AnkitaBagale Apr 25, 2021
462ddd1
refactor: files
AnkitaBagale Apr 26, 2021
6f9d5c1
feat: auth added
AnkitaBagale Apr 28, 2021
3df9929
completed api calls
AnkitaBagale Apr 30, 2021
2d3634c
fix: warnings
AnkitaBagale Apr 30, 2021
7b1a533
fix: video datail page error handling
AnkitaBagale May 4, 2021
215ec4f
fix: video id undefined
AnkitaBagale May 4, 2021
44346b0
feat: search bar and action buttons
AnkitaBagale May 5, 2021
8d158dd
feat: loader and toast
AnkitaBagale May 5, 2021
9a52571
refactor: review comments
AnkitaBagale May 5, 2021
846b633
fix: sign up route after login
AnkitaBagale May 6, 2021
0954809
docs: readme update
AnkitaBagale May 6, 2021
396de03
docs: readme update
AnkitaBagale May 6, 2021
065b669
docs: readme update
AnkitaBagale May 6, 2021
caf6ad7
fix: router scroll issue
AnkitaBagale May 17, 2021
cdb4c56
fix: sign up and forget password issue
AnkitaBagale May 22, 2021
196b6bb
fix: data persistence after logout
AnkitaBagale May 22, 2021
7816a29
feat: JWT authentication
AnkitaBagale May 29, 2021
b9a0752
fix: api url
AnkitaBagale May 29, 2021
5d4507c
fix: 401 error handler
AnkitaBagale May 29, 2021
83a64e5
fix: forgot password api url
AnkitaBagale Jun 2, 2021
c6e62a0
fix: status codes
AnkitaBagale Jun 2, 2021
e4f6f93
feat: share video
AnkitaBagale Jun 11, 2021
3b49338
fix: share url
AnkitaBagale Jun 11, 2021
3b8b33c
fix: change share url
AnkitaBagale Jun 15, 2021
3e61b5e
Update README.md
AnkitaBagale Jun 15, 2021
4995051
fix: small UI issues
AnkitaBagale Jun 17, 2021
031118c
fix: nav items dry
AnkitaBagale Jun 17, 2021
1dbd257
Merge pull request #2 from AnkitaBagale/ankita-fix-nitpicks
AnkitaBagale Jun 17, 2021
6f9e4f1
fix: spell
AnkitaBagale Jun 17, 2021
f4e40fc
Merge pull request #3 from AnkitaBagale/ankita-fix-nitpicks
AnkitaBagale Jun 17, 2021
cd83829
fix: axios error handler
AnkitaBagale Jun 27, 2021
80ff8bc
fix: warning
AnkitaBagale Jun 27, 2021
37222e5
Merge pull request #4 from AnkitaBagale/ankita-fix-nitpicks
AnkitaBagale Jun 27, 2021
c2f3ece
fix: footer color
AnkitaBagale Jun 29, 2021
b85d6b2
Merge pull request #5 from AnkitaBagale/ankita-fix-nitpicks
AnkitaBagale Jun 29, 2021
a24e1c4
feat: login with test creds
AnkitaBagale Jul 18, 2021
62008b4
fix: enter key press in search bar
AnkitaBagale Jul 19, 2021
199b814
fix: image sizes
AnkitaBagale Jul 19, 2021
d136d5a
add: login on sign up
AnkitaBagale Jul 21, 2021
06e6081
fix: api url
AnkitaBagale Jul 21, 2021
b2e9f65
fix: liked videos deletion
AnkitaBagale Jul 23, 2021
47999ac
fix: liked videos deletion
AnkitaBagale Jul 23, 2021
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
76 changes: 74 additions & 2 deletions package-lock.json

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

13 changes: 7 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,16 @@
"@testing-library/jest-dom": "^5.11.10",
"@testing-library/react": "^11.2.6",
"@testing-library/user-event": "^12.8.3",
"axios": "^0.21.1",
"faker": "^5.5.2",
"history": "^5.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-loader-spinner": "^4.0.0",
"react-player": "^2.9.0",
"react-router-dom": "^6.0.0-beta.0",
"react-scripts": "4.0.3",
"uuid": "^8.3.2",
"web-vitals": "^1.1.1"
},
"scripts": {
Expand All @@ -17,12 +24,6 @@
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"eslintConfig": {
"extends": [
"react-app",
"react-app/jest"
]
},
"browserslist": {
"production": [
">0.2%",
Expand Down
1 change: 1 addition & 0 deletions public/_redirects
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/* /index.html 200
5 changes: 4 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,16 @@

<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<link rel="icon" type="image/x-icon" href="%PUBLIC_URL%/myfav.ico" />

<meta
name="description"
content="Web site created using create-react-app"
/>


<title>U&I Videos</title>
<link rel="stylesheet" href="https://u-and-i.netlify.app/Components/u-and-i.css">

</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
Expand Down
Binary file added public/myfav.ico
Binary file not shown.
165 changes: 139 additions & 26 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -1,38 +1,151 @@
.App {
text-align: center;
:root{
--bg-light-pink : #fff7f9;
--bg-lesslight-pink : #ffd9e2;
}

.App-logo {
height: 40vmin;
pointer-events: none;
*{
box-sizing: border-box;
}

@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
.bg-light-pink{
background-color: var(--bg-light-pink);
}

.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
.bg-lesslight-pink{
background-color: var(--bg-lesslight-pink);
}
.text-green{
color: #03a685;
}
.spacer-3rem {
width: 100%;
height: 3rem;
}
.margin-0{
margin: 0;
}

.logo-title{
font-size: 2rem;
font-family: 'Roboto Slab', serif;
font-weight: 500;

.App-link {
color: #61dafb;
}
.logo-and-symbol-style{
font-size: 1rem;
margin-right: 0.1875rem;
}
.logo-tagline{
font-size:0.625rem;
font-weight:500;
letter-spacing: 1px;
}

@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
.app-container{
min-height: 60vh;
}
.text-light-weight{
font-weight: 400;
}
.padding-around-1rem{
padding: 1rem;
}
.card-horizontal .image-container {
height: auto;
}
.grid-4-column-layout{
box-sizing: border-box;
}
.border-1px-square {
border: 1px solid #e9e9eb;
}
.width-100pc{
width:100%;
}
.margin-bottom-0{
margin-bottom: 0;
}
.margin-bottom-1rem{
margin-bottom: 1rem;
}
.grid-item-nav{
grid-area: nav;
}
.grid-item-footer{
grid-area: footer;
}
.grid-item-main{
grid-area: main;
}

.page-grid-layout {
display: grid;
grid-template-columns: 1fr;
grid-template-areas: "nav"
"main"
"footer";
}
.margin-top-3rem{
margin-top: 3rem;
}
.height-90vh{
height: 90vh;
}
.scrollbar-styled{
overflow-y: auto;
}
.scrollbar-styled::-webkit-scrollbar {
width: 0.25rem;
}

.scrollbar-styled::-webkit-scrollbar-thumb {
background-color: rgb(216, 215, 216);

}
.scrollbar-styled::-webkit-scrollbar-track {
background: #edebef;
}

.border-radius-1rem{
border-radius: 1rem;
}
.margin-top-1rem{
margin-top:1rem;
}

.margin-top-2rem{
margin-top: 2rem;
}
.shadow-right{
box-shadow: 4px 8px 12px 0px rgb(0 0 0 / 5%);
}

.padding-right-0{
padding-right: 0;
}
.padding-top-1rem{
padding-top: 1rem;
}
.btn-text-icon-secondary .btn-icon.padding-0{
padding: 0;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this could be combined in line 113

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

}
.padding-bottom-1rem{
padding-bottom: 1rem;
}
.padding-left-1rem{
padding-left: 1rem;
}
.padding-right-1rem{
padding-right: 1rem;
}

@media screen and (min-width: 1025px){
.hide-in-desktop{
display: none;
}
}
@media screen and (max-width: 768px){
.hide-in-mobile{
display: none;
}
}
Loading