Skip to content

Commit b4e439b

Browse files
AnthonytorreroAnthonytorrero
authored andcommitted
before merging Elena's testing code
1 parent b6e74a5 commit b4e439b

File tree

3 files changed

+14
-9
lines changed

3 files changed

+14
-9
lines changed

app/src/Dashboard/Project.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,11 @@ const Project = ({
201201
: '' }
202202
<div className = 'header'>
203203
<div className = 'projectInfo'>
204-
<h2>Project: { name }</h2>
205-
<h3>Author: { username }</h3>
206-
<h3>Likes: { likes }</h3>
204+
<b>
205+
<h2>Project: { name }</h2>
206+
<h3>Author: { username }</h3>
207+
<h3>Likes: { likes }</h3>
208+
</b>
207209
</div>
208210
<div className = "icons">
209211
<IconButton tooltip="Like Template" style={noPointer} onClick = { handleLike }>

app/src/Dashboard/ProjectContainer.tsx

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
import React, { useState, useContext, useEffect, createContext } from 'react';
22
import { createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
3+
import { makeStyles } from '@material-ui/core/styles';
4+
import Grid from '@material-ui/core/Grid';
35
import { useQuery } from '@apollo/client';
46
import { GET_PROJECTS } from './gqlStrings';
57
import Project from './Project';
@@ -19,6 +21,7 @@ export const styleContext = createContext({
1921
const lightTheme = theme1;
2022
const darkTheme = theme2; // dark mode color in theme.ts not reached
2123

24+
2225
const ProjectContainer = () => {
2326
const myVar = {};
2427
// Need this for the individual user dasboard, for now, dashboard shows all projects from all users
@@ -119,14 +122,14 @@ const ProjectContainer = () => {
119122
<div className = "dashboardContainer">
120123
<NavBarDash setTheme={setTheme} styles={[style, setStyle]} isThemeLight={isThemeLight} optionClicked={optionClicked}/>
121124
<h1> Public Dashboard </h1>
122-
<div className = "projectContainer">
125+
<Grid className = "projectContainer" container justify='flex-start' wrap='wrap' spacing={3}>
123126
{sortedDisplay}
124-
</div>
127+
</Grid>
125128
<hr></hr>
126129
<h1> User Dashboard </h1>
127-
<div className = "projectContainer">
130+
<Grid className = "projectContainer" container justify='flex-start' wrap='wrap'>
128131
{userDisplay}
129-
</div>
132+
</Grid>
130133
</div>
131134
</MuiThemeProvider>
132135
);

app/src/Dashboard/styles.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ $button-blue: #24BCFF; */
3434
overflow: scroll;
3535
}
3636

37-
.formContainer , .projectContainer{
37+
.formContainer {
3838
display: flex;
3939
flex-flow: row wrap;
4040
overflow: scroll;
@@ -101,7 +101,7 @@ $button-blue: #24BCFF; */
101101
.header {
102102
background-color: #0CBABA;
103103
color: rgba(255, 255, 255, 0.897);
104-
opacity: 0.7;
104+
opacity: 0.6;
105105
width: 100%;
106106
}
107107
/* .formContainer {

0 commit comments

Comments
 (0)