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.

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

CONCD-654 Merge Feature branch into Main #2276

Merged
merged 62 commits into from
Feb 13, 2024
Merged

Conversation

rasarkar
Copy link
Collaborator

No description provided.

rasarkar and others added 30 commits February 12, 2024 09:49
…ration) (#2086)

* CONCD-492 Create database tables for Tutorial slides (WiP)

* CONCD-492 I don't actually want this to display as 'Tutorial Cards' in the admin

* CONCD-492 Card display, sort order
* CONCD-488 Delete Quick Tips module in Django admin

* CONCD-488 database change (Requires Migration)

* CONCD-488 no idea where auth 0013 came from
* CONCD-491 post_save signal handler

* CONCD-491 trying to resolve a merge conflict
* CONCD-480 Create manual link for opening tutorial

* CONCD-480 toggle modal
… and comes back, the popup should automatically open again
rasarkar and others added 20 commits February 12, 2024 15:00
* Bump jinja2 from 3.1.2 to 3.1.3 (#2229)

Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/pallets/jinja/releases)
- [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst)
- [Commits](pallets/jinja@3.1.2...3.1.3)

---
updated-dependencies:
- dependency-name: jinja2
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* CONCD-646 Simple unit test (#2232)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* CONCD-650 Build front end for How To Guide (WiP)

* CONCD-650 I'm struggling to get this to work using bootstrap, so for now I'm going to implement it using only html and css

* CONCD-650 just barely started working on the actual layout

* CONCD-650 misc style fixes

* CONCD-650 implementing the various guides as custom panes

* CONCD-650 I think that it actually makes more sense to organize these as a carousel

* CONCD-650 fixed the issue with the 'hamburger' icon not being rendered correctly

* CONCD-650 moved the button/ label to the side

* CONCD-650 About this Campaign

* CONCD-650 Helpful links

* CONCD-650 minor fixes. I think the carousel works a lot better, if we just remove the 'slide' class

* CONCD-650 while the guide is 'hidden', its border shouldn't be visible

* CONCD-650 some code clean-up
* CONCD-650 slide indices were off by 1

* CONCD-650 pointer: cursor
* CONCD-651 Share data between simple pages and guides

* CONCD-650 slide indices were off by 1

* CONCD-651 fixing an issue where view tests were failing
* CONCD-650 Make the X to escape out always available

* CONCD-650 Also make the guide closeable at any time by hitting ESC

* CONCD-650 the padding around the transcription box is missing

* CONCD-650 Reduce padding around both the How to Guide heading and the section title

* CONCD-650 Campaign.description

* CONCD-650 added padding above Helpful Links

* CONCD-650 reduced font size of Helpful Links
…allow date data to be passed in from the admin (#2246) (#2247)

* Modified daily data backfill functions to split them using tasks and allow date data to be psssed in from the admin

* Updated black version in pre-commit config

* Updated black version to lint files

* Linted one other file

Co-authored-by: Josh Stegmaier <104993387+joshuastegmaier@users.noreply.github.com>
* CONCD-675 refactor Simple Pages (WiP)

* CONCD-675 setup codemirror

* CONCD-675 add new field to the template
* CONCD-674 display heading data has not yet been added

* CONCD-674 set the dialog box to one standard height (WiP)

* CONCD-674 fixed an issue where controls weren't always clickable

* CONCD-674 alt text
* CONCD-650 going to try moving the guide outside of the editor column

* CONCD-650 adjusting the vertical positioning of the guide

* CONCD-650 additional padding between the About this Campaign sections

* CONCD-650 fixed a bug where the external link symbol was being displayed next to loc.gov links

* CONCD-650 reduced font of Helpful Links

* CONCD-650 Change title to 'How-To Guide'

* CONCD-650 fixed an issue where css was having unintended consequences

* CONCD-650 trying to fix an issue where the modal cannot be interacted with, unless there is at least one guide object

* CONCD-650 center name in the title bar vertically

* CONCD-650 center X vertically

* CONCD-650 trying to make the 'x' consistent across guide sections
…2258)

* CONCD-675 pull content for Simple Page from the corresponding Guide section (rather than the reverse)

* CONCD-675 reverting older changes
* CONCD-588 order the new fields a little more logically

* CONCD-588 added updated_on field to Card model (Requires Migration)

* CONCD-588 set Card.updated_on (Requires Migration)

* CONCD-588 renumbered migrations
* CONCD-675 exception for transcription page (WiP)

* CONCD-675 exception for transcription page
* CONCD-674 reduce some padding slightly

* CONCD-674 close button should align with header

* CONCD-674 set height dynamically
* CONCD-650 I want to try moving the title bar outside of the carousel (WiP)

* CONCD-650 I think the title bar looks better works better outside of the carousel

* CONCD-650 show/ hide the 'hamburger' icon
* CONCD-650 within text areas, set headers to the same size as text (1 rem) but bolded

* CONCD-650 add 8px of padding above the H3s
@rasarkar rasarkar marked this pull request as ready for review February 13, 2024 13:33
package.json Outdated Show resolved Hide resolved
@jkueloc jkueloc merged commit b5329bb into main Feb 13, 2024
4 checks passed
@rasarkar rasarkar deleted the CONCD-654-rsar-merge-branch branch February 20, 2024 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants