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.

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

David 49 #102

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

David 49 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33452b2
minor changes
DavidUf11 Dec 2, 2020
93cad76
minor changes pre-demo
DavidUf11 Dec 4, 2020
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
1 change: 1 addition & 0 deletions client/src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function App() {
<Route path="/artist" component={ArtistCollab} />
</Switch>
</BrowserRouter>
<div className="w-full h-24" style={{ backgroundColor: '#222222' }}></div>
</AppContextProvider>
);
}
Expand Down
9 changes: 5 additions & 4 deletions client/src/components/AddImage.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,16 +51,17 @@ const AddImage = () => {
? preview
: currentUser?.avatar
? currentUser.avatar
: 'https://images.unsplash.com/photo-1501612780327-45045538702b?ixlib=rb-1.2.1&ixid=MXwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHw%3D&auto=format&fit=crop&w=1950&q=80'
: 'https://myareanetwork-photos.s3.amazonaws.com/bizlist_photos/f/199088_1499965414.jpg?0'
}
alt="profile"
width={250}
height={250}
roundedCircle
className="the-profile-image"
className="the-profile-image rounded-md"
style={{ position: 'relative', bottom: '5rem' }}
/>
</label>
<button
{/* <button
type="submit"
size="sm"
className="save-image"
Expand All @@ -73,7 +74,7 @@ const AddImage = () => {
}}
>
Save+
</button>
</button> */}
</form>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Login.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const Login = () => {
/>
</div>
<div className="btn-area">
<input type="submit" className="btn-1" value="Login" />
<input type="submit" className="btn-1 login-button" value="Login" />
</div>
</form>
</div>
Expand Down
Loading