forked from PicWorthy/PicWorthy
-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathdlfk
1598 lines (1076 loc) · 46.4 KB
/
dlfk
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
[33mcommit 367950065e908b42b9e2065f2fe4618ceb230a4e[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 11:09:53 2018 -0700
fix bug with going from upload page to user page
[33mcommit c5a500b5cc3e7b4e502bc832092be5e3f1c76d96[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 08:44:48 2018 -0700
ready for pull request
[33mcommit 16fb0843eb44fb7d2131ad85b4253bdb5dd42470[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 08:27:52 2018 -0700
revert back to basic landing page
[33mcommit 7becb00aced20c162ce47bf8ded329cadd2ea496[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 08:07:31 2018 -0700
uncomment validation for dropping pin
[33mcommit 621b3946dc4c27592baeb5b54e0ae826c86a2fe5[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 08:06:48 2018 -0700
fix bug with reloading user
[33mcommit 9f7206f0a85a429ab4b00b6cb77dda43cdcc56a2[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 07:31:31 2018 -0700
refactor user and likes into locations
[33mcommit 79b35bdf6dce267fb515c7e78fa90c9d285ddc31[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 06:23:53 2018 -0700
fix bug with react router on reload
[33mcommit c7d293baa0eeb2ee5313208285d08a4284cbb3b1[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 06:08:51 2018 -0700
add rotate pics to likes and userpage and add likes to reactRouter
[33mcommit 8d466fcc46400ec2c3b9d3dc02e599a85b94acbc[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 05:38:02 2018 -0700
likes page
[33mcommit 81c336efab734969e36d2f2bc8696a32eb531f4c[m
Author: William Cory <[email protected]>
Date: Mon Apr 23 05:16:35 2018 -0700
complete locations.jsx
[33mcommit 4dc103121310291a1a234ee8ab3a872595e6599c[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 22:49:10 2018 -0700
ready to do pull request
[33mcommit 5f45fed639692cae8c070ebbe8fe327c966e483b[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 15:12:05 2018 -0700
make pics rotate the correct direction
[33mcommit ed819de950802e8cdc4227b12f1b0411aa39b5b9[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 14:29:01 2018 -0700
make map move to location on clicks
[33mcommit 3b8bd7799ab743e804a89efebaa78177a40c01b2[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 13:33:40 2018 -0700
add clickable pins to map
[33mcommit f83188344a598275da966db3209697bbcf512552[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 13:02:11 2018 -0700
make a fire landing page
[33mcommit b2c11f56b31071dfa8f39787e4225982a6804795[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 10:43:52 2018 -0700
make details component work completely and style clicked on cards
[33mcommit 904fdbd496594de86cd5f33024ecb5b12f46cca3[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 08:27:19 2018 -0700
debug pic showing
[33mcommit 431fac06a4f6a0eb5e00f8c720695eef3c089869[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 08:15:44 2018 -0700
add link to card, add pass props down to details (untested)
[33mcommit df00d0d5ca40c963ca1a4d44004f6c3872a1f770[m
Merge: d7c6b5e 62960fd
Author: William Cory <[email protected]>
Date: Sun Apr 22 07:15:25 2018 -0700
fix merge conflict
[33mcommit d7c6b5e149f93c6a7ad5dc71fe92a397e0f32117[m
Author: William Cory <[email protected]>
Date: Sun Apr 22 07:11:13 2018 -0700
preparing for another merge
[33mcommit 7f9a9292d2073fe2f6aff7b38cdbd27f5dd3c182[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 22:01:07 2018 -0700
export default classes
[33mcommit fbd7ff75b4db0d822fcb1fc9ae76a9fa3c4ecdc8[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 21:47:02 2018 -0700
move getuserlocation to helpers
[33mcommit dfe83d919c7e4ee3b43aa53edd70b9859aab3f80[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 21:32:09 2018 -0700
refactor update displayamount
[33mcommit 62960fd9745df6a1c6f9afb42f6404da10d51994[m
Merge: e4a2f0a 1cd26cd
Author: William Cory <[email protected]>
Date: Sun Apr 22 00:21:06 2018 -0400
Merge pull request #81 from ceyuen/favorites
Added details component to likes and user pages
[33mcommit 7b5dc94ca762b47ea00f8195ffb2455b92dd79a0[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 21:12:02 2018 -0700
get location page halfway working and refactored
[33mcommit 3d54c04a1186ddb16df0cbb4ea1c12ef03adab72[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 16:44:51 2018 -0700
add billabong to allowed urls
[33mcommit f1a94509b55c938f61014d27b9d81af11b0dd597[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 16:36:54 2018 -0700
create api to get closest pics
[33mcommit b9d0cfe990978b655e6d46fd2eadd7d0f2526dc5[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 16:10:28 2018 -0700
refactor database
[33mcommit b739d0cbb5be3d845452ea3ee488678abf73feec[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 15:52:47 2018 -0700
refactor server routing
[33mcommit 1cd26cd15755583ae99481a55267adaceb88a27f[m
Author: Christina <[email protected]>
Date: Sat Apr 21 14:11:13 2018 -0700
Added details component to likes and userpage
[33mcommit 5bee771f1566d51fbf17d012261ffab839ad16d2[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 13:35:30 2018 -0700
refactor details (broken)
[33mcommit f85c43bc66c9ae2bb3864b53c2a24ea3a9cbe779[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 13:15:14 2018 -0700
refactor footer and landing
[33mcommit 5cfc4d292aed5495ece409985f0a61941679798a[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 13:14:12 2018 -0700
refactor landing
[33mcommit 1c35f9cdfe9c3f66ccb69241b8433e31051c9ea8[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 13:07:12 2018 -0700
complete refactor of navbar
[33mcommit e41bcac81eb99d7d74687c503c43385258ec394d[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 12:40:30 2018 -0700
factor state out of navbar
[33mcommit 43b0a46bd74d16ad98b587598193f264d47f7675[m
Merge: 132d058 e4a2f0a
Author: William Cory <[email protected]>
Date: Sat Apr 21 12:25:27 2018 -0700
merge changes
[33mcommit a4547aceb51f318eae2cd1fe8c1e3d760c080033[m
Author: Christina <[email protected]>
Date: Sat Apr 21 12:25:20 2018 -0700
Fixed bug in favorites feature
[33mcommit 132d05839e35798861b85ee5dcdc55159e3efaac[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 12:20:02 2018 -0700
preparing to merge and then refactor state
[33mcommit e4a2f0af5d596e3687cac71e4ee687b6e355c532[m
Merge: 3bca7ba 8622f1d
Author: William Cory <[email protected]>
Date: Sat Apr 21 15:03:26 2018 -0400
Merge pull request #80 from ceyuen/favorites
Likes page along with a few other things
[33mcommit 8622f1dfc7540f75c1bcd548176aad137a2979ce[m
Author: Christina <[email protected]>
Date: Sat Apr 21 11:58:31 2018 -0700
Removed react-fontawesome in favor of react-icons
[33mcommit cc6c59904814a083c1f1b4423f39409c74243622[m
Author: Christina <[email protected]>
Date: Sat Apr 21 11:47:43 2018 -0700
Changed login and signup modals.
Only Login appears in navbar now.
Link to signup is within login.
[33mcommit f44f13bf187fa023ce938d561c1d0ae158529ada[m
Author: Christina <[email protected]>
Date: Sat Apr 21 10:09:59 2018 -0700
Changede footer on upload page
[33mcommit 7fce988469a24e8ff653a547edc2b388f1415b7e[m
Author: Christina <[email protected]>
Date: Sat Apr 21 10:04:41 2018 -0700
changed map height to be dynamic on locations page.
Changed map height on upload page.
[33mcommit e441caed09f6e60eb558ad7700746ca75c8ecd92[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 09:53:50 2018 -0700
make backend save locations and fetch nearest locations
[33mcommit 8554a15d4af944153ef48d43b6e9bec0a3263e5f[m
Author: Christina <[email protected]>
Date: Sat Apr 21 09:41:32 2018 -0700
Changed details grid color
[33mcommit 86ff526f9c886ac615a1bdb79337b0925112511c[m
Author: Christina <[email protected]>
Date: Sat Apr 21 09:39:07 2018 -0700
Fixed details to be able to click next card.
Changed colors
[33mcommit 96ed3d659fbbf681c7a4228e2043d99691e1664f[m
Author: Christina <[email protected]>
Date: Sat Apr 21 09:25:08 2018 -0700
Changed imageStyle in details to always fit inside container and keep ratio
[33mcommit e8ec2044955b270265dba7d0a0257ab4cedb70f3[m
Author: Christina <[email protected]>
Date: Sat Apr 21 08:58:22 2018 -0700
changed function name in locations to renderClickedCard
[33mcommit 1100168d8332c96d05d64d6a3852b450509ec00c[m
Author: Christina <[email protected]>
Date: Sat Apr 21 08:49:11 2018 -0700
Only shows chevron arrows in row when picStatic is greater than 5
[33mcommit 1241e7ed9be653b88abe27ce5e87dcc1ac2cd349[m
Author: Christina <[email protected]>
Date: Sat Apr 21 08:36:51 2018 -0700
Fixed footer to be sticky to the bottom of page
[33mcommit a755fbe7efbce14e8077a70b8fc4b2c4b5f56295[m
Author: Christina <[email protected]>
Date: Sat Apr 21 08:07:36 2018 -0700
Removed some comments and styled navbar
[33mcommit bb951fd6edb165edf18996685325754887a7f332[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 08:05:44 2018 -0700
add geolocation to database
[33mcommit fde5227d2716be5e073be59deb58e580046b9876[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 07:22:06 2018 -0700
get user location from map
[33mcommit 331390bef9542d031c22c43255a305bd7856b0fe[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 07:05:05 2018 -0700
add validation for upload
[33mcommit 9956ee1c01aac442f6b1af6d97625b64ec238228[m
Merge: 481d6a5 3bca7ba
Author: William Cory <[email protected]>
Date: Sat Apr 21 06:40:50 2018 -0700
merging
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit 481d6a5fc222aaa1aeaa7531f45f2714835d9f08[m
Author: William Cory <[email protected]>
Date: Sat Apr 21 06:40:29 2018 -0700
about to merge
[33mcommit 5af8409b8285ba26ea4c54c805feec5fe547073d[m
Author: Christina <[email protected]>
Date: Fri Apr 20 19:42:17 2018 -0700
Working favorites function! :D
[33mcommit 1f5e132b6840dfaf2d4c20fc9a0d6cb63d3fcbbf[m
Author: Christina <[email protected]>
Date: Fri Apr 20 18:54:18 2018 -0700
Works with objectId now instead of imgurl
[33mcommit 3ddfce3d6825575ea60468a4631c44083298f985[m
Merge: 39b312d 3bca7ba
Author: Christina <[email protected]>
Date: Fri Apr 20 17:52:56 2018 -0700
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy into favorites
[33mcommit 39b312d9c7ce99c214bf88fb96bf93d5d8e1d6ba[m
Author: Christina <[email protected]>
Date: Fri Apr 20 17:44:37 2018 -0700
Working favorites feature
[33mcommit 3bca7ba9b6c60b9346c7cae51e73a8e46955e7f2[m
Merge: 35727a8 69531cf
Author: William Cory <[email protected]>
Date: Fri Apr 20 18:40:55 2018 -0400
Merge pull request #79 from roninjin10/master
add api key to google
[33mcommit 69531cf12a2cba3bb4c1905709df1807b3861f15[m
Merge: 574f594 7303459
Author: William Cory <[email protected]>
Date: Fri Apr 20 15:39:47 2018 -0700
fix conflict
[33mcommit 574f594d723d7cd6ac1b7a9a87121577a11073f1[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 15:38:59 2018 -0700
add key to clustered map
[33mcommit 35727a827031f00861135183f34d18ee7015f8ff[m
Merge: 8f2f7d3 7303459
Author: William Cory <[email protected]>
Date: Fri Apr 20 18:30:49 2018 -0400
Merge pull request #77 from roninjin10/master
just deleting the stray index.html
[33mcommit 9cd2edf396f67e75e7ad5699bf2e471c6d27c539[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 15:30:00 2018 -0700
add api key
[33mcommit 78cfcdfb15ef9ba2296617cb8b1622fcf954255a[m
Merge: 72e2753 8f2f7d3
Author: William Cory <[email protected]>
Date: Fri Apr 20 15:26:30 2018 -0700
pulling
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit 7303459736cb555de704146b48677744c3a06b59[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 15:25:42 2018 -0700
adding api key
adding api key for google
[33mcommit 8f2f7d3327485b4dbb0eba53ff9b490547cb50a7[m
Merge: a6ac081 a1e90d2
Author: Will <[email protected]>
Date: Fri Apr 20 15:06:29 2018 -0700
Merge pull request #78 from wvha/likes
changes for heroku
[33mcommit a1e90d2b04877c1af8ddf5449a68e8843e21a72b[m
Author: wvha <[email protected]>
Date: Fri Apr 20 15:02:31 2018 -0700
changes for heroku
[33mcommit 72e275332bbb66f2a4f14009bb82777b2c07b273[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 14:35:27 2018 -0700
remove upload.html
[33mcommit 0ffc878672edfefc771bd0eafb3f0b9b2d0e41b4[m
Merge: 21def0b a6ac081
Author: William Cory <[email protected]>
Date: Fri Apr 20 14:34:50 2018 -0700
merge will ha
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit a6ac0816d907b52c9635e9e2fd30166659d1458f[m
Merge: 9d59ba0 5fd0391
Author: William Cory <[email protected]>
Date: Fri Apr 20 17:34:32 2018 -0400
Merge pull request #76 from wvha/likes
not likes, but row component to pull user images
[33mcommit f272fe1e7ca00cc5ddcf3eeeedb85537fb331d95[m
Author: Christina <[email protected]>
Date: Fri Apr 20 14:25:45 2018 -0700
Pushes image src string
[33mcommit db5e3cccbfb3d67fce95684af85b951bca386b46[m
Author: Christina <[email protected]>
Date: Fri Apr 20 14:12:54 2018 -0700
patches database with details
[33mcommit 5fd0391d7865db51f4e83304a6d82440255f58a6[m
Author: wvha <[email protected]>
Date: Fri Apr 20 14:08:42 2018 -0700
updated row component to rerender based on rowtype is user
[33mcommit 21def0b1b74d0b33697c2ef0eced5930e4ac7170[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 14:08:38 2018 -0700
about to remerge after messing everythign up
[33mcommit 5cc6bff26c055cf61b45ab9b362a42b04d1b8433[m
Author: wvha <[email protected]>
Date: Fri Apr 20 14:06:39 2018 -0700
moved userpage link to require login
[33mcommit d67428ce5bf105f75275714f7105ec3556ef7a2a[m
Author: wvha <[email protected]>
Date: Fri Apr 20 13:10:52 2018 -0700
ERRORS N BUGS
[33mcommit a7e7c66f20b377b41a1c6ab21aba86fbdc306db4[m
Author: wvha <[email protected]>
Date: Fri Apr 20 11:08:39 2018 -0700
get user posts works on both sides!
[33mcommit 1c9c527a9735bf126223fbae57ed5e3f421fd8cd[m
Merge: f7f763b 9d59ba0
Author: wvha <[email protected]>
Date: Fri Apr 20 10:22:20 2018 -0700
merge conflicts
[33mcommit 10d798f8b35db3c48462210c220393749ca919c7[m
Merge: 4276111 9d59ba0
Author: William Cory <[email protected]>
Date: Fri Apr 20 10:17:55 2018 -0700
merging
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit 4276111cbd57554b18b67331b1ce85c00cd4f906[m
Author: William Cory <[email protected]>
Date: Fri Apr 20 10:17:49 2018 -0700
update googlePlaces
[33mcommit 9d59ba0866bc556d250e09bfce5e1f1c0ec2c8d2[m
Merge: ad01876 57ec62f
Author: Sam Rosenblum <[email protected]>
Date: Fri Apr 20 10:13:48 2018 -0700
Merge pull request #75 from ceyuen/styleUpload
Changes to upload page
[33mcommit 57ec62fe70beda22267b8d0497d069fc4e6e238b[m
Author: Christina <[email protected]>
Date: Fri Apr 20 09:53:15 2018 -0700
Removed comment
[33mcommit 97c7f5c42761646e0fed2e461f19c7634be2e956[m
Author: Christina <[email protected]>
Date: Fri Apr 20 09:50:26 2018 -0700
Added loading element to submit button.
Changed input of description to be text area.
[33mcommit 8cb03daed7cfc81169156ebe6b8e32df0c638cc3[m
Author: Christina <[email protected]>
Date: Fri Apr 20 00:07:41 2018 -0700
Added loading spinner
[33mcommit 35502d93936870de100e7c162baf72678c7b558f[m
Author: Christina <[email protected]>
Date: Thu Apr 19 23:48:10 2018 -0700
Changed text for when image is attached.
Added state for when image is successfully submitted
[33mcommit f7f763b406a99f6eae07c872f1f713216674749a[m
Author: wvha <[email protected]>
Date: Thu Apr 19 23:34:45 2018 -0700
fixed get.userPosts function
[33mcommit f5d25d69ed9a026c8ba7ab2d47659ff02106ef95[m
Author: wvha <[email protected]>
Date: Thu Apr 19 23:34:21 2018 -0700
updated database db.getUserPosts function
[33mcommit a4b90d392682fc938bd24abae8a0b18684e36131[m
Author: wvha <[email protected]>
Date: Thu Apr 19 23:32:59 2018 -0700
added componentdidmount axios request
[33mcommit cf5c7d819d88b4b5f5de711282751dea7a50142b[m
Author: wvha <[email protected]>
Date: Thu Apr 19 23:31:49 2018 -0700
added userpage link to username
[33mcommit d4ccb8f3982185b50106131d1ec49b926e3182b0[m
Author: wvha <[email protected]>
Date: Thu Apr 19 22:48:04 2018 -0700
sigh, need to get push to work
[33mcommit c8a3073aadd5913bc71f9ee6fc8325d18788fe80[m
Author: wvha <[email protected]>
Date: Thu Apr 19 21:03:32 2018 -0700
added to database
[33mcommit 3330df64b81035d67d51f26c9507631262830432[m
Author: wvha <[email protected]>
Date: Thu Apr 19 21:03:01 2018 -0700
fixed upload data
[33mcommit a32a242fe088758f4c1c35eb934f4722ee1aaaed[m
Author: wvha <[email protected]>
Date: Thu Apr 19 21:02:40 2018 -0700
fixed schemas
[33mcommit f96941c39d07b6c1e784f44d75cc090e1e0fc6ad[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:28:21 2018 -0700
added user id property
[33mcommit 9e6b2ba750215497d57ab21c0c865feadbab13b3[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:27:52 2018 -0700
added userlikes and userposts get functions
[33mcommit 51ee063fb0a386ace32db3ee22bb25ffb5a374f4[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:27:11 2018 -0700
added routes for likes and userposts
[33mcommit 4861fb74ca2e7f9adf4fdfbd41a2e54b6052bc0f[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:26:49 2018 -0700
updated schemas to use with populate
[33mcommit 27b416adc9a4228f466ff964cf56ae45f903fdd8[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:26:27 2018 -0700
refactored index.jsx to have highest props
[33mcommit 5be50f69e25bdd844058039a6b2cf13fb7d8f5ba[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:25:55 2018 -0700
linkedupload page to button
[33mcommit a861876b064f918d794a026e24b85c311530c036[m
Author: wvha <[email protected]>
Date: Thu Apr 19 20:16:17 2018 -0700
will work on this later
[33mcommit ad01876aa4919fb9fb4d5503fa61072ee0bf0001[m
Merge: c570ae7 52cbb0a
Author: William Cory <[email protected]>
Date: Thu Apr 19 23:12:52 2018 -0400
Merge pull request #74 from ceyuen/styleUpload
Styled upload page
[33mcommit 52cbb0a5f28ccf8bf2fd8bccd292ca1f7bf25b9b[m
Author: Christina <[email protected]>
Date: Thu Apr 19 19:04:31 2018 -0700
Added image change for dropzone
[33mcommit 3e9b17e0be1b5beb535bf8148164acb934c12df8[m
Author: Christina <[email protected]>
Date: Thu Apr 19 18:45:15 2018 -0700
Styled upload page
[33mcommit fddd4f33604f8abd633acceddb59a8cf46c46f47[m
Author: Christina <[email protected]>
Date: Thu Apr 19 17:21:36 2018 -0700
Updated Footer so that it always stays at the bottom.
Updated + icon to link to upload page
[33mcommit a947e22fb268ec1a2da735cca26607bc734e4fd1[m
Merge: 64ef9f0 c570ae7
Author: wvha <[email protected]>
Date: Thu Apr 19 15:58:04 2018 -0700
merge changes
[33mcommit 64ef9f030512e353c927fb9c6bb6f259c537189a[m
Author: wvha <[email protected]>
Date: Thu Apr 19 15:52:42 2018 -0700
adding axios to userpage
[33mcommit 101db9f5ead10de460f45cefde0cc675b2de0955[m
Author: wvha <[email protected]>
Date: Thu Apr 19 15:52:18 2018 -0700
added user likes and pics db functions
[33mcommit 5f9bac71ce5d04473facab880ecb58869b7be27d[m
Author: wvha <[email protected]>
Date: Thu Apr 19 15:51:11 2018 -0700
created likes page
[33mcommit c570ae7be6ec29ef3db1b9f43226c8af36085cf7[m
Merge: 7a33714 2ae9a4b
Author: Christina Yuen <[email protected]>
Date: Thu Apr 19 15:44:40 2018 -0700
Merge pull request #73 from roninjin10/master
add upload page
[33mcommit 2ae9a4b906158a0fe5ce77824e828de10e21b116[m
Merge: 8d67b6b 7a33714
Author: William Cory <[email protected]>
Date: Thu Apr 19 15:39:20 2018 -0700
fix conflicts with index.jsx
[33mcommit 8d67b6bc9646dca4b365988bbc884e9cbde4aa08[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 15:36:02 2018 -0700
create upload page
[33mcommit 7a337144a6deaba5467b27b1a19ef503fb0ce73b[m
Merge: 41e62ed ab34f1b
Author: William Cory <[email protected]>
Date: Thu Apr 19 18:35:34 2018 -0400
Merge pull request #72 from ceyuen/descriptionComponent
Details, Footer, Modals
[33mcommit ab34f1b775a0856b343400810a444dbce3bf0fa8[m
Merge: 376a8a8 41e62ed
Author: Christina <[email protected]>
Date: Thu Apr 19 14:59:49 2018 -0700
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy into descriptionComponent
[33mcommit 376a8a8586121b71c83a1e7d9c10db251ef5324a[m
Author: Christina <[email protected]>
Date: Thu Apr 19 14:56:47 2018 -0700
Made login and signup components modal.
Upon successfully logging in, it now redirects to the location page.
When not logged in, it doesn't show the home, favorites, and upload buttons.
[33mcommit 64be65eb6c72f73f76d9f862c6b95844211f4d7d[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 14:33:37 2018 -0700
move all worthy map stuff to worthy map
[33mcommit 20b5f9419e9a178b20375f951667e11930a04aa3[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 14:28:08 2018 -0700
change all the routes to api routes
[33mcommit 69909d258b5d9994cf707116d214ddfcced5ea8c[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 13:24:32 2018 -0700
create functions to scrape google places api
[33mcommit 438c417c4ea3848c7695524a980badae8bf26a00[m
Merge: befc356 41e62ed
Author: wvha <[email protected]>
Date: Thu Apr 19 12:06:19 2018 -0700
merge changes again
[33mcommit befc356ccb81c05984dda6bf1e2583f7b874ca1f[m
Merge: 4cc9ec7 8364683
Author: wvha <[email protected]>
Date: Thu Apr 19 12:05:20 2018 -0700
merging
[33mcommit 41e62ed30e3bdd49bec0990d4b962262b9be6178[m
Merge: 8364683 12180af
Author: Will <[email protected]>
Date: Thu Apr 19 11:50:21 2018 -0700
Merge pull request #71 from roninjin10/master
prepared to connect front end to database
[33mcommit 12180af629b33561b64a76d368373ef380996a28[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 11:46:34 2018 -0700
refactor sams react components to prepare to integrate everything
[33mcommit ee59d6b6d5d217c4719dbf975f68c9e5cd622a2a[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 11:36:45 2018 -0700
refactor sams backend
[33mcommit 3f588082d33c4e4e871750c3566120eacacafb31[m
Merge: 030c35a 8364683
Author: William Cory <[email protected]>
Date: Thu Apr 19 11:24:10 2018 -0700
merging sam
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit 030c35a8fce9d2c772a78d9764f438df47f5ea73[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 11:24:00 2018 -0700
about to merge sams stuff
[33mcommit 83646838f8b572d38a94b84c58f9b0530d9c132c[m
Merge: 0c48768 7ec9e9e
Author: William Cory <[email protected]>
Date: Thu Apr 19 14:23:10 2018 -0400
Merge pull request #70 from slrosenblum/master
Add first implementation of picture upload form and picture display button to landing page
[33mcommit 7ec9e9ef8129697f9eaaa2f67bef57c2225c10a3[m
Author: Samuel Rosenblum <[email protected]>
Date: Thu Apr 19 11:10:26 2018 -0700
Add in database info displayer component to landing page + sync with server and database
[33mcommit d536d7d7de9ef85fbc3244f2db0300ed56c0887f[m
Author: Samuel Rosenblum <[email protected]>
Date: Thu Apr 19 10:55:56 2018 -0700
Get upload component working on landing page + synced with server and database
[33mcommit 29599088abd15e61d59758ad13103a4c15f92203[m
Author: Samuel Rosenblum <[email protected]>
Date: Thu Apr 19 10:24:24 2018 -0700
Added server route to index.js
[33mcommit d146e564f9034b7501052370c379e95b91b0ef90[m
Merge: b6ac6f6 0c48768
Author: William Cory <[email protected]>
Date: Thu Apr 19 10:22:55 2018 -0700
another pull
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit b6ac6f669e3ae03dc7a6fae937ae694f473fa269[m
Author: William Cory <[email protected]>
Date: Thu Apr 19 10:22:50 2018 -0700
add clickhandler to marker
[33mcommit 300f788e46b5e48dd1e4d1dcd8d77a564467dd43[m
Author: Christina <[email protected]>
Date: Wed Apr 18 22:02:21 2018 -0700
Removed react transition group from package.json
[33mcommit d3bfb7505f0969cfccbe513d3352828717d9dfe0[m
Author: Christina <[email protected]>
Date: Wed Apr 18 21:50:27 2018 -0700
Added footer component
[33mcommit b0ecf21e5f724d06f5972641656e7664b8367b4a[m
Author: Christina <[email protected]>
Date: Wed Apr 18 17:38:27 2018 -0700
minimum working details display
[33mcommit 4cc9ec76a05c4803d7d241073c33b06ec4e6d047[m
Author: wvha <[email protected]>
Date: Wed Apr 18 17:09:52 2018 -0700
added potential schema table for pics and likes
[33mcommit 1ad3f52d20b742939d0ccf757501a2b04822cd3e[m
Author: wvha <[email protected]>
Date: Wed Apr 18 17:08:52 2018 -0700
updated state object for userdata in navbar
[33mcommit fd799c44e2f1608cd2e72669122ffd2fe63a4428[m
Author: Samuel Rosenblum <[email protected]>
Date: Wed Apr 18 15:06:13 2018 -0700
Adds UploadForm component to landing component, sets up server route
[33mcommit 23d89bd65cc6fe9227799db056573627a1da00fe[m
Author: wvha <[email protected]>
Date: Wed Apr 18 14:55:30 2018 -0700
created base template for userpage
[33mcommit a446457c04bf8ce36c584416c02a95847f729d51[m
Author: wvha <[email protected]>
Date: Wed Apr 18 14:55:06 2018 -0700
added routes for userpage ish
[33mcommit f8e00a2826544a07446db9d7dd582f4a5c3b95c4[m
Author: Christina <[email protected]>
Date: Wed Apr 18 14:24:54 2018 -0700
Added details component. Replaced all " with ` in card and row components
[33mcommit bd95484cf2e7b0c0457aa5afb7a56750b4ab8f1e[m
Merge: 49e30a7 0c48768
Author: Samuel Rosenblum <[email protected]>
Date: Wed Apr 18 12:08:20 2018 -0700
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit 49e30a7873e480b6f7fb1b6b449e2ef87d2a2c92[m
Author: Samuel Rosenblum <[email protected]>
Date: Wed Apr 18 12:02:31 2018 -0700
Add .vscode/ to .gitignore
[33mcommit 0c487682aa498436bdd7e46d48c345a6c9c88b86[m
Merge: 9d969d5 cc98cb5
Author: Sam Rosenblum <[email protected]>
Date: Wed Apr 18 11:52:28 2018 -0700
Merge pull request #69 from ceyuen/mapCurrentLocation
Added geolocation method
[33mcommit 61d2690ba161677f2ade175574dbf9949af46652[m
Author: wvha <[email protected]>
Date: Wed Apr 18 11:49:51 2018 -0700
created userpage.jsx file
[33mcommit cc98cb5299946599308c109291ee27fd1120ea18[m
Author: Christina <[email protected]>
Date: Wed Apr 18 11:22:55 2018 -0700
Working geolocation method, but very slow
[33mcommit 9d969d52c429da0f80e523aa563317218772a221[m
Merge: a09cd67 6372a51
Author: Christina Yuen <[email protected]>
Date: Tue Apr 17 18:01:23 2018 -0700
Merge pull request #68 from roninjin10/master
create search bar
[33mcommit 6372a519911d2b9a57820b839785b46314fb5118[m
Author: William Cory <[email protected]>
Date: Tue Apr 17 17:59:16 2018 -0700
add search feature
[33mcommit 5d101e602c7fb37a1c385214a95abdd1f1a97a6c[m
Merge: 43f5626 a09cd67
Author: William Cory <[email protected]>
Date: Tue Apr 17 17:58:22 2018 -0700
add logout
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy
[33mcommit a09cd67429f82d3b6eadeed0ee7727314845e1a9[m
Merge: abdc8d3 0ed32ae
Author: Christina Yuen <[email protected]>
Date: Tue Apr 17 17:58:02 2018 -0700
Merge pull request #67 from wvha/logout
Logout button and show firstname
[33mcommit 0ed32ae8456bb2eccd592f92e63809f872626dcb[m
Author: wvha <[email protected]>
Date: Tue Apr 17 17:44:55 2018 -0700
logout button reloads page
[33mcommit 43f5626e53ad1de2e7126b82153d1497b1968f7e[m
Merge: 7acc787 abdc8d3
Author: William Cory <[email protected]>
Date: Tue Apr 17 17:26:07 2018 -0700
Merge branch 'master' of https://github.com/PicWorthy/PicWorthy