generated from the-collab-lab/smart-shopping-list-deprecated
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add Semantic UI * Start replacing components on List.js, Add header * Convert list to Semantic components * Add theming to App Theming is set up so that when we decide on fonts, colors, and custom layouts we can update and/or override the default styles using less variables and css. * Style list * Add list icon to header, remove header from welcome page In an earlier commit I added a site header to App.js I removed it so that the welcome page for new lists can have it's own header. I changed some colors also just to play with it. I'm not married to any style choices I made we can still talk about final design choices. * Add color code to list * Add delete button to list item * Change button layout and color * Change to outline from background color * Clean up unused functions * Remove animation from list * Clean up HomePage.js * Change Welcome prompt to Semantic * Simplify welcome prompt Instead of making the welcome prompt two parts it's not just one view. The join list field and button are responsive. * Add details dropdown to list items I added a drop down with some placeholder data and moved the delete button to inside of it. Also, I took the popup off of the delete button action because it was behaving strangely on mobile. * All pages styled All the pages have a basic level of styling. For usability I also added a delete item function on the shopping list view. There was a problem where I was losing the token if the addItem screen was the entry to the app. It was because there was no communication with the list in context and we were using that list to check for duplicates. To fix this I added a call to fetchList when addItem loads. Let me know if this breaks anything. * Remove a CSS rule * Add missing functions to listContext * Remove unused files, adjust addItem styles * Center Add Item header * Remove test content from item details * Clean up comments and console.log statements, adjust color code logic * Update .gitignore * Remove Semantic folder from gitignore * Try ignoring /src/semantic-ui/site * Add back theme files * Clean up unneeded <div>, small changes I cleaned up a an unneeded div tag, removed some blank lines, and moved the updateItem function closer to purchaseItem in listContext.js.
- Loading branch information
Showing
39 changed files
with
825 additions
and
430 deletions.
There are no files selected for viewing
This file contains 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 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 @@ | ||
module.exports = { | ||
plugins: [{ plugin: require('@semantic-ui-react/craco-less') }], | ||
}; |
This file contains 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
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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 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,22 +1,3 @@ | ||
.App { | ||
text-align: center; | ||
} | ||
|
||
.App-logo { | ||
height: 40vmin; | ||
} | ||
|
||
.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; | ||
} | ||
|
||
.App-link { | ||
color: #09d3ac; | ||
header > h1 { | ||
font-size: 1.6rem; | ||
} |
This file contains 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,5 +1,6 @@ | ||
import React from 'react'; | ||
import AppRouter from './AppRouter'; | ||
import './App.css'; | ||
|
||
function App() { | ||
return ( | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains 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,43 @@ | ||
import React from 'react'; | ||
import { Header, Segment, Button } from 'semantic-ui-react'; | ||
import { Link } from 'react-router-dom'; | ||
|
||
function AppHeader(props) { | ||
return ( | ||
<Segment textAlign="center" style={{ borderRadius: 0 }}> | ||
{props.showBackArrow && ( | ||
<> | ||
<Button | ||
style={{ marginRight: '-37.5px' }} | ||
basic | ||
as={Link} | ||
to="/" | ||
icon="arrow left" | ||
size="medium" | ||
color="blue" | ||
circular | ||
floated="left" | ||
></Button> | ||
{/* <Divider hidden /> */} | ||
</> | ||
)} | ||
|
||
<header> | ||
{/* <Image | ||
src={Logo} | ||
centered | ||
size="tiny" | ||
verticalAlign="middle" | ||
alt="Shopping List" | ||
/> */} | ||
<Header as="h1"> | ||
<Header.Content>{props.children}</Header.Content> | ||
</Header> | ||
</header> | ||
</Segment> | ||
); | ||
} | ||
AppHeader.defaultProps = { | ||
showBackArrow: false, | ||
}; | ||
export default AppHeader; |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains 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 was deleted.
Oops, something went wrong.
This file contains 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 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,4 +1,3 @@ | ||
//normalized function | ||
const normalizeName = name => { | ||
return name | ||
.replace(/[,.;:!-?]/g, '') | ||
|
Oops, something went wrong.