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

Update/update json #31

Merged
merged 125 commits into from
Apr 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
42eda56
first commit
micahsuomi Jul 15, 2020
99b86ba
first commit
micahsuomi Jul 15, 2020
6328ebf
added jwt authentication, user routes and model
micahsuomi Jul 20, 2020
db94607
fixing likes functionality, added user's page, likes routing, changed…
micahsuomi Aug 17, 2020
0098273
added frontend and backend for comments functionality, add, edit and …
micahsuomi Aug 19, 2020
9c04d78
adjusted responsivness
micahsuomi Aug 20, 2020
7018e43
added heroku postbuild
micahsuomi Aug 21, 2020
2a6dc89
created toggle bar for mobile and tablet navigation
micahsuomi Aug 21, 2020
4b4dfb5
adjusted navbar responsivness
micahsuomi Aug 21, 2020
39077e2
fixing pagination
micahsuomi Aug 23, 2020
91dc9f8
fixed responsivness
micahsuomi Aug 23, 2020
5152544
added image upload for photos and users with cloudinary
micahsuomi Aug 25, 2020
a213c7e
added image upload with cloudinary and multer
micahsuomi Aug 25, 2020
049cb5e
changed responsivness
micahsuomi Aug 25, 2020
6c3d754
adjusted fetchdata
micahsuomi Aug 25, 2020
0b909cb
added react-scroll on pull, no pag on mobile, improving fetchdata
micahsuomi Aug 25, 2020
1043930
adjusted loader and responsivness for mobile
micahsuomi Aug 25, 2020
2d37b79
adjusted popup windows
micahsuomi Aug 26, 2020
e16cabe
adjusted pull to refresh
micahsuomi Aug 26, 2020
85f8d8c
solved conflicts
micahsuomi Aug 26, 2020
b9d42ec
updated user route, improved viewphoto ui
micahsuomi Aug 27, 2020
6e15f97
deleted yarn.lock
micahsuomi Aug 27, 2020
7faebb0
added route for like comment and react components
micahsuomi Aug 31, 2020
39545b6
added sorted by likes and comments
micahsuomi Sep 1, 2020
7ab4745
adjusted styling
micahsuomi Sep 2, 2020
6219609
changed nav icons, added most liked and commented pics, adjusted styling
micahsuomi Sep 3, 2020
faac496
adjusted styling
micahsuomi Sep 3, 2020
a5206e6
untracked node_modules
micahsuomi Sep 4, 2020
d371e90
added controllers, actions and reducers for user and photos
micahsuomi Sep 30, 2020
802273c
fixed middleware on routes
micahsuomi Oct 2, 2020
79725db
improving edit comments, routes, changing actions to async functions
micahsuomi Oct 28, 2020
412b0d0
adjusting controllers, fixing users and user edit
micahsuomi Oct 30, 2020
0159d12
fixing user update, comments, styling user api
micahsuomi Nov 3, 2020
34f5d3f
styling forms
micahsuomi Nov 3, 2020
108cdbe
code
micahsuomi Nov 3, 2020
065c373
adding tags functionality to add and edit photos
micahsuomi Nov 5, 2020
efd1ef1
fixing user page bugs
micahsuomi Nov 11, 2020
9ae575d
updating user page
micahsuomi Nov 16, 2020
2272cfa
fixing heroku commit
micahsuomi Nov 16, 2020
c2473c3
added saga and localstorage to store
micahsuomi Nov 17, 2020
ac36e20
Merge pull request #4 from micahsuomi/develop
micahsuomi Nov 17, 2020
4e0964a
creating heroku app
micahsuomi Nov 17, 2020
86bc868
creating heroku app
micahsuomi Nov 17, 2020
931f320
fixing register
micahsuomi Nov 17, 2020
d82a087
styling, refactoring
micahsuomi Nov 19, 2020
c92154c
changed nav on mobile, styling
micahsuomi Dec 8, 2020
156d0a9
styling, adding content to community page
micahsuomi Dec 9, 2020
07b91ad
fixed community header
micahsuomi Dec 29, 2020
cc61a3a
deploying
micahsuomi Dec 30, 2020
5d1aa0f
deploying
micahsuomi Dec 30, 2020
3875ab5
Bump axios from 0.19.2 to 0.21.1 in /client
dependabot[bot] Jan 6, 2021
acfcab6
added favicon logo
micahsuomi Feb 8, 2021
944790b
testing server for deploy
micahsuomi Feb 8, 2021
6a50031
Merge pull request #5 from micahsuomi/dependabot/npm_and_yarn/client/…
micahsuomi Feb 8, 2021
486d5da
added favicon logo
micahsuomi Feb 8, 2021
199cbb2
Merge branch 'master' of https://github.com/micahsuomi/MYPixx
micahsuomi Feb 8, 2021
8464c7b
refactoring whole app code
micahsuomi Feb 12, 2021
0de0be6
fixing likecomment bugs and components
micahsuomi Feb 12, 2021
36f0130
styling comment section
micahsuomi Feb 13, 2021
36126da
styling comment section
micahsuomi Feb 13, 2021
adb840c
added vakidator for signup
micahsuomi Feb 14, 2021
f5148fe
implementing typescript on backend
micahsuomi Feb 14, 2021
0ee1317
Bump bl from 1.2.2 to 1.2.3 in /fast-track-5-typescript-men-boilerplate
dependabot[bot] Feb 14, 2021
4a87019
Bump ini from 1.3.5 to 1.3.8 in /fast-track-5-typescript-men-boilerplate
dependabot[bot] Feb 14, 2021
9138cc3
Bump dot-prop in /fast-track-5-typescript-men-boilerplate
dependabot[bot] Feb 14, 2021
601fa9c
Bump decompress in /fast-track-5-typescript-men-boilerplate
dependabot[bot] Feb 14, 2021
1905d0c
remove all ts backend files to fix repo
micahsuomi Feb 15, 2021
c17a82b
fixed bug on like comment, added comment reply and like reply, proptypes
micahsuomi Feb 17, 2021
384fa50
adding proptypes
micahsuomi Feb 17, 2021
2d5c149
adding emoji components
micahsuomi Feb 18, 2021
852c90f
adding emoji components
micahsuomi Feb 18, 2021
363b626
fixing comments section
micahsuomi Feb 19, 2021
7f5201b
fixing comment replies styling and functionality
micahsuomi Feb 19, 2021
9870f65
fixing comment replies styling and functionality
micahsuomi Feb 19, 2021
82e857f
fixing bugs on edit user
micahsuomi Feb 22, 2021
ec46051
fixing style and functionality on viephoto and edit user
micahsuomi Feb 22, 2021
f9d2d62
created userphoto component, adjusted photo item, changed styling
micahsuomi Feb 24, 2021
17ddc91
refactoring
micahsuomi Feb 24, 2021
9e9ca53
refactoring
micahsuomi Feb 24, 2021
cb2e2a2
refactoring
micahsuomi Feb 24, 2021
6a0d7f6
refactoring
micahsuomi Feb 25, 2021
77b959d
refactoring
micahsuomi Feb 25, 2021
2e27fd1
refactoring
micahsuomi Feb 25, 2021
b9eba31
refactoring
micahsuomi Feb 26, 2021
e6e7723
refactoring
micahsuomi Feb 26, 2021
6108eb8
added select category functionality
micahsuomi Feb 28, 2021
b5bded6
added select category functionality
micahsuomi Feb 28, 2021
160d9bf
added select category functionality
micahsuomi Feb 28, 2021
9b30d1d
fixing links
micahsuomi Mar 1, 2021
fa082ee
fixed bug on login and register errors
micahsuomi Mar 1, 2021
28444d9
fixed bug on login and register errors
micahsuomi Mar 1, 2021
ed73a15
added forgot and reset password
micahsuomi Mar 3, 2021
63db7e8
styling forms
micahsuomi Mar 3, 2021
6a2356b
Delete .env
micahsuomi Mar 4, 2021
8438bc8
Delete .env
micahsuomi Mar 4, 2021
d598faa
resolve confilcts
micahsuomi Mar 4, 2021
b4a672c
Merge branch 'dependabot/npm_and_yarn/fast-track-5-typescript-men-boi…
micahsuomi Mar 4, 2021
38e61e0
Merge pull request #9 from micahsuomi/dependabot/npm_and_yarn/fast-tr…
micahsuomi Mar 4, 2021
a7ca27b
Merge pull request #8 from micahsuomi/dependabot/npm_and_yarn/fast-tr…
micahsuomi Mar 4, 2021
b19105f
Merge pull request #7 from micahsuomi/dependabot/npm_and_yarn/fast-tr…
micahsuomi Mar 4, 2021
e2e3d2a
testing .env removal
micahsuomi Mar 4, 2021
23d6d51
fixing vulnerability issues
micahsuomi Mar 4, 2021
2a553cf
switched to sendgrid to send password reset email
micahsuomi Mar 4, 2021
7cb27a4
switched to sendgrid to send password reset email
micahsuomi Mar 4, 2021
861ff0b
changing proxy
micahsuomi Mar 4, 2021
dc24eb9
changing proxy
micahsuomi Mar 4, 2021
3e37bd1
refactoring
micahsuomi Mar 5, 2021
c297319
testing removal of .env file
micahsuomi Mar 8, 2021
d2af322
added google-auth login
micahsuomi Mar 9, 2021
109c992
refactoring
micahsuomi Mar 10, 2021
b7bece5
fixing urls
micahsuomi Mar 10, 2021
cd8945f
fixing urls
micahsuomi Mar 10, 2021
e44043b
fixing urls for axios
micahsuomi Mar 10, 2021
bd78348
fixing proxy urls
micahsuomi Mar 10, 2021
ffea1bf
testing proxy
micahsuomi Mar 10, 2021
ef31536
testing proxy
micahsuomi Mar 10, 2021
86ad4b8
refactoring
micahsuomi Mar 12, 2021
b07ff07
refactoring
micahsuomi Mar 12, 2021
e65b239
testing google-auth
micahsuomi Mar 12, 2021
e641ff4
fixing heroku bugs
micahsuomi Mar 12, 2021
18a57ce
switching branch
micahsuomi Mar 12, 2021
a78c62c
adding readme-info
micahsuomi Mar 12, 2021
6dd7a52
chore: update dependencies due to security issue
micahsuomi Apr 12, 2021
2292b67
chore: fixing conflics for merge develop
micahsuomi Apr 13, 2021
9208cf3
Merge branch 'develop' into update/update-json
micahsuomi Apr 13, 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
58 changes: 40 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,45 @@
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz
*.swp

# dependencies
/node_modules
/.pnp
.pnp.js
pids
logs
results
tmp

# testing
/coverage
# Build
public/css/main.css

# production
/build
# Coverage reports
coverage

# misc
# API keys and secrets
.env
.env.example

# Dependency directory
node_modules
bower_components

# Editors
.idea
*.iml

# OS metadata
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local

npm-debug.log*
yarn-debug.log*
yarn-error.log*
Thumbs.db

# Ignore built ts files
dist/**/*

# ignore yarn.lock
yarn.lock

*.swo
*.swp
101 changes: 53 additions & 48 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,73 @@
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
# MYPixx MERN APP (React Js, Redux, Sass, MongoDB, ExpressJS, NodeJS, JWT, Google Auth)
MYPixx is a social media art gallery where users can register and share their artwork

## Available Scripts
# Table of contents:

In the project directory, you can run:
- [Overview](#overview)
- [Tech Stack Used](#tech-stack-used)
- [Sign Up](#sign-up)
- [Sign In](#sign-in)
- [User Profile](#user-profile)
- [Add, edit, delete pictures](#add-edit-delete-pictures)
- [Community](#community)
- [Likes and Comments](#likes-and-comments)
- [Database](#database)
- [Models](#models)
- [Deployment](#deployment)

### `yarn start`

Runs the app in the development mode.<br />
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
# Overview
MYPixx is a social media art sharing app for art fanatics. Users can register an account or sign in with Google, create their own gallery work, update their profile, edit, delete their pictures, comment or like other users' work.

The page will reload if you make edits.<br />
You will also see any lint errors in the console.
![Home Page UI](./readme-imgs/mypixx_home.png)

### `yarn test`
# Tech Stack Used
- JavaScript
- Sass
- React Js
- Redux
- Axios
- Node Js
- Express
- Mongo DB
- Mongoose
- JSON Web Tokens
- Google Auth

Launches the test runner in the interactive watch mode.<br />
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
# Sign Up
Users can register on MYPixx creating a new account. The app uses React validators to check proper input filling and checks whether users are already registered.

### `yarn build`
![Sign Up](./readme-imgs/mypixx_register.png)

Builds the app for production to the `build` folder.<br />
It correctly bundles React in production mode and optimizes the build for the best performance.
# Sign In
Users can sign in either after creating a new account or directly sign in using Google authentication. In case a user signs in with Google, a new User model will be created the first time the user signs in. Both sign in use JSON Web Tokens for authentication.

The build is minified and the filenames include the hashes.<br />
Your app is ready to be deployed!
![Sign In](./readme-imgs/mypixx_login.png)

See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
# User Profile
Users can view and edit their profile, switch view and check their own photos. Users can edit details such as personal info or medium used in their artwork (i.e. painting, photography, digital art). The app checks whether a user is signed in as Google user, and doesn't allow Google users to update their profile.

### `yarn eject`
![User Profile](./readme-imgs/mypixx_user.png)

**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
# Add, edit, delete pictures
Only signed in and authorized users can add, edit or delete their own artwork. A guest user with no registered account or Google authentication can still view users' profiles and artwork.

If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
![Add, edit, delete pictures](./readme-imgs/mypixx_viewphoto.png)

Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
# Community
The community page offers an overview of users, most commented and most likes pictures. It is also accessible to guest users.

You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
![Community](./readme-imgs/mypixx_community.png)

## Learn More
# Likes and Comments
Register users can like and comment on each other's other artwork, reply to comments, like comments and comment replies. When adding comment users can use emojis thanks to the emoji-mart React library.

You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
![Likes and Comments](./readme-imgs/mypixx_comments.png)
![Likes and Comments](./readme-imgs/mypixx_emoji.png)
![Likes and Comments](./readme-imgs/mypixx_likes.png)

To learn React, check out the [React documentation](https://reactjs.org/).
# Deployment
The app is deployed on Heroku and can be found at the following link: https://mypixx.herokuapp.com/

### Code Splitting

This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting

### Analyzing the Bundle Size

This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size

### Making a Progressive Web App

This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app

### Advanced Configuration

This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration

### Deployment

This section has moved here: https://facebook.github.io/create-react-app/docs/deployment

### `yarn build` fails to minify

This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
## License
Copyright (c) Michele Zucca Web Dev
1 change: 1 addition & 0 deletions client/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

# misc
.DS_Store
.env
.env.local
.env.development.local
.env.test.local
Expand Down
Loading