forked from Benja-Wainer/tellus
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathexit
More file actions
1966 lines (1325 loc) · 67.1 KB
/
exit
File metadata and controls
1966 lines (1325 loc) · 67.1 KB
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 bd951794379a9ea4d29c7b0ea4a3fc6628db3973[m[33m ([m[1;36mHEAD -> [m[1;32mmaster[m[33m, [m[1;31morigin/master[m[33m, [m[1;31morigin/HEAD[m[33m, [m[1;32mcountry-show-page-masonry[m[33m)[m
Merge: e149c0a 752bc9b
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 21:47:31 2023 +0900
Merge pull request #93 from Benja-Wainer/revert-89-country-show-page-masonry
Revert "Apply masonry to the country show page and remove duplicate modal"
[33mcommit e149c0ae9239c2dbc166e94c99119564a4496ac3[m
Merge: 46fefad c20d3b2
Author: Christian St. Prix <[email protected]>
Date: Thu Aug 31 21:47:24 2023 +0900
Merge pull request #91 from Benja-Wainer/modal-changes
Changed button and topic links colors
[33mcommit 46fefada47dcd1443d731a74c8bad2bd883c5b25[m
Merge: 929f029 16045e1
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 31 21:47:06 2023 +0900
Merge pull request #92 from Benja-Wainer/profile-improvements4
Profile improvements4
[33mcommit 752bc9b3831c14be78bcf19dfdc5e538dca5f573[m[33m ([m[1;31morigin/revert-89-country-show-page-masonry[m[33m)[m
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 31 21:43:40 2023 +0900
Revert "Apply masonry to the country show page and remove duplicate modal"
[33mcommit 929f029e8f690904f6b03611bf2dfe6bf59100a4[m
Merge: 11ec4db c689d51
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 31 21:40:07 2023 +0900
Merge pull request #89 from Benja-Wainer/country-show-page-masonry
Apply masonry to the country show page and remove duplicate modal
[33mcommit c689d514e04671edf62fd6d7ffb3f1df159c19e5[m[33m ([m[1;31morigin/country-show-page-masonry[m[33m)[m
Merge: 7965dc3 11ec4db
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 31 21:39:56 2023 +0900
Merge branch 'master' into country-show-page-masonry
[33mcommit 16045e1ee5e871ef48fbdf3b73e12d2a2d89632e[m[33m ([m[1;31morigin/profile-improvements4[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 21:38:15 2023 +0900
made small style changes
[33mcommit c20d3b280956719f40be51ed46442913f7b1474d[m[33m ([m[1;31morigin/modal-changes[m[33m)[m
Author: Benjamin Wainer <[email protected]>
Date: Thu Aug 31 21:36:32 2023 +0900
Changed button and topic links colors
[33mcommit 6b93e1613110229da5c721d16aa859d9760eb8a1[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 21:30:19 2023 +0900
made profile adjustments
[33mcommit 11ec4db1a2f415b552647238aba6c4588250b8e7[m
Merge: c7fa294 343b32b
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 21:22:51 2023 +0900
Merge pull request #90 from Benja-Wainer/revert-88-profile-improvements2
Revert "Profile improvements2"
[33mcommit 343b32bdeed98d33a2c7eff67e0123c1439ce51f[m[33m ([m[1;31morigin/revert-88-profile-improvements2[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 21:22:40 2023 +0900
Revert "Profile improvements2"
[33mcommit c7fa29419316770057d41a4e44bda22e24a518e3[m
Merge: 927b666 8b30358
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 21:21:21 2023 +0900
Merge pull request #88 from Benja-Wainer/profile-improvements2
Profile improvements2
[33mcommit 8b30358d7309cb88b7ffa936d251acb7481b4259[m[33m ([m[1;31morigin/profile-improvements2[m[33m)[m
Merge: fa39fed 927b666
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 21:21:13 2023 +0900
Merge branch 'master' into profile-improvements2
[33mcommit 7965dc347a0dfec91635df72cfc88ad3d5887fd4[m
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 21:18:12 2023 +0900
Apply masonry to the country show page and remove duplicate modal
[33mcommit fa39fed26d4a5ba7a0f7813ff10105709f4837bb[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 21:15:49 2023 +0900
added border to country of the day
[33mcommit 927b6665f79044c201d4fde9a62372e040bbb450[m
Merge: 1eae7df 7ce1c02
Author: Christian St. Prix <[email protected]>
Date: Thu Aug 31 21:15:22 2023 +0900
Merge pull request #87 from Benja-Wainer/modal-changes
Partial is used for article modals. Also added text breaking in artic…
[33mcommit 7ce1c02a29ce7561d7b5a6f98912dca6c80257c9[m
Author: Benjamin Wainer <[email protected]>
Date: Thu Aug 31 21:02:48 2023 +0900
Partial is used for article modals. Also added text breaking in articles created from topics page.
[33mcommit 8d5f941d6554623bbb0a0f64e6195df53df1fe2e[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 20:52:42 2023 +0900
centered country card name and changed padding on cards
[33mcommit 67de0e822b09d886d742b11d87ca40b7615906cf[m
Merge: ad91120 1eae7df
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 19:43:50 2023 +0900
Merge branch 'master' of github.com:Benja-Wainer/tellus
[33mcommit 1eae7df657b2599e38facf755b8327861d3af840[m[33m ([m[1;32mpopup-sidebar-tweaks[m[33m)[m
Merge: 39822bb ab72a58
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 19:35:23 2023 +0900
Merge pull request #86 from Benja-Wainer/revert-83-modal-improvements
Revert "Added padding to article modals. Removed footer with close button. Mo…"
[33mcommit ab72a5859a3b375247c717a49ad99d06023c25e9[m[33m ([m[1;31morigin/revert-83-modal-improvements[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 19:35:05 2023 +0900
Revert "Added padding to article modals. Removed footer with close button. Mo…"
[33mcommit 39822bb5da1d78c0e07e28a0b034b1a57c605e7b[m[33m ([m[1;32mmodal-partial[m[33m)[m
Merge: e3f96bf 7cfbd7d
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 19:25:57 2023 +0900
Merge pull request #83 from Benja-Wainer/modal-improvements
Added padding to article modals. Removed footer with close button. Mo…
[33mcommit 7cfbd7dba2b0a36f1438bb3a5a42da6b0475acdc[m[33m ([m[1;31morigin/modal-improvements[m[33m)[m
Merge: 0535751 e3f96bf
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 19:25:36 2023 +0900
Merge branch 'master' into modal-improvements
[33mcommit ad911209b7e6cb2e0a3d27434e4353eefa290ccc[m
Merge: f57dd79 e3f96bf
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 19:13:09 2023 +0900
Merge branch 'master' of github.com:Benja-Wainer/tellus
[33mcommit e3f96bf339555b5f0fb03614b4c89e8915bd672a[m
Merge: c4d6cbf c6ff1c6
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 31 19:12:43 2023 +0900
Merge pull request #85 from Benja-Wainer/profile-improvements
Profile improvements
[33mcommit f57dd7989d09a2e88de50a729e7c53d1ce969b24[m
Merge: 23f98a2 c4d6cbf
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 18:50:27 2023 +0900
Merge branch 'master' of github.com:Benja-Wainer/tellus
[33mcommit c4d6cbf6dc5c75a2dd86e8307e04d4e976b728da[m
Merge: 1f469d4 49346da
Author: Christian St. Prix <[email protected]>
Date: Thu Aug 31 18:48:59 2023 +0900
Merge pull request #84 from Benja-Wainer/close-button-modal-fix
fix close button on modals
[33mcommit c6ff1c65e20a3ba73808859d24e51eba58437b24[m[33m ([m[1;31morigin/profile-improvements[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 18:47:12 2023 +0900
added date to articles
[33mcommit 49346da4981bc57fc1798ad01932cb40f1d7c25c[m[33m ([m[1;31morigin/close-button-modal-fix[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 31 18:12:01 2023 +0900
fix close button on modals
[33mcommit 71c4a74339b0d85d0abe47e9325dfeccd53ef46a[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 17:51:39 2023 +0900
changed z-index to 0 for cards and navbar to 1
[33mcommit 23f98a26c10ab0c3b499ee1668c2004481e2fe97[m
Merge: 5f449a8 1f469d4
Author: Christian Stprix <[email protected]>
Date: Thu Aug 31 14:48:22 2023 +0900
Merge branch 'master' of github.com:Benja-Wainer/tellus
[33mcommit 0535751d4d1de39b65720154ba83d8239c74f707[m
Author: Benjamin Wainer <[email protected]>
Date: Wed Aug 30 21:20:43 2023 +0900
Added padding to article modals. Removed footer with close button. Moved collapsable related topics list to top of article's content.
[33mcommit 1f469d428952af8049b7f59913c30484425c41d1[m
Merge: a687eb5 f981fa9
Author: Christopher Bowman <[email protected]>
Date: Wed Aug 30 20:53:07 2023 +0900
Merge pull request #82 from Benja-Wainer/topics-masonry
Implement masonry in topics show and search page
[33mcommit 5f449a8002dc9857b71e9850e0af80df463fd9aa[m
Author: Christian Stprix <[email protected]>
Date: Wed Aug 30 12:03:10 2023 +0900
made card position static
[33mcommit f981fa906c03e7db84ea9022efb0751720c30c20[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 23:49:24 2023 +0900
Implement masonry in topics show and search page
[33mcommit a3d70b9b43f7b63f81b1d1ca07f4134c12af6ffa[m[33m ([m[1;32mtopic-show-page[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 23:38:28 2023 +0900
Implement masonry to both topic show and search page
[33mcommit 5a6fd70c3662365c241902fe2d0e9237dfd06d78[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 23:37:14 2023 +0900
Implement masonry to topic show page
[33mcommit fe3b916b5bce5097ffa5d9907203dbe54ff2c084[m
Merge: 752ad42 a687eb5
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 22:21:09 2023 +0900
Merged
[33mcommit 752ad428045639a92131073d2e0d57990f25a49a[m[33m ([m[1;31morigin/topic-show-page[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 22:16:10 2023 +0900
idk
[33mcommit a687eb5b8fa41d99ce9b54c38bc25d6178ee1440[m
Merge: debd7c4 3a90b46
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 22:14:57 2023 +0900
Merge pull request #80 from Benja-Wainer/topics-controller-country-assignment-fix
Adjust topics controller to new country instances and fix linking cou…
[33mcommit 3a90b46409c89e389a26af09e26c195e5b28a612[m[33m ([m[1;31morigin/topics-controller-country-assignment-fix[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 29 22:14:25 2023 +0900
Adjust topics controller to new country instances and fix linking countries to tags
[33mcommit af6e3219aefdc514ed899b8c504b461552f483de[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 29 22:07:14 2023 +0900
more stlye changes to div and added carousel
[33mcommit debd7c4efcad605dc72138da5d2336ff11b41605[m
Merge: d1fe4fe 4b0a543
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 29 21:07:25 2023 +0900
Merge pull request #79 from Benja-Wainer/new-seed2
Create countries as a hash
[33mcommit 4b0a543dcd0bd2dcf8cd7592999745204869248c[m[33m ([m[1;31morigin/new-seed2[m[33m, [m[1;32mnew-seed2[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 21:06:13 2023 +0900
Create countries as a hash
[33mcommit d1fe4fe370f34a369536c83e9a0992855b24b07c[m
Merge: 1e08db0 4501526
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 20:28:01 2023 +0900
Merge pull request #78 from Benja-Wainer/profileinteresting
Profileinteresting
[33mcommit 4501526a09e5a3e26c3dd6d194c4a54631f2363b[m[33m ([m[1;31morigin/profileinteresting[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 29 20:26:34 2023 +0900
switched to darkmode
[33mcommit 1e08db051745d97f23a40afe327f85a98cca714a[m[33m ([m[1;32mcountry-show-page[m[33m)[m
Merge: 6bc9190 72ff2cf
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 29 19:48:06 2023 +0900
Merge pull request #77 from Benja-Wainer/topic-show-page-flags
Small flags are added to articles in topics show page for these artic…
[33mcommit ad67274fbcd51424e78447b4e54a865824ab9b36[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 29 13:41:00 2023 +0900
added some styling to cards and to country of the day
[33mcommit 72ff2cfde0cc2074f94847217acbe234a8c0f010[m[33m ([m[1;31morigin/topic-show-page-flags[m[33m)[m
Author: Benjamin Wainer <[email protected]>
Date: Mon Aug 28 23:24:33 2023 +0900
Small flags are added to articles in topics show page for these articles linked to a country.
[33mcommit 89df37a221dd3291a627df8dc166dfd730429fd3[m
Author: Christian Stprix <[email protected]>
Date: Mon Aug 28 01:07:53 2023 +0900
added country of the day and cards to followed countries
[33mcommit 6bc919062007f173430a3f7d12ae075f0231d3f0[m
Merge: 47d94a0 64c3f3f
Author: Benja-Wainer <[email protected]>
Date: Sun Aug 27 19:40:12 2023 +0900
Merge pull request #76 from Benja-Wainer/searchtopics
added topic search function
[33mcommit 47d94a0e20c4e1bb7c3be1ca5104fc47164af2bf[m
Merge: 200a987 c0ca6f5
Author: Benja-Wainer <[email protected]>
Date: Sun Aug 27 19:39:58 2023 +0900
Merge pull request #75 from Benja-Wainer/check-if-image-article-show
Add regex check validation for image file for the country show page
[33mcommit 200a98750d47ae07dd542ce7a4681f8eac4ad44e[m
Merge: a0ecdbd 85ee7ae
Author: Benja-Wainer <[email protected]>
Date: Sun Aug 27 19:39:42 2023 +0900
Merge pull request #74 from Benja-Wainer/mapbox-search-box
Add search function to world map
[33mcommit 64c3f3fa89cef881c0735a49640d858220c063bd[m[33m ([m[1;31morigin/searchtopics[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Sat Aug 26 22:51:19 2023 +0900
added topic search function
[33mcommit 85ee7ae194a947b4b92ce80ac7a0befb986d5932[m[33m ([m[1;31morigin/mapbox-search-box[m[33m, [m[1;32mmapbox-search-box[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 19:36:29 2023 +0900
Modify the chat gpt prompt if we ever get it to work again
[33mcommit 5e9bc31da330d0493c0aad6a4b1deefe078d8cf5[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 19:34:02 2023 +0900
Add a useless(for now) render articles controller for possible chat gpt implementation
[33mcommit c0ca6f5027300c6a1892aee123dc7a2b5da0de51[m[33m ([m[1;31morigin/check-if-image-article-show[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Sat Aug 26 18:55:10 2023 +0900
Add regex check validation for image file for the country show page
[33mcommit db9e18b045ba7b14478d7a7e7558d1f0b01c1742[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 18:23:35 2023 +0900
Add search function to world map
[33mcommit a0ecdbdcff6ca2da8c223e0bc0ac5bb98456c54e[m
Merge: 7ac8fe2 1abacb6
Author: Christian St. Prix <[email protected]>
Date: Sat Aug 26 17:34:24 2023 +0900
Merge pull request #73 from Benja-Wainer/article-paragraphs
When creating articles it splits contents onto paragraphs each three …
[33mcommit 1abacb6b262fbed0be622a258d76fca0667affdc[m[33m ([m[1;31morigin/article-paragraphs[m[33m)[m
Author: Benjamin Wainer <[email protected]>
Date: Sat Aug 26 17:30:23 2023 +0900
When creating articles it splits contents onto paragraphs each three sentences
[33mcommit 7ac8fe24a9b424dbd57c0c7de9c93a71bc965cfd[m
Merge: 0d4566b 537deaf
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 11:23:40 2023 +0900
Merge pull request #72 from Benja-Wainer/path-fix
Fix more image paths
[33mcommit 537deaf0cdd75640a572919f7c4f505df8304845[m[33m ([m[1;31morigin/path-fix[m[33m, [m[1;32mpath-fix[m[33m, [m[1;32mless_seeds[m[33m, [m[1;32mexperiementing[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 11:22:24 2023 +0900
Fix more image paths
[33mcommit 0d4566b1543b23fd4695ba3bd382bbdedde76625[m
Merge: 0d1956a cb24f1d
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 11:13:50 2023 +0900
Merge pull request #71 from Benja-Wainer/image-path
Add image paths
[33mcommit cb24f1df17c0601b1e08d385122d542728740b20[m[33m ([m[1;31morigin/image-path[m[33m, [m[1;32mimage-path[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 11:13:07 2023 +0900
Add image paths
[33mcommit 0d1956a400e7e834b46fe4ba22d236f7ff305e89[m
Merge: 2b6d185 26b7463
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 10:43:59 2023 +0900
Merge pull request #70 from Benja-Wainer/topic_show_page_modals
Topic show page modals
[33mcommit 26b74632b83b6a39685ec4faee9cf4470441e91e[m[33m ([m[1;31morigin/topic_show_page_modals[m[33m, [m[1;32mtopic_show_page_modals[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:43:35 2023 +0900
Pretty up search function
[33mcommit 8bdbe23e8a31a4fa24ce791f637889f43360cc8b[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:40:36 2023 +0900
Add Modals for topic show page
[33mcommit 2b6d185005b965c035d63b73b71a82087ff0b83e[m
Merge: 929252d 959d3ec
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:23:29 2023 +0900
Merge pull request #69 from Benja-Wainer/modalfix
removed button
[33mcommit 959d3ecb735ca328eebc2d8c5bc9ee1c23e31779[m[33m ([m[1;31morigin/modalfix[m[33m)[m
Merge: 4ce0036 929252d
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:23:19 2023 +0900
Merge branch 'master' into modalfix
[33mcommit 929252da3f8ad18a1a07e86873ea8e771bf171ed[m
Merge: ef49d6f 1d571d9
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 10:18:15 2023 +0900
Merge pull request #68 from Benja-Wainer/seed-fix
Fixed seeds
[33mcommit 1d571d95e5b36c555efafef5803b19b991eea6d7[m[33m ([m[1;31morigin/seed-fix[m[33m, [m[1;32mseed-fix[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:17:48 2023 +0900
Fixed seeds
[33mcommit ef49d6fccbc94711d0224fd35ee9bc5e9da682a3[m
Merge: 2f9887a b7cecd3
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 10:13:28 2023 +0900
Merge pull request #67 from Benja-Wainer/delete_country_codes
Delete country codes
[33mcommit 2f9887a5c62bb4264deff200d5f606ee0048c78a[m
Merge: 24d8a3c c9e5660
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:12:57 2023 +0900
Merge pull request #66 from Benja-Wainer/country-flags
Country flags
[33mcommit c9e56600a3def9f093361ea9ec956296a9655f8a[m[33m ([m[1;31morigin/country-flags[m[33m)[m
Merge: aa99ea9 24d8a3c
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:12:51 2023 +0900
Merge branch 'master' into country-flags
[33mcommit 4ce0036f3f1cbde204794a11aef3deed507e8a7e[m
Author: Christian Stprix <[email protected]>
Date: Sat Aug 26 10:10:06 2023 +0900
removed button
[33mcommit b7cecd351ac1ef11b298c557b78558986d3f62c7[m[33m ([m[1;31morigin/delete_country_codes[m[33m, [m[1;32mdelete_country_codes[m[33m)[m
Merge: ba3d9ea 24d8a3c
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 10:02:39 2023 +0900
Debugging
[33mcommit 24d8a3ca72a3cfbffec36b700d6ffe4b645d3818[m
Merge: 6af400f 5b1bbfa
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 26 09:55:06 2023 +0900
Merge pull request #65 from Benja-Wainer/debugging2
Fix small bugs and quality of life changes
[33mcommit ba3d9eaa8ebb0fd07f0187442029a8d5311c26d4[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 09:54:12 2023 +0900
Hi
[33mcommit 5b1bbfaf3ac8d153b0e138412dbc918f6110b391[m[33m ([m[1;31morigin/debugging2[m[33m, [m[1;32mdebugging2[m[33m)[m
Merge: dbaaa6d 6af400f
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 26 09:40:55 2023 +0900
merged
[33mcommit 508b8f6709ad76977341af6fe0b76b225369b954[m
Author: Christian Stprix <[email protected]>
Date: Sat Aug 26 09:05:02 2023 +0900
added scrollable div
[33mcommit aa99ea9ff8c70a3ff033eea8d8142a8860300333[m
Author: Benjamin Wainer <[email protected]>
Date: Fri Aug 25 05:38:48 2023 +0900
Added flag to country pop ups where available. Not implemented on country search yet as there seems to be an issue with the background.
[33mcommit dbaaa6dd233dedb8d360e0e7cb6fbcfe773a7767[m
Author: Trevor Gaffney <[email protected]>
Date: Fri Aug 25 00:18:27 2023 +0900
Fix small bugs and quality of life changes
I changed the seed and schema so that each country has a "code" column
to reference when making the newsdata API call. I also fixed the width
issue on the sidebar card images and made categories only show if there
were articles under them.
[33mcommit 40d485676cb51ca7f76dadba4f33b20ed052a218[m
Author: Benjamin Wainer <[email protected]>
Date: Thu Aug 24 23:28:10 2023 +0900
Adds flag url from wikipedia when available
[33mcommit 654159dbbe11cb39f7b00fa918c63fbc1d8d196c[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 24 22:20:30 2023 +0900
added wikipedia call to profile page
[33mcommit 6af400f4451ac815c368624294da404c33c55435[m
Merge: 3354473 3662d47
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 24 21:47:28 2023 +0900
Merge pull request #64 from Benja-Wainer/modaltry2
added modals to countries show page
[33mcommit 3662d47ec71272afeb9906cc549c25162997a141[m[33m ([m[1;31morigin/modaltry2[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 24 21:46:12 2023 +0900
added modals to countries show page
[33mcommit 3354473358b28ab01c6efc4e7c14f3b5287cd9c6[m
Merge: 065ed0b b156b47
Author: Christopher Bowman <[email protected]>
Date: Thu Aug 24 20:41:40 2023 +0900
Merge pull request #63 from Benja-Wainer/savearticles2
added saving partial to articles show page
[33mcommit b156b47d239a141cb38e1151c89f743116521802[m[33m ([m[1;31morigin/savearticles2[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 24 20:23:02 2023 +0900
added saving partial to articles show page
[33mcommit 065ed0baaccd54b1d48f82fc03f94bb962f633b4[m
Merge: 7ba20d0 6088c93
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 24 19:51:52 2023 +0900
Merge pull request #61 from Benja-Wainer/seed-purge
Purge seed of extranneous files
[33mcommit 6088c939b88ddebad80a99ad9c1eb8e6683c959c[m[33m ([m[1;31morigin/seed-purge[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:42:46 2023 +0900
Purge extranneous seeds
[33mcommit a4729f559824270e534c8536b6b84e8e845c2fd3[m[33m ([m[1;31morigin/ugly-seed[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:27:56 2023 +0900
Ugly seed
[33mcommit 7ba20d08a917e2d5c8125b4d9b4f430f28503089[m
Merge: c1ad718 6eda68f
Author: Benja-Wainer <[email protected]>
Date: Thu Aug 24 19:20:18 2023 +0900
Merge pull request #57 from Benja-Wainer/country-preview
Beautify the map popup and sidebar
[33mcommit c1ad718d67f5b4971743c473c5e4763640e80963[m
Merge: 5596694 a5bb344
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:19:41 2023 +0900
Merge pull request #58 from Benja-Wainer/qualityoflife2
deleted extra button on home page
[33mcommit a5bb344389928b7ecb5516796857659dc9417e1f[m[33m ([m[1;31morigin/qualityoflife2[m[33m)[m
Merge: d7869bd 5596694
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:19:30 2023 +0900
Merge branch 'master' into qualityoflife2
[33mcommit 6eda68f8b1b5f8ec3ebd11d6cb7cfc6e9a4f1b64[m[33m ([m[1;31morigin/country-preview[m[33m)[m
Merge: 64691d9 5596694
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:17:55 2023 +0900
Merge branch 'master' into country-preview
[33mcommit 5596694781b0e6abc94834ef755c77cd1bf3300f[m
Merge: 5727721 e333004
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:13:48 2023 +0900
Merge pull request #59 from Benja-Wainer/fadein
added in fade in effect and stimulus controller
[33mcommit e333004a5245bb028dd13144ecd0f9d22274e891[m[33m ([m[1;31morigin/fadein[m[33m)[m
Merge: 365e041 5727721
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:13:41 2023 +0900
Merge branch 'master' into fadein
[33mcommit 572772148a28277f852c525dca6248ba2f3a58be[m
Merge: 178691e c18344c
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:12:32 2023 +0900
Merge pull request #60 from Benja-Wainer/article-show-improvements
Article show improvements
[33mcommit c18344c4d1e6668bb34b19937d93090fd7d74dd8[m[33m ([m[1;31morigin/article-show-improvements[m[33m)[m
Merge: acfb59a 178691e
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:12:17 2023 +0900
Merge branch 'master' into article-show-improvements
[33mcommit 64691d98adc16787cf866132ae082fdf0190f3b4[m
Merge: 151d9e6 178691e
Author: Trevor Gaffney <[email protected]>
Date: Thu Aug 24 19:11:08 2023 +0900
Merge branch 'master' into country-preview
[33mcommit acfb59a2e681a259d6f0fe6a6f41f87c1067840a[m
Author: Benjamin Wainer <[email protected]>
Date: Thu Aug 24 00:37:41 2023 +0900
Installed bootstrap. Moved article topics to bootstrap collapsable card and made button for original article. Deleted paragraph for article source, including source in the original article button. Article titles could maybe use a different source, suggestions welcome.
[33mcommit 365e0419eb01f9468de557dda7d4ce956af387bf[m
Author: Christian Stprix <[email protected]>
Date: Thu Aug 24 00:31:35 2023 +0900
added in fade in effect and stimulus controller
[33mcommit d7869bd3592c342b0f82c4e690eeadd22258aaf1[m
Author: Christian Stprix <[email protected]>
Date: Wed Aug 23 23:50:11 2023 +0900
deleted extra button on home page
[33mcommit 151d9e6779bf50d3b2b7d8819d58c2938ee013ba[m
Author: Trevor Gaffney <[email protected]>
Date: Wed Aug 23 01:28:37 2023 +0900
Beautify the map popup and sidebar
I created a javascript bootstrap carousel of rotating articles below
each pinned country and topic. I also created three articles to preview
after clicking on a country.
[33mcommit f4531ef974cc9c4cda74c860ce9bdd3bb642901d[m
Author: Benjamin Wainer <[email protected]>
Date: Tue Aug 22 23:55:05 2023 +0900
Reverted change in application.js
[33mcommit 0aa3bee3e9271bad3177b4e08c99ddc46ac0edcb[m
Author: Benjamin Wainer <[email protected]>
Date: Tue Aug 22 23:52:38 2023 +0900
Made article topics collapsable with JS controller
[33mcommit 178691e9cc36712daa42a5eadbaacd7246a42869[m
Merge: 781f4b7 0e91abd
Author: Christian St. Prix <[email protected]>
Date: Tue Aug 22 22:04:28 2023 +0900
Merge pull request #56 from Benja-Wainer/54-add-link-to-topic-in-sidebar
Add topic links to the sidebar.
[33mcommit 781f4b712dd5628c74cb73ddee2142dbff6e908b[m
Merge: 27c3263 378cda1
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 22 22:03:18 2023 +0900
Merge pull request #55 from Benja-Wainer/savearticles
made articles favoritable and created join table for users and articl…
[33mcommit 0e91abd1279b7da7aedb2915b4d94acce46ecbb4[m[33m ([m[1;31morigin/54-add-link-to-topic-in-sidebar[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 22 21:58:36 2023 +0900
Add topic links to the sidebar.
[33mcommit 378cda1e041179b53aa4e22ae324fc0122beaea5[m[33m ([m[1;31morigin/savearticles[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 22 21:51:56 2023 +0900
made articles favoritable and created join table for users and articles for later use
[33mcommit 27c326342a15e3d942f9176e87af90835b9805dc[m
Merge: a00533b 1b8e350
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 22 21:07:37 2023 +0900
Merge pull request #53 from Benja-Wainer/52-make-country-api-call-in-the-country-show-page
Add API Call for articles in Country Show.
[33mcommit 1b8e350783d999572018a1b4dcf870b4e32ce3a0[m[33m ([m[1;31morigin/52-make-country-api-call-in-the-country-show-page[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 22 20:56:27 2023 +0900
Add API Call for articles in Country Show.
This now creates articles in the country show page on the current countries supported by newsdataio. Please check the documentation for supported countries.
[33mcommit a00533bcac1ae6af66cf5cfd4a71ced50e4810cd[m
Merge: e13a7dc e5ecb02
Author: Benja-Wainer <[email protected]>
Date: Tue Aug 22 20:03:33 2023 +0900
Merge pull request #51 from Benja-Wainer/navbar-bugfix
Fix the navbar css
[33mcommit e5ecb02661f26a1a03cec1383b7173f65aacfe29[m[33m ([m[1;31morigin/navbar-bugfix[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 22 20:02:41 2023 +0900
Fix the navbar css
[33mcommit e13a7dc7f48e8a0ab54cbc8ed3ae7c9c39bd2334[m
Merge: c1c639e 09addbd
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 22 19:58:33 2023 +0900
Merge pull request #50 from Benja-Wainer/profile
Profile
[33mcommit 09addbd68a827e2f47e0ed5d4c371022311d249b[m[33m ([m[1;31morigin/profile[m[33m)[m
Merge: c3710bd c1c639e
Author: Trevor Gaffney <[email protected]>
Date: Tue Aug 22 19:58:25 2023 +0900
Merge branch 'master' into profile
[33mcommit c3710bde3cefeed1fb4d624b9f4ca6ac86622bab[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 22 19:55:41 2023 +0900
added h4
[33mcommit c1c639ed30244b8cbed1371f20c335de321e9c67[m
Merge: d677baa 1112836
Author: Christopher Bowman <[email protected]>
Date: Tue Aug 22 19:46:33 2023 +0900
Merge pull request #49 from Benja-Wainer/qualityoflife
changed navbar link and added extra button on home page
[33mcommit 1112836711e413058234e34647aa011523edc3d8[m[33m ([m[1;31morigin/qualityoflife[m[33m)[m
Author: Christian Stprix <[email protected]>
Date: Tue Aug 22 19:08:09 2023 +0900
changed navbar link and added extra button on home page
[33mcommit d677baa96f649e661d25a1939457706c233b3257[m
Merge: 086f722 a6d0ba6
Author: Benja-Wainer <[email protected]>
Date: Sun Aug 20 12:59:08 2023 +0900
Merge pull request #48 from Benja-Wainer/faster-refresh
Fix and improve the toggle heart action
[33mcommit a6d0ba6ae0b2df68d335fb684ee160041dbf2560[m[33m ([m[1;31morigin/faster-refresh[m[33m)[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 18:42:54 2023 +0900
Fix and improve the toggle heart action
I set the refresh rate to 0.1 and moved the refresh_pins route to the
pages controller so that the world map can also access the refresh_pins
action.
[33mcommit e8e9fa317d32b842cab0148c2e058151539fdc4a[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 18:24:39 2023 +0900
Made sleep in articles_controller#refresh_pins set to 0.1. It still seems to work
[33mcommit 086f72225f11d226b6318112a1413bc580cd7a71[m
Merge: fe005bb 61447f5
Author: Christopher Bowman <[email protected]>
Date: Sat Aug 19 18:17:16 2023 +0900
Merge pull request #47 from Benja-Wainer/seeding
Added categories to seeds and rearranged the show page
[33mcommit 61447f5e130802a9dfd1c614365b989adb7fe879[m[33m ([m[1;31morigin/seeding[m[33m)[m
Merge: d8f8d21 fe005bb
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 18:16:45 2023 +0900
Fixed conflicts
[33mcommit fe005bbeddaa6d9ae9346edb2692992570f85308[m
Merge: d6f6f05 939d4a7
Author: Christopher Bowman <[email protected]>
Date: Sat Aug 19 18:09:03 2023 +0900
Merge pull request #46 from Benja-Wainer/sidebar-javascript
Sidebar javascript
[33mcommit d8f8d21afa3a730829a1f54080c0bb5292078cb4[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 18:08:45 2023 +0900
Added categories to seeds, rearranged the dhow page to be organized by category, fixed the sticky navbar, created a pin icon partial, fixed the background
[33mcommit 939d4a75c7faf1b6a5376ea06d1f1c5bb9944545[m[33m ([m[1;31morigin/sidebar-javascript[m[33m)[m
Author: Benjamin Wainer <[email protected]>
Date: Sat Aug 19 18:05:29 2023 +0900
Sidebar autorefreshes and add cards when pinning articles' topics
[33mcommit a38f45a068fe4e8d553d67163fd8122ab073ce9b[m
Author: Christian Stprix <[email protected]>
Date: Sat Aug 19 18:04:21 2023 +0900
Added banner and style to profile page
[33mcommit d6f6f057936a95811ddf19a6f22764ee07dfbfb2[m
Merge: d91ea5f 33fb0f1
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 17:40:05 2023 +0900
Merge pull request #45 from Benja-Wainer/topics-newsdataio-api
create topic api controller keyword search. create topics show templa…
[33mcommit 33fb0f1efa412961db0daec7e8e172b6a927a7f3[m[33m ([m[1;31morigin/topics-newsdataio-api[m[33m)[m
Author: Christopher Bowman <[email protected]>
Date: Sat Aug 19 17:38:32 2023 +0900
create topic api controller keyword search. create topics show template, and add article uniqueness validation
[33mcommit c322d00c77b8327b3fb86142a957685529d840f6[m
Merge: 5d8fb55 d91ea5f
Author: Benjamin Wainer <[email protected]>
Date: Sat Aug 19 14:34:31 2023 +0900
Merging with navbar debugging
[33mcommit d91ea5f7ff0e0091cedb442d01f347a5cca06a0c[m
Merge: 7f51f18 5b4c15f
Author: Benja-Wainer <[email protected]>
Date: Sat Aug 19 14:33:49 2023 +0900
Merge pull request #44 from Benja-Wainer/debugging
Debugging front end icon toggle
[33mcommit 5b4c15fd033ee6399bf2761cc709a0c272a33aa9[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 12:07:06 2023 +0900
Pin toggle working now on articles show page
[33mcommit 618ed1d41f6bf167952f35bb9ce6e273b382ad5d[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 12:03:16 2023 +0900
debugging
[33mcommit 7f51f189b362377676ab86a24931302987bdd73e[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 11:25:59 2023 +0900
navbar bugfix
[33mcommit 5d8fb55d38cdc51cf00808cfb0675722ac3e5216[m
Author: Benjamin Wainer <[email protected]>
Date: Sat Aug 19 11:18:50 2023 +0900
Fixed seed and country show page default image
[33mcommit fa6dd875cea73c58a1a6ca7859606fb2a3c20689[m
Author: Trevor Gaffney <[email protected]>
Date: Sat Aug 19 11:05:59 2023 +0900
Last second fixes
[33mcommit 7eb8660c37a3e3918acd1a0580b1741b78fcd71e[m
Merge: db7d2dd 2c245ba
Author: Christian St. Prix <[email protected]>
Date: Sat Aug 19 10:18:44 2023 +0900