Code

Group 8 Final Project Submission#47

Code

Open

ajwhitney23 wants to merge 140 commits intocs4241-21a:maincs4241-21a/final_project:mainfrom ajwhitney23:mainajwhitney23/final_project:mainCopy head branch name to clipboard

+12,254-51

Commits

Commits on Sep 27, 2021

• added proposal

  ajwhitney23

  committed
  d998b6a

Commits on Oct 2, 2021

• added starter server code

  ajwhitney23

  committed
  28a33de

Commits on Oct 4, 2021

• Folder Configuration

  NickFrangie

  committed
  f8c4def

Commits on Oct 5, 2021

• Setup React with Server

  NickFrangie

  committed
  55b3bd8

• fixed db connection issues

  ajwhitney23

  committed
  1c1854a

• fix up replace

  ajwhitney23

  committed
  d5d4f06

• Merge pull request #1 from ajwhitney23/react

  Show description for df53884
  ajwhitney23

  authored
  df53884

Commits on Oct 6, 2021

• Setup skeleton code

  NickFrangie

  committed
  e85b257

• Merge branch 'main' into backend

  ajwhitney23

  committed
  fe2f0ca

• removed debug code

  ajwhitney23

  committed
  df56c2f

• Merge pull request #2 from ajwhitney23/backend

  Show description for 4cf72ed
  ajwhitney23

  authored
  4cf72ed

• fetch pref data for user w/ ID 1 for now, until login is implemented

  ajwhitney23

  committed
  bc91b11

• remove console.log

  ajwhitney23

  committed
  53198be

• updated server to parse json when received

  ajwhitney23

  committed
  ac234da

• Added images from Genshin

  Show description for aa9fe7b
  lockeanddemosthenes

  committed
  aa9fe7b

• Merge branch 'main' of https://github.com/ajwhitney23/final_project into main

  lockeanddemosthenes

  committed
  b5146f0

• Merge pull request #3 from ajwhitney23/dbinteraction

  Show description for 837c9ba
  lockeanddemosthenes

  authored
  837c9ba

• Merge branch 'main' of https://github.com/ajwhitney23/final_project into main

  lockeanddemosthenes

  committed
  0f896fa

Commits on Oct 7, 2021

• Merge pull request #4 from ajwhitney23/images

  Show description for c7c48ee
  ajwhitney23

  authored
  c7c48ee

• updated server to use session id, added login button, had to set redirect to http://localhost since sendfile was setting to https

  ajwhitney23

  committed
  c2a8ef3

• updated server and mainroute for user handling

  ajwhitney23

  committed
  e80be85

• removed reference to localhost

  ajwhitney23

  committed
  6eea118

• removed localhost references in react

  ajwhitney23

  committed
  6426ba9

• changed logout to not redirect

  ajwhitney23

  committed
  907805f

• remove login.md

  ajwhitney23

  committed
  f2fc1fd

Commits on Oct 8, 2021

• Merge pull request #5 from ajwhitney23/login

  Show description for f7b8237
  ajwhitney23

  authored
  f7b8237

• updated login to init char/weapon/artifact prefs along with added button to save prefs into db

  ajwhitney23

  committed
  4b242c9

• Merge pull request #6 from ajwhitney23/loadonlogin

  Show description for c6cced6
  lockeanddemosthenes

  authored
  c6cced6

• moved all the images into static/img

  lockeanddemosthenes

  committed
  c9e6649

• image directory fixed

  Show description for 692ca84
  lockeanddemosthenes

  committed
  692ca84

• addPref Functionality

  NickFrangie

  committed
  2bc7a2b

• wowah menu button

  lockeanddemosthenes

  committed
  266fd52

• slight pretty changes

  lockeanddemosthenes

  committed
  e8d241a

Commits on Oct 9, 2021

• removePref, updatePref Functionality

  NickFrangie

  committed
  06f2760

• Demo functionality

  NickFrangie

  committed
  a82ae31

• Merge pull request #8 from ajwhitney23/select-helpers

  Show description for 049a8d7
  ajwhitney23

  authored
  049a8d7

• wip

  ajwhitney23

  committed
  a5ff592

• moved menucontainer into mainroute

  lockeanddemosthenes

  committed
  333f0e6

• farming display now sets days farm and locations

  ajwhitney23

  committed
  e675485

• Reorganize HTML order & file structure

  NickFrangie

  committed
  ba98442

• Merge branch 'main' into flyout

  NickFrangie

  committed
  9ea4136

• Merge pull request #7 from ajwhitney23/flyout

  Show description for fcbd43c
  NickFrangie

  authored
  fcbd43c

• adding farming display, needs api data to test

  ajwhitney23

  committed
  e21cc10

• Merge branch 'main' into calendar

  ajwhitney23

  committed
  9bd7f6e

• Added json files from database, started interface

  

  AzinxtheOnix

  committed
  291a6ed

• working calendar, needs data

  ajwhitney23

  committed
  8e5a1bf

• Merge pull request #9 from ajwhitney23/calendar

  Show description for 6a280d7
  lockeanddemosthenes

  authored
  6a280d7

• automatically updates db

  ajwhitney23

  committed
  6c1a478

• now automatically updates, and cleanup/ error prevention

  ajwhitney23

  committed
  619dd55

• added a reset button

  ajwhitney23

  committed
  e886650

• all img names fixed, added some missing imgs, removed unnecessary imgs

  lockeanddemosthenes

  committed
  0f40aac

• farmables folder

  lockeanddemosthenes

  committed
  055faa1

• Merge pull request #10 from ajwhitney23/automaticallysave

  Show description for 1b90fb1
  lockeanddemosthenes

  authored
  1b90fb1

• Merge pull request #11 from ajwhitney23/imgNameFix

  Show description for 8bd8023
  NickFrangie

  authored
  8bd8023

• ArtifactProps complete, issues with accessing

  

  AzinxtheOnix

  committed
  9c1639b

• SelectPrefButton added

  NickFrangie

  committed
  7a3a8ae

• SelectPrefButton content def to children

  NickFrangie

  committed
  19d0157

• Merge pull request #12 from ajwhitney23/select-buttons

  Show description for 1bdaa64
  AstroSeer

  authored
  1bdaa64

• Merge pull request #13 from ajwhitney23/main

  Show description for cdd5df8
  AstroSeer

  authored
  cdd5df8

• updated to most recent main

  ajwhitney23

  committed
  05291ff

• updated data to condense weapons and compile

  ajwhitney23

  committed
  c9746b8

• updated data to be fetched

  ajwhitney23

  committed
  6865c4f

• calendar display pretty :)

  lockeanddemosthenes

  committed
  220c9b7

• commented out dummy data

  lockeanddemosthenes

  committed
  8c42ffe

• loading json

  ajwhitney23

  committed
  027430e

• debug prints

  ajwhitney23

  committed
  0449419

• Menu has working button to close

  AstroSeer

  committed
  90eb948

Commits on Oct 10, 2021

• Merge pull request #14 from ajwhitney23/farmingdisplay

  Show description for 0f9571b
  ajwhitney23

  authored
  0f9571b

• Update Menu.jsx

  AstroSeer

  committed
  abdd2f2

• Merge branch 'menu-button'

  AstroSeer

  committed
  a916284

• Merge branch 'main' into api

  ajwhitney23

  committed
  be8439c

• Revert "Merge branch 'main' into api"

  Show description for 32d2a5a
  NickFrangie

  committed
  32d2a5a

• fixed imports

  ajwhitney23

  committed
  5b9ff31

• updates to debug

  ajwhitney23

  committed
  01a7bd4

• removed farmable props

  ajwhitney23

  committed
  b4c5a9d

• forgot one spot

  ajwhitney23

  committed
  c3f90c7

• updated locations

  ajwhitney23

  committed
  c54165d

• Used Setters

  NickFrangie

  committed
  271336a

• updated api/select to now functional state

  ajwhitney23

  committed
  19b5d58

• Merge pull request #16 from ajwhitney23/api

  Show description for 0bb907a
  NickFrangie

  authored
  0bb907a

• update filters to now properly show data

  ajwhitney23

  committed
  9a1a15d

• Merge pull request #17 from ajwhitney23/dayfilters

  Show description for 7a6bc15
  NickFrangie

  authored
  7a6bc15

• Fixed Button Display on Reload

  NickFrangie

  committed
  7bc49b1

• Merge branch 'main' into select-button-bf

  NickFrangie

  committed
  15d8f82

• Merge pull request #18 from ajwhitney23/select-button-bf

  Show description for 8775540
  ajwhitney23

  authored
  8775540

• Readded window redirect

  NickFrangie

  committed
  87538df

• andrew got smarted today

  ajwhitney23

  committed
  6cc461c

• SelectButtons work after refresh

  NickFrangie

  committed
  427b267

• Logout Redirect

  NickFrangie

  committed
  c7bd20a

• Merge pull request #19 from ajwhitney23/out-of-sync

  Show description for 1dea9aa
  NickFrangie

  authored
  1dea9aa

• all img names fixed

  lockeanddemosthenes

  committed
  37e7490

• display names fixed

  lockeanddemosthenes

  committed
  8b8798b

• add weapon & element to characters

  lockeanddemosthenes

  committed
  af63fdc

• favicon???? may need to be fixed

  lockeanddemosthenes

  committed
  5450d8f

• adjusted brightness of weapontype icon

  lockeanddemosthenes

  committed
  5922ad6

• fixed color of weapontype icon

  lockeanddemosthenes

  committed
  19fc5f3

• make images in CharacterSelect a little bigger

  lockeanddemosthenes

  committed
  26379ac

• Revert "make images in CharacterSelect a little bigger"

  Show description for 9f8e271
  lockeanddemosthenes

  committed
  9f8e271

• Revert "Revert "make images in CharacterSelect a little bigger""

  Show description for 10ccb6f
  lockeanddemosthenes

  committed
  10ccb6f

• we are out here, making things pretty.

  Show description for c8de985
  lockeanddemosthenes

  committed
  c8de985

• Tabs in Menu

  AstroSeer

  committed
  4c5093c

• Added components to tabs

  AstroSeer

  committed
  933af81

• Merge branch 'main' into menu-button

  ajwhitney23

  committed
  ed25f7b

• updated menu to pass in tsx

  ajwhitney23

  committed
  881d560

• minimal viable product

  ajwhitney23

  committed
  37a32a0

• update formatting

  ajwhitney23

  committed
  ffe6893

• update mainroute to remove comment code

  ajwhitney23

  committed
  faa0ccd

• package.json change

  

  AzinxtheOnix

  committed
  89fbd6c

• Merge branch 'menu-button' of https://github.com/ajwhitney23/final_project into menu-button

  

  AzinxtheOnix

  committed
  c203a62

• Merge pull request #20 from ajwhitney23/menu-button

  Show description for 9c9776b
  ajwhitney23

  authored
  9c9776b

• Merge branch 'main' into display-updates

  ajwhitney23

  committed
  443ed97

• Format Readme for Assignment

  NickFrangie

  committed
  56a2108

• andrew whitney readme update

  ajwhitney23

  committed
  37bfdaf

• Nick sections filled

  NickFrangie

  committed
  5bf2742

• some styling for selection now that the menu exists

  lockeanddemosthenes

  committed
  65b28c1

• Errica sections filled

  lockeanddemosthenes

  committed
  bbfbd21

• updated andrew whitney readme

  ajwhitney23

  committed
  675dc03

• Merge branch 'readme' of github.com:ajwhitney23/final_project into readme

  ajwhitney23

  committed
  85702d3

• updated readme

  ajwhitney23

  committed
  6bdd1f3

• started answering question 1

  lockeanddemosthenes

  committed
  86cf066

• Merge branch 'readme' of https://github.com/ajwhitney23/final_project into readme

  lockeanddemosthenes

  committed
  a0d0d49

• HOT SCROLLBAR FRESH OFF THE KBBQ GRILL

  lockeanddemosthenes

  committed
  2915af3

• made tabs pretty lol

  lockeanddemosthenes

  committed
  f8ba40b

• slight img padding so i stop screaming and hitting my head

  lockeanddemosthenes

  committed
  368277b

Commits on Oct 11, 2021

• Matt's section added and first part additions

  AstroSeer

  committed
  f08c573

• moving button over one

  ajwhitney23

  committed
  b9c2106

• Merge pull request #21 from ajwhitney23/display-updates

  Show description for ecfc11d
  ajwhitney23

  authored
  ecfc11d

• Menu pushing works

  

  AzinxtheOnix

  committed
  8863ea9

• formatting updates i think

  lockeanddemosthenes

  committed
  81a2f96

• more formatting...

  lockeanddemosthenes

  committed
  e7e2f6b

• Merge branch 'main' of https://github.com/ajwhitney23/final_project into menu-push

  

  AzinxtheOnix

  committed
  fa20061

• Merge pull request #22 from ajwhitney23/menu-push

  Show description for b52889b
  AstroSeer

  authored
  b52889b

• SPELLING ERROR RAAAH

  lockeanddemosthenes

  committed
  14328ae

• Michael ~ Added my section

  

  AzinxtheOnix

  committed
  b2c7667

• teeny tiny menu button changes

  lockeanddemosthenes

  committed
  cf5d3fc

• Merge pull request #23 from ajwhitney23/menu-butt

  Show description for bda0103
  ajwhitney23

  authored
  bda0103

• added link

  ajwhitney23

  committed
  9ce283e

• update 2

  ajwhitney23

  committed
  d22dfde

• Video Link Added

  NickFrangie

  committed
  6e42c94

• Merge pull request #24 from ajwhitney23/readme

  Show description for 821148c
  ajwhitney23

  authored
  821148c