This repository was archived by the owner on Oct 7, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 0
Drawer #34
Open
cindyunrau
wants to merge
24
commits into
master
Choose a base branch
from
drawer
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Drawer #34
Changes from all commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
c53c117
Added Drawer Branch
cindyunrau 1f5ee38
Started drawer contents
cindyunrau 38697af
Semester, GPA, Current Courses, Previous Courses added to Drawer Cont…
cindyunrau 773ef7d
Recommiting to undo windows CR line endings
cindyunrau ecb5a62
just trying things
cindyunrau 527a229
lets try this again
cindyunrau 7dee131
Fix line endings
BraidenCutforth 2004957
Merged Changes
cindyunrau 32caa81
Fixed issues in Draft Pull Request #34
cindyunrau 7451d15
fix line endings
BraidenCutforth 4f4f28e
Added Drawer Branch
cindyunrau 535b495
Started drawer contents
cindyunrau 741c074
Semester, GPA, Current Courses, Previous Courses added to Drawer Cont…
cindyunrau 57d3c94
Recommiting to undo windows CR line endings
cindyunrau aae9051
just trying things
cindyunrau 16069b0
lets try this again
cindyunrau c61d3e1
Fix line endings
BraidenCutforth 53698da
Fixed issues in Draft Pull Request #34
cindyunrau 7afecf6
hard rebase
BraidenCutforth b17517a
I kinda forgot what changes are included in this commit, I'm just com…
cindyunrau e4b2b80
Made style in DrawerContent.tsx external (Style.tsx)
cindyunrau 68faaed
messing with app.tsx
cindyunrau e590465
messing with app.tsx 2
cindyunrau 41a6e65
Fixed Issue with nested lists, the semesters now collapse individually
cindyunrau File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "typescript.tsdk": "node_modules/typescript/lib" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,135 +1,137 @@ | ||
| import React from 'react'; | ||
| import AppBar from '@material-ui/core/AppBar'; | ||
| import CssBaseline from '@material-ui/core/CssBaseline'; | ||
| import Drawer from '@material-ui/core/Drawer'; | ||
| import Hidden from '@material-ui/core/Hidden'; | ||
| import IconButton from '@material-ui/core/IconButton'; | ||
| import MenuIcon from '@material-ui/icons/Menu'; | ||
| import Toolbar from '@material-ui/core/Toolbar'; | ||
| import Typography from '@material-ui/core/Typography'; | ||
| import { makeStyles, useTheme, Theme, createStyles } from '@material-ui/core/styles'; | ||
| import React from 'react' | ||
| import AppBar from '@material-ui/core/AppBar' | ||
| import CssBaseline from '@material-ui/core/CssBaseline' | ||
| import Drawer from '@material-ui/core/Drawer' | ||
| import DrawerContent from '../drawer-content/DrawerContent' | ||
| import Hidden from '@material-ui/core/Hidden' | ||
| import IconButton from '@material-ui/core/IconButton' | ||
| import MenuIcon from '@material-ui/icons/Menu' | ||
| import Toolbar from '@material-ui/core/Toolbar' | ||
| import Typography from '@material-ui/core/Typography' | ||
| import { | ||
| makeStyles, | ||
| useTheme, | ||
| Theme, | ||
| createStyles, | ||
| } from '@material-ui/core/styles' | ||
|
|
||
| const drawerWidth = 240; | ||
| const drawerWidth = 240 | ||
|
|
||
| const useStyles = makeStyles((theme: Theme) => | ||
| createStyles({ | ||
| root: { | ||
| display: 'flex', | ||
| }, | ||
| drawer: { | ||
| [theme.breakpoints.up('sm')]: { | ||
| width: drawerWidth, | ||
| flexShrink: 0, | ||
| }, | ||
| }, | ||
| appBar: { | ||
| [theme.breakpoints.up('sm')]: { | ||
| width: `calc(100% - ${drawerWidth}px)`, | ||
| marginLeft: drawerWidth, | ||
| }, | ||
| }, | ||
| sectionDesktop: { | ||
| display: 'none', | ||
| [theme.breakpoints.up('md')]: { | ||
| display: 'flex-end', | ||
| }, | ||
| }, | ||
| menuButton: { | ||
| marginRight: theme.spacing(2), | ||
| [theme.breakpoints.up('sm')]: { | ||
| display: 'none', | ||
| }, | ||
| }, | ||
| toolbar: theme.mixins.toolbar, | ||
| drawerPaper: { | ||
| width: drawerWidth, | ||
| }, | ||
| content: { | ||
| flexGrow: 1, | ||
| padding: theme.spacing(3), | ||
| }, | ||
| }), | ||
| ); | ||
|
|
||
|
|
||
| createStyles({ | ||
| root: { | ||
| display: 'flex', | ||
| }, | ||
| drawer: { | ||
| [theme.breakpoints.up('sm')]: { | ||
| width: drawerWidth, | ||
| flexShrink: 0, | ||
| }, | ||
| }, | ||
| appBar: { | ||
| [theme.breakpoints.up('sm')]: { | ||
| width: `calc(100% - ${drawerWidth}px)`, | ||
| marginLeft: drawerWidth, | ||
| }, | ||
| }, | ||
| sectionDesktop: { | ||
| display: 'none', | ||
| [theme.breakpoints.up('md')]: { | ||
| display: 'flex-end', | ||
| }, | ||
| }, | ||
| menuButton: { | ||
| marginRight: theme.spacing(2), | ||
| [theme.breakpoints.up('sm')]: { | ||
| display: 'none', | ||
| }, | ||
| }, | ||
| toolbar: theme.mixins.toolbar, | ||
| drawerPaper: { | ||
| width: drawerWidth, | ||
| }, | ||
| content: { | ||
| flexGrow: 1, | ||
| padding: theme.spacing(3), | ||
| }, | ||
| }), | ||
| ) | ||
|
|
||
| export default function ApplicationBar() { | ||
| const classes = useStyles(); | ||
| const theme = useTheme(); | ||
| const [mobileOpen, setMobileOpen] = React.useState(false); | ||
| const classes = useStyles() | ||
| const theme = useTheme() | ||
| const [mobileOpen, setMobileOpen] = React.useState(false) | ||
|
|
||
| const handleDrawerToggle = () => { | ||
| setMobileOpen(!mobileOpen); | ||
| }; | ||
| const handleDrawerToggle = () => { | ||
| setMobileOpen(!mobileOpen) | ||
| } | ||
|
|
||
| const drawer = <div> | ||
| <h1>HELLO THIS IS DRAWER</h1> | ||
| </div> | ||
| const drawer = ( | ||
| <div> | ||
| <h1>HELLO THIS IS DRAWER</h1> | ||
| </div> | ||
| ) | ||
|
|
||
| return ( | ||
| <div className={classes.root}> | ||
| <CssBaseline /> | ||
| <AppBar position="fixed" className={classes.appBar}> | ||
| <Toolbar> | ||
| <IconButton | ||
| color="inherit" | ||
| aria-label="open drawer" | ||
| edge="start" | ||
| onClick={handleDrawerToggle} | ||
| className={classes.menuButton} | ||
| > | ||
| <MenuIcon /> | ||
| </IconButton> | ||
| <Typography variant="h4" noWrap> | ||
| Passr | ||
| </Typography> | ||
| <div className={classes.sectionDesktop}> | ||
| <IconButton | ||
| edge="end" | ||
| aria-label="account of current user" | ||
| aria-haspopup="true" | ||
| color="inherit" | ||
| > | ||
| </IconButton> | ||
| </div> | ||
| </Toolbar> | ||
| </AppBar> | ||
| <nav className={classes.drawer} aria-label="mailbox folders"> | ||
| {/* The implementation can be swapped with js to avoid SEO duplication of links. */} | ||
| <Hidden smUp implementation="css"> | ||
| <Drawer | ||
| variant="temporary" | ||
| anchor={theme.direction === 'rtl' ? 'right' : 'left'} | ||
| open={mobileOpen} | ||
| onClose={handleDrawerToggle} | ||
| classes={{ | ||
| paper: classes.drawerPaper, | ||
| }} | ||
| ModalProps={{ | ||
| keepMounted: true, // Better open performance on mobile. | ||
| }} | ||
| > | ||
| </Drawer> | ||
| </Hidden> | ||
| <Hidden xsDown implementation="css"> | ||
| <Drawer | ||
| classes={{ | ||
| paper: classes.drawerPaper, | ||
| }} | ||
| variant="permanent" | ||
| open | ||
| > | ||
| {drawer} | ||
| </Drawer> | ||
| </Hidden> | ||
| </nav> | ||
| <main className={classes.content}> | ||
| <div className={classes.toolbar} /> | ||
| {/* Insert CourseContent here */} | ||
| <Typography paragraph> | ||
| INSERT CONTENT HERE | ||
| </Typography> | ||
| </main> | ||
| </div> | ||
| ); | ||
| return ( | ||
| <div className={classes.root}> | ||
| <CssBaseline /> | ||
| <AppBar position="fixed" className={classes.appBar}> | ||
| <Toolbar> | ||
| <IconButton | ||
| color="inherit" | ||
| aria-label="open drawer" | ||
| edge="start" | ||
| onClick={handleDrawerToggle} | ||
| className={classes.menuButton} | ||
| > | ||
| <MenuIcon /> | ||
| </IconButton> | ||
| <Typography variant="h4" noWrap> | ||
| Passr | ||
| </Typography> | ||
| <div className={classes.sectionDesktop}> | ||
| <IconButton | ||
| edge="end" | ||
| aria-label="account of current user" | ||
| aria-haspopup="true" | ||
| color="inherit" | ||
| ></IconButton> | ||
| </div> | ||
| </Toolbar> | ||
| </AppBar> | ||
| <nav className={classes.drawer} aria-label="mailbox folders"> | ||
| {/* The implementation can be swapped with js to avoid SEO duplication of links. */} | ||
| <Hidden smUp implementation="css"> | ||
| <Drawer | ||
| variant="temporary" | ||
| anchor={theme.direction === 'rtl' ? 'right' : 'left'} | ||
| open={mobileOpen} | ||
| onClose={handleDrawerToggle} | ||
| classes={{ | ||
| paper: classes.drawerPaper, | ||
| }} | ||
| ModalProps={{ | ||
| keepMounted: true, // Better open performance on mobile. | ||
| }} | ||
| ></Drawer> | ||
| </Hidden> | ||
| <Hidden xsDown implementation="css"> | ||
| <Drawer | ||
| classes={{ | ||
| paper: classes.drawerPaper, | ||
| }} | ||
| variant="permanent" | ||
| open | ||
| > | ||
| <DrawerContent /> | ||
| </Drawer> | ||
| </Hidden> | ||
| </nav> | ||
| <main className={classes.content}> | ||
| <div className={classes.toolbar} /> | ||
| {/* Insert CourseContent here */} | ||
| <Typography paragraph>INSERT CONTENT HERE</Typography> | ||
| </main> | ||
| </div> | ||
| ) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| import React from 'react'; | ||
| import {user1} from '../../services/storage/mock' | ||
|
|
||
| export const CourseSort: React.FC = () => { | ||
|
|
||
| return <div id='course_sort' > | ||
| Heyo | ||
| </div> | ||
|
|
||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like another format thing your editor did by accident 🙃