Code

Merge 1#33

Code

Open

Pegasusor001 wants to merge 107 commits intoNimaBoscarino:masterNimaBoscarino/react-rails-boilerplate:masterfrom aeunderhill:merge_1aeunderhill/final_project:merge_1Copy head branch name to clipboard

+44,887-16,784

Commits

Commits on Aug 2, 2021

• intial commit

  aeunderhill

  committed
  9a84172

• Senay

  Senayson

  committed
  fc4ae0a

• finish setup the env

  Pegasusor001

  committed
  f06b156

• Senay setup

  Senayson

  committed
  75bacd5

• Create database tables

  Senayson

  committed
  a4ebead

• Create fake data for client and artist

  Senayson

  committed
  543a5fb

Commits on Aug 3, 2021

• Able to render data via json to frontend

  Senayson

  committed
  d08237d

• add content of artist see request, accept request and update request

  Pegasusor001

  committed
  e8a4e18

• mer with from-end artist but jason file problem

  Pegasusor001

  committed
  4603c04

• Create artist/client authentication methods

  Senayson

  committed
  2cd1d6d

• merge with front end artist successfully

  Pegasusor001

  committed
  4f8098a

• Add fake date categories/artists_categories

  Senayson

  committed
  2530cbe

• Create sessions controller create destroy methods

  Senayson

  committed
  be14124

• adding login, home, about, register, gallery pages

  aeunderhill

  committed
  88b1d04

• add filter help method

  Pegasusor001

  committed
  27052b8

• request will be changed and muted when artist accept the request

  Pegasusor001

  committed
  70ddd97

Commits on Aug 4, 2021

• add filter bar

  Pegasusor001

  committed
  fbc332b

• Create CRUD for artists/clients

  Senayson

  committed
  5c78afe

• Able to serve all tables to react server

  Senayson

  committed
  ef6b8d0

• add gallery, login, register pages

  aeunderhill

  committed
  28ece08

• CRUD for all except messages

  Senayson

  committed
  6d714bd

• Merge branch 'master' into senai

  Senayson

  committed
  568f2f1

• can mark request when accepted, confirm, and finish

  Pegasusor001

  committed
  1a31ca2

• further setting up and debugging of gallery, login, register, home

  aeunderhill

  committed
  fb0466b

• updating gallery page to allow for information and icon on the image

  aeunderhill

  committed
  12deb4c

• updating gallery page

  aeunderhill

  committed
  ec8b373

• merge conflict changes

  aeunderhill

  committed
  d30e674

• try to get adams input

  Pegasusor001

  committed
  8d3dc9a

• after merge

  Pegasusor001

  committed
  79844c7

• solve merge problem

  Pegasusor001

  committed
  f247fe0

• solve merge problem

  Pegasusor001

  committed
  0786396

• add route, start styling

  Pegasusor001

  committed
  1287047

Commits on Aug 5, 2021

• A

  Senayson

  committed
  bd08623

• Stage

  Senayson

  committed
  b85a56c

• Install react_router dom

  Senayson

  committed
  a610aa9

• Install react router dom

  Senayson

  committed
  c6bb600

• style the dashboard with css

  Pegasusor001

  committed
  04bdf60

• add 2

  Pegasusor001

  committed
  91fa99f

• merge with style

  Pegasusor001

  committed
  6bdf3fc

• merge with master

  Pegasusor001

  committed
  e3ba32e

• Merge pull request #3 from aeunderhill/feature/styling_2

  Show description for 4359ea3
  Pegasusor001

  authored
  4359ea3

• Merge branch 'master' of github.com:aeunderhill/final_project

  Senayson

  committed
  6c11a23

• Update

  Senayson

  committed
  90a0421

• Package.json

  Senayson

  committed
  deb791d

• Merge branch 'master' into senai

  Senayson

  committed
  4dfc2df

• Sort promise problem

  Senayson

  committed
  b8511ed

• Sort Promise problem

  Senayson

  committed
  5300788

• rename component

  Pegasusor001

  committed
  b536ab0

• Add comments on Lun's work

  Senayson

  committed
  1845a01

Commits on Aug 6, 2021

• Create a nested review under artist

  Senayson

  committed
  493e0a5

• Create function to filter table by columns and id

  Senayson

  committed
  f93d2e4

• Implement filter function on different tables

  Senayson

  committed
  0f3e4c3

• "Update"

  Senayson

  committed
  e0f6721

• add tag to dashboard

  Pegasusor001

  committed
  473e07d

• add backend

  Pegasusor001

  committed
  4047ad6

• add backend code

  Pegasusor001

  committed
  539520a

• Merge pull request #4 from aeunderhill/feature/styling_3

  Show description for 5335136
  Pegasusor001

  authored
  5335136

• minor change in index

  Pegasusor001

  committed
  aa91909

Commits on Aug 7, 2021

• Before useContext creation

  Senayson

  committed
  69c8d71

• Add column rating to artist remove column title from reviews

  Senayson

  committed
  a094cf8

• Change the data structure to contain objects with key-object pair

  Senayson

  committed
  451473a

• Minor changes to pages

  Senayson

  committed
  1730697

Commits on Aug 8, 2021

• No changes

  Senayson

  committed
  e30d823

Commits on Aug 9, 2021

• StateContext rectify

  Senayson

  committed
  88b9602

• Merge branch 'master' into senai

  Senayson

  committed
  334244d

• styling the dashboards

  Pegasusor001

  committed
  1547d94

• REQUESTS post request implement

  Senayson

  committed
  8a423f1

• Merge feature/usercommission to senai

  Senayson

  committed
  44a628e

• Merge remote-tracking branch 'refs/remotes/origin/master'

  Senayson

  committed
  2664684

• Merge branch 'senai'

  Senayson

  committed
  d854ee8

• Delete stateProvider.js.jsx duplicate of stateProvider.jsx

  Senayson

  committed
  4cfba39

• Usercommission changes

  Senayson

  committed
  9351a0d

• Merge branch 'feature/User-Commission' into senai

  Senayson

  committed
  9da69db

• Merge branch 'senai'

  Senayson

  committed
  ab6b2bd

Commits on Aug 10, 2021

• backup

  Pegasusor001

  committed
  a58daf5

• login and register

  Pegasusor001

  committed
  3aa9f11

• Implement accept request to db n to state"

  Senayson

  committed
  1b1f2ec

• merge

  Senayson

  committed
  aa2d597

• add login, logout session and css

  Pegasusor001

  committed
  ccb7405

• add login, logout session and css

  Pegasusor001

  committed
  67b5ae1

• Merge branch 'master' of github.com:aeunderhill/final_project

  Pegasusor001

  committed
  d6b9a20

• final version

  Pegasusor001

  committed
  afb58e3

Commits on Aug 11, 2021

• connect with backend on artist request page

  Pegasusor001

  committed
  f82f437

• connect with backend on artist request page

  Pegasusor001

  committed
  694104d

• connect with backend on artist request page

  Pegasusor001

  committed
  0b85b4e

• add artistrequest

  Pegasusor001

  committed
  bf817bc

• add artistrequest

  Pegasusor001

  committed
  61b6503

• add artistrequest

  Pegasusor001

  committed
  11e9a4f

• Merge pull request #5 from aeunderhill/feature/session_5

  Show description for 97c7c66
  Pegasusor001

  authored
  97c7c66

• connect to backend for all

  Pegasusor001

  committed
  be53b5f

• all functions done verions

  Pegasusor001

  committed
  7be54e9

• cleanup seeds and code

  Pegasusor001

  committed
  e3693f5

• Merge branch 'master' into merge_1

  Pegasusor001

  committed
  de8c4b0

• Merge 1 (#6)

  Show description for bd7c832
  Pegasusor001

  authored
  bd7c832

• Adam css2 (#7)

  Show description for 33d1626
  aeunderhill

  authored
  33d1626

• Align UserCommission form

  Senayson

  committed
  e346d74

• Update

  Senayson

  committed
  7498bed

• Senayson

  committed
  71eda7a

• add redirect function to login and commission

  Pegasusor001

  committed
  892b1f0

• add style

  Pegasusor001

  committed
  133d479

• add styling

  Pegasusor001

  committed
  9e31d36

• Update User Account

  Senayson

  committed
  12df3b0

• add commision style

  Pegasusor001

  committed
  69da273

• merge the css

  Pegasusor001

  committed
  15ea92c

• backup

  Pegasusor001

  committed
  bc72a36

• Merge branch 'master' into merge_1

  Pegasusor001

  committed
  16164b2

Commits on Aug 12, 2021

• after merge with CSS from senay and adam

  Pegasusor001

  committed
  84176a1