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.

Sign up for GitHub

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

Jump to bottom

Feature/galleries #55

Merged
merged 103 commits into from
Dec 6, 2020
Merged

Feature/galleries #55

merged 103 commits into from
Dec 6, 2020

Conversation

itinerare
Copy link
Collaborator

@itinerare itinerare commented Dec 4, 2020 •
edited
Loading

Merge in galleries. Includes some changes relative to the current state of the extension:

New:

  • Galleries can have set open/close times and can be hidden before start, much like prompts. They cannot be hidden after end.
  • Empty galleries with child/sub-galleries check if any visible submissions to their sub-galleries exist, and display the most recent. (Thanks to @preimpression for the idea!)
  • Gallery submissions no longer have the option to select an associated prompt; instead, a list of associated prompt submissions (those where the url is the gallery submission's url) is gathered and the prompt details collected from those. This is used both to supply information for auto-prefixing as well as to populate a new section of gallery submission information containing a list of visible prompt submissions.

Misc:

  • Removed package dependency
  • Add galleries to credits page

Bugs Fixed:

  • Attempting to approve a submission with a character attached without an on-site owner causes approval to fail

Tested locally - Requires migrate, composer update (for those with galleries installed previously)

@itinerare
Migration, models, gallery admin interface
b37cf71
@itinerare
Merge remote-tracking branch 'hub/bootstrapTables' into galleries
0e47bba
@itinerare
Tidy up admin gallery interface
6a6ac36
@itinerare
Merge branch 'comments-addon' into galleries
cb3c2e1
@itinerare
Hide vote settings on galleries when submissions are set to not requi…
99ae87e 
…re approval
@itinerare
Adjusted migration, models, settings command
110124a
@itinerare
Initial setup of gallery display/user-facing views, work on gallery s…
1919730 
…tructure and endeavoring to make a customizable form
@itinerare
Add rejected status to gallery submissions
ea304ea
@itinerare
Beginnings of the submission form.
09124ae
@itinerare
Remove prompt submission elements
1a9cc02
@itinerare
Integrate group currency form into submission form.
7ee03fc
@itinerare
Submission create/edit form
0fcd5fe
@itinerare
submission post function for controller, beginning of service
379748c
@itinerare
Initial creation of submissions and reorganization of currency form c…
7a616db 
…onfiguration.
@itinerare
Notification text and start of implementation
6e422b3
@itinerare
Submission editing form and processing as well as display of currency…
fbf34d6 
… form data within it.
@itinerare
Precisely one tooltip
906d93d
@itinerare
Progress on view submission page, formatting submissions in gallery
5d6dc83
@itinerare
Add toggleable favorites on submissions, incl notifications for submi…
1c4d347 
…tting user
@itinerare
Collaborator editing/approval/removal
76c4d00
@itinerare
Beginning of admin submission queue, archival, and creation of litera…
ca3d184 
…ture submission thumbnails
@itinerare
Further adjustments to submisison queue including beginning to build …
6c70c1e 
…out detailed view for vote log, staff comments, etc
@itinerare
Further progress on detailed log view
e458373
@itinerare
Gallery submission voting, approval and rejection, and staff comments
b40e9e4
@itinerare
Finish putting together submission archival
3ab27cd
@itinerare
Notifications on acceptance and rejection of gallery submissions
78f3505
@itinerare
Make verbiage around submission acceptance more consistent in the ser…
db578ef 
…vice
@itinerare
- Up through form for currency award processing
bc5434c 
- Add 'participants'-- giftees, commissioners, etc for the sake of systems where it's relelvant
- Add ability to set a prefix for prompts...
- and add automatic submission title prefixes based on extant participant types and the prompt associated with the submission, if there is an associated prompt and it has a prefix
@itinerare
Processing of gallery submission currency evaluation form, awarding o…
980882f 
…f currency to users, sending of notifications to affected users
@itinerare
Merge branch 'comments' into galleries
01fef45
@itinerare
Merge branch 'modified-main' into galleries
3dafbb8
@itinerare
- Add report link to gallery submissions
7d99385 
- Add content warning display to both parsed-text gallery submission thumbnails and pre-generated markdown
- Make parsed-text gallery submission thumbnails use plain credits for readability
@itinerare
Better generated markdown for gallery submissions with images and con…
90c66f8 
…tent warnings
@itinerare
Merge branch 'modified-main' into galleries
60ee5fa
@itinerare
Merge branch 'modified-main' into galleries
c65f5db
@itinerare
Clarify collaborator approval form
e5225af
@itinerare
Merge branch 'modified-main' into extension/galleries
31cf26e
@itinerare
Merge branch 'develop' into feature/galleries
4d468c9
@itinerare
Remove form builder package dependency
0be12dd
@itinerare
- Add start and end time to galleries as well as hide before start
0de86f4 
- Add display of recent submissions in a gallery's child galleries on index page (thanks Uri!)
@itinerare
Add display of submissions in child galleries to gallery page as well
b3ff1da
@itinerare
Fix bug approving gallery submisisons with associated character witho…
e0de09a 
…ut on-site owner
@itinerare
- Update gallery submissions to find associated prompts/prompt submis…
382cfa1 
…sions automatically

(Searches submission URLs for the gallery submission URL)
- Update auto-prefixing to use automatically associated prompts
- Add section to gallery submission sidebar with associated submissions
@itinerare itinerare added the needs review Pull requests that are pending community review label Dec 4, 2020
corowne
corowne requested changes Dec 5, 2020
View reviewed changes
Copy link
Owner

@corowne corowne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mostly small comment edits and etc.; the two relatively larger ones are:

  • Put the gallery settings in AddSiteSettings
  • Shuffle some HTML out of a model

app/Http/Controllers/Admin/Data/GalleryController.php Outdated Show resolved Hide resolved
app/Http/Controllers/Users/UserController.php Outdated Show resolved Hide resolved
app/Models/Gallery/Gallery.php Outdated Show resolved Hide resolved
app/Models/Gallery/GallerySubmission.php Outdated Show resolved Hide resolved
app/Models/Gallery/GallerySubmission.php Outdated Show resolved Hide resolved
database/migrations/2020_09_16_190405_make_gallery_tables.php Show resolved Hide resolved
database/migrations/2020_09_16_190405_make_gallery_tables.php Show resolved Hide resolved
database/migrations/2020_09_16_190405_make_gallery_tables.php Show resolved Hide resolved
.gitignore Outdated Show resolved Hide resolved
app/Console/Commands/AddGallerySettings.php Outdated Show resolved Hide resolved
@itinerare
- Move thumbnail HTML out of model
e47fcc6 
- Fix child submission display bug
@itinerare
- Clean up comments
a479f55 
- Add migration to add indexes to gallery tables
- Move gallery settings to add-site-settings
- General tidying
corowne
corowne requested changes Dec 6, 2020
View reviewed changes
Copy link
Owner

@corowne corowne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mentioned 2 of these things on Discord, aside from that one small typo

resources/views/galleries/_sidebar.blade.php Outdated Show resolved Hide resolved
resources/views/galleries/index.blade.php Outdated Show resolved Hide resolved
resources/views/galleries/_sidebar.blade.php Outdated Show resolved Hide resolved
corowne
corowne approved these changes Dec 6, 2020
View reviewed changes
Copy link
Owner

@corowne corowne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good to go I think!

@itinerare itinerare added reviewed Pull requests that have received community review and are pending merge and removed needs review Pull requests that are pending community review labels Dec 6, 2020
@itinerare itinerare merged commit 2777cfe into corowne:develop Dec 6, 2020
@itinerare itinerare deleted the feature/galleries branch December 6, 2020 10:21
@corowne corowne mentioned this pull request Dec 6, 2020
Closed
28 tasks
@itinerare itinerare added this to the v2.0.0 milestone Dec 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@corowne corowne corowne approved these changes

Assignees
No one assigned
Labels
reviewed Pull requests that have received community review and are pending merge
Projects
None yet
Milestone
v2.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@itinerare @corowne